@aemforms/af-core 0.22.134 → 0.22.136

package/esm/afb-runtime.js

@@ -1535,6 +1535,20 @@ class BaseNode {
         this.queueEvent(action);
         this.form.getEventQueue().runPendingQueue();
     }
+    withDependencyTrackingControl(disableDependencyTracking, callback) {
+        const currentDependencyTracking = this.form.ruleEngine.getDependencyTracking();
+        if (disableDependencyTracking) {
+            this.form.ruleEngine.setDependencyTracking(false);
+        }
+        try {
+            return callback();
+        }
+        finally {
+            if (disableDependencyTracking) {
+                this.form.ruleEngine.setDependencyTracking(currentDependencyTracking);
+            }
+        }
+    }
     notifyDependents(action) {
         const depsToRestore = this._jsonModel._dependents;
         if (depsToRestore) {
@@ -1548,7 +1562,9 @@ class BaseNode {
         }
         const handlers = this._callbacks[action.type] || [];
         handlers.forEach(x => {
-            x(new ActionImplWithTarget(action, this));
+            this.withDependencyTrackingControl(true, () => {
+                x(new ActionImplWithTarget(action, this));
+            });
         });
     }
     isEmpty(value = this._jsonModel.value) {
@@ -3638,22 +3654,24 @@ class Form extends Container {
         return children.filter(child => child.visible === true);
     }
     #getFirstNavigableChild(container) {
-        const navigableChidren = this.#getNavigableChildren(container.items);
-        if (navigableChidren) {
-            return navigableChidren[0];
+        const navigableChildren = this.#getNavigableChildren(container.items);
+        if (navigableChildren && navigableChildren.length > 0) {
+            return navigableChildren[0];
         }
         return null;
     }
     #setActiveFirstDeepChild(currentField) {
         if (!currentField.isContainer) {
-            const parent = currentField.parent;
-            parent.activeChild = currentField;
+            currentField.parent.activeChild = currentField;
             return;
         }
         this.#clearCurrentFocus(currentField);
-        let currentActiveChild = currentField.activeChild;
-        currentActiveChild = (currentActiveChild === null) ? this.#getFirstNavigableChild(currentField) : currentField.activeChild;
-        this.#setActiveFirstDeepChild(currentActiveChild);
+        const activeChild = currentField.activeChild || this.#getFirstNavigableChild(currentField);
+        if (activeChild === null) {
+            currentField.parent.activeChild = currentField;
+            return;
+        }
+        this.#setActiveFirstDeepChild(activeChild);
     }
     #getNextItem(currIndex, navigableChidren) {
         if (currIndex < (navigableChidren.length - 1)) {

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

@@ -84,6 +84,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     abstract executeAction(action: Action): any;
     queueEvent(action: Action): void;
     dispatch(action: Action): void;
+    protected withDependencyTrackingControl<T>(disableDependencyTracking: boolean, callback: () => T): T;
     notifyDependents(action: Action): void;
     protected isEmpty(value?: any): boolean;
     _setProperty<T>(prop: string, newValue: T, notify?: boolean, notifyChildren?: (action: Action) => void): any;

package/lib/BaseNode.d.ts

@@ -84,6 +84,7 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     abstract executeAction(action: Action): any;
     queueEvent(action: Action): void;
     dispatch(action: Action): void;
+    protected withDependencyTrackingControl<T>(disableDependencyTracking: boolean, callback: () => T): T;
     notifyDependents(action: Action): void;
     protected isEmpty(value?: any): boolean;
     _setProperty<T>(prop: string, newValue: T, notify?: boolean, notifyChildren?: (action: Action) => void): any;

package/lib/BaseNode.js

@@ -330,6 +330,20 @@ class BaseNode {
         this.queueEvent(action);
         this.form.getEventQueue().runPendingQueue();
     }
+    withDependencyTrackingControl(disableDependencyTracking, callback) {
+        const currentDependencyTracking = this.form.ruleEngine.getDependencyTracking();
+        if (disableDependencyTracking) {
+            this.form.ruleEngine.setDependencyTracking(false);
+        }
+        try {
+            return callback();
+        }
+        finally {
+            if (disableDependencyTracking) {
+                this.form.ruleEngine.setDependencyTracking(currentDependencyTracking);
+            }
+        }
+    }
     notifyDependents(action) {
         const depsToRestore = this._jsonModel._dependents;
         if (depsToRestore) {
@@ -343,7 +357,9 @@ class BaseNode {
         }
         const handlers = this._callbacks[action.type] || [];
         handlers.forEach(x => {
-            x(new ActionImplWithTarget(action, this));
+            this.withDependencyTrackingControl(true, () => {
+                x(new ActionImplWithTarget(action, this));
+            });
         });
     }
     isEmpty(value = this._jsonModel.value) {

package/lib/Form.js

@@ -401,21 +401,23 @@ class Form extends Container_1.default {
 _Form_instances = new WeakSet(), _Form_getNavigableChildren = function _Form_getNavigableChildren(children) {
     return children.filter(child => child.visible === true);
 }, _Form_getFirstNavigableChild = function _Form_getFirstNavigableChild(container) {
-    const navigableChidren = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNavigableChildren).call(this, container.items);
-    if (navigableChidren) {
-        return navigableChidren[0];
+    const navigableChildren = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNavigableChildren).call(this, container.items);
+    if (navigableChildren && navigableChildren.length > 0) {
+        return navigableChildren[0];
     }
     return null;
 }, _Form_setActiveFirstDeepChild = function _Form_setActiveFirstDeepChild(currentField) {
     if (!currentField.isContainer) {
-        const parent = currentField.parent;
-        parent.activeChild = currentField;
+        currentField.parent.activeChild = currentField;
         return;
     }
     __classPrivateFieldGet(this, _Form_instances, "m", _Form_clearCurrentFocus).call(this, currentField);
-    let currentActiveChild = currentField.activeChild;
-    currentActiveChild = (currentActiveChild === null) ? __classPrivateFieldGet(this, _Form_instances, "m", _Form_getFirstNavigableChild).call(this, currentField) : currentField.activeChild;
-    __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, currentActiveChild);
+    const activeChild = currentField.activeChild || __classPrivateFieldGet(this, _Form_instances, "m", _Form_getFirstNavigableChild).call(this, currentField);
+    if (activeChild === null) {
+        currentField.parent.activeChild = currentField;
+        return;
+    }
+    __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, activeChild);
 }, _Form_getNextItem = function _Form_getNextItem(currIndex, navigableChidren) {
     if (currIndex < (navigableChidren.length - 1)) {
         return navigableChidren[currIndex + 1];

package/package.json

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