@aemforms/af-core 0.22.101 → 0.22.102

package/esm/afb-runtime.js

@@ -2043,7 +2043,19 @@ class Container extends Scriptable {
         if ((action.type === 'addItem' || action.type == 'addInstance') && this._itemTemplate != null) {
             if ((this._jsonModel.maxItems === -1) || (this._children.length < this._jsonModel.maxItems)) {
                 const dataNode = this.getDataNode();
-                let instanceIndex = action.payload;
+                let instanceIndex = null;
+                let instanceData = null;
+                if (typeof action.payload === 'number') {
+                    instanceIndex = action.payload;
+                }
+                else if (typeof action.payload === 'object') {
+                    if ('index' in action.payload) {
+                        instanceIndex = action.payload.index;
+                    }
+                    if ('data' in action.payload) {
+                        instanceData = action.payload.data;
+                    }
+                }
                 const retVal = this._addChild(this._itemTemplate, action.payload, true);
                 if (typeof instanceIndex !== 'number' || instanceIndex > this._children.length) {
                     instanceIndex = this._children.length;
@@ -2059,6 +2071,9 @@ class Container extends Scriptable {
                 for (let i = instanceIndex + 1; i < this._children.length; i++) {
                     this._children[i].dispatch(new ExecuteRule());
                 }
+                if (instanceData) {
+                    retVal.importData(instanceData);
+                }
             }
         }
     }
@@ -2112,14 +2127,21 @@ class Container extends Scriptable {
     dispatch(action) {
         super.dispatch(action);
     }
+    createDataGroup(dataModel) {
+        const dataGroup = new DataGroup(this._data.$name, dataModel, this._data.$type, this._data.parent);
+        try {
+            this._data.parent?.$addDataNode(dataGroup.$name, dataGroup, true);
+        }
+        catch (e) {
+            this.form.logger.error(`Unable to set items for container '${this.qualifiedName}' with data model '${dataModel}': ${e.message}`);
+            return null;
+        }
+        return dataGroup;
+    }
     importData(dataModel) {
         if (typeof this._data !== 'undefined' && this.type === 'array' && Array.isArray(dataModel)) {
-            const dataGroup = new DataGroup(this._data.$name, dataModel, this._data.$type, this._data.parent);
-            try {
-                this._data.parent?.$addDataNode(dataGroup.$name, dataGroup, true);
-            }
-            catch (e) {
-                this.form.logger.error(`unable to setItems for ${this.qualifiedName} : ${e}`);
+            const dataGroup = this.createDataGroup(dataModel);
+            if (!dataGroup) {
                 return;
             }
             this._data = dataGroup;
@@ -2136,6 +2158,13 @@ class Container extends Scriptable {
                 this.notifyDependents(propertyChange('items', null, item.getState()));
             });
         }
+        if (typeof this._data !== 'undefined' && this.type === 'object') {
+            const dataGroup = this.createDataGroup(dataModel);
+            if (!dataGroup) {
+                return;
+            }
+            this.syncDataAndFormModel(dataGroup);
+        }
     }
     syncDataAndFormModel(contextualDataModel) {
         const result = {

package/esm/types/src/Container.d.ts

@@ -64,6 +64,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
     reset(): void;
     validate(): import("./types/Model").ValidationError[];
     dispatch(action: Action): void;
+    createDataGroup(dataModel: any): DataGroup | null;
     importData(dataModel: any): void;
     syncDataAndFormModel(contextualDataModel?: DataGroup): any;
     get activeChild(): BaseModel | null;

package/esm/types/src/controller/Events.d.ts

@@ -32,6 +32,10 @@ export type UIChangePayload = {
     value?: any;
     checked?: boolean;
 };
+export type AddItemPayload = {
+    index: number;
+    data: Record<string, any>;
+};
 export declare class Change extends ActionImpl {
     constructor(payload: ChangePayload, dispatch?: boolean);
     withAdditionalChange(change: Change): Change;
@@ -93,13 +97,13 @@ export declare class CustomEvent extends ActionImpl {
     get isCustomEvent(): boolean;
 }
 export declare class AddItem extends ActionImpl {
-    constructor(payload?: number);
+    constructor(payload?: number | AddItemPayload);
 }
 export declare class RemoveItem extends ActionImpl {
     constructor(payload?: number);
 }
 export declare class AddInstance extends ActionImpl {
-    constructor(payload?: number);
+    constructor(payload?: number | AddItemPayload);
 }
 export declare class RemoveInstance extends ActionImpl {
     constructor(payload?: number);

package/lib/Container.d.ts

@@ -64,6 +64,7 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
     reset(): void;
     validate(): import("./types/Model").ValidationError[];
     dispatch(action: Action): void;
+    createDataGroup(dataModel: any): DataGroup | null;
     importData(dataModel: any): void;
     syncDataAndFormModel(contextualDataModel?: DataGroup): any;
     get activeChild(): BaseModel | null;

package/lib/Container.js

@@ -275,7 +275,19 @@ class Container extends Scriptable_1.default {
         if ((action.type === 'addItem' || action.type == 'addInstance') && this._itemTemplate != null) {
             if ((this._jsonModel.maxItems === -1) || (this._children.length < this._jsonModel.maxItems)) {
                 const dataNode = this.getDataNode();
-                let instanceIndex = action.payload;
+                let instanceIndex = null;
+                let instanceData = null;
+                if (typeof action.payload === 'number') {
+                    instanceIndex = action.payload;
+                }
+                else if (typeof action.payload === 'object') {
+                    if ('index' in action.payload) {
+                        instanceIndex = action.payload.index;
+                    }
+                    if ('data' in action.payload) {
+                        instanceData = action.payload.data;
+                    }
+                }
                 const retVal = this._addChild(this._itemTemplate, action.payload, true);
                 if (typeof instanceIndex !== 'number' || instanceIndex > this._children.length) {
                     instanceIndex = this._children.length;
@@ -291,6 +303,9 @@ class Container extends Scriptable_1.default {
                 for (let i = instanceIndex + 1; i < this._children.length; i++) {
                     this._children[i].dispatch(new Events_1.ExecuteRule());
                 }
+                if (instanceData) {
+                    retVal.importData(instanceData);
+                }
             }
         }
     }
@@ -345,15 +360,22 @@ class Container extends Scriptable_1.default {
     dispatch(action) {
         super.dispatch(action);
     }
-    importData(dataModel) {
+    createDataGroup(dataModel) {
         var _a;
+        const dataGroup = new DataGroup_1.default(this._data.$name, dataModel, this._data.$type, this._data.parent);
+        try {
+            (_a = this._data.parent) === null || _a === void 0 ? void 0 : _a.$addDataNode(dataGroup.$name, dataGroup, true);
+        }
+        catch (e) {
+            this.form.logger.error(`Unable to set items for container '${this.qualifiedName}' with data model '${dataModel}': ${e.message}`);
+            return null;
+        }
+        return dataGroup;
+    }
+    importData(dataModel) {
         if (typeof this._data !== 'undefined' && this.type === 'array' && Array.isArray(dataModel)) {
-            const dataGroup = new DataGroup_1.default(this._data.$name, dataModel, this._data.$type, this._data.parent);
-            try {
-                (_a = this._data.parent) === null || _a === void 0 ? void 0 : _a.$addDataNode(dataGroup.$name, dataGroup, true);
-            }
-            catch (e) {
-                this.form.logger.error(`unable to setItems for ${this.qualifiedName} : ${e}`);
+            const dataGroup = this.createDataGroup(dataModel);
+            if (!dataGroup) {
                 return;
             }
             this._data = dataGroup;
@@ -370,6 +392,13 @@ class Container extends Scriptable_1.default {
                 this.notifyDependents((0, Events_1.propertyChange)('items', null, item.getState()));
             });
         }
+        if (typeof this._data !== 'undefined' && this.type === 'object') {
+            const dataGroup = this.createDataGroup(dataModel);
+            if (!dataGroup) {
+                return;
+            }
+            this.syncDataAndFormModel(dataGroup);
+        }
     }
     syncDataAndFormModel(contextualDataModel) {
         const result = {

package/lib/controller/Events.d.ts

@@ -32,6 +32,10 @@ export declare type UIChangePayload = {
     value?: any;
     checked?: boolean;
 };
+export declare type AddItemPayload = {
+    index: number;
+    data: Record<string, any>;
+};
 export declare class Change extends ActionImpl {
     constructor(payload: ChangePayload, dispatch?: boolean);
     withAdditionalChange(change: Change): Change;
@@ -93,13 +97,13 @@ export declare class CustomEvent extends ActionImpl {
     get isCustomEvent(): boolean;
 }
 export declare class AddItem extends ActionImpl {
-    constructor(payload?: number);
+    constructor(payload?: number | AddItemPayload);
 }
 export declare class RemoveItem extends ActionImpl {
     constructor(payload?: number);
 }
 export declare class AddInstance extends ActionImpl {
-    constructor(payload?: number);
+    constructor(payload?: number | AddItemPayload);
 }
 export declare class RemoveInstance extends ActionImpl {
     constructor(payload?: number);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.101",
+  "version": "0.22.102",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.101"
+    "@aemforms/af-formatters": "^0.22.102"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",