@aemforms/af-core 0.22.120 → 0.22.121

package/esm/afb-events.js

@@ -111,8 +111,8 @@ class ValidationComplete extends ActionImpl {
     }
 }
 class Focus extends ActionImpl {
-    constructor() {
-        super({}, 'focus', { dispatch: false });
+    constructor(payload, dispatch = false) {
+        super(payload, 'focus', { dispatch });
     }
 }
 class Submit extends ActionImpl {

package/esm/afb-runtime.js

@@ -1,4 +1,4 @@
-import { propertyChange, ExecuteRule, Initialize, RemoveItem, SubmitSuccess, CustomEvent, SubmitError, SubmitFailure, Submit, Save, Valid, Invalid, RemoveInstance, AddInstance, Reset, AddItem, Click, Change, FormLoad, FieldChanged, ValidationComplete } from './afb-events.js';
+import { propertyChange, ExecuteRule, Initialize, RemoveItem, SubmitSuccess, CustomEvent, SubmitError, SubmitFailure, Submit, Save, Focus, Valid, Invalid, RemoveInstance, AddInstance, Reset, AddItem, Click, Change, FormLoad, FieldChanged, ValidationComplete } from './afb-events.js';
 import Formula from '@adobe/json-formula';
 import { parseDefaultDate, datetimeToNumber, format, parseDateSkeleton, numberToDatetime, formatDate, parseDate } from '@aemforms/af-formatters';
 
@@ -2050,7 +2050,6 @@ class Container extends Scriptable {
         return {
             ...super.getState(forRestore),
             ...(forRestore ? {
-                initialItems: this.items.length,
                 ':items': undefined,
                 ':itemsOrder': undefined
             } : {}),
@@ -2176,7 +2175,8 @@ class Container extends Scriptable {
             if (typeof (this._jsonModel.initialItems) !== 'number') {
                 this._jsonModel.initialItems = Math.max(1, this._jsonModel.minItems);
             }
-            for (let i = 0; i < this._jsonModel.initialItems; i++) {
+            const itemsLength = mode === 'restore' ? this._jsonModel.items.length : this._jsonModel.initialItems;
+            for (let i = 0; i < itemsLength; i++) {
                 let child;
                 if (mode === 'restore') {
                     let itemTemplate = this._itemTemplate;
@@ -2825,6 +2825,8 @@ const createAction = (name, payload = {}, dispatch = false) => {
             return new Valid(payload);
         case 'initialize':
             return new Initialize(payload);
+        case 'focus':
+            return new Focus(payload);
         default:
             console.error('invalid action');
     }
@@ -3891,7 +3893,7 @@ class Field extends Scriptable {
             this._jsonModel.value = undefined;
         }
         else if (this.fieldType === 'image') {
-            this._jsonModel.value = this._jsonModel.properties['fd:repoPath'] ?? this._jsonModel.value;
+            this._jsonModel.value = this._jsonModel?.properties?.['fd:repoPath'] ?? this._jsonModel.value;
         }
         else {
             this._jsonModel.default = this._jsonModel.default || this._jsonModel.value;
@@ -4098,7 +4100,7 @@ class Field extends Scriptable {
             return this.executeExpression(this.displayValueExpression);
         }
         const df = this.displayFormat;
-        if (df && this.isNotEmpty(this.value) && this.valid !== false) {
+        if (df && this.isNotEmpty(this.value) && this?.validity?.typeMismatch !== true) {
             try {
                 return format(this.value, this.lang, df);
             }

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

@@ -32,7 +32,6 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
         items: any[];
         enabled: boolean | undefined;
         readOnly: any;
-        initialItems?: number | undefined;
         ':items'?: undefined;
         ':itemsOrder'?: undefined;
         _dependents?: string[] | undefined;

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

@@ -100,7 +100,6 @@ declare class Form extends Container<FormJson> implements FormModel {
         items: any[];
         enabled: boolean | undefined;
         readOnly: any;
-        initialItems?: number | undefined;
         ':items'?: undefined;
         ':itemsOrder'?: undefined;
         _dependents?: string[] | undefined;

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

@@ -69,7 +69,7 @@ export declare class ValidationComplete extends ActionImpl {
     constructor(payload?: Array<ValidationError>, dispatch?: boolean);
 }
 export declare class Focus extends ActionImpl {
-    constructor();
+    constructor(payload?: any, dispatch?: boolean);
 }
 export declare class Submit extends ActionImpl {
     constructor(payload?: any, dispatch?: boolean);

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

@@ -15,7 +15,7 @@ export interface ScriptableField {
     readonly ruleEngine: RuleEngine;
 }
 interface WithState<T> {
-    getState: () => any;
+    getState: (forRestore?: boolean) => any;
 }
 type stateProps = {
     id: string;

package/lib/Container.d.ts

@@ -32,7 +32,6 @@ declare abstract class Container<T extends ContainerJson & RulesJson> extends Sc
         items: any[];
         enabled: boolean | undefined;
         readOnly: any;
-        initialItems?: number | undefined;
         ':items'?: undefined;
         ':itemsOrder'?: undefined;
         _dependents?: string[] | undefined;

package/lib/Container.js

@@ -114,7 +114,6 @@ class Container extends Scriptable_1.default {
     }
     getState(isRepeatableChild = false, forRestore = false) {
         return Object.assign(Object.assign(Object.assign({}, super.getState(forRestore)), (forRestore ? {
-            initialItems: this.items.length,
             ':items': undefined,
             ':itemsOrder': undefined
         } : {})), { items: this.getItemsState(isRepeatableChild, forRestore), enabled: this.enabled, readOnly: this.readOnly });
@@ -228,7 +227,8 @@ class Container extends Scriptable_1.default {
             if (typeof (this._jsonModel.initialItems) !== 'number') {
                 this._jsonModel.initialItems = Math.max(1, this._jsonModel.minItems);
             }
-            for (let i = 0; i < this._jsonModel.initialItems; i++) {
+            const itemsLength = mode === 'restore' ? this._jsonModel.items.length : this._jsonModel.initialItems;
+            for (let i = 0; i < itemsLength; i++) {
                 let child;
                 if (mode === 'restore') {
                     let itemTemplate = this._itemTemplate;

package/lib/Field.js

@@ -100,7 +100,7 @@ class Field extends Scriptable_1.default {
         return finalType;
     }
     _applyDefaults() {
-        var _a;
+        var _a, _b, _c;
         super._applyDefaultsInModel();
         this.coerceParam('required', 'boolean');
         this.coerceParam('readOnly', 'boolean');
@@ -113,7 +113,7 @@ class Field extends Scriptable_1.default {
             this._jsonModel.value = undefined;
         }
         else if (this.fieldType === 'image') {
-            this._jsonModel.value = (_a = this._jsonModel.properties['fd:repoPath']) !== null && _a !== void 0 ? _a : this._jsonModel.value;
+            this._jsonModel.value = (_c = (_b = (_a = this._jsonModel) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b['fd:repoPath']) !== null && _c !== void 0 ? _c : this._jsonModel.value;
         }
         else {
             this._jsonModel.default = this._jsonModel.default || this._jsonModel.value;
@@ -315,11 +315,12 @@ class Field extends Scriptable_1.default {
         }
     }
     get displayValue() {
+        var _a;
         if (this.displayValueExpression && typeof this.displayValueExpression === 'string' && this.displayValueExpression.length !== 0) {
             return this.executeExpression(this.displayValueExpression);
         }
         const df = this.displayFormat;
-        if (df && this.isNotEmpty(this.value) && this.valid !== false) {
+        if (df && this.isNotEmpty(this.value) && ((_a = this === null || this === void 0 ? void 0 : this.validity) === null || _a === void 0 ? void 0 : _a.typeMismatch) !== true) {
             try {
                 return (0, af_formatters_1.format)(this.value, this.lang, df);
             }

package/lib/Form.d.ts

@@ -100,7 +100,6 @@ declare class Form extends Container<FormJson> implements FormModel {
         items: any[];
         enabled: boolean | undefined;
         readOnly: any;
-        initialItems?: number | undefined;
         ':items'?: undefined;
         ':itemsOrder'?: undefined;
         _dependents?: string[] | undefined;

package/lib/controller/Events.d.ts

@@ -69,7 +69,7 @@ export declare class ValidationComplete extends ActionImpl {
     constructor(payload?: Array<ValidationError>, dispatch?: boolean);
 }
 export declare class Focus extends ActionImpl {
-    constructor();
+    constructor(payload?: any, dispatch?: boolean);
 }
 export declare class Submit extends ActionImpl {
     constructor(payload?: any, dispatch?: boolean);

package/lib/controller/Events.js

@@ -120,8 +120,8 @@ class ValidationComplete extends ActionImpl {
 }
 exports.ValidationComplete = ValidationComplete;
 class Focus extends ActionImpl {
-    constructor() {
-        super({}, 'focus', { dispatch: false });
+    constructor(payload, dispatch = false) {
+        super(payload, 'focus', { dispatch });
     }
 }
 exports.Focus = Focus;

package/lib/rules/FunctionRuntime.js

@@ -191,6 +191,8 @@ const createAction = (name, payload = {}, dispatch = false) => {
             return new Events_1.Valid(payload);
         case 'initialize':
             return new Events_1.Initialize(payload);
+        case 'focus':
+            return new Events_1.Focus(payload);
         default:
             console.error('invalid action');
     }

package/lib/types/Model.d.ts

@@ -15,7 +15,7 @@ export interface ScriptableField {
     readonly ruleEngine: RuleEngine;
 }
 interface WithState<T> {
-    getState: () => any;
+    getState: (forRestore?: boolean) => any;
 }
 declare type stateProps = {
     id: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.120",
+  "version": "0.22.121",
   "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.120"
+    "@aemforms/af-formatters": "^0.22.121"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",