@aemforms/af-core 0.22.118 → 0.22.120

package/esm/afb-runtime.js

@@ -2407,7 +2407,10 @@ class Container extends Scriptable {
             for (const change of action.payload.changes) {
                 if (change.propertyName !== undefined && notifyChildrenAttributes.includes(change.propertyName)) {
                     this.items.forEach((child) => {
-                        this.notifyDependents.call(child, propertyChange(change.propertyName, child.getState()[change.propertyName], null));
+                        if (change.currentValue !== child.getState()[change.propertyName]) {
+                            child._jsonModel[change.propertyName] = change.currentValue;
+                            this.notifyDependents.call(child, propertyChange(change.propertyName, child.getState()[change.propertyName], null));
+                        }
                         if (child.fieldType === 'panel') {
                             this.notifyChildren.call(child, action);
                         }
@@ -3450,28 +3453,35 @@ class Form extends Container {
         }
     }
     setFocus(field, focusOption) {
-        if (!focusOption) {
-            this.#clearCurrentFocus(field);
-            this.#setActiveFirstDeepChild(field);
-            return;
-        }
-        const parent = (field?.isContainer ? field : field.parent);
-        const navigableChidren = this.#getNavigableChildren(parent.items);
-        let activeChild = parent.activeChild;
-        let currActiveChildIndex = activeChild !== null ? navigableChidren.indexOf(activeChild) : -1;
-        if (parent.activeChild === null) {
-            this.#setActiveFirstDeepChild(navigableChidren[0]);
-            currActiveChildIndex = 0;
-            return;
-        }
-        if (focusOption === FocusOption.NEXT_ITEM) {
-            activeChild = this.#getNextItem(currActiveChildIndex, navigableChidren);
-        }
-        else if (focusOption === FocusOption.PREVIOUS_ITEM) {
-            activeChild = this.#getPreviousItem(currActiveChildIndex, navigableChidren);
+        const dependencyTracking = this._ruleEngine.getDependencyTracking();
+        this._ruleEngine.setDependencyTracking(false);
+        try {
+            if (!focusOption) {
+                this.#clearCurrentFocus(field);
+                this.#setActiveFirstDeepChild(field);
+                return;
+            }
+            const parent = (field?.isContainer ? field : field.parent);
+            const navigableChidren = this.#getNavigableChildren(parent.items);
+            let activeChild = parent.activeChild;
+            let currActiveChildIndex = activeChild !== null ? navigableChidren.indexOf(activeChild) : -1;
+            if (parent.activeChild === null) {
+                this.#setActiveFirstDeepChild(navigableChidren[0]);
+                currActiveChildIndex = 0;
+                return;
+            }
+            if (focusOption === FocusOption.NEXT_ITEM) {
+                activeChild = this.#getNextItem(currActiveChildIndex, navigableChidren);
+            }
+            else if (focusOption === FocusOption.PREVIOUS_ITEM) {
+                activeChild = this.#getPreviousItem(currActiveChildIndex, navigableChidren);
+            }
+            if (activeChild !== null) {
+                this.#setActiveFirstDeepChild(activeChild);
+            }
         }
-        if (activeChild !== null) {
-            this.#setActiveFirstDeepChild(activeChild);
+        finally {
+            this._ruleEngine.setDependencyTracking(dependencyTracking);
         }
     }
     getState(forRestore = false) {
@@ -3681,6 +3691,7 @@ class RuleEngine {
     ];
     customFunctions;
     debugInfo = [];
+    dependencyTracking = true;
     constructor() {
         this.customFunctions = FunctionRuntime.getFunctions();
     }
@@ -3715,10 +3726,16 @@ class RuleEngine {
         return finalRes;
     }
     trackDependency(subscriber) {
-        if (this._context && this._context.field !== undefined && this._context.field !== subscriber) {
+        if (this.dependencyTracking && this._context && this._context.field !== undefined && this._context.field !== subscriber) {
             subscriber._addDependent(this._context.field);
         }
     }
+    setDependencyTracking(track) {
+        this.dependencyTracking = track;
+    }
+    getDependencyTracking() {
+        return this.dependencyTracking;
+    }
 }
 
 class Fieldset extends Container {
@@ -3873,6 +3890,9 @@ class Field extends Scriptable {
         if (['plain-text', 'image'].indexOf(this.fieldType) === -1) {
             this._jsonModel.value = undefined;
         }
+        else if (this.fieldType === 'image') {
+            this._jsonModel.value = this._jsonModel.properties['fd:repoPath'] ?? this._jsonModel.value;
+        }
         else {
             this._jsonModel.default = this._jsonModel.default || this._jsonModel.value;
         }

package/esm/types/src/rules/RuleEngine.d.ts

@@ -5,6 +5,7 @@ declare class RuleEngine {
     private _globalNames;
     private readonly customFunctions;
     private debugInfo;
+    private dependencyTracking;
     constructor();
     compileRule(rule: string, locale?: string): {
         formula: Formula;
@@ -12,5 +13,7 @@ declare class RuleEngine {
     };
     execute(node: any, data: any, globals: any, useValueOf: boolean | undefined, eString: string): any;
     trackDependency(subscriber: BaseModel): void;
+    setDependencyTracking(track: boolean): void;
+    getDependencyTracking(): boolean;
 }
 export default RuleEngine;

package/lib/Container.js

@@ -463,7 +463,10 @@ class Container extends Scriptable_1.default {
             for (const change of action.payload.changes) {
                 if (change.propertyName !== undefined && notifyChildrenAttributes.includes(change.propertyName)) {
                     this.items.forEach((child) => {
-                        this.notifyDependents.call(child, (0, Events_1.propertyChange)(change.propertyName, child.getState()[change.propertyName], null));
+                        if (change.currentValue !== child.getState()[change.propertyName]) {
+                            child._jsonModel[change.propertyName] = change.currentValue;
+                            this.notifyDependents.call(child, (0, Events_1.propertyChange)(change.propertyName, child.getState()[change.propertyName], null));
+                        }
                         if (child.fieldType === 'panel') {
                             this.notifyChildren.call(child, action);
                         }

package/lib/Field.js

@@ -100,6 +100,7 @@ class Field extends Scriptable_1.default {
         return finalType;
     }
     _applyDefaults() {
+        var _a;
         super._applyDefaultsInModel();
         this.coerceParam('required', 'boolean');
         this.coerceParam('readOnly', 'boolean');
@@ -111,6 +112,9 @@ class Field extends Scriptable_1.default {
         if (['plain-text', 'image'].indexOf(this.fieldType) === -1) {
             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;
+        }
         else {
             this._jsonModel.default = this._jsonModel.default || this._jsonModel.value;
         }

package/lib/Form.js

@@ -166,28 +166,35 @@ class Form extends Container_1.default {
         return new SubmitMetaData_1.default(options);
     }
     setFocus(field, focusOption) {
-        if (!focusOption) {
-            __classPrivateFieldGet(this, _Form_instances, "m", _Form_clearCurrentFocus).call(this, field);
-            __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, field);
-            return;
-        }
-        const parent = ((field === null || field === void 0 ? void 0 : field.isContainer) ? field : field.parent);
-        const navigableChidren = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNavigableChildren).call(this, parent.items);
-        let activeChild = parent.activeChild;
-        let currActiveChildIndex = activeChild !== null ? navigableChidren.indexOf(activeChild) : -1;
-        if (parent.activeChild === null) {
-            __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, navigableChidren[0]);
-            currActiveChildIndex = 0;
-            return;
-        }
-        if (focusOption === index_1.FocusOption.NEXT_ITEM) {
-            activeChild = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNextItem).call(this, currActiveChildIndex, navigableChidren);
-        }
-        else if (focusOption === index_1.FocusOption.PREVIOUS_ITEM) {
-            activeChild = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getPreviousItem).call(this, currActiveChildIndex, navigableChidren);
+        const dependencyTracking = this._ruleEngine.getDependencyTracking();
+        this._ruleEngine.setDependencyTracking(false);
+        try {
+            if (!focusOption) {
+                __classPrivateFieldGet(this, _Form_instances, "m", _Form_clearCurrentFocus).call(this, field);
+                __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, field);
+                return;
+            }
+            const parent = ((field === null || field === void 0 ? void 0 : field.isContainer) ? field : field.parent);
+            const navigableChidren = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNavigableChildren).call(this, parent.items);
+            let activeChild = parent.activeChild;
+            let currActiveChildIndex = activeChild !== null ? navigableChidren.indexOf(activeChild) : -1;
+            if (parent.activeChild === null) {
+                __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, navigableChidren[0]);
+                currActiveChildIndex = 0;
+                return;
+            }
+            if (focusOption === index_1.FocusOption.NEXT_ITEM) {
+                activeChild = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNextItem).call(this, currActiveChildIndex, navigableChidren);
+            }
+            else if (focusOption === index_1.FocusOption.PREVIOUS_ITEM) {
+                activeChild = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getPreviousItem).call(this, currActiveChildIndex, navigableChidren);
+            }
+            if (activeChild !== null) {
+                __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, activeChild);
+            }
         }
-        if (activeChild !== null) {
-            __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, activeChild);
+        finally {
+            this._ruleEngine.setDependencyTracking(dependencyTracking);
         }
     }
     getState(forRestore = false) {

package/lib/rules/RuleEngine.d.ts

@@ -5,6 +5,7 @@ declare class RuleEngine {
     private _globalNames;
     private readonly customFunctions;
     private debugInfo;
+    private dependencyTracking;
     constructor();
     compileRule(rule: string, locale?: string): {
         formula: Formula;
@@ -12,5 +13,7 @@ declare class RuleEngine {
     };
     execute(node: any, data: any, globals: any, useValueOf: boolean | undefined, eString: string): any;
     trackDependency(subscriber: BaseModel): void;
+    setDependencyTracking(track: boolean): void;
+    getDependencyTracking(): boolean;
 }
 export default RuleEngine;

package/lib/rules/RuleEngine.js

@@ -21,6 +21,7 @@ class RuleEngine {
             '$event'
         ];
         this.debugInfo = [];
+        this.dependencyTracking = true;
         this.customFunctions = FunctionRuntime_1.FunctionRuntime.getFunctions();
     }
     compileRule(rule, locale) {
@@ -55,9 +56,15 @@ class RuleEngine {
         return finalRes;
     }
     trackDependency(subscriber) {
-        if (this._context && this._context.field !== undefined && this._context.field !== subscriber) {
+        if (this.dependencyTracking && this._context && this._context.field !== undefined && this._context.field !== subscriber) {
             subscriber._addDependent(this._context.field);
         }
     }
+    setDependencyTracking(track) {
+        this.dependencyTracking = track;
+    }
+    getDependencyTracking() {
+        return this.dependencyTracking;
+    }
 }
 exports.default = RuleEngine;

package/package.json

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