fix(json-schema): improve anyOf selection of primitive types

fix #3980
ngx-formly · Oct 13, 2024 · 74662f6 · 74662f6
1 parent 4fbc367
commit 74662f6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/core/json-schema/src/formly-json-schema.service.spec.ts b/src/core/json-schema/src/formly-json-schema.service.spec.ts
@@ -1800,6 +1800,30 @@ describe('Service: FormlyJsonschema', () => {
 
           expect(field.model).toEqual({ foo: 'bar' });
         });
+
+        it('should support anyOf using mixed type', () => {
+          const { field } = renderComponent({
+            model: { foo: [] },
+            schema: {
+              type: 'object',
+              properties: {
+                foo: {
+                  anyOf: [{ type: 'object' }, { type: 'array' }],
+                },
+              },
+            },
+          });
+
+          const [
+            ,
+            {
+              fieldGroup: [foo1Field, foo2Field],
+            },
+          ] = field.fieldGroup[0].fieldGroup[0].fieldGroup;
+
+          expect(foo1Field.hide).toBeTruthy();
+          expect(foo2Field.hide).toBeFalsy();
+        });
       });
     });
 

diff --git a/src/core/json-schema/src/formly-json-schema.service.ts b/src/core/json-schema/src/formly-json-schema.service.ts
@@ -498,10 +498,10 @@ export class FormlyJsonschema {
       ];
     }
 
-    if (schema.oneOf && !field.type) {
+    if (schema.anyOf && !field.type) {
       delete field.key;
       field.fieldGroup = [
-        this.resolveMultiSchema('oneOf', <JSONSchema7[]>schema.oneOf, { ...options, key, shareFormControl: false }),
+        this.resolveMultiSchema('oneOf', <JSONSchema7[]>schema.anyOf, { ...options, key, shareFormControl: false }),
       ];
     }