@zeedhi/common 1.63.4-beta.0 → 1.64.1

package/dist/zd-common.esm.js

@@ -1,6 +1,4 @@
-import AutoNumeric from '@zeedhi/autonumeric';
-export { default as AutoNumeric } from '@zeedhi/autonumeric';
-import { AccessorManager, Event, KeyMap, Metadata, FormatterParserProvider, Validation, Mask, Accessor, DatasourceFactory, I18n, MethodNotAssignedError, Loader, Config, dayjs, DateHelper, Utils, Router, InstanceNotFoundError, Cookie, Http, URL as URL$1 } from '@zeedhi/core';
+import { AccessorManager, Event, KeyMap, Metadata, FormatterParserProvider, Validation, Mask, Accessor, DatasourceFactory, I18n, MethodNotAssignedError, Loader, Config, dayjs, DateHelper, Utils, Router, InstanceNotFoundError, Cookie, Http, URL as URL$1, VersionService } from '@zeedhi/core';
 import merge from 'lodash.merge';
 import debounce from 'lodash.debounce';
 import isUndefined from 'lodash.isundefined';
@@ -2488,6 +2486,17 @@ class TextInput extends Input {
     prependOuterIconClick(event, element) {
         this.callEvent('prependOuterIconClick', { event, element, component: this });
     }
+    getMaskValue() {
+        let mask = '';
+        if (typeof this.mask === 'function') {
+            mask = this.mask(Mask.getValueWithoutMask(this.value || ''));
+        }
+        else if (typeof this.mask === 'string' || Array.isArray(this.mask)) {
+            mask = this.mask || '';
+        }
+        mask = Mask.getMaskArray(mask);
+        return mask;
+    }
 }
 FormatterParserProvider.registerFormatter('ZdTextInput', (value, { valueWithPrefix = textInputDefaults.valueWithPrefix, prefix = textInputDefaults.prefix, valueWithSuffix = textInputDefaults.valueWithSuffix, suffix = textInputDefaults.suffix, mask = textInputDefaults.mask, } = {}) => {
     let formatted = value;
@@ -2544,7 +2553,7 @@ class Number$1 extends TextInput {
         this.validateMask();
     }
     validateMask() {
-        AutoNumeric.validate(this.mask);
+        AutoNumeric.validate(this.mask, true);
         this.maskValid = true;
         this.value = this.localValue; // force atualization after validate mask
     }
@@ -4045,6 +4054,23 @@ class DateRange extends TextInput {
         this.hint = this.previousHint;
         this.persistentHint = this.previousPersistentHint;
     }
+    getMaskValue() {
+        let mask = '';
+        if (typeof this.mask === 'function') {
+            mask = this.mask(Mask.getValueWithoutMask((this.value && this.value[0]) || ''));
+        }
+        else if (typeof this.mask === 'string') {
+            mask = this.mask.split(this.splitter)[0] || '';
+            mask = Mask.getMaskArray(mask);
+            if (Array.isArray(mask) && mask.length > 0) {
+                mask = mask.concat(this.splitter.split('')).concat(mask);
+            }
+        }
+        else if (Array.isArray(this.mask)) {
+            mask = this.mask;
+        }
+        return mask;
+    }
 }
 FormatterParserProvider.registerFormatter('ZdDateRange', (value, { dateFormat = Config.dateFormat, displayFormat = Config.displayFormat, inputFormat = Config.dateInputFormat, initialMask, splitter = ' ~ ', unitMask = '', mask = '', isSimpleDisplay = false, } = {}) => {
     if (!value || value.length === 0 || (value.length === 1 && !value[0])) {
@@ -5553,32 +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 {
-            Metadata.updateInstance(instanceName, newComponent);
+            const updatedComponent = Object.assign({}, newComponent);
+            delete updatedComponent.datasource;
+            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;
     }
@@ -13261,4 +13293,8 @@ class Report {
     }
 }
 
-export { Alert, AlertService, ApexChart, Badge, Breadcrumbs, Button, ButtonGroup, CSVReport, Card, Carousel, Checkbox, CheckboxMultiple, ChildNotFoundError, Chip, CodeEditor, Col, CollapseCard, Column, ColumnNotFoundError, Component, ComponentRender, Container, Currency, Dashboard, Date$1 as Date, DateRange, Dialog, DialogService, Divider, Dropdown, FileInput, Footer, Form, Frame, FramePage, Grid, GridColumn, GridColumnEditable, GridEditable, Header, Icon, Icons, Image, Increment, Input, Iterable, IterableColumnsButton, IterableColumnsButtonController, IterableComponentRender, IterablePageComponent, IterablePageInfo, IterablePageSize, IterablePagination, List, ListGroup, ListItem, Loading, LoadingService, Login, LoginButton, MasterDetail, Menu, MenuButton, MenuGroup, MenuLink, MenuSeparator, Modal, ModalCloseButton, ModalService, Month, Number$1 as Number, PDFReport, Password, Progress, Radio, RangeSlider, Report, Row, Search, Select, SelectMultiple, SelectTree, SelectTreeMultiple, SelectableList, SpeedDial, Steppers, SvgMap, Switch, Tab, Table, Tabs, Tag, Text, TextInput, Textarea, Time, Toggleable, Tooltip, Tree, TreeDataStructure, TreeGrid, TreeGridEditable, WatchURL, XLS2Report, XLS3Report, XLSReport, initTheme };
+const AutoNumeric = require('@zeedhi/autonumeric/dist/autoNumeric');
+const packageContent = require('../package.json');
+VersionService.addPackageVersion(packageContent.name, packageContent.version);
+
+export { Alert, AlertService, ApexChart, AutoNumeric, Badge, Breadcrumbs, Button, ButtonGroup, CSVReport, Card, Carousel, Checkbox, CheckboxMultiple, ChildNotFoundError, Chip, CodeEditor, Col, CollapseCard, Column, ColumnNotFoundError, Component, ComponentRender, Container, Currency, Dashboard, Date$1 as Date, DateRange, Dialog, DialogService, Divider, Dropdown, FileInput, Footer, Form, Frame, FramePage, Grid, GridColumn, GridColumnEditable, GridEditable, Header, Icon, Icons, Image, Increment, Input, Iterable, IterableColumnsButton, IterableColumnsButtonController, IterableComponentRender, IterablePageComponent, IterablePageInfo, IterablePageSize, IterablePagination, List, ListGroup, ListItem, Loading, LoadingService, Login, LoginButton, MasterDetail, Menu, MenuButton, MenuGroup, MenuLink, MenuSeparator, Modal, ModalCloseButton, ModalService, Month, Number$1 as Number, PDFReport, Password, Progress, Radio, RangeSlider, Report, Row, Search, Select, SelectMultiple, SelectTree, SelectTreeMultiple, SelectableList, SpeedDial, Steppers, SvgMap, Switch, Tab, Table, Tabs, Tag, Text, TextInput, Textarea, Time, Toggleable, Tooltip, Tree, TreeDataStructure, TreeGrid, TreeGridEditable, WatchURL, XLS2Report, XLS3Report, XLSReport, initTheme };

package/dist/zd-common.umd.js

@@ -1,12 +1,11 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@zeedhi/autonumeric'), require('@zeedhi/core'), require('lodash.merge'), require('lodash.debounce'), require('lodash.isundefined'), require('lodash.set'), require('lodash.get')) :
-  typeof define === 'function' && define.amd ? define(['exports', '@zeedhi/autonumeric', '@zeedhi/core', 'lodash.merge', 'lodash.debounce', 'lodash.isundefined', 'lodash.set', 'lodash.get'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@zeedhi/common"] = {}, global.AutoNumeric, global.core, global.merge, global.debounce, global.isUndefined, global.set, global.get));
-})(this, (function (exports, AutoNumeric, core, merge, debounce, isUndefined, set, get) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@zeedhi/core'), require('lodash.merge'), require('lodash.debounce'), require('lodash.isundefined'), require('lodash.set'), require('lodash.get')) :
+  typeof define === 'function' && define.amd ? define(['exports', '@zeedhi/core', 'lodash.merge', '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.debounce, global.isUndefined, global.set, global.get));
+})(this, (function (exports, core, merge, debounce, isUndefined, set, get) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-  var AutoNumeric__default = /*#__PURE__*/_interopDefaultLegacy(AutoNumeric);
   var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
   var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
   var isUndefined__default = /*#__PURE__*/_interopDefaultLegacy(isUndefined);
@@ -2494,6 +2493,17 @@
       prependOuterIconClick(event, element) {
           this.callEvent('prependOuterIconClick', { event, element, component: this });
       }
+      getMaskValue() {
+          let mask = '';
+          if (typeof this.mask === 'function') {
+              mask = this.mask(core.Mask.getValueWithoutMask(this.value || ''));
+          }
+          else if (typeof this.mask === 'string' || Array.isArray(this.mask)) {
+              mask = this.mask || '';
+          }
+          mask = core.Mask.getMaskArray(mask);
+          return mask;
+      }
   }
   core.FormatterParserProvider.registerFormatter('ZdTextInput', (value, { valueWithPrefix = textInputDefaults.valueWithPrefix, prefix = textInputDefaults.prefix, valueWithSuffix = textInputDefaults.valueWithSuffix, suffix = textInputDefaults.suffix, mask = textInputDefaults.mask, } = {}) => {
       let formatted = value;
@@ -2550,7 +2560,7 @@
           this.validateMask();
       }
       validateMask() {
-          AutoNumeric__default["default"].validate(this.mask);
+          AutoNumeric.validate(this.mask, true);
           this.maskValid = true;
           this.value = this.localValue; // force atualization after validate mask
       }
@@ -2562,7 +2572,7 @@
               return;
           this.localValue = value;
           if (this.maskValid && this.localValue !== undefined && this.localValue !== null) {
-              this.formattedValue = AutoNumeric__default["default"].format(this.localValue, this.mask);
+              this.formattedValue = AutoNumeric.format(this.localValue, this.mask);
               if (this.autoNumericObj) {
                   this.autoNumericObj.setValue(value);
               }
@@ -2614,8 +2624,8 @@
           const [controller, accessor] = core.Accessor.getAccessor(maskDef);
           maskDef = core.Loader.getInstance(controller)[accessor];
       }
-      const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric__default["default"].unformat(value)) : maskDef;
-      return value === null ? '' : AutoNumeric__default["default"].format(value, maskValue);
+      const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
+      return value === null ? '' : AutoNumeric.format(value, maskValue);
   });
   core.FormatterParserProvider.registerParser('ZdNumber', (value, { mask = core.Config.masks.numberMask, } = {}) => {
       let maskDef = mask;
@@ -2623,8 +2633,8 @@
           const [controller, accessor] = core.Accessor.getAccessor(maskDef);
           maskDef = core.Loader.getInstance(controller)[accessor];
       }
-      const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric__default["default"].format(value)) : maskDef;
-      return value === '' ? null : AutoNumeric__default["default"].unformat(value, maskValue);
+      const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
+      return value === '' ? null : AutoNumeric.unformat(value, maskValue);
   });
 
   /**
@@ -2641,8 +2651,8 @@
           this.validateMask();
       }
   }
-  core.FormatterParserProvider.registerFormatter('ZdCurrency', (value, { mask = core.Config.masks.currencyMask, } = {}) => (value === null ? '' : AutoNumeric__default["default"].format(value, mask)));
-  core.FormatterParserProvider.registerParser('ZdCurrency', (value, { mask = core.Config.masks.currencyMask, } = {}) => (value === '' ? null : AutoNumeric__default["default"].unformat(value, mask)));
+  core.FormatterParserProvider.registerFormatter('ZdCurrency', (value, { mask = core.Config.masks.currencyMask, } = {}) => (value === null ? '' : AutoNumeric.format(value, mask)));
+  core.FormatterParserProvider.registerParser('ZdCurrency', (value, { mask = core.Config.masks.currencyMask, } = {}) => (value === '' ? null : AutoNumeric.unformat(value, mask)));
 
   /**
    * Alert Service Class
@@ -4051,6 +4061,23 @@
           this.hint = this.previousHint;
           this.persistentHint = this.previousPersistentHint;
       }
+      getMaskValue() {
+          let mask = '';
+          if (typeof this.mask === 'function') {
+              mask = this.mask(core.Mask.getValueWithoutMask((this.value && this.value[0]) || ''));
+          }
+          else if (typeof this.mask === 'string') {
+              mask = this.mask.split(this.splitter)[0] || '';
+              mask = core.Mask.getMaskArray(mask);
+              if (Array.isArray(mask) && mask.length > 0) {
+                  mask = mask.concat(this.splitter.split('')).concat(mask);
+              }
+          }
+          else if (Array.isArray(this.mask)) {
+              mask = this.mask;
+          }
+          return mask;
+      }
   }
   core.FormatterParserProvider.registerFormatter('ZdDateRange', (value, { dateFormat = core.Config.dateFormat, displayFormat = core.Config.displayFormat, inputFormat = core.Config.dateInputFormat, initialMask, splitter = ' ~ ', unitMask = '', mask = '', isSimpleDisplay = false, } = {}) => {
       if (!value || value.length === 0 || (value.length === 1 && !value[0])) {
@@ -5559,32 +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 {
-              core.Metadata.updateInstance(instanceName, newComponent);
+              const updatedComponent = Object.assign({}, newComponent);
+              delete updatedComponent.datasource;
+              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;
       }
@@ -13267,13 +13300,14 @@
       }
   }
 
-  Object.defineProperty(exports, 'AutoNumeric', {
-    enumerable: true,
-    get: function () { return AutoNumeric__default["default"]; }
-  });
+  const AutoNumeric = require('@zeedhi/autonumeric/dist/autoNumeric');
+  const packageContent = require('../package.json');
+  core.VersionService.addPackageVersion(packageContent.name, packageContent.version);
+
   exports.Alert = Alert;
   exports.AlertService = AlertService;
   exports.ApexChart = ApexChart;
+  exports.AutoNumeric = AutoNumeric;
   exports.Badge = Badge;
   exports.Breadcrumbs = Breadcrumbs;
   exports.Button = Button;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.63.4-beta.0",
+  "version": "1.64.1",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -19,7 +19,7 @@
     "watch": "npm run build -- -w"
   },
   "dependencies": {
-    "@zeedhi/autonumeric": "*",
+    "@zeedhi/autonumeric": "^4.6.0",
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
     "lodash.isundefined": "^3.0.1",
@@ -39,5 +39,5 @@
     "lodash.times": "^4.3.2",
     "mockdate": "^3.0.2"
   },
-  "gitHead": "d3168001ebba9d674560ecc8913a30c1601fa99a"
+  "gitHead": "459021cbc1875f83cec7a00c975aac8e9dba27c5"
 }

package/types/components/zd-date/date-range.d.ts

@@ -129,4 +129,5 @@ export declare class DateRange extends TextInput implements IDateRange {
     private previousPersistentHint;
     updateHelperHint(): void;
     change(event?: Event, element?: any): void;
+    getMaskValue(): any;
 }

package/types/components/zd-text-input/text-input.d.ts

@@ -89,4 +89,5 @@ export declare class TextInput extends Input implements ITextInput {
      * @param element Text input
      */
     prependOuterIconClick(event: Event, element: any): void;
+    getMaskValue(): any;
 }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import AutoNumeric from '@zeedhi/autonumeric';
+declare const AutoNumeric: any;
 export * from './components';
 export * from './services';
 export * from './utils';