@revolist/revogrid 4.27.4 → 4.27.5

package/hydrate/index.js

@@ -7627,7 +7627,6 @@ class FilterPanel {
         registerInstance(this, hostRef);
         this.filterChange = createEvent(this, "filterChange", 7);
         this.resetChange = createEvent(this, "resetChange", 7);
-        this.hasChanges = false;
         this.filterCaptionsInternal = {
             title: 'Filter by',
             ok: 'Close',
@@ -7663,7 +7662,7 @@ class FilterPanel {
          */
         this.allowDuplicateOperators = true;
         this.debouncedApplyFilter = debounce$1(() => {
-            this.emitFilterChange();
+            this.filterChange.emit(this.filterItems);
         }, 400);
     }
     onMouseDown(e) {
@@ -7693,28 +7692,10 @@ class FilterPanel {
         }
     }
     async show(newEntity) {
-        this.debouncedApplyFilter.flush();
-        this.hasChanges = false;
         this.changes = newEntity;
-        this.filterItems = this.cloneFilterItems((newEntity === null || newEntity === void 0 ? void 0 : newEntity.filterItems) || {});
-        this.draftFilter = undefined;
+        this.filterItems = (newEntity === null || newEntity === void 0 ? void 0 : newEntity.filterItems) || {};
         if (this.changes) {
             this.changes.type = this.changes.type || defaultType;
-            const prop = this.changes.prop;
-            const propFilters = prop === undefined ? undefined : this.filterItems[prop];
-            if (!(propFilters === null || propFilters === void 0 ? void 0 : propFilters.length) &&
-                this.changes.showDefaultFilter !== false &&
-                this.changes.hideDefaultFilters !== true) {
-                const type = this.resolveDraftFilterType(this.changes.defaultFilterType);
-                if (type) {
-                    this.draftFilter = {
-                        id: ++this.filterId,
-                        type,
-                        value: '',
-                        relation: 'and',
-                    };
-                }
-            }
         }
     }
     async getChanges() {
@@ -7735,42 +7716,29 @@ class FilterPanel {
         const prop = (_a = this.changes) === null || _a === void 0 ? void 0 : _a.prop;
         if (prop === undefined)
             return '';
-        const propFilters = ((_b = this.filterItems[prop]) !== null && _b !== void 0 ? _b : []).map((filter, index) => ({
-            filter,
-            index,
-            isDraft: false,
-        }));
-        if (this.draftFilter) {
-            propFilters.push({
-                filter: this.draftFilter,
-                index: propFilters.length,
-                isDraft: true,
-            });
-        }
-        const visibleFilters = propFilters.filter(({ filter }) => !filter.hidden);
-        const visibleFilterCount = visibleFilters.length;
+        const propFilters = (_b = this.filterItems[prop]) !== null && _b !== void 0 ? _b : [];
+        const visibleFilterCount = propFilters.filter(filter => !filter.hidden).length;
         const capts = Object.assign(Object.assign({}, this.filterCaptionsInternal), this.filterCaptions);
-        return (hAsync("div", { key: this.filterId }, hAsync("ul", { class: "multi-filter-list-container" }, propFilters.map(({ filter, index, isDraft }) => {
-            var _a;
+        return (hAsync("div", { key: this.filterId }, hAsync("ul", { class: "multi-filter-list-container" }, propFilters.map((filter, index) => {
             let andOrButton;
             if (filter.hidden) {
                 return;
             }
             // hide toggle button if there is only one filter and the last one
-            if (((_a = visibleFilters[visibleFilterCount - 1]) === null || _a === void 0 ? void 0 : _a.filter.id) !== filter.id) {
+            if (index !== this.filterItems[prop].length - 1) {
                 andOrButton = (hAsync(AndOrButton, { text: filter.relation === 'and' ? capts.and : capts.or, onClick: () => this.toggleFilterAndOr(filter.id) }));
             }
-            const extra = this.renderExtra(prop, index, isDraft);
+            const extra = this.renderExtra(prop, index);
             const isDragging = this.draggedFilterId === filter.id;
             const isDragOver = this.dragOverFilterId === filter.id && !isDragging;
-            const canReorder = visibleFilterCount > 1 && !isDraft;
+            const canReorder = visibleFilterCount > 1;
             return (hAsync("li", { key: filter.id, class: FILTER_LIST_CLASS, "aria-label": `${capts.filterCondition} ${index + 1}` }, hAsync("div", { class: {
                     'multi-filter-list-row': true,
                     'filter-row-drop-active': this.draggedFilterId !== undefined && !isDragging,
                     'filter-row-dragging': isDragging,
                     'filter-row-drag-over': isDragOver,
-                } }, canReorder ? (hAsync("button", { type: "button", class: "filter-row-drop-target", tabIndex: -1, "aria-label": `${capts.filterCondition} ${index + 1}`, onDragOver: e => this.onFilterDragOver(e, filter.id), onDragLeave: () => this.onFilterDragLeave(filter.id), onDrop: e => this.onFilterDrop(e, prop, filter.id) })) : '', canReorder ? (hAsync(ReorderButton, { ariaLabel: capts.reorderFilter, dragging: isDragging, dragOver: isDragOver, onDragStart: e => this.onFilterDragStart(e, filter.id), onDragEnd: () => this.onFilterDragEnd(), onKeyDown: e => this.onFilterReorderKeyDown(e, prop, filter.id) })) : '', hAsync("div", { class: { 'select-input': true } }, hAsync("select", { class: "select-css select-filter", onChange: e => this.onFilterTypeChange(e, prop, index, isDraft) }, this.renderSelectOptions(filter.type, true)), extra ? hAsync("div", { class: "filter-extra" }, extra) : ''), hAsync("div", { class: FILTER_LIST_CLASS_ACTION }, andOrButton, hAsync(TrashButton, { ariaLabel: capts.removeFilter, onClick: () => this.onRemoveFilter(filter.id) })))));
-        })), visibleFilterCount ? hAsync("div", { class: "add-filter-divider" }) : ''));
+                } }, canReorder ? (hAsync("button", { type: "button", class: "filter-row-drop-target", tabIndex: -1, "aria-label": `${capts.filterCondition} ${index + 1}`, onDragOver: e => this.onFilterDragOver(e, filter.id), onDragLeave: () => this.onFilterDragLeave(filter.id), onDrop: e => this.onFilterDrop(e, prop, filter.id) })) : '', canReorder ? (hAsync(ReorderButton, { ariaLabel: capts.reorderFilter, dragging: isDragging, dragOver: isDragOver, onDragStart: e => this.onFilterDragStart(e, filter.id), onDragEnd: () => this.onFilterDragEnd(), onKeyDown: e => this.onFilterReorderKeyDown(e, prop, filter.id) })) : '', hAsync("div", { class: { 'select-input': true } }, hAsync("select", { class: "select-css select-filter", onChange: e => this.onFilterTypeChange(e, prop, index) }, this.renderSelectOptions(this.filterItems[prop][index].type, true)), extra ? hAsync("div", { class: "filter-extra" }, extra) : ''), hAsync("div", { class: FILTER_LIST_CLASS_ACTION }, andOrButton, hAsync(TrashButton, { ariaLabel: capts.removeFilter, onClick: () => this.onRemoveFilter(filter.id) })))));
+        })), propFilters.some(f => !f.hidden) ? hAsync("div", { class: "add-filter-divider" }) : ''));
     }
     componentDidRender() {
         this.syncDialog();
@@ -7819,24 +7787,16 @@ class FilterPanel {
         el.style.left = `${left}px`;
         el.style.top = `${top}px`;
     }
-    onFilterTypeChange(e, prop, index, isDraft = false) {
+    onFilterTypeChange(e, prop, index) {
         if (!(e.target instanceof HTMLSelectElement)) {
             return;
         }
-        const type = e.target.value;
-        const filter = isDraft
-            ? this.promoteDraft(prop, type)
-            : this.filterItems[prop][index];
-        if (!filter) {
-            return;
-        }
-        filter.type = type;
-        this.hasChanges = true;
+        this.filterItems[prop][index].type = e.target.value;
         // this re-renders the input to know if we need extra input
         this.filterId++;
         // adding setTimeout will wait for the next tick DOM update then focus on input
         setTimeout(() => {
-            const input = document.getElementById('filter-input-' + filter.id);
+            const input = document.getElementById('filter-input-' + this.filterItems[prop][index].id);
             if (input instanceof HTMLInputElement) {
                 input.focus();
             }
@@ -7871,20 +7831,12 @@ class FilterPanel {
             return;
         this.filterId++;
         this.currentFilterId = this.filterId;
-        if (this.draftFilter) {
-            this.draftFilter.id = this.currentFilterId;
-            this.draftFilter.type = this.currentFilterType;
-            this.promoteDraft(prop);
-        }
-        else {
-            this.filterItems[prop].push({
-                id: this.currentFilterId,
-                type: this.currentFilterType,
-                value: '',
-                relation: 'and',
-            });
-            this.hasChanges = true;
-        }
+        this.filterItems[prop].push({
+            id: this.currentFilterId,
+            type: this.currentFilterType,
+            value: '',
+            relation: 'and',
+        });
         // adding setTimeout will wait for the next tick DOM update then focus on input
         setTimeout(() => {
             const input = document.getElementById('filter-input-' + this.currentFilterId);
@@ -7893,9 +7845,7 @@ class FilterPanel {
         }, 0);
     }
     onSave() {
-        if (this.hasChanges) {
-            this.emitFilterChange();
-        }
+        this.filterChange.emit(this.filterItems);
     }
     onCancel() {
         this.changes = undefined;
@@ -7903,25 +7853,16 @@ class FilterPanel {
     onReset() {
         var _a;
         this.assertChanges();
-        this.draftFilter = undefined;
-        const prop = (_a = this.changes) === null || _a === void 0 ? void 0 : _a.prop;
-        if (prop !== undefined) {
-            delete this.filterItems[prop];
-        }
-        this.resetChange.emit(prop);
+        this.resetChange.emit((_a = this.changes) === null || _a === void 0 ? void 0 : _a.prop);
         // this updates the DOM which is used by getFilterItemsList() key
         this.filterId++;
     }
     onRemoveFilter(id) {
-        var _a, _b;
+        var _a;
         this.assertChanges();
         // this is for reactivity issues for getFilterItemsList()
         this.filterId++;
         const prop = (_a = this.changes) === null || _a === void 0 ? void 0 : _a.prop;
-        if (((_b = this.draftFilter) === null || _b === void 0 ? void 0 : _b.id) === id) {
-            this.draftFilter = undefined;
-            return;
-        }
         const items = this.filterItems[prop !== null && prop !== void 0 ? prop : ''];
         if (!items)
             return;
@@ -7929,7 +7870,6 @@ class FilterPanel {
         if (index === -1)
             return;
         items.splice(index, 1);
-        this.hasChanges = true;
         // let's remove the prop if no more filters so the filter icon will be removed
         if (items.length === 0)
             delete this.filterItems[prop !== null && prop !== void 0 ? prop : ''];
@@ -7971,7 +7911,6 @@ class FilterPanel {
         if (!moveFilterItem(items, sourceId, targetId)) {
             return;
         }
-        this.hasChanges = true;
         this.filterId++;
         if (!this.disableDynamicFiltering) {
             this.debouncedApplyFilter();
@@ -8007,7 +7946,6 @@ class FilterPanel {
         if (!target || !moveFilterItem(items, sourceId, target.id)) {
             return;
         }
-        this.hasChanges = true;
         this.filterId++;
         if (!this.disableDynamicFiltering) {
             this.debouncedApplyFilter();
@@ -8026,7 +7964,6 @@ class FilterPanel {
         if (index === -1)
             return;
         items[index].relation = items[index].relation === 'and' ? 'or' : 'and';
-        this.hasChanges = true;
         if (!this.disableDynamicFiltering) {
             this.debouncedApplyFilter();
         }
@@ -8075,22 +8012,12 @@ class FilterPanel {
         }
         return options;
     }
-    renderExtra(prop, index, isDraft = false) {
-        var _a, _b;
-        const currentFilter = isDraft
-            ? this.draftFilter
-            : (_a = this.filterItems[prop]) === null || _a === void 0 ? void 0 : _a[index];
+    renderExtra(prop, index) {
+        const currentFilter = this.filterItems[prop];
         if (!currentFilter)
             return '';
         const applyFilter = (value) => {
-            currentFilter.value = value;
-            if (isDraft && !this.isMeaningfulDraftValue(value)) {
-                return;
-            }
-            if (isDraft && !this.promoteDraft(prop)) {
-                return;
-            }
-            this.hasChanges = true;
+            this.filterItems[prop][index].value = value;
             if (!this.disableDynamicFiltering) {
                 this.debouncedApplyFilter();
             }
@@ -8105,11 +8032,11 @@ class FilterPanel {
             }
         };
         const capts = Object.assign(Object.assign({}, this.filterCaptionsInternal), this.filterCaptions);
-        const extra = (_b = this.filterEntities[currentFilter.type]) === null || _b === void 0 ? void 0 : _b.extra;
+        const extra = this.filterEntities[currentFilter[index].type].extra;
         if (typeof extra === 'function') {
             return extra(hAsync, {
-                value: currentFilter.value,
-                filter: currentFilter,
+                value: currentFilter[index].value,
+                filter: currentFilter[index],
                 prop,
                 index,
                 placeholder: capts.placeholder,
@@ -8124,7 +8051,7 @@ class FilterPanel {
         if (extra !== 'input' && extra !== 'datepicker') {
             return '';
         }
-        return (hAsync("input", { id: `filter-input-${currentFilter.id}`, placeholder: capts.placeholder, type: extra === 'datepicker' ? 'date' : 'text', value: currentFilter.value, onInput: (e) => {
+        return (hAsync("input", { id: `filter-input-${currentFilter[index].id}`, placeholder: capts.placeholder, type: extra === 'datepicker' ? 'date' : 'text', value: currentFilter[index].value, onInput: (e) => {
                 if (e.target instanceof HTMLInputElement) {
                     applyFilter(e.target.value);
                 }
@@ -8140,42 +8067,6 @@ class FilterPanel {
                 e.stopPropagation();
             } }));
     }
-    resolveDraftFilterType(preferred) {
-        var _a, _b;
-        const available = Object.values((_b = (_a = this.changes) === null || _a === void 0 ? void 0 : _a.filterTypes) !== null && _b !== void 0 ? _b : {}).flat();
-        const type = preferred && available.includes(preferred)
-            ? preferred
-            : available[0];
-        return type;
-    }
-    promoteDraft(prop, type) {
-        if (!this.draftFilter) {
-            return;
-        }
-        if (!this.filterItems[prop]) {
-            this.filterItems[prop] = [];
-        }
-        if (type) {
-            this.draftFilter.type = type;
-        }
-        const filter = this.draftFilter;
-        this.filterItems[prop].push(filter);
-        this.draftFilter = undefined;
-        this.hasChanges = true;
-        return filter;
-    }
-    isMeaningfulDraftValue(value) {
-        return value !== '' && value !== undefined && value !== null;
-    }
-    emitFilterChange() {
-        this.filterChange.emit(this.cloneFilterItems(this.filterItems));
-    }
-    cloneFilterItems(filterItems) {
-        return Object.fromEntries(Object.entries(filterItems).map(([prop, filters]) => [
-            prop,
-            filters.map(filter => (Object.assign({}, filter))),
-        ]));
-    }
     getAddFilterSelect() {
         return this.element.querySelector(`#${FILTER_ID}`);
     }
@@ -8208,7 +8099,7 @@ class FilterPanel {
             top: `${(_d = (_c = this.changes) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0}px`,
         };
         const capts = Object.assign(Object.assign({}, this.filterCaptionsInternal), this.filterCaptions);
-        return (hAsync(Host, { key: 'd0207c7c243134808f89dc0f024d4b46e18fb3d9' }, hAsync("dialog", { key: '1466680fc6bf4c4464600122bd16a7627131745f', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
+        return (hAsync(Host, { key: 'd0e4ebb408750b11b3965da6a25e581733c968e3' }, hAsync("dialog", { key: '3df36777c931ec1063e8574169ca880a99dbfe41', class: "filter-panel-dialog", style: style, ref: el => (this.dialog = el), onCancel: e => {
                 e.preventDefault();
                 this.onCancel();
             } }, this.changes && [
@@ -8217,7 +8108,7 @@ class FilterPanel {
             ((_g = this.changes) === null || _g === void 0 ? void 0 : _g.hideDefaultFilters) !== true && [
                 hAsync("label", { key: "filter-title" }, capts.title),
                 hAsync("div", { key: "filter-holder", class: "filter-holder" }, this.getFilterItemsList()),
-                hAsync("div", { key: "add-filter", class: "add-filter" }, hAsync("select", { key: 'c924b40863671e714e67eef2b6465b861805bac2', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
+                hAsync("div", { key: "add-filter", class: "add-filter" }, hAsync("select", { key: 'e2a8bd29f2090d3e6c933795427b71ca190b82aa', id: FILTER_ID, class: "select-css", onChange: e => this.onAddNewFilter(e) }, this.renderSelectOptions(this.currentFilterType))),
             ],
             hAsync("slot", { key: "default-slot" }),
             ((_j = (_h = this.changes).extraBottomContent) === null || _j === void 0 ? void 0 : _j.call(_h, this.changes)) || '',
@@ -8249,7 +8140,6 @@ class FilterPanel {
             "currentFilterType": [32],
             "changes": [32],
             "filterItems": [32],
-            "draftFilter": [32],
             "draggedFilterId": [32],
             "dragOverFilterId": [32],
             "show": [64],
@@ -16505,11 +16395,6 @@ const filterTypes = {
     boolean: ['notEmpty', 'empty'],
     array: ['notEmpty', 'empty'],
 };
-/** Preferred initial operator for built-in filter families. */
-const filterTypeDefaults = {
-    string: 'contains',
-    number: 'eqN',
-};
 const filterNames = {
     none: 'None',
     empty: 'Is blank',
@@ -16552,8 +16437,6 @@ const FILTE_PANEL = 'revogr-filter-panel';
  *
  * @property {FilterLocalization|undefined} localization - translation for filter popup captions.
  *
- * @property {boolean|undefined} defaultFilter - creates a draft condition when an empty filter panel opens. Defaults to true.
- *
  * @property {boolean|undefined} disableDynamicFiltering - disables dynamic filtering. A way to apply filters on Save only.
  */
 /**
@@ -16575,7 +16458,7 @@ class FilterPlugin extends BasePlugin {
          *    number: ['eqN', 'neqN', 'gt']
          *  }
          */
-        this.filterByType = Object.fromEntries(Object.entries(filterTypes).map(([type, filters]) => [type, [...filters]]));
+        this.filterByType = Object.assign({}, filterTypes);
         this.filterNameIndexByType = Object.assign({}, filterNames);
         this.filterFunctionsIndexedByType = Object.assign({}, filterCoreFunctionsIndexedByType);
         this.filterProp = FILTER_PROP;
@@ -16659,16 +16542,11 @@ class FilterPlugin extends BasePlugin {
         return null;
     }
     initConfig(config) {
-        var _a, _b, _c, _d;
+        var _a;
         this.config = config;
         this.allowDuplicateOperators = (_a = config.allowDuplicateOperators) !== null && _a !== void 0 ? _a : true;
         if (this.pop) {
             this.pop.allowDuplicateOperators = this.allowDuplicateOperators;
-            this.pop.disableDynamicFiltering =
-                (_b = config.disableDynamicFiltering) !== null && _b !== void 0 ? _b : false;
-            this.pop.closeOnOutsideClick =
-                (_c = config.closeFilterPanelOnOutsideClick) !== null && _c !== void 0 ? _c : true;
-            this.pop.filterCaptions = (_d = config.localization) === null || _d === void 0 ? void 0 : _d.captions;
         }
         if (config.multiFilterItems) {
             this.multiFilterItems = Object.assign({}, config.multiFilterItems);
@@ -16757,12 +16635,11 @@ class FilterPlugin extends BasePlugin {
         }
         // filter button clicked, open filter dialog
         const buttonPos = (filterButton instanceof HTMLElement ? filterButton : el).getBoundingClientRect();
-        const data = Object.assign(Object.assign(Object.assign({}, e.detail), this.filterCollection[prop]), { x: buttonPos.x, y: buttonPos.y + buttonPos.height, anchorY: buttonPos.y, autoCorrect: true, filterTypes: this.getColumnFilter(e.detail.filter), defaultFilterType: this.getDefaultFilter(e.detail.filter), showDefaultFilter: this.shouldShowDefaultFilter(e.detail.filter), filterItems: this.multiFilterItems, extraContent: this.extraHyperContent, extraBottomContent: this.extraBottomHyperContent });
+        const data = Object.assign(Object.assign(Object.assign({}, e.detail), this.filterCollection[prop]), { x: buttonPos.x, y: buttonPos.y + buttonPos.height, anchorY: buttonPos.y, autoCorrect: true, filterTypes: this.getColumnFilter(e.detail.filter), filterItems: this.multiFilterItems, extraContent: this.extraHyperContent, extraBottomContent: this.extraBottomHyperContent });
         (_b = this.beforeshow) === null || _b === void 0 ? void 0 : _b.call(this, data);
         this.pop.show(data);
     }
-    getColumnFilter(config) {
-        const type = this.isColumnFilterOption(config) ? config.type : config;
+    getColumnFilter(type) {
         let filterType = 'string';
         if (!type) {
             return { [filterType]: this.filterByType[filterType] };
@@ -16782,41 +16659,6 @@ class FilterPlugin extends BasePlugin {
         }
         return { [filterType]: this.filterByType[filterType] };
     }
-    /** Resolve the preferred operator against the column's available filters. */
-    getDefaultFilter(config) {
-        var _a;
-        const filters = this.getColumnFilter(config);
-        const availableFilters = Object.values(filters).flat();
-        const columnDefault = this.isColumnFilterOption(config)
-            ? config.default
-            : undefined;
-        if (typeof columnDefault === 'string' &&
-            availableFilters.includes(columnDefault)) {
-            return columnDefault;
-        }
-        const firstFamily = Object.keys(filters)[0];
-        const familyDefault = filterTypeDefaults[firstFamily];
-        if (familyDefault && ((_a = filters[firstFamily]) === null || _a === void 0 ? void 0 : _a.includes(familyDefault))) {
-            return familyDefault;
-        }
-        return availableFilters[0];
-    }
-    /** Resolve grid and column-level draft opt-outs. */
-    shouldShowDefaultFilter(config) {
-        var _a;
-        if (this.isColumnFilterOption(config)) {
-            if (config.default === false) {
-                return false;
-            }
-            if (typeof config.default === 'string') {
-                return true;
-            }
-        }
-        return ((_a = this.config) === null || _a === void 0 ? void 0 : _a.defaultFilter) !== false;
-    }
-    isColumnFilterOption(value) {
-        return !!value && typeof value === 'object' && !Array.isArray(value);
-    }
     isValidType(type) {
         return !!(typeof type === 'string' && this.filterByType[type]);
     }