@zeedhi/common 1.64.0 → 1.65.0

package/dist/zd-common.esm.js

@@ -5579,34 +5579,38 @@ class Grid extends Iterable {
         });
     }
     getActionComponent(actionComponent, column, row, parentPath = '') {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const rowKey = row[this.datasource.uniqueKey];
         const compName = actionComponent.name;
         const instanceName = `${compName}_${rowKey}`;
         const path = parentPath ? `${parentPath}.${compName}` : compName;
         const newComponent = merge({}, actionComponent, (_b = (_a = this.actionsApplied[rowKey]) === null || _a === void 0 ? void 0 : _a[column.name]) === null || _b === void 0 ? void 0 : _b[path]);
-        let compEvents = {};
-        if (newComponent.events) {
-            compEvents = Event.factory(newComponent.events);
+        let newClickEvt;
+        if ((_c = newComponent.events) === null || _c === void 0 ? void 0 : _c.click) {
+            const compEvents = Event.factory(newComponent.events);
+            if (typeof compEvents.click === 'function') {
+                newClickEvt = ({ component, event, element }) => compEvents.click({
+                    component, event, element, row, column,
+                });
+            }
         }
-        const newEvents = Object.assign(Object.assign({}, compEvents), { click: ({ component, event, element }) => {
-                if (compEvents.click) {
-                    compEvents.click({
-                        component, event, element, row, column,
-                    });
-                }
-            } });
-        const newChildren = (_c = newComponent.children) === null || _c === void 0 ? void 0 : _c.map((child) => this.getActionComponent(child, column, row, path));
+        const newChildren = (_d = newComponent.children) === null || _d === void 0 ? void 0 : _d.map((child) => this.getActionComponent(child, column, row, path));
         newComponent.name = instanceName;
         newComponent.children = newChildren;
-        newComponent.events = newEvents;
         try {
             const updatedComponent = Object.assign({}, newComponent);
             delete updatedComponent.datasource;
-            Metadata.updateInstance(instanceName, updatedComponent);
+            delete updatedComponent.events;
+            const instance = Metadata.updateInstance(instanceName, updatedComponent);
+            if (newClickEvt)
+                instance.events.click = newClickEvt;
         }
         catch (e) {
-            // do nothing
+            if (!newComponent.events) {
+                newComponent.events = {};
+            }
+            if (newClickEvt)
+                newComponent.events.click = newClickEvt;
         }
         return newComponent;
     }

package/dist/zd-common.umd.js

@@ -5586,34 +5586,38 @@
           });
       }
       getActionComponent(actionComponent, column, row, parentPath = '') {
-          var _a, _b, _c;
+          var _a, _b, _c, _d;
           const rowKey = row[this.datasource.uniqueKey];
           const compName = actionComponent.name;
           const instanceName = `${compName}_${rowKey}`;
           const path = parentPath ? `${parentPath}.${compName}` : compName;
           const newComponent = merge__default["default"]({}, actionComponent, (_b = (_a = this.actionsApplied[rowKey]) === null || _a === void 0 ? void 0 : _a[column.name]) === null || _b === void 0 ? void 0 : _b[path]);
-          let compEvents = {};
-          if (newComponent.events) {
-              compEvents = core.Event.factory(newComponent.events);
+          let newClickEvt;
+          if ((_c = newComponent.events) === null || _c === void 0 ? void 0 : _c.click) {
+              const compEvents = core.Event.factory(newComponent.events);
+              if (typeof compEvents.click === 'function') {
+                  newClickEvt = ({ component, event, element }) => compEvents.click({
+                      component, event, element, row, column,
+                  });
+              }
           }
-          const newEvents = Object.assign(Object.assign({}, compEvents), { click: ({ component, event, element }) => {
-                  if (compEvents.click) {
-                      compEvents.click({
-                          component, event, element, row, column,
-                      });
-                  }
-              } });
-          const newChildren = (_c = newComponent.children) === null || _c === void 0 ? void 0 : _c.map((child) => this.getActionComponent(child, column, row, path));
+          const newChildren = (_d = newComponent.children) === null || _d === void 0 ? void 0 : _d.map((child) => this.getActionComponent(child, column, row, path));
           newComponent.name = instanceName;
           newComponent.children = newChildren;
-          newComponent.events = newEvents;
           try {
               const updatedComponent = Object.assign({}, newComponent);
               delete updatedComponent.datasource;
-              core.Metadata.updateInstance(instanceName, updatedComponent);
+              delete updatedComponent.events;
+              const instance = core.Metadata.updateInstance(instanceName, updatedComponent);
+              if (newClickEvt)
+                  instance.events.click = newClickEvt;
           }
           catch (e) {
-              // do nothing
+              if (!newComponent.events) {
+                  newComponent.events = {};
+              }
+              if (newClickEvt)
+                  newComponent.events.click = newClickEvt;
           }
           return newComponent;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.64.0",
+  "version": "1.65.0",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -39,5 +39,5 @@
     "lodash.times": "^4.3.2",
     "mockdate": "^3.0.2"
   },
-  "gitHead": "b6b5f30c0cad72871a9dfb193046d7523f34e302"
+  "gitHead": "9cc57793d46b9a160449bd16cf62c19c6ad63bcf"
 }