@aemforms/af-core 0.22.133 → 0.22.135

package/esm/afb-runtime.js

@@ -1314,15 +1314,20 @@ class BaseNode {
     _tokens = [];
     _eventSource = EventSource.CODE;
     _fragment = '$form';
+    _idSet;
+    createIdSet() {
+        return new Set();
+    }
     get isContainer() {
         return false;
     }
     constructor(params, _options) {
         this._options = _options;
+        this._idSet = this.createIdSet();
         this[qualifiedName] = null;
         this._jsonModel = {
             ...params,
-            id: 'id' in params ? params.id : this.form.getUniqueId()
+            id: this.form.getUniqueId(params?.id)
         };
         if (this.parent?.isFragment) {
             this._fragment = this.parent.qualifiedName;
@@ -3633,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)) {
@@ -3728,11 +3735,20 @@ class Form extends Container {
     get ruleEngine() {
         return this._ruleEngine;
     }
-    getUniqueId() {
+    getUniqueId(id) {
+        if (id && !this._idSet?.has(id)) {
+            this._idSet?.add(id);
+            return id;
+        }
         if (this._ids == null) {
             return '';
         }
-        return this._ids.next().value;
+        const newId = this._ids.next().value;
+        this._idSet?.add(newId);
+        return newId;
+    }
+    clearIdRegistry() {
+        this._idSet?.clear();
     }
     fieldAdded(field) {
         if (field.fieldType === 'captcha' && !this._captcha) {

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

@@ -21,6 +21,8 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     private _tokens;
     _eventSource: EventSource;
     protected _fragment: string;
+    protected _idSet: Set<string> | undefined;
+    protected createIdSet(): Set<string> | undefined;
     get isContainer(): boolean;
     constructor(params: T, _options: {
         form: FormModel;

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

@@ -123,7 +123,8 @@ declare class Form extends Container<FormJson> implements FormModel {
     isTransparent(): boolean;
     get form(): FormModel;
     get ruleEngine(): RuleEngine;
-    getUniqueId(): string;
+    getUniqueId(id?: string): string;
+    clearIdRegistry(): void;
     fieldAdded(field: FieldModel | FieldsetModel): void;
     visit(callBack: (field: FieldModel | FieldsetModel) => void): void;
     traverseChild(container: Container<any>, callBack: (field: FieldModel | FieldsetModel) => void): void;

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

@@ -126,7 +126,7 @@ export interface FormModel extends ContainerModel, WithState<FormJson> {
     readonly specVersion: Version;
     exportData(): any;
     getElement(id: string): FieldModel | FormModel | FieldsetModel;
-    getUniqueId(): string;
+    getUniqueId(id?: string): string;
     getEventQueue(): EventQueue;
     visit(callBack: (field: FieldModel | FieldsetModel) => void): void;
     resolveQualifiedName(qualifiedName: string): FieldModel | FieldsetModel | null;

package/lib/BaseNode.d.ts

@@ -21,6 +21,8 @@ export declare abstract class BaseNode<T extends BaseJson> implements BaseModel
     private _tokens;
     _eventSource: EventSource;
     protected _fragment: string;
+    protected _idSet: Set<string> | undefined;
+    protected createIdSet(): Set<string> | undefined;
     get isContainer(): boolean;
     constructor(params: T, _options: {
         form: FormModel;

package/lib/BaseNode.js

@@ -124,8 +124,9 @@ class BaseNode {
         this._tokens = [];
         this._eventSource = index_1.EventSource.CODE;
         this._fragment = '$form';
+        this._idSet = this.createIdSet();
         this[exports.qualifiedName] = null;
-        this._jsonModel = Object.assign(Object.assign({}, params), { id: 'id' in params ? params.id : this.form.getUniqueId() });
+        this._jsonModel = Object.assign(Object.assign({}, params), { id: this.form.getUniqueId(params === null || params === void 0 ? void 0 : params.id) });
         if ((_a = this.parent) === null || _a === void 0 ? void 0 : _a.isFragment) {
             this._fragment = this.parent.qualifiedName;
         }
@@ -133,6 +134,9 @@ class BaseNode {
             this._fragment = this.parent.fragment;
         }
     }
+    createIdSet() {
+        return new Set();
+    }
     get isContainer() {
         return false;
     }

package/lib/Form.d.ts

@@ -123,7 +123,8 @@ declare class Form extends Container<FormJson> implements FormModel {
     isTransparent(): boolean;
     get form(): FormModel;
     get ruleEngine(): RuleEngine;
-    getUniqueId(): string;
+    getUniqueId(id?: string): string;
+    clearIdRegistry(): void;
     fieldAdded(field: FieldModel | FieldsetModel): void;
     visit(callBack: (field: FieldModel | FieldsetModel) => void): void;
     traverseChild(container: Container<any>, callBack: (field: FieldModel | FieldsetModel) => void): void;

package/lib/Form.js

@@ -240,11 +240,22 @@ class Form extends Container_1.default {
     get ruleEngine() {
         return this._ruleEngine;
     }
-    getUniqueId() {
+    getUniqueId(id) {
+        var _a, _b, _c;
+        if (id && !((_a = this._idSet) === null || _a === void 0 ? void 0 : _a.has(id))) {
+            (_b = this._idSet) === null || _b === void 0 ? void 0 : _b.add(id);
+            return id;
+        }
         if (this._ids == null) {
             return '';
         }
-        return this._ids.next().value;
+        const newId = this._ids.next().value;
+        (_c = this._idSet) === null || _c === void 0 ? void 0 : _c.add(newId);
+        return newId;
+    }
+    clearIdRegistry() {
+        var _a;
+        (_a = this._idSet) === null || _a === void 0 ? void 0 : _a.clear();
     }
     fieldAdded(field) {
         if (field.fieldType === 'captcha' && !this._captcha) {
@@ -390,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/lib/types/Model.d.ts

@@ -126,7 +126,7 @@ export interface FormModel extends ContainerModel, WithState<FormJson> {
     readonly specVersion: Version;
     exportData(): any;
     getElement(id: string): FieldModel | FormModel | FieldsetModel;
-    getUniqueId(): string;
+    getUniqueId(id?: string): string;
     getEventQueue(): EventQueue;
     visit(callBack: (field: FieldModel | FieldsetModel) => void): void;
     resolveQualifiedName(qualifiedName: string): FieldModel | FieldsetModel | null;

package/package.json

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