@zeedhi/common 1.83.0 → 1.83.2

package/dist/zd-common.esm.js

@@ -2881,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);
 });
 
@@ -2915,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);
 });
 
@@ -7414,10 +7418,21 @@ class Select extends TextInput {
         const oldGet = this.datasource.get;
         this.datasource.get = () => __awaiter(this, void 0, void 0, function* () {
             const response = yield oldGet.call(this.datasource);
+            if (!this.datasource.search && !this.manualMode) {
+                this.cachedData = [...this.datasource.data];
+                this.cachedTotal = this.datasource.total;
+            }
             if (this.indexOf(this.value) === -1 && !this.datasource.search && !this.isFocused) {
                 yield this.setValue(this.value, false);
                 this.removePushedValue();
             }
+            if (this.pushedValue && this.indexOf(this.pushedValue) === -1) {
+                const filterValue = this.pushedValue[this.dataValue];
+                const foundInData = this.datasource.data.find(this.getCondition(filterValue));
+                if (!foundInData) {
+                    this.datasource.data.unshift(this.pushedValue);
+                }
+            }
             return response;
         });
     }
@@ -7684,10 +7699,13 @@ class Select extends TextInput {
                 yield this.updateSearch(value);
             }
             else {
-                this.removePushedValue();
-                this.datasource.search = this.searchValue;
                 this.datasource.data = [...this.cachedData];
                 this.datasource.total = this.cachedTotal;
+                this.datasource.search = value;
+                this.removePushedValue();
+                if (this.preventLoadOnFocus) {
+                    yield this.datasource.get();
+                }
             }
         });
     }
@@ -7771,7 +7789,7 @@ FormatterParserProvider.registerFormatter('ZdSelect', (value, { dataText, dataTe
     const dataTextArr = Array.isArray(dataText) ? dataText : [dataText];
     const dataTextNames = [];
     const masks = [];
-    dataTextArr.forEach((text) => {
+    dataTextArr.map((text) => {
         if (typeof text === 'string') {
             dataTextNames.push(text);
             masks.push('');
@@ -7786,6 +7804,7 @@ FormatterParserProvider.registerFormatter('ZdSelect', (value, { dataText, dataTe
                 masks.push(text.mask);
             }
         }
+        return null;
     });
     return dataTextNames.reduce((result, column, index) => {
         if (value[column] !== null && value[column] !== undefined) {
@@ -9673,10 +9692,6 @@ class SelectMultiple extends Select {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.preventLoadOnFocus) {
                 yield this.datasource.get();
-                const values = this.datasource.data.map((row) => row[this.dataValue]);
-                // remove inserted items that are already in datasource
-                this.insertedValues = this.insertedValues.filter((inserted) => !values.includes(inserted[this.dataValue]));
-                this.preventLoadOnFocus = true;
             }
             this.setCache();
             this.updateSearch(this.dirtySearchValue);
@@ -9696,6 +9711,13 @@ class SelectMultiple extends Select {
         }
         this.cachedTotal = this.datasource.total;
     }
+    overrideGet() {
+        const oldGet = this.datasource.get;
+        this.datasource.get = () => __awaiter(this, void 0, void 0, function* () {
+            yield oldGet.call(this.datasource);
+            this.setItemsOnSelect();
+        });
+    }
     /**
      * Field selected rows
      */
@@ -9724,9 +9746,7 @@ class SelectMultiple extends Select {
      */
     cutFromAToB(a, b, condition) {
         const indices = a.reduce((result, value, index) => (condition(value) ? [...result, index] : result), []);
-        indices.forEach((index) => {
-            b.push(a.splice(index, 1)[0]);
-        });
+        indices.map((index) => b.push(a.splice(index, 1)[0]));
     }
     setFieldValue(value) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -9829,12 +9849,14 @@ class SelectMultiple extends Select {
             const parsedValue = this.parserFn(value, this);
             if (parsedValue !== this.datasource.search) {
                 yield this.datasource.setSearch(parsedValue);
-                this.insertSelected();
             }
         });
     }
     /**
-     * Inserts selected items in datasource
+     * Inserts selected items in datasource.
+     * This method will validate, for every selected value, if it is present in datasource:
+     * if it is, removes from insertedValues
+     * if not, add to insertedValues
      */
     insertSelected() {
         if (this.manualMode)
@@ -9858,10 +9880,9 @@ class SelectMultiple extends Select {
                 yield this.updateSearch(value);
             }
             else {
-                if (!this.manualMode) {
-                    this.datasource.data = [...this.cachedData];
-                    this.datasource.total = this.cachedTotal;
-                }
+                this.datasource.data = [...this.cachedData];
+                this.datasource.total = this.cachedTotal;
+                this.datasource.search = value;
                 this.removeInserts();
                 this.insertSelected();
             }
@@ -9887,7 +9908,7 @@ class SelectMultiple extends Select {
         }
         const dataTextNames = [];
         const masks = [];
-        this.dataText.forEach((text) => {
+        this.dataText.map((text) => {
             if (typeof text === 'string') {
                 dataTextNames.push(text);
                 masks.push('');
@@ -9896,6 +9917,7 @@ class SelectMultiple extends Select {
                 dataTextNames.push(text.name);
                 masks.push(text.mask);
             }
+            return text;
         });
         const formattedValue = value.map((row) => {
             const isDisabled = this.dataDisabled && row[this.dataDisabled];
@@ -9937,10 +9959,6 @@ class SelectMultiple extends Select {
                 const foundInData = this.datasource.data.find(this.getCondition(value));
                 return !foundInData;
             });
-            this.insertSelected();
-            if (!this.datasource.search) {
-                this.setCache();
-            }
             this.removePushedValue();
         });
     }
@@ -10001,6 +10019,16 @@ class SelectMultiple extends Select {
             }
         });
     }
+    setItemsOnSelect() {
+        const values = this.datasource.data.map((row) => row[this.dataValue]);
+        // remove inserted items that are already in datasource
+        this.insertedValues = this.insertedValues.filter((inserted) => !values.includes(inserted[this.dataValue]));
+        this.preventLoadOnFocus = true;
+        this.insertSelected();
+        if (!this.datasource.search) {
+            this.setCache();
+        }
+    }
     checkValueOnBlur() { }
 }
 
@@ -10294,6 +10322,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;

package/dist/zd-common.umd.js

@@ -2888,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);
   });
 
@@ -2922,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);
   });
 
@@ -7421,10 +7425,21 @@
           const oldGet = this.datasource.get;
           this.datasource.get = () => __awaiter(this, void 0, void 0, function* () {
               const response = yield oldGet.call(this.datasource);
+              if (!this.datasource.search && !this.manualMode) {
+                  this.cachedData = [...this.datasource.data];
+                  this.cachedTotal = this.datasource.total;
+              }
               if (this.indexOf(this.value) === -1 && !this.datasource.search && !this.isFocused) {
                   yield this.setValue(this.value, false);
                   this.removePushedValue();
               }
+              if (this.pushedValue && this.indexOf(this.pushedValue) === -1) {
+                  const filterValue = this.pushedValue[this.dataValue];
+                  const foundInData = this.datasource.data.find(this.getCondition(filterValue));
+                  if (!foundInData) {
+                      this.datasource.data.unshift(this.pushedValue);
+                  }
+              }
               return response;
           });
       }
@@ -7691,10 +7706,13 @@
                   yield this.updateSearch(value);
               }
               else {
-                  this.removePushedValue();
-                  this.datasource.search = this.searchValue;
                   this.datasource.data = [...this.cachedData];
                   this.datasource.total = this.cachedTotal;
+                  this.datasource.search = value;
+                  this.removePushedValue();
+                  if (this.preventLoadOnFocus) {
+                      yield this.datasource.get();
+                  }
               }
           });
       }
@@ -7778,7 +7796,7 @@
       const dataTextArr = Array.isArray(dataText) ? dataText : [dataText];
       const dataTextNames = [];
       const masks = [];
-      dataTextArr.forEach((text) => {
+      dataTextArr.map((text) => {
           if (typeof text === 'string') {
               dataTextNames.push(text);
               masks.push('');
@@ -7793,6 +7811,7 @@
                   masks.push(text.mask);
               }
           }
+          return null;
       });
       return dataTextNames.reduce((result, column, index) => {
           if (value[column] !== null && value[column] !== undefined) {
@@ -9680,10 +9699,6 @@
           return __awaiter(this, void 0, void 0, function* () {
               if (!this.preventLoadOnFocus) {
                   yield this.datasource.get();
-                  const values = this.datasource.data.map((row) => row[this.dataValue]);
-                  // remove inserted items that are already in datasource
-                  this.insertedValues = this.insertedValues.filter((inserted) => !values.includes(inserted[this.dataValue]));
-                  this.preventLoadOnFocus = true;
               }
               this.setCache();
               this.updateSearch(this.dirtySearchValue);
@@ -9703,6 +9718,13 @@
           }
           this.cachedTotal = this.datasource.total;
       }
+      overrideGet() {
+          const oldGet = this.datasource.get;
+          this.datasource.get = () => __awaiter(this, void 0, void 0, function* () {
+              yield oldGet.call(this.datasource);
+              this.setItemsOnSelect();
+          });
+      }
       /**
        * Field selected rows
        */
@@ -9731,9 +9753,7 @@
        */
       cutFromAToB(a, b, condition) {
           const indices = a.reduce((result, value, index) => (condition(value) ? [...result, index] : result), []);
-          indices.forEach((index) => {
-              b.push(a.splice(index, 1)[0]);
-          });
+          indices.map((index) => b.push(a.splice(index, 1)[0]));
       }
       setFieldValue(value) {
           return __awaiter(this, void 0, void 0, function* () {
@@ -9836,12 +9856,14 @@
               const parsedValue = this.parserFn(value, this);
               if (parsedValue !== this.datasource.search) {
                   yield this.datasource.setSearch(parsedValue);
-                  this.insertSelected();
               }
           });
       }
       /**
-       * Inserts selected items in datasource
+       * Inserts selected items in datasource.
+       * This method will validate, for every selected value, if it is present in datasource:
+       * if it is, removes from insertedValues
+       * if not, add to insertedValues
        */
       insertSelected() {
           if (this.manualMode)
@@ -9865,10 +9887,9 @@
                   yield this.updateSearch(value);
               }
               else {
-                  if (!this.manualMode) {
-                      this.datasource.data = [...this.cachedData];
-                      this.datasource.total = this.cachedTotal;
-                  }
+                  this.datasource.data = [...this.cachedData];
+                  this.datasource.total = this.cachedTotal;
+                  this.datasource.search = value;
                   this.removeInserts();
                   this.insertSelected();
               }
@@ -9894,7 +9915,7 @@
           }
           const dataTextNames = [];
           const masks = [];
-          this.dataText.forEach((text) => {
+          this.dataText.map((text) => {
               if (typeof text === 'string') {
                   dataTextNames.push(text);
                   masks.push('');
@@ -9903,6 +9924,7 @@
                   dataTextNames.push(text.name);
                   masks.push(text.mask);
               }
+              return text;
           });
           const formattedValue = value.map((row) => {
               const isDisabled = this.dataDisabled && row[this.dataDisabled];
@@ -9944,10 +9966,6 @@
                   const foundInData = this.datasource.data.find(this.getCondition(value));
                   return !foundInData;
               });
-              this.insertSelected();
-              if (!this.datasource.search) {
-                  this.setCache();
-              }
               this.removePushedValue();
           });
       }
@@ -10008,6 +10026,16 @@
               }
           });
       }
+      setItemsOnSelect() {
+          const values = this.datasource.data.map((row) => row[this.dataValue]);
+          // remove inserted items that are already in datasource
+          this.insertedValues = this.insertedValues.filter((inserted) => !values.includes(inserted[this.dataValue]));
+          this.preventLoadOnFocus = true;
+          this.insertSelected();
+          if (!this.datasource.search) {
+              this.setCache();
+          }
+      }
       checkValueOnBlur() { }
   }
 
@@ -10301,6 +10329,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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.83.0",
+  "version": "1.83.2",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -42,6 +42,5 @@
     "@types/lodash.times": "4.3.*",
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
-  },
-  "gitHead": "40cb1a2c5fe9d6ebb8d5ceb0add7e08f26cf5659"
+  }
 }

package/types/components/zd-select/select.d.ts

@@ -1,7 +1,7 @@
 import { Datasource, IDictionary } from '@zeedhi/core';
 import { IComponentRender } from '../zd-component/interfaces';
-import { ISelect, SearchParam } from './interfaces';
 import { TextInput } from '../zd-text-input/text-input';
+import { ISelect, SearchParam } from './interfaces';
 /**
  * Base class for Select component.
  */

package/types/components/zd-select-multiple/select-multiple.d.ts

@@ -1,6 +1,6 @@
 import { IDictionary } from '@zeedhi/core';
-import { ISelectMultiple } from './interfaces';
 import { Select } from '../zd-select/select';
+import { ISelectMultiple } from './interfaces';
 export declare class SelectMultiple extends Select implements ISelectMultiple {
     private selectedValue;
     /**
@@ -31,6 +31,7 @@ export declare class SelectMultiple extends Select implements ISelectMultiple {
      * @param props Select properties
      */
     constructor(props: ISelectMultiple);
+    overrideGet(): void;
     /**
      * Field selected rows
      */
@@ -66,7 +67,10 @@ export declare class SelectMultiple extends Select implements ISelectMultiple {
      */
     updateSearch(value: string): Promise<void>;
     /**
-     * Inserts selected items in datasource
+     * Inserts selected items in datasource.
+     * This method will validate, for every selected value, if it is present in datasource:
+     * if it is, removes from insertedValues
+     * if not, add to insertedValues
      */
     private insertSelected;
     protected removePushedValue(): void;
@@ -103,5 +107,6 @@ export declare class SelectMultiple extends Select implements ISelectMultiple {
     onSelectAll(isSelected: boolean, event: Event, element: any): void;
     selectAllItems(): Promise<void>;
     unSelectAllItems(): Promise<void>;
+    private setItemsOnSelect;
     protected checkValueOnBlur(): void;
 }

package/LICENSE

@@ -1,24 +0,0 @@
-MIT License
-
-Copyright (c) 2019 Zeedhi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-This repository includes one file originally copied from https://github.com/vuetifyjs/vuetify/
-under /blob/v1.5.16/packages/vuetify/src/util/, mask.ts.