@aemforms/af-core 0.22.134 → 0.22.135

package/esm/afb-runtime.js

@@ -3638,22 +3638,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/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.135",
   "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.135"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",