@revolist/revogrid 4.21.5 → 4.21.7

package/dist/cjs/{cell-renderer-BLcxDHzP.js → cell-renderer-DW8i7ULg.js}

@@ -4,8 +4,8 @@
 'use strict';
 
 var index = require('./index-Dq8Xzj5l.js');
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
-var column_service = require('./column.service-BmT2HOnj.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
+var column_service = require('./column.service-DvQDqxxx.js');
 
 const SortingSign = ({ column }) => {
     var _a;

package/dist/cjs/{column.drag.plugin-BunAX4dQ.js → column.drag.plugin-BWX5_5iT.js}

@@ -3,13 +3,13 @@
  */
 'use strict';
 
-var column_service = require('./column.service-BmT2HOnj.js');
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
-var viewport_store = require('./viewport.store-DG-4bWqg.js');
+var column_service = require('./column.service-DvQDqxxx.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
+var viewport_store = require('./viewport.store-Dcjud-a-.js');
 var index = require('./index-Dq8Xzj5l.js');
 var filter_button = require('./filter.button-w6LWnyhi.js');
 var debounce = require('./debounce-CcpHiH2p.js');
-var headerCellRenderer = require('./header-cell-renderer-7DgGThjq.js');
+var headerCellRenderer = require('./header-cell-renderer-B1dJwgTO.js');
 
 /**
  * Plugin which recalculates realSize on changes of sizes, originItemSize and count
@@ -1288,6 +1288,7 @@ class FilterPlugin extends BasePlugin {
             if (Object.keys(this.multiFilterItems).length === 0) {
                 return;
             }
+            await dimension_helpers.timeout();
             await this.runFiltering(this.multiFilterItems);
         };
         this.addEventListener('headerclick', e => this.headerclick(e));
@@ -2112,6 +2113,23 @@ function doExpand(vIndex, source, rowItemsIndexes) {
 }
 
 const TRIMMED_GROUPING = 'grouping';
+/**
+ * Converts a trim row index through the index maps produced while regrouping.
+ *
+ * Group rows are synthetic, so they may not exist in the first map. When a
+ * second map is available, fall back to the original index so trims created
+ * against the grouped physical source can still be remapped. If neither path
+ * resolves to a number, the caller drops the stale trim entry.
+ */
+function convertTrimmedIndex(initialIndex, firstLevelMap, secondLevelMap) {
+    const sourceIndex = Number.parseInt(initialIndex, 10);
+    const firstConversionIndex = firstLevelMap[sourceIndex];
+    if (!secondLevelMap) {
+        return firstConversionIndex;
+    }
+    const secondConversionKey = typeof firstConversionIndex === 'number' ? firstConversionIndex : sourceIndex;
+    return secondLevelMap[secondConversionKey];
+}
 /**
  * Prepare trimming updated indexes for grouping
  * @param initiallyTrimed
@@ -2130,31 +2148,73 @@ function processDoubleConversionTrimmed(initiallyTrimed, firstLevelMap, secondLe
         const items = initiallyTrimed[type];
         const newItems = {};
         for (let initialIndex in items) {
+            if (!items[initialIndex]) {
+                continue;
+            }
             /**
              * if item exists we find it in collection
              * we support 2 level of conversions
              */
-            let newConversionIndex = firstLevelMap[initialIndex];
-            if (secondLevelMap) {
-                newConversionIndex = secondLevelMap[newConversionIndex];
+            const newConversionIndex = convertTrimmedIndex(initialIndex, firstLevelMap, secondLevelMap);
+            // Group rows do not exist in the ungrouped index map and must not leak into new trims.
+            if (typeof newConversionIndex !== 'number') {
+                continue;
             }
             /**
              * if item was trimmed previously
              * trimming makes sense to apply
              */
-            if (items[initialIndex]) {
-                newItems[newConversionIndex] = true;
-                /**
-                 * If changes present apply changes to new source
-                 */
-                if (newConversionIndex !== parseInt(initialIndex, 10)) {
-                    trimemedOptionsToUpgrade[type] = newItems;
-                }
-            }
+            newItems[newConversionIndex] = true;
         }
+        trimemedOptionsToUpgrade[type] = newItems;
     }
     return trimemedOptionsToUpgrade;
 }
+function hasVisibleGroupItems(source, trimmed, groupIndex) {
+    var _a;
+    const depth = (_a = source[groupIndex]) === null || _a === void 0 ? void 0 : _a[column_service.GROUP_DEPTH];
+    if (depth == null) {
+        return false;
+    }
+    // A group is visible when at least one descendant data row survives filtering.
+    for (let i = groupIndex + 1; i < source.length; i++) {
+        const model = source[i];
+        if (column_service.isGrouping(model)) {
+            if (model[column_service.GROUP_DEPTH] <= depth) {
+                break;
+            }
+            continue;
+        }
+        if (!trimmed[i]) {
+            return true;
+        }
+    }
+    return false;
+}
+/**
+ * Preserves data-row filter results and recalculates group-row visibility
+ * from the filtered state of each group's descendant data rows.
+ *
+ * @param source - Grouped row source that contains group rows and data rows.
+ * @param filterTrimmed - Current filter trim map keyed by physical row index.
+ * @returns Filter trim map with empty group rows hidden and matching group rows visible.
+ */
+function filterOutEmptyGroupRows(source, filterTrimmed) {
+    const trimmed = Object.assign({}, filterTrimmed);
+    // Recalculate only group rows; data-row filter results are preserved as-is.
+    source.forEach((model, index) => {
+        if (!column_service.isGrouping(model)) {
+            return;
+        }
+        if (hasVisibleGroupItems(source, trimmed, index)) {
+            delete trimmed[index];
+        }
+        else {
+            trimmed[index] = true;
+        }
+    });
+    return trimmed;
+}
 
 class GroupingRowPlugin extends BasePlugin {
     getStore(type = column_service.GROUPING_ROW_TYPE) {
@@ -2223,16 +2283,18 @@ class GroupingRowPlugin extends BasePlugin {
         }
     }
     beforeTrimmedApply(trimmed, type) {
-        /** Before filter apply remove grouping filtering */
+        /** Filter trim must keep group headers in sync with their visible children. */
         if (type === FILTER_TRIMMED_TYPE) {
             const source = this.getStore().get('source');
-            for (let index in trimmed) {
-                if (trimmed[index] && column_service.isGrouping(source[index])) {
-                    trimmed[index] = false;
-                }
-            }
+            const updatedTrimmed = filterOutEmptyGroupRows(source, trimmed);
+            Object.keys(trimmed).forEach(index => delete trimmed[Number.parseInt(index, 10)]);
+            Object.assign(trimmed, updatedTrimmed);
         }
     }
+    beforeFilterTrimmed(trimmed) {
+        const source = this.getStore().get('source');
+        return filterOutEmptyGroupRows(source, trimmed);
+    }
     isSortingRunning() {
         const sortingPlugin = this.providers.plugins.getByClass(SortingPlugin);
         return !!(sortingPlugin === null || sortingPlugin === void 0 ? void 0 : sortingPlugin.sortingPromise);
@@ -2258,7 +2320,7 @@ class GroupingRowPlugin extends BasePlugin {
         const customRenderer = options === null || options === void 0 ? void 0 : options.groupLabelTemplate;
         // setup source
         this.providers.data.setData(sourceWithGroups, column_service.GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, { depth, customRenderer }, true);
-        this.updateTrimmed(trimmed, oldNewIndexes !== null && oldNewIndexes !== void 0 ? oldNewIndexes : {}, oldNewIndexMap);
+        this.updateTrimmed(trimmed, oldNewIndexes !== null && oldNewIndexes !== void 0 ? oldNewIndexes : {}, oldNewIndexMap, sourceWithGroups);
     }
     /**
      * Apply grouping on data set
@@ -2277,7 +2339,7 @@ class GroupingRowPlugin extends BasePlugin {
         const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = column_service.gatherGrouping(source, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.props) || [], options);
         data.source = sourceWithGroups;
         this.providers.data.setGrouping({ depth });
-        this.updateTrimmed(trimmed, oldNewIndexMap);
+        this.updateTrimmed(trimmed, oldNewIndexMap, undefined, sourceWithGroups);
     }
     /**
      * External call to apply grouping. Called by revogrid when prop changed.
@@ -2326,6 +2388,10 @@ class GroupingRowPlugin extends BasePlugin {
          * based on new results can be new grouping
          */
         this.addEventListener('beforetrimmed', ({ detail: { trimmed, trimmedType } }) => this.beforeTrimmedApply(trimmed, trimmedType));
+        /** Filter plugin owns data-row matching; grouping decides which headers remain visible. */
+        this.addEventListener('beforefiltertrimmed', ({ detail }) => {
+            detail.itemsToFilter = this.beforeFilterTrimmed(detail.itemsToFilter);
+        });
         /**
          * sorting applied need to clear grouping and apply again
          * based on new results whole grouping order will changed
@@ -2371,12 +2437,16 @@ class GroupingRowPlugin extends BasePlugin {
         // clear rows
         const { source, oldNewIndexes } = column_service.getSource(this.getStore().get('source'), this.getStore().get('proxyItems'), true);
         this.providers.data.setData(source, column_service.GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, undefined, true);
-        this.updateTrimmed(undefined, undefined, oldNewIndexes);
+        this.updateTrimmed(undefined, undefined, oldNewIndexes, source);
     }
-    updateTrimmed(trimmedGroup = {}, firstLevelMap = {}, secondLevelMap) {
+    updateTrimmed(trimmedGroup = {}, firstLevelMap = {}, secondLevelMap, source = this.getStore().get('source')) {
         // map previously trimmed data
         const trimemedOptionsToUpgrade = processDoubleConversionTrimmed(this.getStore().get('trimmed'), firstLevelMap, secondLevelMap);
         for (let type in trimemedOptionsToUpgrade) {
+            if (type === FILTER_TRIMMED_TYPE) {
+                /** Regrouping changes physical indexes, so filter trim needs fresh group-header state. */
+                trimemedOptionsToUpgrade[type] = filterOutEmptyGroupRows(source, trimemedOptionsToUpgrade[type]);
+            }
             this.revogrid.addTrimmed(trimemedOptionsToUpgrade[type], type);
         }
         // const emptyGroups = this.filterOutEmptyGroups(trimemedOptionsToUpgrade, childrenByGroup);

package/dist/cjs/{column.service-BmT2HOnj.js → column.service-DvQDqxxx.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
 
 /**
  * Converts `value` to an integer.

package/dist/cjs/{dimension.helpers-BOxHtX5T.js → dimension.helpers-CaIsYC99.js}

@@ -774,7 +774,7 @@ function setCacheAdd(value) {
  * @name has
  * @memberOf SetCache
  * @param {*} value The value to search for.
- * @returns {number} Returns `true` if `value` is found, else `false`.
+ * @returns {boolean} Returns `true` if `value` is found, else `false`.
  */
 function setCacheHas(value) {
   return this.__data__.has(value);

package/dist/cjs/{edit.utils-DnvQVP4H.js → edit.utils-CwMzSIVF.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
 
 function isMetaKey(code) {
     const keys = [

package/dist/cjs/{header-cell-renderer-7DgGThjq.js → header-cell-renderer-B1dJwgTO.js}

@@ -4,7 +4,7 @@
 'use strict';
 
 var index = require('./index-Dq8Xzj5l.js');
-var column_service = require('./column.service-BmT2HOnj.js');
+var column_service = require('./column.service-DvQDqxxx.js');
 
 /**
  * Dispatches a custom event to a specified target element.

package/dist/cjs/index.cjs.js

@@ -3,15 +3,15 @@
  */
 'use strict';
 
-var column_service = require('./column.service-BmT2HOnj.js');
-var column_drag_plugin = require('./column.drag.plugin-BunAX4dQ.js');
-var headerCellRenderer = require('./header-cell-renderer-7DgGThjq.js');
-var cellRenderer = require('./cell-renderer-BLcxDHzP.js');
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
-var textEditor = require('./text-editor-B9ibcdrl.js');
-var edit_utils = require('./edit.utils-DnvQVP4H.js');
+var column_service = require('./column.service-DvQDqxxx.js');
+var column_drag_plugin = require('./column.drag.plugin-BWX5_5iT.js');
+var headerCellRenderer = require('./header-cell-renderer-B1dJwgTO.js');
+var cellRenderer = require('./cell-renderer-DW8i7ULg.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
+var textEditor = require('./text-editor-BTnGaIl3.js');
+var edit_utils = require('./edit.utils-CwMzSIVF.js');
 var index = require('./index-Dq8Xzj5l.js');
-var viewport_store = require('./viewport.store-DG-4bWqg.js');
+var viewport_store = require('./viewport.store-Dcjud-a-.js');
 var filter_button = require('./filter.button-w6LWnyhi.js');
 require('./debounce-CcpHiH2p.js');
 

package/dist/cjs/revo-grid.cjs.entry.js

@@ -4,16 +4,16 @@
 'use strict';
 
 var index = require('./index-Dq8Xzj5l.js');
-var column_service = require('./column.service-BmT2HOnj.js');
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
+var column_service = require('./column.service-DvQDqxxx.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
 var debounce = require('./debounce-CcpHiH2p.js');
-var column_drag_plugin = require('./column.drag.plugin-BunAX4dQ.js');
-var viewport_store = require('./viewport.store-DG-4bWqg.js');
+var column_drag_plugin = require('./column.drag.plugin-BWX5_5iT.js');
+var viewport_store = require('./viewport.store-Dcjud-a-.js');
 var theme_service = require('./theme.service-BgnxGIjK.js');
 var viewport_helpers = require('./viewport.helpers-BAovztDd.js');
 var events = require('./events-DeLDyZlb.js');
 require('./filter.button-w6LWnyhi.js');
-require('./header-cell-renderer-7DgGThjq.js');
+require('./header-cell-renderer-B1dJwgTO.js');
 
 class ColumnDataProvider {
     get stores() {

package/dist/cjs/revogr-attribution_7.cjs.entry.js

@@ -4,14 +4,14 @@
 'use strict';
 
 var index = require('./index-Dq8Xzj5l.js');
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
 var events = require('./events-DeLDyZlb.js');
-var column_service = require('./column.service-BmT2HOnj.js');
-var edit_utils = require('./edit.utils-DnvQVP4H.js');
+var column_service = require('./column.service-DvQDqxxx.js');
+var edit_utils = require('./edit.utils-CwMzSIVF.js');
 var debounce = require('./debounce-CcpHiH2p.js');
-var viewport_store = require('./viewport.store-DG-4bWqg.js');
+var viewport_store = require('./viewport.store-Dcjud-a-.js');
 var viewport_helpers = require('./viewport.helpers-BAovztDd.js');
-var throttle = require('./throttle-DkuCcmB0.js');
+var throttle = require('./throttle-CI4MsAqs.js');
 
 const Attribution = class {
     constructor(hostRef) {

package/dist/cjs/revogr-clipboard_3.cjs.entry.js

@@ -4,9 +4,9 @@
 'use strict';
 
 var index = require('./index-Dq8Xzj5l.js');
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
-var textEditor = require('./text-editor-B9ibcdrl.js');
-var edit_utils = require('./edit.utils-DnvQVP4H.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
+var textEditor = require('./text-editor-BTnGaIl3.js');
+var edit_utils = require('./edit.utils-CwMzSIVF.js');
 var debounce = require('./debounce-CcpHiH2p.js');
 
 const Clipboard = class {

package/dist/cjs/revogr-data_4.cjs.entry.js

@@ -4,12 +4,12 @@
 'use strict';
 
 var index = require('./index-Dq8Xzj5l.js');
-var column_service = require('./column.service-BmT2HOnj.js');
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
-var cellRenderer = require('./cell-renderer-BLcxDHzP.js');
+var column_service = require('./column.service-DvQDqxxx.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
+var cellRenderer = require('./cell-renderer-DW8i7ULg.js');
 var filter_button = require('./filter.button-w6LWnyhi.js');
-var headerCellRenderer = require('./header-cell-renderer-7DgGThjq.js');
-var throttle = require('./throttle-DkuCcmB0.js');
+var headerCellRenderer = require('./header-cell-renderer-B1dJwgTO.js');
+var throttle = require('./throttle-CI4MsAqs.js');
 var viewport_helpers = require('./viewport.helpers-BAovztDd.js');
 require('./debounce-CcpHiH2p.js');
 
@@ -901,7 +901,7 @@ const RevogrViewportScroll = class {
      * @param e
      */
     onHorizontalMouseWheel(type, delta, e) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (!e.deltaX) {
             return;
         }
@@ -910,11 +910,21 @@ const RevogrViewportScroll = class {
         const atRight = scrollLeft + clientWidth >= scrollWidth && e.deltaX > 0;
         // Detect if the user has reached the left end
         const atLeft = scrollLeft === 0 && e.deltaX < 0;
-        if (!atRight && !atLeft && !this.noHorizontalScrollTransfer) {
-            (_a = e.preventDefault) === null || _a === void 0 ? void 0 : _a.call(e);
+        if (this.noHorizontalScrollTransfer) {
+            if (!atRight && !atLeft) {
+                const nextScrollLeft = scrollLeft + e[delta];
+                (_a = e.preventDefault) === null || _a === void 0 ? void 0 : _a.call(e);
+                this.horizontalScroll.scrollLeft = nextScrollLeft;
+                (_b = this.localScrollService) === null || _b === void 0 ? void 0 : _b.scroll(this.horizontalScroll.scrollLeft, type, undefined, e[delta]);
+                this.localScrollTimer.latestScrollUpdate(type);
+            }
+            return;
+        }
+        if (!atRight && !atLeft) {
+            (_c = e.preventDefault) === null || _c === void 0 ? void 0 : _c.call(e);
         }
         const pos = scrollLeft + e[delta];
-        (_b = this.localScrollService) === null || _b === void 0 ? void 0 : _b.scroll(pos, type, undefined, e[delta]);
+        (_d = this.localScrollService) === null || _d === void 0 ? void 0 : _d.scroll(pos, type, undefined, e[delta]);
         this.localScrollTimer.latestScrollUpdate(type);
     }
     get horizontalScroll() { return index.getElement(this); }

package/dist/cjs/{text-editor-B9ibcdrl.js → text-editor-BTnGaIl3.js}

@@ -3,8 +3,8 @@
  */
 'use strict';
 
-var edit_utils = require('./edit.utils-DnvQVP4H.js');
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
+var edit_utils = require('./edit.utils-CwMzSIVF.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
 
 class TextEditor {
     constructor(data, saveCallback) {

package/dist/cjs/{throttle-DkuCcmB0.js → throttle-CI4MsAqs.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
 var debounce = require('./debounce-CcpHiH2p.js');
 
 const initialParams = {

package/dist/cjs/{viewport.store-DG-4bWqg.js → viewport.store-Dcjud-a-.js}

@@ -3,7 +3,7 @@
  */
 'use strict';
 
-var dimension_helpers = require('./dimension.helpers-BOxHtX5T.js');
+var dimension_helpers = require('./dimension.helpers-CaIsYC99.js');
 
 const LETTER_BLOCK_SIZE = 10;
 const calculateRowHeaderSize = (itemsLength, rowHeaderColumn, minWidth = 50) => {

package/dist/collection/components/scroll/revogr-viewport-scroll.js

@@ -277,7 +277,7 @@ export class RevogrViewportScroll {
      * @param e
      */
     onHorizontalMouseWheel(type, delta, e) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         if (!e.deltaX) {
             return;
         }
@@ -286,11 +286,21 @@ export class RevogrViewportScroll {
         const atRight = scrollLeft + clientWidth >= scrollWidth && e.deltaX > 0;
         // Detect if the user has reached the left end
         const atLeft = scrollLeft === 0 && e.deltaX < 0;
-        if (!atRight && !atLeft && !this.noHorizontalScrollTransfer) {
-            (_a = e.preventDefault) === null || _a === void 0 ? void 0 : _a.call(e);
+        if (this.noHorizontalScrollTransfer) {
+            if (!atRight && !atLeft) {
+                const nextScrollLeft = scrollLeft + e[delta];
+                (_a = e.preventDefault) === null || _a === void 0 ? void 0 : _a.call(e);
+                this.horizontalScroll.scrollLeft = nextScrollLeft;
+                (_b = this.localScrollService) === null || _b === void 0 ? void 0 : _b.scroll(this.horizontalScroll.scrollLeft, type, undefined, e[delta]);
+                this.localScrollTimer.latestScrollUpdate(type);
+            }
+            return;
+        }
+        if (!atRight && !atLeft) {
+            (_c = e.preventDefault) === null || _c === void 0 ? void 0 : _c.call(e);
         }
         const pos = scrollLeft + e[delta];
-        (_b = this.localScrollService) === null || _b === void 0 ? void 0 : _b.scroll(pos, type, undefined, e[delta]);
+        (_d = this.localScrollService) === null || _d === void 0 ? void 0 : _d.scroll(pos, type, undefined, e[delta]);
         this.localScrollTimer.latestScrollUpdate(type);
     }
     static get is() { return "revogr-viewport-scroll"; }

package/dist/collection/plugins/filter/filter.plugin.js

@@ -6,7 +6,7 @@ import { h } from "@stencil/core";
 import { BasePlugin } from "../base.plugin";
 import { FILTER_PROP, isFilterBtn } from "./filter.button";
 import { filterCoreFunctionsIndexedByType, filterNames, filterTypes, } from "./filter.indexed";
-import { getCellDataParsed } from "../../utils";
+import { getCellDataParsed, timeout } from "../../utils";
 export * from './filter.types';
 export * from './filter.indexed';
 export * from './filter.button';
@@ -80,6 +80,7 @@ export class FilterPlugin extends BasePlugin {
             if (Object.keys(this.multiFilterItems).length === 0) {
                 return;
             }
+            await timeout();
             await this.runFiltering(this.multiFilterItems);
         };
         this.addEventListener('headerclick', e => this.headerclick(e));

package/dist/collection/plugins/groupingRow/grouping.row.plugin.js

@@ -8,7 +8,7 @@ import { SortingPlugin } from "../sorting/sorting.plugin";
 import { GROUP_EXPAND_EVENT, GROUPING_ROW_TYPE, PSEUDO_GROUP_COLUMN, } from "./grouping.const";
 import { doExpand, doCollapse } from "./grouping.row.expand.service";
 import { gatherGrouping, getExpanded, getSource, isGrouping, isGroupingColumn, } from "./grouping.service";
-import { processDoubleConversionTrimmed, TRIMMED_GROUPING, } from "./grouping.trimmed.service";
+import { filterOutEmptyGroupRows, processDoubleConversionTrimmed, TRIMMED_GROUPING, } from "./grouping.trimmed.service";
 export * from './grouping.const';
 export * from './grouping.row.expand.service';
 export * from './grouping.row.types';
@@ -81,16 +81,18 @@ export class GroupingRowPlugin extends BasePlugin {
         }
     }
     beforeTrimmedApply(trimmed, type) {
-        /** Before filter apply remove grouping filtering */
+        /** Filter trim must keep group headers in sync with their visible children. */
         if (type === FILTER_TRIMMED_TYPE) {
             const source = this.getStore().get('source');
-            for (let index in trimmed) {
-                if (trimmed[index] && isGrouping(source[index])) {
-                    trimmed[index] = false;
-                }
-            }
+            const updatedTrimmed = filterOutEmptyGroupRows(source, trimmed);
+            Object.keys(trimmed).forEach(index => delete trimmed[Number.parseInt(index, 10)]);
+            Object.assign(trimmed, updatedTrimmed);
         }
     }
+    beforeFilterTrimmed(trimmed) {
+        const source = this.getStore().get('source');
+        return filterOutEmptyGroupRows(source, trimmed);
+    }
     isSortingRunning() {
         const sortingPlugin = this.providers.plugins.getByClass(SortingPlugin);
         return !!(sortingPlugin === null || sortingPlugin === void 0 ? void 0 : sortingPlugin.sortingPromise);
@@ -116,7 +118,7 @@ export class GroupingRowPlugin extends BasePlugin {
         const customRenderer = options === null || options === void 0 ? void 0 : options.groupLabelTemplate;
         // setup source
         this.providers.data.setData(sourceWithGroups, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, { depth, customRenderer }, true);
-        this.updateTrimmed(trimmed, oldNewIndexes !== null && oldNewIndexes !== void 0 ? oldNewIndexes : {}, oldNewIndexMap);
+        this.updateTrimmed(trimmed, oldNewIndexes !== null && oldNewIndexes !== void 0 ? oldNewIndexes : {}, oldNewIndexMap, sourceWithGroups);
     }
     /**
      * Apply grouping on data set
@@ -135,7 +137,7 @@ export class GroupingRowPlugin extends BasePlugin {
         const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.props) || [], options);
         data.source = sourceWithGroups;
         this.providers.data.setGrouping({ depth });
-        this.updateTrimmed(trimmed, oldNewIndexMap);
+        this.updateTrimmed(trimmed, oldNewIndexMap, undefined, sourceWithGroups);
     }
     /**
      * External call to apply grouping. Called by revogrid when prop changed.
@@ -184,6 +186,10 @@ export class GroupingRowPlugin extends BasePlugin {
          * based on new results can be new grouping
          */
         this.addEventListener('beforetrimmed', ({ detail: { trimmed, trimmedType } }) => this.beforeTrimmedApply(trimmed, trimmedType));
+        /** Filter plugin owns data-row matching; grouping decides which headers remain visible. */
+        this.addEventListener('beforefiltertrimmed', ({ detail }) => {
+            detail.itemsToFilter = this.beforeFilterTrimmed(detail.itemsToFilter);
+        });
         /**
          * sorting applied need to clear grouping and apply again
          * based on new results whole grouping order will changed
@@ -229,12 +235,16 @@ export class GroupingRowPlugin extends BasePlugin {
         // clear rows
         const { source, oldNewIndexes } = getSource(this.getStore().get('source'), this.getStore().get('proxyItems'), true);
         this.providers.data.setData(source, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, undefined, true);
-        this.updateTrimmed(undefined, undefined, oldNewIndexes);
+        this.updateTrimmed(undefined, undefined, oldNewIndexes, source);
     }
-    updateTrimmed(trimmedGroup = {}, firstLevelMap = {}, secondLevelMap) {
+    updateTrimmed(trimmedGroup = {}, firstLevelMap = {}, secondLevelMap, source = this.getStore().get('source')) {
         // map previously trimmed data
         const trimemedOptionsToUpgrade = processDoubleConversionTrimmed(this.getStore().get('trimmed'), firstLevelMap, secondLevelMap);
         for (let type in trimemedOptionsToUpgrade) {
+            if (type === FILTER_TRIMMED_TYPE) {
+                /** Regrouping changes physical indexes, so filter trim needs fresh group-header state. */
+                trimemedOptionsToUpgrade[type] = filterOutEmptyGroupRows(source, trimemedOptionsToUpgrade[type]);
+            }
             this.revogrid.addTrimmed(trimemedOptionsToUpgrade[type], type);
         }
         // const emptyGroups = this.filterOutEmptyGroups(trimemedOptionsToUpgrade, childrenByGroup);