@zeedhi/common 1.97.0 → 1.97.1

package/dist/zd-common.esm.js

@@ -2004,8 +2004,9 @@ class Input extends ComponentRender {
     updateRules() {
         this.rules = Object.values(this.parsedValidations)
             .map((validation) => (value) => {
-            const isValueDefined = value !== undefined && value !== '';
-            const testValue = isValueDefined ? value : this.value;
+            const parsedValue = this.parser(value);
+            const isValueDefined = parsedValue !== undefined && parsedValue !== '';
+            const testValue = isValueDefined ? parsedValue : this.value;
             return validation(testValue);
         });
     }
@@ -3982,6 +3983,16 @@ class Date$1 extends TextInput {
             });
         }
     }
+    get value() {
+        return this.internalValue;
+    }
+    set value(value) {
+        if (this.internalValue !== value) {
+            this.internalDisplayValue = this.formatter(value);
+            this.internalValue = value;
+            this.change(undefined, undefined, false);
+        }
+    }
     get displayValue() {
         return this.internalDisplayValue;
     }
@@ -4018,14 +4029,14 @@ class Date$1 extends TextInput {
             this.internalValue = this.parser(displayValue);
             this.dateError = false;
             if (lastValue !== this.displayValue)
-                this.change(this.value);
+                this.changeEvent();
         }
         else {
             if (!displayValue) {
                 this.internalDisplayValue = displayValue;
                 this.internalValue = null;
                 if (lastValue !== this.displayValue)
-                    this.change(this.value);
+                    this.changeEvent();
             }
             this.dateError = !!displayValue;
         }
@@ -4064,7 +4075,7 @@ class Date$1 extends TextInput {
         this.dateError = false;
         this.value = this.parseISODateValue(newValue);
         if (lastValue !== this.value)
-            this.change(this.value);
+            this.changeEvent();
     }
     formatISODateValue(value) {
         if (value && this.isValidFormatDate(value, this.dateFormat)) {
@@ -4159,15 +4170,19 @@ class Date$1 extends TextInput {
             this.persistentHint = true;
         }
     }
-    change(event, element) {
-        if (this.lastChangeValue && this.lastChangeValue === this.value)
-            return;
-        this.lastChangeValue = this.value;
+    changeEvent(event, element) {
         super.change(event, element);
         this.helperValue = '';
         this.hint = this.previousHint;
         this.persistentHint = this.previousPersistentHint;
     }
+    change(event, element, callEvent = true) {
+        if (this.lastChangeValue && this.lastChangeValue === this.value)
+            return;
+        this.lastChangeValue = this.value;
+        if (callEvent)
+            this.changeEvent(event, element);
+    }
 }
 FormatterParserProvider.registerFormatter('ZdDate', (value, { dateFormat = Config.dateFormat, displayFormat = Config.displayFormat, inputFormat = Config.dateInputFormat, mask = '', initialMask, isSimpleDisplay = false, } = {}) => {
     if (!value) {
@@ -5561,7 +5576,7 @@ class Iterable extends ComponentRender {
      * @param props Iterable properties
      */
     constructor(props) {
-        var _a, _b;
+        var _a;
         super(props);
         /**
          * Iterable columns
@@ -5592,12 +5607,26 @@ class Iterable extends ComponentRender {
         this.defaultSearchVisibleOnly = (_a = Config.iterableSearchVisibleOnly) !== null && _a !== void 0 ? _a : true;
         this.columns = this.getColumns(props.columns || this.columns);
         this.createController();
-        this.datasource = DatasourceFactory.factory(Object.assign(Object.assign({}, props.datasource), { searchIn: ((_b = props.datasource) === null || _b === void 0 ? void 0 : _b.searchIn) || `{{IterableController_${this.name}.searchIn}}` }));
+        this.initializeDatasource(props);
         this.pageSizes = this.getInitValue('pageSizes', props.pageSizes, this.pageSizes);
         this.searchVisibleOnly = this.getInitValue('searchVisibleOnly', props.searchVisibleOnly, this.defaultSearchVisibleOnly);
         this.virtualScroll = this.getInitValue('virtualScroll', props.virtualScroll, this.virtualScroll);
         this.virtualScrollCache = this.getInitValue('virtualScrollCache', props.virtualScrollCache, this.virtualScrollCache);
     }
+    getDatasourceDefaults() {
+        return {};
+    }
+    initializeDatasource(props) {
+        var _a;
+        let datasourceProps = props.datasource;
+        // if using accessor, get props from the controller
+        if (typeof props.datasource === 'string' && Accessor.isAccessorDefinition(props.datasource)) {
+            const [controller, accessor] = Accessor.getAccessor(props.datasource);
+            const instance = Loader.getInstance(controller);
+            datasourceProps = instance[accessor];
+        }
+        this.datasource = DatasourceFactory.factory(Object.assign(Object.assign(Object.assign({}, datasourceProps), this.getDatasourceDefaults()), { searchIn: ((_a = props.datasource) === null || _a === void 0 ? void 0 : _a.searchIn) || `{{IterableController_${this.name}.searchIn}}` }));
+    }
     createController() {
         const controller = new IterableController(this);
         Loader.addController(`IterableController_${this.name}`, controller);
@@ -6901,7 +6930,10 @@ class GridEditable extends Grid {
         }
         let allValid = true;
         this.datasource.data.forEach((row) => this.columns.forEach((column) => {
-            if (!column.isVisible || !column.editable)
+            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)
                 return;
             if (!this.isValid(column, row, true))
                 allValid = false;
@@ -7737,10 +7769,9 @@ class Select extends TextInput {
     }
     set search(value) {
         this.searchValue = value || '';
-        const searchValue = this.dataTextDiscrete.length === 0
-            ? this.formatter(this.selectValue)
-            : this.formatter(this.selectValue, this.discreteProps);
-        if (this.searchValue === '' || this.searchValue !== searchValue) {
+        const searchValue = this.formatter(this.selectValue);
+        const searchDiscrete = this.formatter(this.selectValue, this.discreteProps);
+        if (this.searchValue === '' || (this.searchValue !== searchValue && this.searchValue !== searchDiscrete)) {
             this.dirtySearchValue = this.searchValue;
             if (this.isFocused)
                 this.debounceSearch(this.searchValue);
@@ -12892,7 +12923,7 @@ class TreeGrid extends Grid {
      */
     constructor(props) {
         var _a;
-        super(Object.assign(Object.assign({}, props), { datasource: Object.assign(Object.assign({}, props.datasource), { lazyLoad: true, loadAll: true }) }));
+        super(props);
         /**
          * Parent field name
          */
@@ -12947,6 +12978,9 @@ class TreeGrid extends Grid {
         this.treeDataStructure = new TreeDataStructure(this);
         this.createAccessors();
     }
+    getDatasourceDefaults() {
+        return { lazyLoad: true, loadAll: true };
+    }
     onMounted(element) {
         super.onMounted(element);
         if (!this.lazyLoad || this.datasource.data.length) {

package/dist/zd-common.umd.js

@@ -2011,8 +2011,9 @@
       updateRules() {
           this.rules = Object.values(this.parsedValidations)
               .map((validation) => (value) => {
-              const isValueDefined = value !== undefined && value !== '';
-              const testValue = isValueDefined ? value : this.value;
+              const parsedValue = this.parser(value);
+              const isValueDefined = parsedValue !== undefined && parsedValue !== '';
+              const testValue = isValueDefined ? parsedValue : this.value;
               return validation(testValue);
           });
       }
@@ -3989,6 +3990,16 @@
               });
           }
       }
+      get value() {
+          return this.internalValue;
+      }
+      set value(value) {
+          if (this.internalValue !== value) {
+              this.internalDisplayValue = this.formatter(value);
+              this.internalValue = value;
+              this.change(undefined, undefined, false);
+          }
+      }
       get displayValue() {
           return this.internalDisplayValue;
       }
@@ -4025,14 +4036,14 @@
               this.internalValue = this.parser(displayValue);
               this.dateError = false;
               if (lastValue !== this.displayValue)
-                  this.change(this.value);
+                  this.changeEvent();
           }
           else {
               if (!displayValue) {
                   this.internalDisplayValue = displayValue;
                   this.internalValue = null;
                   if (lastValue !== this.displayValue)
-                      this.change(this.value);
+                      this.changeEvent();
               }
               this.dateError = !!displayValue;
           }
@@ -4071,7 +4082,7 @@
           this.dateError = false;
           this.value = this.parseISODateValue(newValue);
           if (lastValue !== this.value)
-              this.change(this.value);
+              this.changeEvent();
       }
       formatISODateValue(value) {
           if (value && this.isValidFormatDate(value, this.dateFormat)) {
@@ -4166,15 +4177,19 @@
               this.persistentHint = true;
           }
       }
-      change(event, element) {
-          if (this.lastChangeValue && this.lastChangeValue === this.value)
-              return;
-          this.lastChangeValue = this.value;
+      changeEvent(event, element) {
           super.change(event, element);
           this.helperValue = '';
           this.hint = this.previousHint;
           this.persistentHint = this.previousPersistentHint;
       }
+      change(event, element, callEvent = true) {
+          if (this.lastChangeValue && this.lastChangeValue === this.value)
+              return;
+          this.lastChangeValue = this.value;
+          if (callEvent)
+              this.changeEvent(event, element);
+      }
   }
   core.FormatterParserProvider.registerFormatter('ZdDate', (value, { dateFormat = core.Config.dateFormat, displayFormat = core.Config.displayFormat, inputFormat = core.Config.dateInputFormat, mask = '', initialMask, isSimpleDisplay = false, } = {}) => {
       if (!value) {
@@ -5568,7 +5583,7 @@
        * @param props Iterable properties
        */
       constructor(props) {
-          var _a, _b;
+          var _a;
           super(props);
           /**
            * Iterable columns
@@ -5599,12 +5614,26 @@
           this.defaultSearchVisibleOnly = (_a = core.Config.iterableSearchVisibleOnly) !== null && _a !== void 0 ? _a : true;
           this.columns = this.getColumns(props.columns || this.columns);
           this.createController();
-          this.datasource = core.DatasourceFactory.factory(Object.assign(Object.assign({}, props.datasource), { searchIn: ((_b = props.datasource) === null || _b === void 0 ? void 0 : _b.searchIn) || `{{IterableController_${this.name}.searchIn}}` }));
+          this.initializeDatasource(props);
           this.pageSizes = this.getInitValue('pageSizes', props.pageSizes, this.pageSizes);
           this.searchVisibleOnly = this.getInitValue('searchVisibleOnly', props.searchVisibleOnly, this.defaultSearchVisibleOnly);
           this.virtualScroll = this.getInitValue('virtualScroll', props.virtualScroll, this.virtualScroll);
           this.virtualScrollCache = this.getInitValue('virtualScrollCache', props.virtualScrollCache, this.virtualScrollCache);
       }
+      getDatasourceDefaults() {
+          return {};
+      }
+      initializeDatasource(props) {
+          var _a;
+          let datasourceProps = props.datasource;
+          // if using accessor, get props from the controller
+          if (typeof props.datasource === 'string' && core.Accessor.isAccessorDefinition(props.datasource)) {
+              const [controller, accessor] = core.Accessor.getAccessor(props.datasource);
+              const instance = core.Loader.getInstance(controller);
+              datasourceProps = instance[accessor];
+          }
+          this.datasource = core.DatasourceFactory.factory(Object.assign(Object.assign(Object.assign({}, datasourceProps), this.getDatasourceDefaults()), { searchIn: ((_a = props.datasource) === null || _a === void 0 ? void 0 : _a.searchIn) || `{{IterableController_${this.name}.searchIn}}` }));
+      }
       createController() {
           const controller = new IterableController(this);
           core.Loader.addController(`IterableController_${this.name}`, controller);
@@ -6908,7 +6937,10 @@
           }
           let allValid = true;
           this.datasource.data.forEach((row) => this.columns.forEach((column) => {
-              if (!column.isVisible || !column.editable)
+              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)
                   return;
               if (!this.isValid(column, row, true))
                   allValid = false;
@@ -7744,10 +7776,9 @@
       }
       set search(value) {
           this.searchValue = value || '';
-          const searchValue = this.dataTextDiscrete.length === 0
-              ? this.formatter(this.selectValue)
-              : this.formatter(this.selectValue, this.discreteProps);
-          if (this.searchValue === '' || this.searchValue !== searchValue) {
+          const searchValue = this.formatter(this.selectValue);
+          const searchDiscrete = this.formatter(this.selectValue, this.discreteProps);
+          if (this.searchValue === '' || (this.searchValue !== searchValue && this.searchValue !== searchDiscrete)) {
               this.dirtySearchValue = this.searchValue;
               if (this.isFocused)
                   this.debounceSearch(this.searchValue);
@@ -12899,7 +12930,7 @@
        */
       constructor(props) {
           var _a;
-          super(Object.assign(Object.assign({}, props), { datasource: Object.assign(Object.assign({}, props.datasource), { lazyLoad: true, loadAll: true }) }));
+          super(props);
           /**
            * Parent field name
            */
@@ -12954,6 +12985,9 @@
           this.treeDataStructure = new TreeDataStructure(this);
           this.createAccessors();
       }
+      getDatasourceDefaults() {
+          return { lazyLoad: true, loadAll: true };
+      }
       onMounted(element) {
           super.onMounted(element);
           if (!this.lazyLoad || this.datasource.data.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.97.0",
+  "version": "1.97.1",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -43,5 +43,5 @@
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
   },
-  "gitHead": "4cbf0b1966af294da09421e7bfc7e28f7e42d14c"
+  "gitHead": "be2b1ea788cbea322e237b4360caf19b1125a5eb"
 }

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

@@ -96,6 +96,8 @@ export declare class Date extends TextInput implements IDate {
      * @param element
      */
     selectDate(date: string, event?: Event, element?: any): void;
+    get value(): any;
+    set value(value: any);
     get displayValue(): string;
     set displayValue(newValue: string);
     /**
@@ -147,5 +149,6 @@ export declare class Date extends TextInput implements IDate {
     private previousPersistentHint;
     updateHelperHint(): void;
     private lastChangeValue;
-    change(event?: Event, element?: any): void;
+    changeEvent(event?: Event, element?: any): void;
+    change(event?: Event, element?: any, callEvent?: boolean): void;
 }

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

@@ -50,6 +50,8 @@ export declare class Iterable extends ComponentRender implements IIterable {
      * @param props Iterable properties
      */
     constructor(props: IIterable);
+    protected getDatasourceDefaults(): {};
+    protected initializeDatasource(props: IIterable): void;
     protected createController(): void;
     /**
      * Retrieves columns instances

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

@@ -49,6 +49,10 @@ export declare class TreeGrid extends Grid implements ITreeGrid {
      * @param props Tree Grid properties
      */
     constructor(props: ITreeGrid);
+    protected getDatasourceDefaults(): {
+        lazyLoad: boolean;
+        loadAll: boolean;
+    };
     private navigationTreeKeyMapping;
     onMounted(element: any): void;
     /**

package/types/services/zd-json-cache/json-cache-service.d.ts

@@ -1,12 +0,0 @@
-export interface IJSONObject {
-    path: string;
-}
-export declare class JsonCacheService {
-    /**
-     * jsons collection
-     */
-    static jsonCollection: IJSONObject[];
-    static saveJSONCache(jsonCollection: IJSONObject[]): Promise<void>;
-    static getJSONCache(path: string): any;
-    static clearJSONCache(jsonCollection: IJSONObject[]): void;
-}