@aemforms/af-core 0.22.66 → 0.22.68

package/lib/Form.js

@@ -7,7 +7,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _Form_instances, _Form_getNavigableChildren, _Form_getFirstNavigableChild, _Form_setActiveFirstDeepChild, _Form_getNextItem, _Form_getPreviousItem;
+var _Form_instances, _Form_getNavigableChildren, _Form_getFirstNavigableChild, _Form_setActiveFirstDeepChild, _Form_getNextItem, _Form_getPreviousItem, _Form_clearCurrentFocus;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Container_1 = __importDefault(require("./Container"));
 const FormMetaData_1 = __importDefault(require("./FormMetaData"));
@@ -82,32 +82,28 @@ class Form extends Container_1.default {
         return submitMetaInstance;
     }
     setFocus(field, focusOption) {
-        if (focusOption) {
-            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 === Model_1.FocusOption.NEXT_ITEM) {
-                activeChild = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNextItem).call(this, currActiveChildIndex, navigableChidren);
-            }
-            else if (focusOption === Model_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 (!focusOption) {
+            __classPrivateFieldGet(this, _Form_instances, "m", _Form_clearCurrentFocus).call(this, field);
+            __classPrivateFieldGet(this, _Form_instances, "m", _Form_setActiveFirstDeepChild).call(this, field);
+            return;
         }
-        else {
-            const parent = field.parent;
-            const currentField = field;
-            while (parent != null && parent.activeChild != currentField) {
-                parent.activeChild = currentField;
-            }
+        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 === Model_1.FocusOption.NEXT_ITEM) {
+            activeChild = __classPrivateFieldGet(this, _Form_instances, "m", _Form_getNextItem).call(this, currActiveChildIndex, navigableChidren);
+        }
+        else if (focusOption === Model_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);
         }
     }
     getState() {
@@ -160,7 +156,25 @@ class Form extends Container_1.default {
         field.subscribe((action) => {
             const field = action.target.getState();
             if (field) {
-                const fieldChangedAction = new Events_1.FieldChanged(action.payload.changes, field);
+                const shallowClone = (obj) => {
+                    if (obj && typeof obj === 'object') {
+                        if (Array.isArray(obj)) {
+                            return obj.map(shallowClone);
+                        }
+                        else {
+                            return Object.assign({}, obj);
+                        }
+                    }
+                    return obj;
+                };
+                const changes = action.payload.changes.map(({ propertyName, currentValue, prevValue }) => {
+                    return {
+                        propertyName,
+                        currentValue: shallowClone(currentValue),
+                        prevValue: shallowClone(prevValue)
+                    };
+                });
+                const fieldChangedAction = new Events_1.FieldChanged(changes, field);
                 this.dispatch(fieldChangedAction);
             }
         });
@@ -244,6 +258,7 @@ _Form_instances = new WeakSet(), _Form_getNavigableChildren = function _Form_get
         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);
@@ -257,5 +272,10 @@ _Form_instances = new WeakSet(), _Form_getNavigableChildren = function _Form_get
         return navigableChidren[currIndex - 1];
     }
     return null;
+}, _Form_clearCurrentFocus = function _Form_clearCurrentFocus(field) {
+    const parent = field.parent;
+    if (parent != null && parent.activeChild != null) {
+        parent.activeChild = null;
+    }
 };
 exports.default = Form;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aemforms/af-core",
-  "version": "0.22.66",
+  "version": "0.22.68",
   "description": "Core Module for Forms Runtime",
   "author": "Adobe Systems",
   "license": "Adobe Proprietary",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@adobe/json-formula": "0.1.50",
-    "@aemforms/af-formatters": "^0.22.66"
+    "@aemforms/af-formatters": "^0.22.68"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.20.2",