@sanity/assist 4.4.7 → 4.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/assist",
-  "version": "4.4.7",
+  "version": "4.4.8",
   "description": "You create the instructions; Sanity AI Assist does the rest.",
   "keywords": [
     "sanity",

package/src/helpers/conditionalMembers.test.ts

@@ -227,6 +227,49 @@ describe('conditionalMembers', () => {
     ])
   })
 
+  test('should include field with conditional state inside fieldset', () => {
+    const docSchema: ObjectSchemaType = Schema.compile({
+      name: 'test',
+      types: [
+        defineType({
+          type: 'document',
+          name: 'article',
+          fieldsets: [{name: 'set'}],
+          fields: [{type: 'string', fieldset: 'set', name: 'title', hidden: () => false}],
+        }),
+      ],
+    }).get('article')
+
+    const docState = {
+      path: [],
+      schemaType: docSchema,
+      members: [
+        {
+          kind: 'fieldSet',
+          fieldSet: {
+            name: 'set',
+            path: ['set'],
+            members: [
+              {
+                kind: 'field',
+                field: {path: [docSchema.fields[0].name], schemaType: docSchema.fields[0].type},
+              },
+            ],
+          },
+        },
+      ],
+    } as any
+    const conditionalMembers = getConditionalMembers(docState)
+
+    expect(conditionalMembers).toEqual([
+      {
+        path: 'title',
+        hidden: false,
+        readOnly: false,
+      },
+    ])
+  })
+
   test('should respect max-depth', () => {
     const docSchema: ObjectSchemaType = Schema.compile({
       name: 'test',

package/src/helpers/conditionalMembers.ts

@@ -67,8 +67,8 @@ function conditionalState(memberState: {
 }): ConditionalMemberInnerState {
   return {
     path: pathToString(memberState.path),
-    readOnly: !!memberState.readOnly,
-    hidden: false, // if its in members, its not hidden
+    readOnly: !!memberState.readOnly, // Use actual form state readOnly value
+    hidden: false, // If it's in form state members, it's not hidden
     conditional: isConditional(memberState.schemaType),
   }
 }
@@ -124,7 +124,7 @@ function extractConditionalPaths(
       const innerFields = extractConditionalPaths(member.fieldSet, maxDepth).map((f) => ({
         ...f,
         // if fieldset is conditional, visible fields must also be considered conditional
-        conditional: conditionalFieldset ?? f.conditional,
+        conditional: conditionalFieldset || f.conditional,
       }))
       return [...acc, ...innerFields]
     }