Merge pull request #375 from guillotinaweb/fix_373_2.4.x

add support for array items with different schema definitions fix #373

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.4.11 (2020-12-03)
+- fix #373: add support for array items with different schema definitions
+
+# 2.4.10 (2020-12-03)
+- fix #370: handle non existing fields in visibleIf - oneOf and allOf as null value.
+
 # 2.4.9 (2020-11-12)
 - fix #367: Fix boolean negative visiblityIf condition. Add array support for $EXP$ as visibilityIf condition.
 

projects/schema-form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngx-schema-form",
-  "version": "2.4.10",
+  "version": "2.4.11",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/guillotinaweb/ngx-schema-form"

projects/schema-form/src/lib/model/arrayproperty.ts

@@ -26,7 +26,19 @@ export class ArrayProperty extends PropertyGroup {
   }
 
   private addProperty() {
-    let newProperty = this.formPropertyFactory.createProperty(this.schema.items, this);
+    let itemSchema = this.schema.items
+    if (Array.isArray(this.schema.items)) {
+      const itemSchemas = this.schema.items as object[]
+      if (itemSchemas.length > (<FormProperty[]>this.properties).length) {
+        itemSchema = itemSchema[(<FormProperty[]>this.properties).length]
+      } else if (this.schema.additionalItems) {
+        itemSchema = this.schema.additionalItems
+      } else {
+        // souldn't add new items since schema is undefined for the item at its position
+        return null
+      }
+    }
+    let newProperty = this.formPropertyFactory.createProperty(itemSchema, this);
     (<FormProperty[]>this.properties).push(newProperty);
     return newProperty;
   }