@zeedhi/common 1.39.0 → 1.39.1

package/dist/zd-common.esm.js

@@ -4313,10 +4313,10 @@ class Column extends Component {
      * Apply conditions
      * @param row Datasource row
      */
-    applyCondition(row) {
+    applyCondition(row, factoredConditions = this.factoredConditions) {
         const appliedConditions = {};
-        Object.keys(this.factoredConditions).forEach((condition) => {
-            const conditionFunction = this.factoredConditions[condition];
+        Object.keys(factoredConditions).forEach((condition) => {
+            const conditionFunction = factoredConditions[condition];
             set(appliedConditions, condition, conditionFunction({ row, column: this }));
         });
         return appliedConditions;
@@ -4331,11 +4331,7 @@ class Column extends Component {
         const appliedConditions = {};
         Object.keys(this.actionFactoredConditions).forEach((action) => {
             const factoredConditions = this.actionFactoredConditions[action];
-            appliedConditions[action] = {};
-            Object.keys(factoredConditions).forEach((condition) => {
-                const conditionFunction = factoredConditions[condition];
-                set(appliedConditions[action], condition, conditionFunction({ row }));
-            });
+            appliedConditions[action] = Object.assign({}, this.applyCondition(row, factoredConditions));
         });
         return appliedConditions;
     }

package/dist/zd-common.umd.js

@@ -4320,10 +4320,10 @@
        * Apply conditions
        * @param row Datasource row
        */
-      applyCondition(row) {
+      applyCondition(row, factoredConditions = this.factoredConditions) {
           const appliedConditions = {};
-          Object.keys(this.factoredConditions).forEach((condition) => {
-              const conditionFunction = this.factoredConditions[condition];
+          Object.keys(factoredConditions).forEach((condition) => {
+              const conditionFunction = factoredConditions[condition];
               set__default["default"](appliedConditions, condition, conditionFunction({ row, column: this }));
           });
           return appliedConditions;
@@ -4338,11 +4338,7 @@
           const appliedConditions = {};
           Object.keys(this.actionFactoredConditions).forEach((action) => {
               const factoredConditions = this.actionFactoredConditions[action];
-              appliedConditions[action] = {};
-              Object.keys(factoredConditions).forEach((condition) => {
-                  const conditionFunction = factoredConditions[condition];
-                  set__default["default"](appliedConditions[action], condition, conditionFunction({ row }));
-              });
+              appliedConditions[action] = Object.assign({}, this.applyCondition(row, factoredConditions));
           });
           return appliedConditions;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.39.0",
+  "version": "1.39.1",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -37,5 +37,5 @@
     "lodash.times": "^4.3.2",
     "mockdate": "^3.0.2"
   },
-  "gitHead": "71a699db31a055a0ea5102b6903c97f80bc34edd"
+  "gitHead": "fbf85c6aaac496ff2df31cf231d70b79b3114e5c"
 }

package/types/components/zd-iterable/column.d.ts

@@ -1,4 +1,4 @@
-import { IDictionary, Datasource } from '@zeedhi/core';
+import { IDictionary, Datasource, IEvents } from '@zeedhi/core';
 import { IColumn, ColumnAlign, ColumnType } from './interfaces';
 import { Component } from '../zd-component/component';
 /**
@@ -69,7 +69,9 @@ export declare class Column extends Component implements IColumn {
      * Apply conditions
      * @param row Datasource row
      */
-    applyCondition(row: IDictionary<any>): IDictionary<any>;
+    applyCondition(row: IDictionary<any>, factoredConditions?: IEvents<{
+        row: IDictionary<any>;
+    }>): IDictionary<any>;
     /**
      * Apply conditions on action columns
      * @param row Datasource row