@revolist/revogrid 4.27.0 → 4.27.2

package/dist/collection/plugins/row-resize/row-resize.plugin.js

@@ -1,9 +1,9 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { getItemByIndex } from "../../store/index";
+import { getItemByIndex, getViewportMaxCoordinate, rowTypes } from "../../store/index";
 import { BasePlugin } from "../base.plugin";
-import { GROUP_EXPAND_EVENT } from "../groupingRow/grouping.const";
+import { BEFORE_GROUPING_APPLY_EVENT, GROUP_EXPAND_EVENT, } from "../groupingRow/grouping.const";
 import { clampRowResizeHeight, createRowResizePatch, getRowResizeIndexes, mergeRowResizeDefinitions, resolveRowResizeConfig, } from "./row-resize.utils";
 export const ROW_RESIZE_HANDLE_CLASS = 'row-resize-handle';
 export const BEFORE_ROW_RESIZE_EVENT = 'beforerowresize';
@@ -11,18 +11,14 @@ export const ROW_RESIZE_EVENT = 'rowresize';
 export const AFTER_ROW_RESIZE_EVENT = 'afterrowresize';
 export const ROW_RESIZE_CANCEL_EVENT = 'rowresizecancel';
 export class RowResizePlugin extends BasePlugin {
-    static fromGridProperty(revogrid, providers) {
-        const plugin = new RowResizePlugin(revogrid, providers);
-        plugin.controlFromGridProperty();
-        return plugin;
-    }
     constructor(revogrid, providers, config = {}) {
         super(revogrid, providers);
         this.enabled = false;
-        this.gridResizeRow = false;
-        this.gridPlugins = [];
-        this.committedSizes = new Map();
-        this.appliedIndexes = new Map();
+        this.appliedDefinitionIndexes = new Map();
+        this.pendingBottomAnchor = false;
+        this.keepBottomAnchor = false;
+        this.rowDefinitionRemapQueued = false;
+        this.pendingSourceCounts = new Map();
         this.previousBodyCursor = '';
         this.decorateRow = ({ detail, }) => {
             if (!this.enabled ||
@@ -86,22 +82,72 @@ export class RowResizePlugin extends BasePlugin {
             }
         };
         this.onWindowBlur = () => this.cancel('blur');
-        this.reapplyCommittedSizes = () => this.applyCommittedSizes(false);
-        this.rebuildCommittedSizes = () => this.applyCommittedSizes(true);
-        this.syncAppliedIndexes = () => {
-            for (const [rowType, committed] of this.committedSizes) {
+        this.updateBottomAnchorState = ({ detail, }) => {
+            if (detail.dimension !== 'rgRow') {
+                return;
+            }
+            this.keepBottomAnchor = this.isMainViewportAtBottom(detail.coordinate);
+        };
+        this.applyPendingBottomAnchor = () => {
+            if (!this.pendingBottomAnchor) {
+                return;
+            }
+            this.pendingBottomAnchor = false;
+            const dimension = this.providers.dimension.stores.rgRow.store;
+            // Scroll surfaces have slightly different client sizes. Give the shared
+            // scrolling service the content end and let each surface clamp to its own
+            // exact bottom coordinate.
+            void this.revogrid.scrollToCoordinate({ y: dimension.get('realSize') });
+        };
+        this.scheduleRowDefinitionRemap = () => {
+            if (this.rowDefinitionRemapQueued) {
+                return;
+            }
+            this.rowDefinitionRemapQueued = true;
+            queueMicrotask(() => {
+                if (!this.rowDefinitionRemapQueued) {
+                    return;
+                }
+                this.pruneRowDefinitions();
+                this.reapplyRowDefinitionSizes();
+                this.rowDefinitionRemapQueued = false;
+            });
+        };
+        /** Map source-indexed row definitions back onto the current virtual order. */
+        this.reapplyRowDefinitionSizes = () => {
+            const rowDefinitions = this.providers.dimension.getRowDefinitions();
+            for (const rowType of rowTypes) {
                 const items = this.providers.data.stores[rowType].store.get('items');
+                const definitions = new Map(rowDefinitions
+                    .filter(definition => definition.type === rowType)
+                    .map(definition => [definition.index, definition.size]));
+                const appliedIndexes = this.appliedDefinitionIndexes.get(rowType);
+                if (!definitions.size && !(appliedIndexes === null || appliedIndexes === void 0 ? void 0 : appliedIndexes.size)) {
+                    continue;
+                }
+                const dimension = this.providers.dimension.stores[rowType];
+                const currentSizes = dimension.store.get('sizes');
+                const sizes = Object.assign({}, currentSizes);
+                for (const index of appliedIndexes || []) {
+                    delete sizes[index];
+                }
                 const indexes = new Set();
                 items.forEach((physicalIndex, virtualIndex) => {
-                    if (committed.has(physicalIndex)) {
+                    const size = definitions.get(physicalIndex);
+                    if (size !== undefined) {
+                        sizes[virtualIndex] = size;
                         indexes.add(virtualIndex);
                     }
                 });
-                this.appliedIndexes.set(rowType, indexes);
+                this.appliedDefinitionIndexes.set(rowType, indexes);
+                const sizeKeys = Object.keys(sizes);
+                if (sizeKeys.length !== Object.keys(currentSizes).length ||
+                    sizeKeys.some(index => sizes[index] !== currentSizes[index])) {
+                    this.providers.dimension.setCustomSizes(rowType, sizes);
+                }
             }
         };
         this.config = resolveRowResizeConfig(config);
-        this.rowDefinitionsRef = revogrid.rowDefinitions;
         if (new.target !== RowResizePlugin) {
             this.enabled = true;
             this.registerEventListeners();
@@ -109,77 +155,53 @@ export class RowResizePlugin extends BasePlugin {
     }
     registerEventListeners() {
         this.addEventListener('beforerowrender', this.decorateRow);
-        this.addEventListener('beforeanysource', ({ detail }) => {
+        this.addEventListener('beforeanysource', () => {
             this.cancel('data-change');
-            const committed = this.committedSizes.get(detail.type);
-            if (!committed) {
-                return;
-            }
-            const removedIndexes = new Set();
-            for (const index of committed.keys()) {
-                if (index >= detail.source.length) {
-                    committed.delete(index);
-                    removedIndexes.add(index);
-                }
-            }
-            if (removedIndexes.size) {
-                const rowDefinitions = this.revogrid.rowDefinitions.filter(definition => definition.type !== detail.type ||
-                    !removedIndexes.has(definition.index));
-                this.rowDefinitionsRef = rowDefinitions;
-                this.revogrid.rowDefinitions = rowDefinitions;
-            }
+            this.keepBottomAnchor = false;
+        });
+        this.addEventListener('afteranysource', ({ detail }) => {
+            this.pendingSourceCounts.set(detail.type, detail.source.length);
+            this.scheduleRowDefinitionRemap();
         });
-        this.addEventListener('afteranysource', this.rebuildCommittedSizes);
         this.addEventListener('beforesourcesortingapply', this.cancelForDataChange);
-        this.addEventListener('aftersortingapply', this.reapplyCommittedSizes);
+        this.addEventListener('beforesortingapply', this.cancelForDataChange);
+        this.addEventListener('sortingconfigchanged', this.cancelForDataChange);
+        this.addEventListener(BEFORE_GROUPING_APPLY_EVENT, this.cancelForDataChange);
+        this.addEventListener('aftersortingapply', this.scheduleRowDefinitionRemap);
         this.addEventListener('beforefilterapply', this.cancelForDataChange);
-        this.addEventListener('beforerowdefinition', ({ detail }) => {
+        this.addEventListener('afterfilterapply', this.scheduleRowDefinitionRemap);
+        this.addEventListener('beforerowdefinition', () => {
             this.cancel('data-change');
-            if (detail.vals !== this.rowDefinitionsRef) {
-                this.committedSizes.clear();
-                this.appliedIndexes.clear();
-                this.rowDefinitionsRef = detail.vals;
-            }
-        });
-        this.addEventListener('afterthemechanged', this.reapplyCommittedSizes);
-        this.addEventListener('aftertrimmed', this.syncAppliedIndexes);
-        this.addEventListener('roworderchange', () => {
-            queueMicrotask(this.reapplyCommittedSizes);
+            this.scheduleRowDefinitionRemap();
         });
+        this.addEventListener('afterthemechanged', this.scheduleRowDefinitionRemap);
+        this.addEventListener('aftertrimmed', this.scheduleRowDefinitionRemap);
+        this.addEventListener('roworderchange', this.scheduleRowDefinitionRemap);
         this.addEventListener(GROUP_EXPAND_EVENT, () => {
-            queueMicrotask(this.reapplyCommittedSizes);
+            if (this.keepBottomAnchor) {
+                this.pendingBottomAnchor = true;
+            }
+            this.scheduleRowDefinitionRemap();
         });
+        this.addEventListener('aftergridrender', this.applyPendingBottomAnchor);
+        this.addEventListener('viewportscroll', this.updateBottomAnchorState);
         this.addEventListener('rowheaderschanged', ({ detail }) => {
             if (!detail && !this.config.fullRow) {
                 this.cancel('row-headers-hidden');
             }
         });
     }
-    controlFromGridProperty() {
-        this.gridResizeRow = this.revogrid.resizeRow;
-        this.gridPlugins = this.revogrid.plugins;
-        this.syncGridProperty(false);
-        this.watch('resizeRow', value => {
-            this.gridResizeRow = value;
-            this.syncGridProperty();
-        });
-        this.watch('plugins', value => {
-            this.gridPlugins = value || [];
-            this.syncGridProperty();
-        });
-    }
-    syncGridProperty(refresh = true) {
-        const hasConfiguredPlugin = this.gridPlugins.some(plugin => plugin !== RowResizePlugin &&
+    syncGridConfig(refresh = true) {
+        const { plugins = [], resizeRow } = this.revogrid;
+        const isCorePlugin = this.constructor === RowResizePlugin;
+        const hasConfiguredPlugin = plugins.some(plugin => plugin !== RowResizePlugin &&
             plugin.prototype instanceof RowResizePlugin);
-        const explicitlyEnabled = this.gridPlugins.includes(RowResizePlugin);
-        const enabled = hasConfiguredPlugin
-            ? false
-            : explicitlyEnabled || !!this.gridResizeRow;
-        const config = resolveRowResizeConfig(!hasConfiguredPlugin &&
-            !explicitlyEnabled &&
-            typeof this.gridResizeRow === 'object'
-            ? this.gridResizeRow
-            : undefined);
+        const enabled = !isCorePlugin ||
+            (!hasConfiguredPlugin && !!resizeRow);
+        const resizeConfig = typeof resizeRow === 'object' ? resizeRow : undefined;
+        const config = isCorePlugin
+            ? resolveRowResizeConfig(resizeConfig)
+            : this.config;
         const configChanged = config.minHeight !== this.config.minHeight ||
             config.maxHeight !== this.config.maxHeight ||
             config.fullRow !== this.config.fullRow;
@@ -191,10 +213,13 @@ export class RowResizePlugin extends BasePlugin {
         if (enabled !== this.enabled) {
             this.enabled = enabled;
             if (enabled) {
-                this.rowDefinitionsRef = this.revogrid.rowDefinitions;
                 this.registerEventListeners();
             }
             else {
+                this.pendingBottomAnchor = false;
+                this.keepBottomAnchor = false;
+                this.rowDefinitionRemapQueued = false;
+                this.pendingSourceCounts.clear();
                 this.clearSubscriptions();
             }
         }
@@ -213,6 +238,7 @@ export class RowResizePlugin extends BasePlugin {
         }
         const dimension = this.providers.dimension.stores[rowType];
         const dimensionState = dimension.getCurrentState();
+        const viewport = this.providers.viewport.stores[rowType];
         const item = getItemByIndex(dimensionState, index);
         const focusedStore = this.providers.selection.focusedStore;
         const selectedRowType = focusedStore
@@ -244,16 +270,23 @@ export class RowResizePlugin extends BasePlugin {
             currentHeight: startHeight,
             previousSizes,
             originalCustomSizes: Object.assign({}, dimensionState.sizes),
-            startEvent: event,
+            bottomAnchored: rowType === 'rgRow' &&
+                this.isMainViewportAtBottom(viewport.lastCoordinate),
             lastEvent: event,
         };
+        this.active = active;
         const beforeEvent = this.emit(BEFORE_ROW_RESIZE_EVENT, this.eventDetail(active, event, startHeight));
         if (beforeEvent.defaultPrevented) {
+            if (this.active === active) {
+                this.active = undefined;
+            }
+            return;
+        }
+        if (!this.enabled || this.active !== active) {
             return;
         }
         event.preventDefault();
         event.stopPropagation();
-        this.active = active;
         const doc = this.revogrid.ownerDocument;
         this.previousBodyCursor = ((_a = doc.body) === null || _a === void 0 ? void 0 : _a.style.cursor) || '';
         if (doc.body) {
@@ -276,6 +309,7 @@ export class RowResizePlugin extends BasePlugin {
             return;
         }
         this.providers.dimension.setCustomSizes(active.rowType, createRowResizePatch(active.indexes, size), true);
+        this.requestBottomAnchor(active);
         active.currentHeight = size;
         this.emit(ROW_RESIZE_EVENT, this.eventDetail(active, active.lastEvent, size));
     }
@@ -294,7 +328,8 @@ export class RowResizePlugin extends BasePlugin {
             }
         }
         this.providers.dimension.setCustomSizes(active.rowType, currentSizes);
-        const detail = Object.assign(Object.assign({}, this.eventDetail(active, active.lastEvent || active.startEvent, active.startHeight)), { reason });
+        this.requestBottomAnchor(active);
+        const detail = Object.assign(Object.assign({}, this.eventDetail(active, active.lastEvent, active.startHeight)), { reason });
         this.finishGesture();
         this.emit(ROW_RESIZE_CANCEL_EVENT, detail);
     }
@@ -313,51 +348,44 @@ export class RowResizePlugin extends BasePlugin {
             return;
         }
         const items = this.providers.data.stores[active.rowType].store.get('items');
-        let committed = this.committedSizes.get(active.rowType);
-        if (!committed) {
-            committed = new Map();
-            this.committedSizes.set(active.rowType, committed);
-        }
-        let applied = this.appliedIndexes.get(active.rowType);
-        if (!applied) {
-            applied = new Set();
-            this.appliedIndexes.set(active.rowType, applied);
-        }
         const physicalIndexes = active.indexes.reduce((result, index) => {
             const physicalIndex = items[index];
             if (physicalIndex !== undefined) {
-                committed.set(physicalIndex, active.currentHeight);
-                applied.add(index);
                 result.push(physicalIndex);
             }
             return result;
         }, []);
         if (physicalIndexes.length) {
-            const rowDefinitions = mergeRowResizeDefinitions(this.revogrid.rowDefinitions, active.rowType, physicalIndexes, active.currentHeight);
-            this.rowDefinitionsRef = rowDefinitions;
-            this.revogrid.rowDefinitions = rowDefinitions;
+            const rowDefinitions = mergeRowResizeDefinitions(this.providers.dimension.getRowDefinitions(), active.rowType, physicalIndexes, active.currentHeight);
+            this.providers.dimension.setRowDefinitions(rowDefinitions);
+            this.scheduleRowDefinitionRemap();
+            this.keepBottomAnchor = active.bottomAnchored;
+            this.requestBottomAnchor(active);
         }
     }
-    applyCommittedSizes(clearAppliedIndexes) {
-        for (const [rowType, committed] of this.committedSizes) {
-            const dimension = this.providers.dimension.stores[rowType];
-            const sizes = Object.assign({}, dimension.store.get('sizes'));
-            if (clearAppliedIndexes) {
-                for (const index of this.appliedIndexes.get(rowType) || []) {
-                    delete sizes[index];
-                }
-            }
-            const items = this.providers.data.stores[rowType].store.get('items');
-            const indexes = new Set();
-            items.forEach((physicalIndex, virtualIndex) => {
-                const size = committed.get(physicalIndex);
-                if (size !== undefined) {
-                    sizes[virtualIndex] = size;
-                    indexes.add(virtualIndex);
-                }
-            });
-            this.appliedIndexes.set(rowType, indexes);
-            this.providers.dimension.setCustomSizes(rowType, sizes);
+    requestBottomAnchor(active) {
+        if (active.bottomAnchored) {
+            this.pendingBottomAnchor = true;
+        }
+    }
+    isMainViewportAtBottom(coordinate) {
+        const dimension = this.providers.dimension.stores.rgRow.getCurrentState();
+        const viewport = this.providers.viewport.stores.rgRow.store.state;
+        return (dimension.realSize > viewport.clientSize &&
+            coordinate >= getViewportMaxCoordinate(dimension, viewport.virtualSize));
+    }
+    pruneRowDefinitions() {
+        if (!this.pendingSourceCounts.size) {
+            return;
+        }
+        const definitions = this.providers.dimension.getRowDefinitions();
+        const rowDefinitions = definitions.filter(definition => {
+            const count = this.pendingSourceCounts.get(definition.type);
+            return count === undefined || definition.index < count;
+        });
+        this.pendingSourceCounts.clear();
+        if (rowDefinitions.length !== definitions.length) {
+            this.providers.dimension.setRowDefinitions(rowDefinitions);
         }
     }
     finishGesture() {
@@ -380,6 +408,9 @@ export class RowResizePlugin extends BasePlugin {
     }
     destroy() {
         this.cancel('destroy');
+        this.keepBottomAnchor = false;
+        this.rowDefinitionRemapQueued = false;
+        this.pendingSourceCounts.clear();
         super.destroy();
     }
 }

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

@@ -6,6 +6,7 @@ import { BasePlugin } from "../base.plugin";
 import { getColumnByProp } from "../../utils/column.utils";
 import { columnTypes, rowTypes } from "../../store/index";
 import { isGrouping } from "../groupingRow/grouping.service";
+import { gatherGroupedRowIndexes } from "../groupingRow/grouping.sorting.service";
 import { getComparer, getNextOrder, getSortingIndex, hasActiveSorting, sortIndexByItems, } from "./sorting.func";
 export * from './sorting.types';
 export * from './sorting.func';
@@ -13,18 +14,6 @@ export * from './sorting.sign';
 function getSortableRowIndexes(indexes, source) {
     return indexes.filter(index => !isGrouping(source[index]));
 }
-function mergeSortedRowsWithGroups(indexes, source, sortedRows) {
-    if (sortedRows.length === indexes.length) {
-        return sortedRows;
-    }
-    let rowIndex = 0;
-    return indexes.map(index => {
-        if (isGrouping(source[index])) {
-            return index;
-        }
-        return sortedRows[rowIndex++];
-    });
-}
 /**
  * Lifecycle
  * 1. @event `beforesorting` - Triggered when sorting just starts. Nothing has happened yet. This can be triggered from a column or from the source. If the type is from rows, the column will be undefined.
@@ -184,6 +173,7 @@ export class SortingPlugin extends BasePlugin {
         storeService.setData({ proxyItems: newItemsOrder });
     }
     applySortingForStore(type, sorting, sortingFunc, sortingColumns, sortingOrder, ignoreViewportUpdate) {
+        var _a;
         const storeService = this.providers.data.stores[type];
         // row data
         const source = storeService.store.get('source');
@@ -191,7 +181,10 @@ export class SortingPlugin extends BasePlugin {
         const proxyItems = storeService.store.get('proxyItems');
         const sortItems = getSortableRowIndexes(proxyItems, source);
         const sortedItems = sortIndexByItems([...sortItems], source, sortingFunc, sorting, sortingColumns, sortingOrder);
-        const newItemsOrder = mergeSortedRowsWithGroups(proxyItems, source, sortedItems);
+        const hasGroupingRows = sortedItems.length !== proxyItems.length;
+        const newItemsOrder = hasGroupingRows
+            ? (_a = gatherGroupedRowIndexes(source, sortedItems)) !== null && _a !== void 0 ? _a : proxyItems
+            : sortedItems;
         // take row indexes before trim applied and proxy items
         const prevItems = storeService.store.get('items');
         storeService.setData({
@@ -217,6 +210,16 @@ export class SortingPlugin extends BasePlugin {
         }
         this.postponeSort(order, sortingFunc, sortingColumns, sortingOrder, ignoreViewportUpdate);
     }
+    /**
+     * Schedules the current active sort again after another plugin rebuilds row
+     * proxy indexes while keeping the physical source unchanged.
+     */
+    reapplySorting() {
+        if (!hasActiveSorting(this.sorting) || !this.sortingFunc) {
+            return;
+        }
+        this.startSorting(this.sorting, this.sortingFunc, this.sortingColumns, this.sortingOrder);
+    }
     /**
      * Applies sorting requested by a sortable header click.
      *

package/dist/collection/plugins/wcag/index.js

@@ -2,6 +2,7 @@
  * Built by Revolist OU ❤️
  */
 import { BasePlugin } from "../base.plugin";
+const toAriaIndex = (index) => `${index + 1}`;
 /**
  * WCAG Plugin is responsible for enhancing the accessibility features of the RevoGrid component.
  * It ensures that the grid is fully compliant with Web Content Accessibility Guidelines (WCAG) 2.1.
@@ -45,14 +46,14 @@ export class WCAGPlugin extends BasePlugin {
                 column.columnProperties = (...args) => {
                     const result = (columnProperties === null || columnProperties === void 0 ? void 0 : columnProperties(...args)) || {};
                     result.role = 'columnheader';
-                    result['aria-colindex'] = `${index}`;
+                    result['aria-colindex'] = toAriaIndex(index);
                     return result;
                 };
                 column.cellProperties = (...args) => {
                     const wcagProps = {
                         ['role']: 'gridcell',
-                        ['aria-colindex']: `${index}`,
-                        ['aria-rowindex']: `${args[0].rowIndex}`,
+                        ['aria-colindex']: toAriaIndex(index),
+                        ['aria-rowindex']: toAriaIndex(args[0].rowIndex),
                         ['tabindex']: -1,
                     };
                     const columnProps = (cellProperties === null || cellProperties === void 0 ? void 0 : cellProperties(...args)) || {};
@@ -67,7 +68,7 @@ export class WCAGPlugin extends BasePlugin {
             revogrid.setAttribute('aria-rowcount', `${detail.source.length}`);
         });
         this.addEventListener('beforerowrender', ({ detail, }) => {
-            detail.node.$attrs$ = Object.assign(Object.assign({}, detail.node.$attrs$), { role: 'row', ['aria-rowindex']: detail.item.itemIndex });
+            detail.node.$attrs$ = Object.assign(Object.assign({}, detail.node.$attrs$), { role: 'row', ['aria-rowindex']: toAriaIndex(detail.item.itemIndex) });
         });
         // focuscell
         this.addEventListener('afterfocus', async (e) => {

package/dist/collection/services/dimension.provider.js

@@ -19,7 +19,9 @@ export function isVirtualXDimension(type, disableVirtualX = false, virtualX = DE
 export default class DimensionProvider {
     constructor(viewports, config) {
         this.viewports = viewports;
-        const sizeChanged = debounce((k) => config.realSizeChanged(k), RESIZE_INTERVAL);
+        this.config = config;
+        this.rowDefinitions = [];
+        const sizeChanged = debounce((k) => this.config.realSizeChanged(k), RESIZE_INTERVAL);
         this.stores = [...rowTypes, ...columnTypes].reduce((sources, t) => {
             sources[t] = new DimensionStore(t);
             sources[t].store.onChange('realSize', () => sizeChanged(t));
@@ -37,6 +39,20 @@ export default class DimensionProvider {
         this.viewports.stores[t].setOriginalSizes(this.stores[t].store.get('originItemSize'));
         this.setItemCount(count, t);
     }
+    getRowDefinitions() {
+        return this.rowDefinitions;
+    }
+    syncRowDefinitions(definitions) {
+        this.rowDefinitions = definitions;
+    }
+    setRowDefinitions(definitions) {
+        var _a, _b;
+        if (definitions === this.rowDefinitions) {
+            return;
+        }
+        this.syncRowDefinitions(definitions);
+        (_b = (_a = this.config).rowDefinitionsChanged) === null || _b === void 0 ? void 0 : _b.call(_a, definitions);
+    }
     /**
      * Apply new custom sizes to dimension and view port
      * @param type - dimension type

package/dist/esm/{cell-renderer-BFpmdV8H.js → cell-renderer-D9ze8OJw.js}

@@ -3,7 +3,7 @@
  */
 import { h, e as Build } from './index-CtimkLsB.js';
 import { o as DATA_ROW, b as getSourceItem, n as DATA_COL, C as CELL_CLASS, x as DRAG_ICON_CLASS, y as DRAGGABLE_CLASS } from './dimension.helpers-Cln9sALu.js';
-import { A as getCellRaw, v as isGroupingColumn, l as GROUP_EXPAND_BTN, m as GROUP_EXPAND_EVENT, j as GROUP_COLUMN_PROP, P as PSEUDO_GROUP_ITEM, h as GROUP_EXPANDED, G as GROUP_DEPTH, O as isRowDragService, B as getCellDataParsed } from './column.service-CM-wgGs8.js';
+import { A as getCellRaw, v as isGroupingColumn, l as GROUP_EXPAND_BTN, m as GROUP_EXPAND_EVENT, j as GROUP_COLUMN_PROP, P as PSEUDO_GROUP_ITEM, h as GROUP_EXPANDED, G as GROUP_DEPTH, Q as isRowDragService, C as getCellDataParsed } from './column.service-pu_fdQ0S.js';
 
 /**
  * Renders sorting direction and optional additive sorting rank.

package/dist/esm/{column.service-CM-wgGs8.js → column.service-pu_fdQ0S.js}

@@ -432,6 +432,7 @@ const GROUP_COLUMN_PROP = `${GRID_INTERNALS}-prop`;
 const GROUP_ORIGINAL_INDEX = `${GRID_INTERNALS}-original-index`;
 const GROUP_EXPAND_BTN = `group-expand`;
 const GROUP_EXPAND_EVENT = `groupexpandclick`;
+const BEFORE_GROUPING_APPLY_EVENT = `beforegroupingapply`;
 const GROUPING_ROW_TYPE = 'rgRow';
 
 function getGroupValueDefault(item, prop, emptyGroupValue) {
@@ -1006,4 +1007,4 @@ function doPropMerge(existing, extra) {
     return props;
 }
 
-export { getCellRaw as A, getCellDataParsed as B, getColumnType as C, getColumnSizes as D, isColGrouping as E, getColumns as F, GROUP_DEPTH as G, gatherGroup as H, getColumnByProp as I, reduce as J, baseEach as K, toInteger as L, ColumnService as M, getCellEditor as N, isRowDragService as O, PSEUDO_GROUP_ITEM as P, doPropMerge as Q, cropCellToMax as a, isRangeSingleCell as b, columnTypes as c, PSEUDO_GROUP_ITEM_ID as d, PSEUDO_GROUP_ITEM_VALUE as e, PSEUDO_GROUP_COLUMN as f, getRange as g, GROUP_EXPANDED as h, isRowType as i, GROUP_COLUMN_PROP as j, GROUP_ORIGINAL_INDEX as k, GROUP_EXPAND_BTN as l, GROUP_EXPAND_EVENT as m, nextCell as n, GROUPING_ROW_TYPE as o, getSource as p, getExpanded as q, rowTypes as r, gatherGrouping as s, getGroupingName as t, isGrouping as u, isGroupingColumn as v, measureEqualDepth as w, getParsedGroup as x, isSameGroup as y, getCellData as z };
+export { getCellRaw as A, BEFORE_GROUPING_APPLY_EVENT as B, getCellDataParsed as C, getColumnType as D, getColumnSizes as E, isColGrouping as F, GROUP_DEPTH as G, getColumns as H, gatherGroup as I, getColumnByProp as J, reduce as K, baseEach as L, toInteger as M, ColumnService as N, getCellEditor as O, PSEUDO_GROUP_ITEM as P, isRowDragService as Q, doPropMerge as R, cropCellToMax as a, isRangeSingleCell as b, columnTypes as c, PSEUDO_GROUP_ITEM_ID as d, PSEUDO_GROUP_ITEM_VALUE as e, PSEUDO_GROUP_COLUMN as f, getRange as g, GROUP_EXPANDED as h, isRowType as i, GROUP_COLUMN_PROP as j, GROUP_ORIGINAL_INDEX as k, GROUP_EXPAND_BTN as l, GROUP_EXPAND_EVENT as m, nextCell as n, GROUPING_ROW_TYPE as o, getSource as p, getExpanded as q, rowTypes as r, gatherGrouping as s, getGroupingName as t, isGrouping as u, isGroupingColumn as v, measureEqualDepth as w, getParsedGroup as x, isSameGroup as y, getCellData as z };

package/dist/esm/{filter.button-DMhpuAiw.js → filter.button-CEPUxLUo.js}

@@ -10,9 +10,10 @@ const AND_OR_BUTTON = 'and-or-button';
 const TRASH_BUTTON = 'trash-button';
 const REORDER_BUTTON = 'reorder-button';
 const FilterButton = ({ column }) => {
-    return (h("span", null, h("button", { class: {
+    const active = !!(column === null || column === void 0 ? void 0 : column[FILTER_PROP]);
+    return (h("span", { class: "filter-button-wrapper" }, h("button", { class: {
             [FILTER_BUTTON_CLASS]: true,
-            [FILTER_BUTTON_ACTIVE]: column && !!column[FILTER_PROP],
+            [FILTER_BUTTON_ACTIVE]: active,
         } }, h("svg", { class: "filter-img", viewBox: "0 0 64 64" }, h("g", { stroke: "none", "stroke-width": "1", fill: "none", "fill-rule": "evenodd" }, h("path", { d: "M43,48 L43,56 L21,56 L21,48 L43,48 Z M53,28 L53,36 L12,36 L12,28 L53,28 Z M64,8 L64,16 L0,16 L0,8 L64,8 Z", fill: "currentColor" }))))));
 };
 const TrashButton = ({ ariaLabel, onClick }) => {

package/dist/{revo-grid/header-cell-renderer-Bqh1PrgH.js → esm/header-cell-renderer-YCiVIQ2E.js}

@@ -2,7 +2,7 @@
  * Built by Revolist OU ❤️
  */
 import { h } from './index-CtimkLsB.js';
-import { Q as doPropMerge } from './column.service-CM-wgGs8.js';
+import { R as doPropMerge } from './column.service-pu_fdQ0S.js';
 
 /**
  * Dispatches a custom event to a specified target element.

package/dist/esm/index.js

@@ -1,18 +1,18 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { d as defineTheme, B as BasePlugin } from './row-resize.plugin-BRiaHlHA.js';
-export { z as AFTER_ROW_RESIZE_EVENT, A as AutoSizeColumnPlugin, q as BEFORE_COLUMN_DRAG_END_EVENT, x as BEFORE_ROW_RESIZE_EVENT, p as COLUMN_DRAG_END_EVENT, o as COLUMN_DRAG_MOVE_EVENT, s as COLUMN_DRAG_START_EVENT, C as ColumnAutoSizeMode, u as ColumnMovePlugin, k as DEFAULT_BLANK_SEMANTICS, J as DEFAULT_MIN_ROW_HEIGHT, D as DimensionStore, b as ExportCsv, E as ExportFilePlugin, c as FILTER_CONFIG_CHANGED_EVENT, F as FILTER_TRIMMED_TYPE, e as FILTE_PANEL, f as FilterPlugin, G as GroupingRowPlugin, H as ROW_RESIZE_CANCEL_EVENT, y as ROW_RESIZE_EVENT, R as ROW_RESIZE_HANDLE_CLASS, I as RowResizePlugin, S as SelectionStore, P as SortingPlugin, a as StretchColumn, L as clampRowResizeHeight, N as createRowResizePatch, V as defaultCellCompare, W as descCellCompare, m as doCollapse, n as doExpand, g as filterCoreFunctionsIndexedByType, j as filterNames, h as filterTypes, w as getColumnDragPosition, Y as getComparer, v as getLeftRelative, X as getNextOrder, M as getRowResizeIndexes, T as getSortingIndex, Q as hasActiveSorting, l as isBlankValue, i as isStretchPlugin, O as mergeRowResizeDefinitions, r as resolveBlankSemantics, K as resolveRowResizeConfig, U as sortIndexByItems, t as themeTokenCssVariables } from './row-resize.plugin-BRiaHlHA.js';
-export { o as GROUPING_ROW_TYPE, j as GROUP_COLUMN_PROP, G as GROUP_DEPTH, h as GROUP_EXPANDED, l as GROUP_EXPAND_BTN, m as GROUP_EXPAND_EVENT, k as GROUP_ORIGINAL_INDEX, f as PSEUDO_GROUP_COLUMN, P as PSEUDO_GROUP_ITEM, d as PSEUDO_GROUP_ITEM_ID, e as PSEUDO_GROUP_ITEM_VALUE, c as columnTypes, a as cropCellToMax, H as gatherGroup, s as gatherGrouping, z as getCellData, B as getCellDataParsed, A as getCellRaw, I as getColumnByProp, D as getColumnSizes, C as getColumnType, F as getColumns, q as getExpanded, t as getGroupingName, x as getParsedGroup, g as getRange, p as getSource, E as isColGrouping, u as isGrouping, v as isGroupingColumn, b as isRangeSingleCell, i as isRowType, y as isSameGroup, w as measureEqualDepth, n as nextCell, r as rowTypes } from './column.service-CM-wgGs8.js';
-export { d as dispatch, a as dispatchByEvent } from './header-cell-renderer-Bqh1PrgH.js';
-export { C as CellRenderer, G as GroupingRowRenderer, S as SortingSign, e as expandEvent, a as expandSvgIconVNode, r as renderGroupCells } from './cell-renderer-BFpmdV8H.js';
+import { d as defineTheme, B as BasePlugin } from './row-resize.plugin-Beu0pMds.js';
+export { H as AFTER_ROW_RESIZE_EVENT, A as AutoSizeColumnPlugin, s as BEFORE_COLUMN_DRAG_END_EVENT, y as BEFORE_ROW_RESIZE_EVENT, q as COLUMN_DRAG_END_EVENT, p as COLUMN_DRAG_MOVE_EVENT, u as COLUMN_DRAG_START_EVENT, C as ColumnAutoSizeMode, v as ColumnMovePlugin, l as DEFAULT_BLANK_SEMANTICS, K as DEFAULT_MIN_ROW_HEIGHT, D as DimensionStore, b as ExportCsv, E as ExportFilePlugin, c as FILTER_CONFIG_CHANGED_EVENT, F as FILTER_TRIMMED_TYPE, e as FILTE_PANEL, f as FilterPlugin, G as GroupingRowPlugin, I as ROW_RESIZE_CANCEL_EVENT, z as ROW_RESIZE_EVENT, R as ROW_RESIZE_HANDLE_CLASS, J as RowResizePlugin, S as SelectionStore, Q as SortingPlugin, a as StretchColumn, M as clampRowResizeHeight, O as createRowResizePatch, W as defaultCellCompare, X as descCellCompare, n as doCollapse, o as doExpand, g as filterCoreFunctionsIndexedByType, k as filterNames, j as filterTypeDefaults, h as filterTypes, x as getColumnDragPosition, Z as getComparer, w as getLeftRelative, Y as getNextOrder, N as getRowResizeIndexes, U as getSortingIndex, T as hasActiveSorting, m as isBlankValue, i as isStretchPlugin, P as mergeRowResizeDefinitions, r as resolveBlankSemantics, L as resolveRowResizeConfig, V as sortIndexByItems, t as themeTokenCssVariables } from './row-resize.plugin-Beu0pMds.js';
+export { B as BEFORE_GROUPING_APPLY_EVENT, o as GROUPING_ROW_TYPE, j as GROUP_COLUMN_PROP, G as GROUP_DEPTH, h as GROUP_EXPANDED, l as GROUP_EXPAND_BTN, m as GROUP_EXPAND_EVENT, k as GROUP_ORIGINAL_INDEX, f as PSEUDO_GROUP_COLUMN, P as PSEUDO_GROUP_ITEM, d as PSEUDO_GROUP_ITEM_ID, e as PSEUDO_GROUP_ITEM_VALUE, c as columnTypes, a as cropCellToMax, I as gatherGroup, s as gatherGrouping, z as getCellData, C as getCellDataParsed, A as getCellRaw, J as getColumnByProp, E as getColumnSizes, D as getColumnType, H as getColumns, q as getExpanded, t as getGroupingName, x as getParsedGroup, g as getRange, p as getSource, F as isColGrouping, u as isGrouping, v as isGroupingColumn, b as isRangeSingleCell, i as isRowType, y as isSameGroup, w as measureEqualDepth, n as nextCell, r as rowTypes } from './column.service-pu_fdQ0S.js';
+export { d as dispatch, a as dispatchByEvent } from './header-cell-renderer-YCiVIQ2E.js';
+export { C as CellRenderer, G as GroupingRowRenderer, S as SortingSign, e as expandEvent, a as expandSvgIconVNode, r as renderGroupCells } from './cell-renderer-D9ze8OJw.js';
 export { a as applyMixins, f as findPositionInArray, g as getScrollbarSize, m as mergeSortedArray, p as pushSorted, r as range, s as scaleValue, t as timeout } from './index-BvMNbQyq.js';
 export { T as TextEditor } from './text-editor-eHtrwvxH.js';
 export { k as isAll, c as isClear, h as isCopy, a as isCtrlKey, b as isCtrlMetaKey, g as isCut, m as isEditInput, n as isEditorCtrConstructible, f as isEnterKeyValue, i as isMetaKey, j as isPaste, l as isShortcutModifier, d as isTab, e as isTabKeyValue } from './edit.utils-3ZbhQCv_.js';
 export { h } from './index-CtimkLsB.js';
 export { C as CELL_CLASS, A as CELL_HANDLER_CLASS, n as DATA_COL, o as DATA_ROW, q as DISABLED_CLASS, y as DRAGGABLE_CLASS, B as DRAGG_TEXT, x as DRAG_ICON_CLASS, D as DataStore, E as EDIT_INPUT_WR, F as FOCUS_CLASS, G as GRID_INTERNALS, w as HEADER_ACTUAL_ROW_CLASS, H as HEADER_CLASS, v as HEADER_ROW_CLASS, u as HEADER_SORTABLE_CLASS, M as MIN_COL_SIZE, z as MOBILE_CLASS, R as RESIZE_INTERVAL, I as ROW_FOCUSED_CLASS, r as ROW_HEADER_TYPE, S as SELECTION_BORDER_CLASS, T as TMP_SELECTION_BG_CLASS, j as calculateDimensionData, J as codesLetter, h as gatherTrimmedItems, l as getItemByIndex, k as getItemByPosition, g as getPhysical, b as getSourceItem, f as getSourceItemVirtualIndexByProp, c as getSourcePhysicalIndex, i as getVisibleItems, a as getVisibleSourceItem, K as keyValues, p as proxyPlugin, e as setItems, d as setSourceByPhysicalIndex, s as setSourceByVirtualIndex, m as setStore, t as trimmedPlugin } from './dimension.helpers-Cln9sALu.js';
 export { V as ViewportStore, b as addMissingItems, j as calculateRowHeaderSize, c as clampViewportCoordinate, f as getFirstItem, d as getItems, h as getLastItem, a as getUpdatedItemsByPosition, g as getViewportMaxCoordinate, i as isActiveRange, e as isActiveRangeOutsideLastItem, r as recombineByOffset, s as setItemSizes, u as updateMissingAndRange } from './viewport.store-DWMKRDSH.js';
-export { A as AND_OR_BUTTON, e as AndOrButton, a as FILTER_BUTTON_ACTIVE, F as FILTER_BUTTON_CLASS, b as FILTER_PROP, c as FilterButton, R as REORDER_BUTTON, f as ReorderButton, T as TRASH_BUTTON, d as TrashButton, i as isFilterBtn } from './filter.button-DMhpuAiw.js';
+export { A as AND_OR_BUTTON, e as AndOrButton, a as FILTER_BUTTON_ACTIVE, F as FILTER_BUTTON_CLASS, b as FILTER_PROP, c as FilterButton, R as REORDER_BUTTON, f as ReorderButton, T as TRASH_BUTTON, d as TrashButton, i as isFilterBtn } from './filter.button-CEPUxLUo.js';
 import './debounce-PCRWZliA.js';
 
 const REVOGRID_EVENTS = new Map([