@zeedhi/common 1.105.0 → 1.105.1

package/dist/zd-common.esm.js

@@ -7175,10 +7175,7 @@ class GridEditable extends Grid {
         }
         let allValid = true;
         this.datasource.data.forEach((row) => this.columns.forEach((column) => {
-            const rowKey = row[this.datasource.uniqueKey];
-            const cellsApplied = (this.cellsApplied[rowKey] || {})[column.name];
-            const columnWithConditions = Object.assign(Object.assign({}, column), cellsApplied);
-            if (!column.isVisible || !columnWithConditions.editable)
+            if (!this.isColumnEditable(column, row))
                 return;
             if (!this.isValid(column, row, true))
                 allValid = false;
@@ -7304,6 +7301,12 @@ class GridEditable extends Grid {
         const column = this.getColumn(columnName);
         this.changeCell(rowKey, rowIdx, column, value);
     }
+    isColumnEditable(column, row) {
+        const rowKey = row[this.datasource.uniqueKey];
+        const cellsApplied = (this.cellsApplied[rowKey] || {})[column.name];
+        const columnWithConditions = Object.assign(Object.assign({}, column), cellsApplied);
+        return column.isVisible && columnWithConditions.editable && this.callCanEditRow(row);
+    }
     /**
      * Changes a cell value in editedRows
      * @param rowKey Cell's row key
@@ -7314,7 +7317,7 @@ class GridEditable extends Grid {
     changeCell(rowKey, rowIdx, column, value) {
         const originalRow = this.datasource.data[rowIdx];
         // Column doesn't have component
-        if (!column.editable || !column.isVisible) {
+        if (!this.isColumnEditable(column, originalRow)) {
             this.changeEditableComponent(column, originalRow, value);
             return;
         }
@@ -10441,7 +10444,7 @@ class IterableComponentRender extends Iterable {
      * Returns the iterable component metadata based on row data
      */
     getComponentMetadata(row) {
-        const exp = new RegExp(`<<${this.rowPropName}.(.[A-z]+?)>>|"<<${this.rowPropName}.(.[A-z]+?)>>"`, 'g');
+        const exp = new RegExp(`<<${this.rowPropName}\\.([A-z_.]+?)>>|"<<${this.rowPropName}.(.[A-z_.]+?)>>"`, 'g');
         const rowExp = new RegExp(`"<<${this.rowPropName}>>"`, 'g');
         const metadata = JSON.stringify(this.componentMetadata)
             .replace(rowExp, JSON.stringify(row))

package/dist/zd-common.umd.js

@@ -7182,10 +7182,7 @@
           }
           let allValid = true;
           this.datasource.data.forEach((row) => this.columns.forEach((column) => {
-              const rowKey = row[this.datasource.uniqueKey];
-              const cellsApplied = (this.cellsApplied[rowKey] || {})[column.name];
-              const columnWithConditions = Object.assign(Object.assign({}, column), cellsApplied);
-              if (!column.isVisible || !columnWithConditions.editable)
+              if (!this.isColumnEditable(column, row))
                   return;
               if (!this.isValid(column, row, true))
                   allValid = false;
@@ -7311,6 +7308,12 @@
           const column = this.getColumn(columnName);
           this.changeCell(rowKey, rowIdx, column, value);
       }
+      isColumnEditable(column, row) {
+          const rowKey = row[this.datasource.uniqueKey];
+          const cellsApplied = (this.cellsApplied[rowKey] || {})[column.name];
+          const columnWithConditions = Object.assign(Object.assign({}, column), cellsApplied);
+          return column.isVisible && columnWithConditions.editable && this.callCanEditRow(row);
+      }
       /**
        * Changes a cell value in editedRows
        * @param rowKey Cell's row key
@@ -7321,7 +7324,7 @@
       changeCell(rowKey, rowIdx, column, value) {
           const originalRow = this.datasource.data[rowIdx];
           // Column doesn't have component
-          if (!column.editable || !column.isVisible) {
+          if (!this.isColumnEditable(column, originalRow)) {
               this.changeEditableComponent(column, originalRow, value);
               return;
           }
@@ -10448,7 +10451,7 @@
        * Returns the iterable component metadata based on row data
        */
       getComponentMetadata(row) {
-          const exp = new RegExp(`<<${this.rowPropName}.(.[A-z]+?)>>|"<<${this.rowPropName}.(.[A-z]+?)>>"`, 'g');
+          const exp = new RegExp(`<<${this.rowPropName}\\.([A-z_.]+?)>>|"<<${this.rowPropName}.(.[A-z_.]+?)>>"`, 'g');
           const rowExp = new RegExp(`"<<${this.rowPropName}>>"`, 'g');
           const metadata = JSON.stringify(this.componentMetadata)
               .replace(rowExp, JSON.stringify(row))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.105.0",
+  "version": "1.105.1",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -43,5 +43,5 @@
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
   },
-  "gitHead": "bac0dd5514d2a2e47f68c9e3b950e3041cf4aad4"
+  "gitHead": "24ad78a766b215833445a5c5ff14ff3f2fffbed1"
 }

package/types/components/zd-grid/grid-editable.d.ts

@@ -233,6 +233,7 @@ export declare class GridEditable extends Grid implements IGridEditable {
      * @throws RowNotFoundError If the row is not present in datasource
      */
     updateCell(rowKey: string, columnName: string, value: any): void;
+    private isColumnEditable;
     /**
      * Changes a cell value in editedRows
      * @param rowKey Cell's row key