fix(fieldset): Fix handleValidation for undefined fieldset

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remoteoss/json-schema-form",
-  "version": "0.11.11-beta.0",
+  "version": "0.11.12-dev.20250310202108",
   "description": "Headless UI form powered by JSON Schemas",
   "author": "Remote.com <engineering@remote.com> (https://remote.com/)",
   "license": "MIT",

src/internals/checkIfConditionMatches.js

@@ -1,6 +1,8 @@
 import { compareFormValueWithSchemaValue, getField, validateFieldSchema } from '../helpers';
 import { hasProperty } from '../utils';
 
+import { supportedTypes } from './fields';
+
 /**
  * Checks if a "IF" condition matches given the current form state
  * @param {Object} node - JSON schema node
@@ -20,7 +22,10 @@ export function checkIfConditionMatchesProperties(node, formValues, formFields,
 
   return Object.keys(node.if.properties ?? {}).every((name) => {
     const currentProperty = node.if.properties[name];
-    const value = formValues[name];
+    const field = getField(name, formFields ?? []);
+    const isFieldsetField = field?.inputType === supportedTypes.FIELDSET;
+    const value = formValues?.[name] ?? (isFieldsetField ? {} : undefined);
+
     const hasEmptyValue =
       typeof value === 'undefined' ||
       // NOTE: This is a "Remote API" dependency, as empty fields are sent as "null".
@@ -65,8 +70,6 @@ export function checkIfConditionMatchesProperties(node, formValues, formFields,
       );
     }
 
-    const field = getField(name, formFields);
-
     return validateFieldSchema(
       {
         ...field,

src/tests/conditions.test.js

@@ -596,6 +596,74 @@ describe('Conditional with anyOf', () => {
   });
 });
 
+describe('Conditional with fieldset', () => {
+  const schema = {
+    additionalProperties: false,
+    type: 'object',
+    properties: {
+      field_a: {
+        type: 'object',
+        properties: {
+          min: { type: 'number' },
+          max: { type: 'number' },
+        },
+      },
+      field_b: { type: 'string' },
+    },
+    allOf: [
+      {
+        if: {
+          properties: {
+            field_a: {
+              properties: {
+                min: {
+                  minimum: 10,
+                },
+              },
+              required: ['min'],
+            },
+          },
+          required: ['field_a'],
+        },
+        then: {
+          required: ['field_b'],
+        },
+        else: {
+          properties: {
+            field_b: false,
+          },
+        },
+      },
+    ],
+  };
+
+  it('handles true case', () => {
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+
+    expect(fields[1].isVisible).toBe(false);
+    expect(handleValidation({ field_a: { min: 100 } }).formErrors).toEqual({
+      field_b: 'Required field',
+    });
+    expect(fields[1].isVisible).toBe(true);
+  });
+
+  it('handles false case', () => {
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+
+    expect(fields[1].isVisible).toBe(false);
+    expect(handleValidation({ field_a: { min: 1 } }).formErrors).toBeUndefined();
+    expect(fields[1].isVisible).toBe(false);
+  });
+
+  it('handles undefined fieldset case', () => {
+    const { fields, handleValidation } = createHeadlessForm(schema, { strictInputType: false });
+
+    expect(fields[1].isVisible).toBe(false);
+    expect(handleValidation({}).formErrors).toBeUndefined();
+    expect(fields[1].isVisible).toBe(false);
+  });
+});
+
 describe('Conditionals - bugs and code-smells', () => {
   // Why do we have these bugs?
   // To be honest we never realized it much later later.