@ng-formworks/core 20.6.5 → 20.6.6

package/fesm2022/ng-formworks-core.mjs

@@ -6460,7 +6460,8 @@ function buildLayoutFromSchema(jsf, widgetLibrary, nodeValue = null, schemaPoint
                                         '/properties/' + innerItemLevel2.name : innerItemLevel2.name;
                                     //innerItemLevel2.oneOfPointer =  schemaPointer + keySchemaPointer + l2SchemaPointer;
                                     // innerItemLevel2.schemaPointer=innerItemLevel2.schemaPointer; 
-                                    innerItemLevel2.oneOfPointer = innerItemLevel2.schemaPointer;
+                                    const ofPointer = { anyOf: "anyOfPointer", oneOf: "oneOfPointer" }[ofType];
+                                    innerItemLevel2[ofPointer] = ofPointer ? innerItemLevel2.schemaPointer : undefined;
                                 });
                             }
                             //TODO review-will never reach here if forRefLibrary==true
@@ -6470,6 +6471,9 @@ function buildLayoutFromSchema(jsf, widgetLibrary, nodeValue = null, schemaPoint
                                 innerItem.forEach(item => {
                                     const l2SchemaPointer = hasOwn(ofItem, 'properties') ?
                                         '/properties/' + item.name : item.name;
+                                    if (ofType == "anyOf") {
+                                        item.anyOfPointer = item.schemaPointer;
+                                    }
                                     if (outerOneOfItem) {
                                         ////item.oneOfPointer =  schemaPointer + keySchemaPointer + l2SchemaPointer;
                                         //schemaPointer + keySchemaPointer + item.dataPointer;
@@ -6493,7 +6497,8 @@ function buildLayoutFromSchema(jsf, widgetLibrary, nodeValue = null, schemaPoint
                             }
                             else {
                                 if (outerOneOfItem) {
-                                    innerItem.oneOfPointer = schemaPointer + keySchemaPointer; // + innerItem.dataPointer;
+                                    const ofPointer = { anyOf: "anyOfPointer", oneOf: "oneOfPointer" }[ofType];
+                                    innerItem[ofPointer] = ofPointer ? schemaPointer + keySchemaPointer : undefined;
                                     ////innerItem.schemaPointer=innerItem.oneOfPointer; 
                                     outerOneOfItem.items = outerOneOfItem.items || [];
                                     outerOneOfItem.items.push(innerItem);
@@ -7503,7 +7508,8 @@ class JsonSchemaFormService {
         //introduced to check if the node  is part of ITE conditional
         //then change or add the control
         if (layoutNode?.schemaPointer && layoutNode.isITEItem ||
-            (layoutNode?.schemaPointer && layoutNode?.oneOfPointer)) {
+            (layoutNode?.schemaPointer && layoutNode?.oneOfPointer) ||
+            layoutNode?.schemaPointer && layoutNode.anyOfPointer) {
             //before changing control, need to set the new data type for data formatting
             const schemaType = this.dataMap.get(layoutNode?.dataPointer).get("schemaType");
             if (schemaType != layoutNode.dataType) {
@@ -7546,9 +7552,9 @@ class JsonSchemaFormService {
         //set, as the control would only be initialized when the condition is true 
         //TODO-review need to decide which of the data sets between data,formValues and default 
         //to use for the value
-        if (ctx.options?.condition || layoutNode?.oneOfPointer) {
+        if (ctx.options?.condition || layoutNode?.oneOfPointer || layoutNode?.anyOfPointer) {
             const dataPointer = this.getDataPointer(ctx);
-            const controlValue = ctx.formControl.value;
+            const controlValue = ctx.formControl?.value;
             const dataValue = JsonPointer.has(this.data, dataPointer) ?
                 JsonPointer.get(this.data, dataPointer) : undefined;
             const formValue = JsonPointer.has(this.formValues, dataPointer) ?
@@ -7679,7 +7685,8 @@ class JsonSchemaFormService {
         }
         const schemaPointer = ctx.layoutNode()?.isITEItem ? ctx.layoutNode()?.schemaPointer : null;
         const oneOfPointer = ctx.layoutNode()?.oneOfPointer;
-        return getControl(this.formGroup, this.getDataPointer(ctx), false, schemaPointer || oneOfPointer);
+        const anyOfPointer = ctx.layoutNode()?.anyOfPointer;
+        return getControl(this.formGroup, this.getDataPointer(ctx), false, schemaPointer || oneOfPointer || anyOfPointer);
     }
     setFormControl(ctx, control) {
         if (!ctx || !ctx.layoutNode ||
@@ -7697,7 +7704,8 @@ class JsonSchemaFormService {
         }
         const schemaPointer = ctx.layoutNode()?.isITEItem ? ctx.layoutNode()?.schemaPointer : null;
         const oneOfPointer = ctx.layoutNode()?.oneOfPointer;
-        const control = getControl(this.formGroup, this.getDataPointer(ctx), false, schemaPointer || oneOfPointer);
+        const anyOfPointer = ctx.layoutNode()?.anyOfPointer;
+        const control = getControl(this.formGroup, this.getDataPointer(ctx), false, schemaPointer || oneOfPointer || anyOfPointer);
         return control ? control.value : null;
     }
     getFormControlGroup(ctx) {
@@ -7706,7 +7714,8 @@ class JsonSchemaFormService {
         }
         const schemaPointer = ctx.layoutNode()?.isITEItem ? ctx.layoutNode()?.schemaPointer : null;
         const oneOfPointer = ctx.layoutNode()?.oneOfPointer;
-        return getControl(this.formGroup, this.getDataPointer(ctx), true, schemaPointer || oneOfPointer);
+        const anyOfPointer = ctx.layoutNode()?.anyOfPointer;
+        return getControl(this.formGroup, this.getDataPointer(ctx), true, schemaPointer || oneOfPointer || anyOfPointer);
     }
     getFormControlName(ctx) {
         if (!ctx || !ctx.layoutNode ||