@revolist/revogrid 4.10.32 → 4.10.34

package/dist/cjs/{column.drag.plugin-e7ee8105.js → column.drag.plugin-5978b75e.js}

@@ -1123,6 +1123,7 @@ const notContains = (value, extra) => {
 notContains.extra = 'input';
 contains.extra = 'input';
 
+// filter.indexed.ts
 const filterCoreFunctionsIndexedByType = {
     none: () => true,
     empty: notSet,
@@ -1160,19 +1161,25 @@ const filterNames = {
     lte: '<=',
 };
 
+// filter.plugin.tsx
 const FILTER_TRIMMED_TYPE = 'filter';
 const FILTER_CONFIG_CHANGED_EVENT = 'filterconfigchanged';
 const FILTE_PANEL = 'revogr-filter-panel';
 /**
  * @typedef ColumnFilterConfig
  * @type {object}
- * @property {FilterCollection|undefined} collection - preserved filter data
+ *
+ * @property {MultiFilterItem|undefined} multiFilterItems - data for multi filtering with relation
+ *
+ * @property {Record<ColumnProp, FilterCollectionItem>|undefined} collection - preserved filter data, relation for filters will be applied as 'and'
+ *
  * @property {string[]|undefined} include - filters to be included, if defined everything else out of scope will be ignored
+ *
  * @property {Record<string, CustomFilter>|undefined} customFilters - hash map of {FilterType:CustomFilter}.
+ *
  * @property {FilterLocalization|undefined} localization - translation for filter popup captions.
- * @property {MultiFilterItem|undefined} multiFilterItems - data for multi filtering.
+ *
  * @property {boolean|undefined} disableDynamicFiltering - disables dynamic filtering. A way to apply filters on Save only.
- * A way to define your own filter types per column
  */
 /**
  * @internal
@@ -1204,7 +1211,7 @@ class FilterPlugin extends BasePlugin {
         this.revogrid.registerVNode = [
             ...existingNodes,
             index.h("revogr-filter-panel", { filterNames: this.filterNameIndexByType, filterEntities: this.filterFunctionsIndexedByType, filterCaptions: (_a = config === null || config === void 0 ? void 0 : config.localization) === null || _a === void 0 ? void 0 : _a.captions, onFilterChange: e => this.onFilterChange(e.detail), onResetChange: e => this.onFilterReset(e.detail), disableDynamicFiltering: config === null || config === void 0 ? void 0 : config.disableDynamicFiltering, ref: e => (this.pop = e) },
-                " ",
+                ' ',
                 this.extraContent()),
         ];
         const aftersourceset = async () => {
@@ -1229,9 +1236,12 @@ class FilterPlugin extends BasePlugin {
             }
             await this.runFiltering(this.multiFilterItems);
         };
-        this.addEventListener('headerclick', (e) => this.headerclick(e));
+        this.addEventListener('headerclick', e => this.headerclick(e));
         this.addEventListener(FILTER_CONFIG_CHANGED_EVENT, ({ detail }) => {
-            if (!detail || typeof detail === 'object' && (!detail.multiFilterItems || !Object.keys(detail.multiFilterItems).length)) {
+            if (!detail ||
+                (typeof detail === 'object' &&
+                    (!detail.multiFilterItems ||
+                        !Object.keys(detail.multiFilterItems).length))) {
                 this.clearFiltering();
                 return;
             }
@@ -1243,6 +1253,9 @@ class FilterPlugin extends BasePlugin {
         this.addEventListener('aftersourceset', aftersourceset);
         this.addEventListener('filter', ({ detail }) => this.onFilterChange(detail));
     }
+    beforeshow(_) {
+        // used as hook for filter panel
+    }
     extraContent() {
         return null;
     }
@@ -1260,8 +1273,11 @@ class FilterPlugin extends BasePlugin {
                 if (!this.filterByType[cFilter.columnFilterType]) {
                     this.filterByType[cFilter.columnFilterType] = [];
                 }
+                // add custom filter type
                 this.filterByType[cFilter.columnFilterType].push(customFilterType);
+                // add custom filter function
                 this.filterFunctionsIndexedByType[customFilterType] = cFilter.func;
+                // add custom filter name
                 this.filterNameIndexByType[customFilterType] = cFilter.name;
             }
         }
@@ -1289,7 +1305,8 @@ class FilterPlugin extends BasePlugin {
             }
         }
         if (config.collection) {
-            this.filterCollection = Object.fromEntries(Object.entries(config.collection).filter(([, item]) => this.filterFunctionsIndexedByType[item.type]));
+            const filtersWithFilterFunctionPresent = Object.entries(config.collection).filter(([, item]) => this.filterFunctionsIndexedByType[item.type]);
+            this.filterCollection = Object.fromEntries(filtersWithFilterFunctionPresent);
         }
         else {
             this.filterCollection = {};
@@ -1305,7 +1322,7 @@ class FilterPlugin extends BasePlugin {
         }
     }
     async headerclick(e) {
-        var _a;
+        var _a, _b;
         const el = (_a = e.detail.originalEvent) === null || _a === void 0 ? void 0 : _a.target;
         if (!filter_button.isFilterBtn(el)) {
             return;
@@ -1318,8 +1335,9 @@ class FilterPlugin extends BasePlugin {
         const gridPos = this.revogrid.getBoundingClientRect();
         const buttonPos = el.getBoundingClientRect();
         const prop = e.detail.prop;
-        const data = Object.assign(Object.assign(Object.assign({}, e.detail), this.filterCollection[prop]), { x: buttonPos.x - gridPos.x, y: buttonPos.y - gridPos.y + buttonPos.height, autoCorrect: true, filterTypes: this.getColumnFilter(e.detail.filter), filterItems: this.multiFilterItems });
-        this.pop.show(Object.assign(Object.assign({}, data), { extraContent: this.extraHyperContent }));
+        const data = Object.assign(Object.assign(Object.assign({}, e.detail), this.filterCollection[prop]), { x: buttonPos.x - gridPos.x, y: buttonPos.y - gridPos.y + buttonPos.height, autoCorrect: true, filterTypes: this.getColumnFilter(e.detail.filter), filterItems: this.multiFilterItems, extraContent: this.extraHyperContent });
+        (_b = this.beforeshow) === null || _b === void 0 ? void 0 : _b.call(this, data);
+        this.pop.show(data);
     }
     getColumnFilter(type) {
         let filterType = 'string';
@@ -1403,7 +1421,11 @@ class FilterPlugin extends BasePlugin {
         }
         // applies the hasFilter to the columns to show filter icon
         this.providers.column.updateColumns(columnsToUpdate);
-        this.emit('afterfilterapply');
+        this.emit('afterfilterapply', {
+            multiFilterItems: filterItems,
+            source,
+            collection,
+        });
     }
     async clearFiltering() {
         this.multiFilterItems = {};
@@ -1418,7 +1440,6 @@ class FilterPlugin extends BasePlugin {
             if (multiFilterItems[prop].length > 0) {
                 const firstFilterItem = multiFilterItems[prop][0];
                 collection[prop] = {
-                    filter: this.filterFunctionsIndexedByType[firstFilterItem.type],
                     type: firstFilterItem.type,
                     value: firstFilterItem.value,
                 };
@@ -1445,67 +1466,83 @@ class FilterPlugin extends BasePlugin {
     getRowFilter(rows, filterItems, columnByProp) {
         const propKeys = Object.keys(filterItems);
         const trimmed = {};
-        let propFilterSatisfiedCount = 0;
-        let lastFilterResults = [];
         // each rows
-        rows.forEach((model, rowIndex) => {
+        for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
             // check filter by column properties
             for (const prop of propKeys) {
-                const propFilters = filterItems[prop];
-                // reset the count of satisfied filters
-                propFilterSatisfiedCount = 0;
+                // add to the list of removed/trimmed rows of filter condition is satisfied
+                if (this.shouldTrimRow(filterItems[prop], prop, columnByProp[prop], rows[rowIndex])) {
+                    trimmed[rowIndex] = true;
+                }
+            } // end of for-of propKeys
+        }
+        return trimmed;
+    }
+    shouldTrimRow(propFilters, prop, column, model = {}) {
+        // reset the count of satisfied filters
+        let propFilterSatisfiedCount = 0;
+        // reset the array of last filter results
+        let lastFilterResults = [];
+        // testing each filter for a prop
+        for (const [filterIndex, filterData] of propFilters.entries()) {
+            // the filter LogicFunction based on the type
+            const filterFunc = this.filterFunctionsIndexedByType[filterData.type];
+            // THE MAGIC OF FILTERING IS HERE
+            // If there is no column but user wants to filter by a property
+            const value = column ? column_service.getCellDataParsed(model, column) : model[prop];
+            // OR relation
+            if (filterData.relation === 'or') {
                 // reset the array of last filter results
                 lastFilterResults = [];
-                // testing each filter for a prop
-                for (const [filterIndex, filterData] of propFilters.entries()) {
-                    // the filter LogicFunction based on the type
-                    const filterFunc = this.filterFunctionsIndexedByType[filterData.type];
-                    // THE MAGIC OF FILTERING IS HERE
-                    const column = columnByProp[prop];
-                    // If there is no column but user wants to filter by a property
-                    const value = column ? column_service.getCellDataParsed(model, columnByProp[prop]) : model[prop];
-                    // OR relation
-                    if (filterData.relation === 'or') {
+                // if the filter is satisfied, continue to the next filter
+                if (filterFunc(value, filterData.value)) {
+                    continue;
+                }
+                // if the filter is not satisfied, count it
+                propFilterSatisfiedCount++;
+                // AND relation
+            }
+            else {
+                // 'and' relation will need to know the next filter
+                // so we save this current filter to include it in the next filter
+                lastFilterResults.push(!filterFunc(value, filterData.value));
+                if (isFinalAndFilter(filterIndex, propFilters)) {
+                    // let's just continue since for sure propFilterSatisfiedCount cannot be satisfied
+                    if (allAndConditionsSatisfied(lastFilterResults)) {
                         // reset the array of last filter results
                         lastFilterResults = [];
-                        // if the filter is satisfied, continue to the next filter
-                        if (filterFunc(value, filterData.value)) {
-                            continue;
-                        }
-                        // if the filter is not satisfied, count it
-                        propFilterSatisfiedCount++;
-                        // AND relation
-                    }
-                    else {
-                        // 'and' relation will need to know the next filter
-                        // so we save this current filter to include it in the next filter
-                        lastFilterResults.push(!filterFunc(value, filterData.value));
-                        // check first if we have a filter on the next index to pair it with this current filter
-                        const nextFilterData = propFilters[filterIndex + 1];
-                        // stop the sequence if there is no next filter or if the next filter is not an 'and' relation
-                        if (!nextFilterData || nextFilterData.relation !== 'and') {
-                            // let's just continue since for sure propFilterSatisfiedCount cannot be satisfied
-                            if (lastFilterResults.indexOf(true) === -1) {
-                                // reset the array of last filter results
-                                lastFilterResults = [];
-                                continue;
-                            }
-                            // we need to add all of the lastFilterResults since we need to satisfy all
-                            propFilterSatisfiedCount += lastFilterResults.length;
-                            // reset the array of last filter results
-                            lastFilterResults = [];
-                        }
+                        continue;
                     }
-                } // end of propFilters forEach
-                // add to the list of removed/trimmed rows of filter condition is satisfied
-                if (propFilterSatisfiedCount === propFilters.length) {
-                    trimmed[rowIndex] = true;
+                    // we need to add all of the lastFilterResults since we need to satisfy all
+                    propFilterSatisfiedCount += lastFilterResults.length;
+                    // reset the array of last filter results
+                    lastFilterResults = [];
                 }
-            } // end of for-of propKeys
-        });
-        return trimmed;
+            }
+        } // end of propFilters forEach
+        return propFilterSatisfiedCount === propFilters.length;
     }
 }
+/**
+ * Checks if the current filter is the final one in an AND sequence.
+ * @param index - Current filter index in the list.
+ * @param filters - Array of filters for the property.
+ * @returns True if this is the last AND condition; false otherwise.
+ */
+function isFinalAndFilter(index, filters) {
+    const nextFilter = filters[index + 1]; // Get the next filter in the list.
+    // Return true if there's no next filter or if the next filter defined and is not part of the AND sequence.
+    return !nextFilter || (!!nextFilter.relation && nextFilter.relation !== 'and');
+}
+/**
+ * Determines if all conditions in an AND sequence are satisfied.
+ * @param pendingResults - An array of results from the AND conditions.
+ * @returns True if all conditions are satisfied; false otherwise.
+ */
+function allAndConditionsSatisfied(pendingResults) {
+    // Check if there are any failed conditions in the pending results.
+    return !pendingResults.includes(true);
+}
 
 // provide collapse data
 function doCollapse(pIndex, source) {
@@ -2523,4 +2560,4 @@ exports.isRowType = isRowType;
 exports.isStretchPlugin = isStretchPlugin;
 exports.rowTypes = rowTypes;
 
-//# sourceMappingURL=column.drag.plugin-e7ee8105.js.map
+//# sourceMappingURL=column.drag.plugin-5978b75e.js.map