Merge branch 'master' of https://github.com/payloadcms/payload into feat/1695-nullable-localized-array-and-blocks

test/fields/collections/Group/index.ts

@@ -67,6 +67,49 @@ const GroupFields: CollectionConfig = {
         },
       ],
     },
+    {
+      type: 'row',
+      fields: [
+        {
+          name: 'groupInRow',
+          type: 'group',
+          fields: [
+            {
+              name: 'field',
+              type: 'text',
+            },
+            {
+              name: 'secondField',
+              type: 'text',
+            },
+            {
+              name: 'thirdField',
+              type: 'text',
+            },
+          ],
+        },
+        {
+          name: 'secondGroupInRow',
+          type: 'group',
+          fields: [
+            {
+              name: 'field',
+              type: 'text',
+            },
+            {
+              name: 'nestedGroup',
+              type: 'group',
+              fields: [
+                {
+                  name: 'nestedField',
+                  type: 'text',
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
   ],
 };
 

test/fields/payload-types.ts

@@ -282,6 +282,17 @@ export interface GroupField {
   potentiallyEmptyGroup: {
     text?: string;
   };
+  groupInRow: {
+    field?: string;
+    secondField?: string;
+    thirdField?: string;
+  };
+  secondGroupInRow: {
+    field?: string;
+    nestedGroup: {
+      nestedField?: string;
+    };
+  };
   createdAt: string;
   updatedAt: string;
 }