refactor(form): fix issue with hiding a field group that only have fi…

…eldsets (#4477) * chore(test-studio): add repro schema for field groups with only fieldsets inside * refactor(form): tidy up field group logic and fix issue causing field group to be hidden if all fields are inside fieldsets Fixes #4432 * fixup! refactor(form): tidy up field group logic and fix issue causing field group to be hidden if all fields are inside fieldsets * fixup! fixup! refactor(form): tidy up field group logic and fix issue causing field group to be hidden if all fields are inside fieldsets --------- Co-authored-by: Robin Pyon <[email protected]>
sanity-io · May 12, 2023 · cf4fc5c · cf4fc5c · vercel · May 12, 2023
1 parent 1f444a8
commit cf4fc5c
Show file tree

Hide file tree

Showing 9 changed files with 255 additions and 123 deletions.
diff --git a/dev/test-studio/schema/debug/fieldGroupsWithFieldsets.js b/dev/test-studio/schema/debug/fieldGroupsWithFieldsets.js
@@ -0,0 +1,54 @@
+import {CogIcon} from '@sanity/icons'
+
+export default {
+  name: 'fieldGroupsWithFieldsets',
+  title: 'Field groups with all fields inside fieldsets',
+  type: 'document',
+  groups: [
+    {
+      name: 'group1',
+      title: 'Group 1',
+      icon: CogIcon,
+    },
+    {
+      name: 'group2',
+      title: 'Group 2',
+    },
+  ],
+  fieldsets: [
+    {name: 'fieldset1', title: 'Fieldset 1', options: {collapsed: true}},
+    {name: 'fieldset2', title: 'Fieldset 2', options: {collapsed: true}},
+  ],
+  fields: [
+    {
+      name: 'group1fieldset1',
+      type: 'string',
+      group: 'group1',
+      fieldset: 'fieldset1',
+    },
+    {
+      name: 'noGroupFieldset1',
+      type: 'string',
+      validation: (r) => r.required(),
+      fieldset: 'fieldset1',
+    },
+    {
+      name: 'group1fieldset2',
+      type: 'string',
+      group: 'group1',
+      fieldset: 'fieldset2',
+    },
+    {
+      name: 'group2fieldset1',
+      type: 'string',
+      group: 'group2',
+      fieldset: 'fieldset1',
+    },
+    {
+      name: 'group2fieldset2',
+      type: 'string',
+      group: 'group2',
+      fieldset: 'fieldset2',
+    },
+  ],
+}
diff --git a/dev/test-studio/schema/index.ts b/dev/test-studio/schema/index.ts
@@ -106,6 +106,7 @@ import validationTest from './ci/validationCI'
 import crossDatasetReference, {crossDatasetSubtype} from './standard/crossDatasetReference'
 import {circularCrossDatasetReferenceTest} from './debug/circularCrossDatasetReference'
 import {allNativeInputComponents} from './debug/allNativeInputComponents'
+import fieldGroupsWithFieldsets from './debug/fieldGroupsWithFieldsets'
 
 // @todo temporary, until code input is v3 compatible
 const codeInputType = {
@@ -244,6 +245,7 @@ export const schemaTypes = [
   fieldGroupsDefault,
   fieldGroupsMany,
   fieldGroupsWithValidation,
+  fieldGroupsWithFieldsets,
   fieldGroupsWithFieldsetsAndValidation,
   allNativeInputComponents,
   ...v3docs.types,

diff --git a/dev/test-studio/structure/constants.ts b/dev/test-studio/structure/constants.ts
@@ -80,6 +80,7 @@ export const DEBUG_FIELD_GROUP_TYPES = [
   'fieldGroupsDefault',
   'fieldGroupsMany',
   'fieldGroupsWithValidation',
+  'fieldGroupsWithFieldsets',
   'fieldGroupsWithFieldsetsAndValidation',
 ]
 

diff --git a/packages/sanity/src/core/form/inputs/ObjectInput/__tests__/ObjectInput.test.tsx b/packages/sanity/src/core/form/inputs/ObjectInput/__tests__/ObjectInput.test.tsx
@@ -147,6 +147,8 @@ describe('basic examples', () => {
               open: false,
               collapsible: true,
               key: 'first-field',
+              inSelectedGroup: false,
+              groups: [],
               index: 0,
               field: {
                 schemaType,

diff --git a/packages/sanity/src/core/form/members/object/fields/PrimitiveField.test.tsx b/packages/sanity/src/core/form/members/object/fields/PrimitiveField.test.tsx
@@ -207,6 +207,8 @@ function setupTest(type: string, value: string | number | boolean | undefined) {
     collapsed: false,
     collapsible: false,
     open: true,
+    groups: [],
+    inSelectedGroup: false,
     field: {
       id: 'id',
       schemaType: {