@zeedhi/common 1.82.1 → 1.83.1

package/dist/zd-common.esm.js

@@ -4,6 +4,7 @@ import cloneDeep from 'lodash.clonedeep';
 import debounce from 'lodash.debounce';
 import isUndefined from 'lodash.isundefined';
 import set from 'lodash.set';
+import omit from 'lodash.omit';
 import get from 'lodash.get';
 
 /**
@@ -2856,9 +2857,15 @@ class Number$1 extends TextInput {
         }
         else {
             this.formattedValue = value;
-            if (this.autoNumericObj) {
-                this.localValue = parseFloat(this.autoNumericObj.rawValue);
+            if (!this.autoNumericObj)
+                return;
+            const parsed = parseFloat(this.autoNumericObj.rawValue);
+            if (window.Number.isNaN(parsed)) {
+                this.localValue = undefined;
+                this.autoNumericObj.clear();
+                return;
             }
+            this.localValue = parsed;
         }
     }
     /**
@@ -2874,22 +2881,24 @@ class Number$1 extends TextInput {
      */
     parser(value) { return this.parserFn(value, this); }
 }
-FormatterParserProvider.registerFormatter('ZdNumber', (value, { mask = Config.masks.numberMask, } = {}) => {
+FormatterParserProvider.registerFormatter('ZdNumber', (value, { mask = {}, } = {}) => {
     let maskDef = mask;
     if (Accessor.isAccessorDefinition(maskDef)) {
         const [controller, accessor] = Accessor.getAccessor(maskDef);
         maskDef = Loader.getInstance(controller)[accessor];
     }
-    const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
+    let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
+    maskValue = Object.assign(Object.assign({}, Config.masks.numberMask), maskValue);
     return value === null ? '' : AutoNumeric.format(value, maskValue);
 });
-FormatterParserProvider.registerParser('ZdNumber', (value, { mask = Config.masks.numberMask, } = {}) => {
+FormatterParserProvider.registerParser('ZdNumber', (value, { mask = {}, } = {}) => {
     let maskDef = mask;
     if (Accessor.isAccessorDefinition(maskDef)) {
         const [controller, accessor] = Accessor.getAccessor(maskDef);
         maskDef = Loader.getInstance(controller)[accessor];
     }
-    const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
+    let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
+    maskValue = Object.assign(Object.assign({}, Config.masks.numberMask), maskValue);
     return value === '' ? null : AutoNumeric.unformat(value, maskValue);
 });
 
@@ -2908,22 +2917,24 @@ class Currency extends Number$1 {
         this.validateMask();
     }
 }
-FormatterParserProvider.registerFormatter('ZdCurrency', (value, { mask = Object.assign(Object.assign({}, Config.masks.numberMask), Config.masks.currencyMask), } = {}) => {
+FormatterParserProvider.registerFormatter('ZdCurrency', (value, { mask = {}, } = {}) => {
     let maskDef = mask;
     if (Accessor.isAccessorDefinition(maskDef)) {
         const [controller, accessor] = Accessor.getAccessor(maskDef);
         maskDef = Loader.getInstance(controller)[accessor];
     }
-    const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
+    let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
+    maskValue = Object.assign(Object.assign(Object.assign({}, Config.masks.numberMask), Config.masks.currencyMask), maskValue);
     return value === null ? '' : AutoNumeric.format(value, maskValue);
 });
-FormatterParserProvider.registerParser('ZdCurrency', (value, { mask = Object.assign(Object.assign({}, Config.masks.numberMask), Config.masks.currencyMask), } = {}) => {
+FormatterParserProvider.registerParser('ZdCurrency', (value, { mask = {}, } = {}) => {
     let maskDef = mask;
     if (Accessor.isAccessorDefinition(maskDef)) {
         const [controller, accessor] = Accessor.getAccessor(maskDef);
         maskDef = Loader.getInstance(controller)[accessor];
     }
-    const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
+    let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
+    maskValue = Object.assign(Object.assign(Object.assign({}, Config.masks.numberMask), Config.masks.currencyMask), maskValue);
     return value === '' ? null : AutoNumeric.unformat(value, maskValue);
 });
 
@@ -4799,7 +4810,7 @@ class FileInput extends TextInput {
         this.selectFileButton = {
             name: 'select-file-button',
             component: 'ZdButton',
-            label: 'Select files from computer',
+            label: 'SELECT_FILE',
             color: 'primary',
             small: true,
             cssClass: 'zd-mt-1',
@@ -4840,7 +4851,7 @@ class FileInput extends TextInput {
         if (Array.isArray(this.value) && this.maxFiles && this.value.length > +this.maxFiles) {
             this.value.splice(+this.maxFiles);
             AlertService.show({
-                text: `You cannot choose more than ${this.maxFiles} file(s).`,
+                text: I18n.translate('MAX_FILES', { limit: this.maxFiles }),
                 name: 'max-files-alert',
                 color: 'error',
             });
@@ -5749,9 +5760,11 @@ const toggleableFormatter = ({ value, componentProps }) => {
     const trueDefined = isUndefined(trueValue) ? true : trueValue;
     const falseDefined = isUndefined(falseValue) ? false : falseValue;
     if (value === trueDefined) {
-        return trueIcon || trueDisplayValue || trueDefined;
+        const display = trueDisplayValue ? I18n.translate(trueDisplayValue) : trueDisplayValue;
+        return trueIcon || display || trueDefined;
     }
-    return falseIcon || falseDisplayValue || falseDefined;
+    const display = falseDisplayValue ? I18n.translate(falseDisplayValue) : falseDisplayValue;
+    return falseIcon || display || falseDefined;
 };
 FormatterParserProvider.registerFormatter('column_ZdCheckbox', toggleableFormatter);
 FormatterParserProvider.registerFormatter('column_ZdSwitch', toggleableFormatter);
@@ -6535,7 +6548,7 @@ class GridEditable extends Grid {
         if (!Utils.isEqual(value, row[columnName])) {
             const newRow = {};
             newRow[key] = Object.assign({}, this.editedRows[key]);
-            newRow[key].originalRow = Object.assign({}, row);
+            newRow[key].originalRow = omit(row, 'originalRow');
             newRow[key][columnName] = value;
             newRow[key][`${columnName}_original`] = row[columnName];
             if (component)
@@ -6555,8 +6568,9 @@ class GridEditable extends Grid {
         }
     }
     updateOriginalRow(key, row) {
-        if (this.editedRows[key] !== undefined)
-            this.editedRows[key].originalRow = row;
+        if (this.editedRows[key] !== undefined) {
+            this.editedRows[key].originalRow = omit(row, 'originalRow');
+        }
     }
     /**
      * Checks if column is edited
@@ -10284,6 +10298,7 @@ class TreeDataStructure {
                 originalData.splice(index + 1, 0, ...data);
                 this.originalDatasource.data = originalData;
                 this.originalDatasource.currentRow = this.clearRow(row);
+                delete this.originalDatasource.filter[this.parentField];
                 return data;
             }
             return undefined;
@@ -12941,7 +12956,7 @@ class TreeGridEditable extends TreeGrid {
     }
     updateOriginalRow(key, row) {
         if (this.editedRows[key] !== undefined)
-            this.editedRows[key].originalRow = row;
+            this.editedRows[key].originalRow = omit(row, 'originalRow');
     }
     checkLookupData(column, row, componentProps) {
         if (row[column.name] && column.lookupData && componentProps.datasource) {
@@ -12968,7 +12983,7 @@ class TreeGridEditable extends TreeGrid {
         if (!Utils.isEqual(value, row[columnName])) {
             const newRow = {};
             newRow[key] = Object.assign({}, this.editedRows[key]);
-            newRow[key].originalRow = Object.assign({}, row);
+            newRow[key].originalRow = omit(row, 'originalRow');
             newRow[key][columnName] = value;
             newRow[key][`${columnName}_original`] = row[columnName];
             if (component)

package/dist/zd-common.umd.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@zeedhi/core'), require('lodash.merge'), require('lodash.clonedeep'), require('lodash.debounce'), require('lodash.isundefined'), require('lodash.set'), require('lodash.get')) :
-  typeof define === 'function' && define.amd ? define(['exports', '@zeedhi/core', 'lodash.merge', 'lodash.clonedeep', 'lodash.debounce', 'lodash.isundefined', 'lodash.set', 'lodash.get'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@zeedhi/common"] = {}, global.core, global.merge, global.cloneDeep, global.debounce, global.isUndefined, global.set, global.get));
-})(this, (function (exports, core, merge, cloneDeep, debounce, isUndefined, set, get) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@zeedhi/core'), require('lodash.merge'), require('lodash.clonedeep'), require('lodash.debounce'), require('lodash.isundefined'), require('lodash.set'), require('lodash.omit'), require('lodash.get')) :
+  typeof define === 'function' && define.amd ? define(['exports', '@zeedhi/core', 'lodash.merge', 'lodash.clonedeep', 'lodash.debounce', 'lodash.isundefined', 'lodash.set', 'lodash.omit', 'lodash.get'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@zeedhi/common"] = {}, global.core, global.merge, global.cloneDeep, global.debounce, global.isUndefined, global.set, global.omit, global.get));
+})(this, (function (exports, core, merge, cloneDeep, debounce, isUndefined, set, omit, get) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -11,6 +11,7 @@
   var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
   var isUndefined__default = /*#__PURE__*/_interopDefaultLegacy(isUndefined);
   var set__default = /*#__PURE__*/_interopDefaultLegacy(set);
+  var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
   var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
 
   /**
@@ -2863,9 +2864,15 @@
           }
           else {
               this.formattedValue = value;
-              if (this.autoNumericObj) {
-                  this.localValue = parseFloat(this.autoNumericObj.rawValue);
+              if (!this.autoNumericObj)
+                  return;
+              const parsed = parseFloat(this.autoNumericObj.rawValue);
+              if (window.Number.isNaN(parsed)) {
+                  this.localValue = undefined;
+                  this.autoNumericObj.clear();
+                  return;
               }
+              this.localValue = parsed;
           }
       }
       /**
@@ -2881,22 +2888,24 @@
        */
       parser(value) { return this.parserFn(value, this); }
   }
-  core.FormatterParserProvider.registerFormatter('ZdNumber', (value, { mask = core.Config.masks.numberMask, } = {}) => {
+  core.FormatterParserProvider.registerFormatter('ZdNumber', (value, { mask = {}, } = {}) => {
       let maskDef = mask;
       if (core.Accessor.isAccessorDefinition(maskDef)) {
           const [controller, accessor] = core.Accessor.getAccessor(maskDef);
           maskDef = core.Loader.getInstance(controller)[accessor];
       }
-      const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
+      let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
+      maskValue = Object.assign(Object.assign({}, core.Config.masks.numberMask), maskValue);
       return value === null ? '' : AutoNumeric.format(value, maskValue);
   });
-  core.FormatterParserProvider.registerParser('ZdNumber', (value, { mask = core.Config.masks.numberMask, } = {}) => {
+  core.FormatterParserProvider.registerParser('ZdNumber', (value, { mask = {}, } = {}) => {
       let maskDef = mask;
       if (core.Accessor.isAccessorDefinition(maskDef)) {
           const [controller, accessor] = core.Accessor.getAccessor(maskDef);
           maskDef = core.Loader.getInstance(controller)[accessor];
       }
-      const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
+      let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
+      maskValue = Object.assign(Object.assign({}, core.Config.masks.numberMask), maskValue);
       return value === '' ? null : AutoNumeric.unformat(value, maskValue);
   });
 
@@ -2915,22 +2924,24 @@
           this.validateMask();
       }
   }
-  core.FormatterParserProvider.registerFormatter('ZdCurrency', (value, { mask = Object.assign(Object.assign({}, core.Config.masks.numberMask), core.Config.masks.currencyMask), } = {}) => {
+  core.FormatterParserProvider.registerFormatter('ZdCurrency', (value, { mask = {}, } = {}) => {
       let maskDef = mask;
       if (core.Accessor.isAccessorDefinition(maskDef)) {
           const [controller, accessor] = core.Accessor.getAccessor(maskDef);
           maskDef = core.Loader.getInstance(controller)[accessor];
       }
-      const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
+      let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
+      maskValue = Object.assign(Object.assign(Object.assign({}, core.Config.masks.numberMask), core.Config.masks.currencyMask), maskValue);
       return value === null ? '' : AutoNumeric.format(value, maskValue);
   });
-  core.FormatterParserProvider.registerParser('ZdCurrency', (value, { mask = Object.assign(Object.assign({}, core.Config.masks.numberMask), core.Config.masks.currencyMask), } = {}) => {
+  core.FormatterParserProvider.registerParser('ZdCurrency', (value, { mask = {}, } = {}) => {
       let maskDef = mask;
       if (core.Accessor.isAccessorDefinition(maskDef)) {
           const [controller, accessor] = core.Accessor.getAccessor(maskDef);
           maskDef = core.Loader.getInstance(controller)[accessor];
       }
-      const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
+      let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
+      maskValue = Object.assign(Object.assign(Object.assign({}, core.Config.masks.numberMask), core.Config.masks.currencyMask), maskValue);
       return value === '' ? null : AutoNumeric.unformat(value, maskValue);
   });
 
@@ -4806,7 +4817,7 @@
           this.selectFileButton = {
               name: 'select-file-button',
               component: 'ZdButton',
-              label: 'Select files from computer',
+              label: 'SELECT_FILE',
               color: 'primary',
               small: true,
               cssClass: 'zd-mt-1',
@@ -4847,7 +4858,7 @@
           if (Array.isArray(this.value) && this.maxFiles && this.value.length > +this.maxFiles) {
               this.value.splice(+this.maxFiles);
               AlertService.show({
-                  text: `You cannot choose more than ${this.maxFiles} file(s).`,
+                  text: core.I18n.translate('MAX_FILES', { limit: this.maxFiles }),
                   name: 'max-files-alert',
                   color: 'error',
               });
@@ -5756,9 +5767,11 @@
       const trueDefined = isUndefined__default["default"](trueValue) ? true : trueValue;
       const falseDefined = isUndefined__default["default"](falseValue) ? false : falseValue;
       if (value === trueDefined) {
-          return trueIcon || trueDisplayValue || trueDefined;
+          const display = trueDisplayValue ? core.I18n.translate(trueDisplayValue) : trueDisplayValue;
+          return trueIcon || display || trueDefined;
       }
-      return falseIcon || falseDisplayValue || falseDefined;
+      const display = falseDisplayValue ? core.I18n.translate(falseDisplayValue) : falseDisplayValue;
+      return falseIcon || display || falseDefined;
   };
   core.FormatterParserProvider.registerFormatter('column_ZdCheckbox', toggleableFormatter);
   core.FormatterParserProvider.registerFormatter('column_ZdSwitch', toggleableFormatter);
@@ -6542,7 +6555,7 @@
           if (!core.Utils.isEqual(value, row[columnName])) {
               const newRow = {};
               newRow[key] = Object.assign({}, this.editedRows[key]);
-              newRow[key].originalRow = Object.assign({}, row);
+              newRow[key].originalRow = omit__default["default"](row, 'originalRow');
               newRow[key][columnName] = value;
               newRow[key][`${columnName}_original`] = row[columnName];
               if (component)
@@ -6562,8 +6575,9 @@
           }
       }
       updateOriginalRow(key, row) {
-          if (this.editedRows[key] !== undefined)
-              this.editedRows[key].originalRow = row;
+          if (this.editedRows[key] !== undefined) {
+              this.editedRows[key].originalRow = omit__default["default"](row, 'originalRow');
+          }
       }
       /**
        * Checks if column is edited
@@ -10291,6 +10305,7 @@
                   originalData.splice(index + 1, 0, ...data);
                   this.originalDatasource.data = originalData;
                   this.originalDatasource.currentRow = this.clearRow(row);
+                  delete this.originalDatasource.filter[this.parentField];
                   return data;
               }
               return undefined;
@@ -12948,7 +12963,7 @@
       }
       updateOriginalRow(key, row) {
           if (this.editedRows[key] !== undefined)
-              this.editedRows[key].originalRow = row;
+              this.editedRows[key].originalRow = omit__default["default"](row, 'originalRow');
       }
       checkLookupData(column, row, componentProps) {
           if (row[column.name] && column.lookupData && componentProps.datasource) {
@@ -12975,7 +12990,7 @@
           if (!core.Utils.isEqual(value, row[columnName])) {
               const newRow = {};
               newRow[key] = Object.assign({}, this.editedRows[key]);
-              newRow[key].originalRow = Object.assign({}, row);
+              newRow[key].originalRow = omit__default["default"](row, 'originalRow');
               newRow[key][columnName] = value;
               newRow[key][`${columnName}_original`] = row[columnName];
               if (component)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.82.1",
+  "version": "1.83.1",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -26,6 +26,7 @@
     "lodash.get": "4.4.*",
     "lodash.isundefined": "3.0.*",
     "lodash.merge": "4.6.*",
+    "lodash.omit": "^4.5.*",
     "lodash.set": "4.3.*"
   },
   "peerDependencies": {
@@ -36,10 +37,11 @@
     "@types/lodash.get": "4.4.*",
     "@types/lodash.isundefined": "3.0.*",
     "@types/lodash.merge": "4.6.*",
+    "@types/lodash.omit": "^4.5.*",
     "@types/lodash.set": "4.3.*",
     "@types/lodash.times": "4.3.*",
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
   },
-  "gitHead": "1bc7beb3fc58f2708365b45cdbacc74fd6802102"
+  "gitHead": "543eabdb14abf45c8c6f645c760cbf299b446cee"
 }

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

@@ -26,6 +26,10 @@ export declare class GridColumn extends Column implements IGridColumn {
         events?: import("..").IComponentEvents<import("@zeedhi/core").IEventParam<any>> | undefined;
         directives?: import("..").IComponentDirectives | undefined;
         isVisible?: string | boolean | undefined;
+        /**
+         * Creates a new Grid Column.
+         * @param props Grid column properties
+         */
         dark?: boolean | undefined;
         light?: boolean | undefined;
         keyMap?: import("@zeedhi/core").IKeyMap<import("@zeedhi/core").IEventParam<any>> | undefined;