@revolist/revogrid 4.24.0 → 4.24.2

package/dist/collection/store/dataSource/data.store.js

@@ -16,7 +16,7 @@ export class DataStore {
         return this.dataStore;
     }
     constructor(type, storeData) {
-        const store = (this.dataStore = createStore(Object.assign({ items: [], proxyItems: [], source: [], groupingDepth: 0, groups: {}, type, trimmed: {}, groupingCustomRenderer: undefined }, storeData)));
+        const store = (this.dataStore = createStore(Object.assign({ items: [], proxyItems: [], source: [], groupingDepth: 0, groups: {}, type, trimmed: {}, groupingCustomRenderer: undefined, groupingCellRenderer: undefined }, storeData)));
         store.use(proxyPlugin(store));
         store.use(trimmedPlugin(store));
     }
@@ -56,6 +56,7 @@ export class DataStore {
                 // if groups are not provided, we will consider that there is only one group with all items
                 groups: grouping.groups,
                 groupingCustomRenderer: grouping.customRenderer,
+                groupingCellRenderer: grouping.cellRenderer,
             });
         }
     }

package/dist/{revo-grid/cell-renderer-CLTRlCa5.js → esm/cell-renderer-BQjko1zB.js}

@@ -2,8 +2,8 @@
  * Built by Revolist OU ❤️
  */
 import { h, f as Build } from './index-Chp_81rd.js';
-import { n as DATA_ROW, w as DRAG_ICON_CLASS, x as DRAGGABLE_CLASS } from './dimension.helpers-CGKwSvw6.js';
-import { l as GROUP_EXPAND_BTN, m as GROUP_EXPAND_EVENT, G as GROUP_DEPTH, h as GROUP_EXPANDED, P as PSEUDO_GROUP_ITEM, O as isRowDragService, B as getCellDataParsed } from './column.service-C6hByxPy.js';
+import { n as DATA_ROW, b as getSourceItem, m as DATA_COL, C as CELL_CLASS, w as DRAG_ICON_CLASS, x as DRAGGABLE_CLASS } from './dimension.helpers-CXrsUc6f.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-BnFqXqQG.js';
 
 /**
  * Renders sorting direction and optional additive sorting rank.
@@ -53,8 +53,58 @@ function expandEvent(e, model, virtualIndex) {
     });
     (_a = e.target) === null || _a === void 0 ? void 0 : _a.dispatchEvent(event);
 }
+function renderGroupCells(props, { name, expanded, depth, }) {
+    const { additionalData, columnItems, groupingCellRenderer, hasExpand, itemIndex, model, providers, size, start, end, } = props;
+    if (!groupingCellRenderer) {
+        return [];
+    }
+    const renderOffset = providers.viewport.get('renderOffset') || 0;
+    const data = providers.data.get('source');
+    const rowItem = { itemIndex, size, start, end };
+    const onExpand = (event) => expandEvent(event, model, itemIndex);
+    return columnItems.map(columnItem => {
+        const column = getSourceItem(providers.columns, columnItem.itemIndex);
+        if (!column) {
+            return null;
+        }
+        const isLabelColumn = isGroupingColumn(column);
+        const templateProps = {
+            prop: column.prop,
+            model,
+            data,
+            column,
+            rowIndex: itemIndex,
+            colIndex: columnItem.itemIndex,
+            colType: providers.colType,
+            type: providers.type,
+            value: getCellRaw(model, column),
+            providers,
+            columnItem,
+            rowItem,
+            group: {
+                name,
+                depth,
+                expanded,
+                prop: model[GROUP_COLUMN_PROP],
+                isLabelColumn,
+                canExpand: hasExpand,
+                onExpand,
+            },
+        };
+        return (h("div", { key: columnItem.itemIndex, class: {
+                [CELL_CLASS]: true,
+                groupingCell: true,
+                groupingLabelCell: isLabelColumn,
+            }, [DATA_COL]: columnItem.itemIndex,
+            [DATA_ROW]: itemIndex, style: {
+                width: `${columnItem.size}px`,
+                transform: `translateX(${columnItem.start - renderOffset}px)`,
+                height: size ? `${size}px` : undefined,
+            } }, groupingCellRenderer(h, templateProps, additionalData)));
+    });
+}
 const GroupingRowRenderer = (props) => {
-    const { model, itemIndex, hasExpand, groupingCustomRenderer } = props;
+    const { model, itemIndex, hasExpand, groupingCustomRenderer, groupingCellRenderer, } = props;
     const name = model[PSEUDO_GROUP_ITEM];
     const expanded = model[GROUP_EXPANDED];
     const depth = parseInt(model[GROUP_DEPTH], 10) || 0;
@@ -63,6 +113,9 @@ const GroupingRowRenderer = (props) => {
         depth,
         expanded,
     };
+    if (groupingCellRenderer) {
+        return (h(RowRenderer, Object.assign({ index: props.index, size: props.size, start: props.start }, groupRowAttrs), renderGroupCells(props, { name, expanded, depth })));
+    }
     if (groupingCustomRenderer) {
         return (h(RowRenderer, Object.assign({}, props, groupRowAttrs), h("div", { onClick: e => expandEvent(e, model, itemIndex) }, groupingCustomRenderer(h, Object.assign(Object.assign({}, props), { colType: props.providers.colType, name,
             expanded,
@@ -70,7 +123,7 @@ const GroupingRowRenderer = (props) => {
     }
     return (h(RowRenderer, Object.assign({}, props, groupRowAttrs), hasExpand && [
         h("button", { class: { [GROUP_EXPAND_BTN]: true }, onClick: e => expandEvent(e, model, itemIndex) }, expandSvgIconVNode(expanded)),
-        name,
+        String(name),
     ]));
 };
 const expandSvgIconVNode = (expanded = false) => {
@@ -115,4 +168,4 @@ const CellRenderer = ({ renderProps, cellProps, }) => {
     return (h("div", Object.assign({}, cellProps, { redraw: render }), render()));
 };
 
-export { CellRenderer as C, GroupingRowRenderer as G, PADDING_DEPTH as P, RowRenderer as R, SortingSign as S, expandSvgIconVNode as a, expandEvent as e };
+export { CellRenderer as C, GroupingRowRenderer as G, PADDING_DEPTH as P, RowRenderer as R, SortingSign as S, expandSvgIconVNode as a, expandEvent as e, renderGroupCells as r };

package/dist/esm/{column.drag.plugin-DKkf7Zqb.js → column.drag.plugin-Cf9DYdQj.js}

@@ -1,14 +1,14 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { J as reduce, g as getRange, K as baseEach, C as getColumnType, c as columnTypes, L as toInteger, u as isGrouping, t as getGroupingName, r as rowTypes, B as getCellDataParsed, A as getCellRaw, j as GROUP_COLUMN_PROP, I as getColumnByProp, h as GROUP_EXPANDED, x as getParsedGroup, y as isSameGroup, G as GROUP_DEPTH, e as PSEUDO_GROUP_ITEM_VALUE, d as PSEUDO_GROUP_ITEM_ID, o as GROUPING_ROW_TYPE, p as getSource, f as PSEUDO_GROUP_COLUMN, s as gatherGrouping, m as GROUP_EXPAND_EVENT, v as isGroupingColumn, q as getExpanded, E as isColGrouping } from './column.service-C6hByxPy.js';
-import { K as createStore, l as setStore, i as calculateDimensionData, L as identity, N as isArray, b as getSourceItem, g as getPhysical, e as setItems, j as getItemByPosition } from './dimension.helpers-CGKwSvw6.js';
-import { j as calculateRowHeaderSize } from './viewport.store-_c579YyM.js';
-import { g as getScrollbarSize, t as timeout } from './index-Db3qZoW5.js';
+import { J as reduce, g as getRange, K as baseEach, C as getColumnType, c as columnTypes, L as toInteger, u as isGrouping, t as getGroupingName, r as rowTypes, B as getCellDataParsed, A as getCellRaw, j as GROUP_COLUMN_PROP, I as getColumnByProp, h as GROUP_EXPANDED, x as getParsedGroup, y as isSameGroup, G as GROUP_DEPTH, e as PSEUDO_GROUP_ITEM_VALUE, d as PSEUDO_GROUP_ITEM_ID, o as GROUPING_ROW_TYPE, p as getSource, f as PSEUDO_GROUP_COLUMN, s as gatherGrouping, m as GROUP_EXPAND_EVENT, v as isGroupingColumn, q as getExpanded, E as isColGrouping } from './column.service-BnFqXqQG.js';
+import { K as createStore, l as setStore, i as calculateDimensionData, L as identity, N as isArray, b as getSourceItem, g as getPhysical, e as setItems, j as getItemByPosition } from './dimension.helpers-CXrsUc6f.js';
+import { j as calculateRowHeaderSize } from './viewport.store-D5jEuhLq.js';
+import { g as getScrollbarSize, t as timeout } from './index-DBqlJITb.js';
 import { h } from './index-Chp_81rd.js';
 import { b as FILTER_PROP, i as isFilterBtn } from './filter.button-B-RBiF67.js';
 import { d as debounce } from './debounce-PCRWZliA.js';
-import { O as ON_COLUMN_CLICK, d as dispatch } from './header-cell-renderer-BMmXRsd_.js';
+import { O as ON_COLUMN_CLICK, d as dispatch } from './header-cell-renderer-B3mYpZD3.js';
 
 function calculateRealSize({ count, originItemSize, sizes, }) {
     const safeCount = Math.max(0, count);
@@ -2452,7 +2452,7 @@ class GroupingRowPlugin extends BasePlugin {
      * Initiated when need to reapply grouping
      */
     doSourceUpdate(options) {
-        var _a;
+        var _a, _b;
         /**
          * Get source without grouping
          * @param newOldIndexMap - provides us mapping with new indexes vs old indexes, we would use it for trimmed mapping
@@ -2464,10 +2464,11 @@ class GroupingRowPlugin extends BasePlugin {
          * Group again
          * @param oldNewIndexMap - provides us mapping with new indexes vs old indexes
          */
-        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.props) || [], expanded);
+        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, (_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.props) !== null && _b !== void 0 ? _b : [], expanded);
         const customRenderer = options === null || options === void 0 ? void 0 : options.groupLabelTemplate;
+        const cellRenderer = options === null || options === void 0 ? void 0 : options.groupCellTemplate;
         // setup source
-        this.providers.data.setData(sourceWithGroups, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, { depth, customRenderer }, true);
+        this.providers.data.setData(sourceWithGroups, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, { depth, customRenderer, cellRenderer }, true);
         this.updateTrimmed(trimmed, oldNewIndexes !== null && oldNewIndexes !== void 0 ? oldNewIndexes : {}, oldNewIndexMap, sourceWithGroups);
     }
     /**
@@ -2476,17 +2477,21 @@ class GroupingRowPlugin extends BasePlugin {
      * If source came from other plugin
      */
     onDataSet(data) {
-        var _a, _b;
+        var _a, _b, _c;
         let preservedExpanded = {};
         if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.preserveGroupingOnUpdate) !== false) {
             let { prevExpanded } = getSource(this.getStore().get('source'), this.getStore().get('proxyItems'), true);
             preservedExpanded = prevExpanded;
         }
         const source = data.source.filter(s => !isGrouping(s));
-        const options = Object.assign(Object.assign({}, (this.revogrid.grouping || {})), { prevExpanded: preservedExpanded });
-        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.props) || [], options);
+        const options = Object.assign(Object.assign({}, this.options), { prevExpanded: preservedExpanded });
+        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, (_c = (_b = this.options) === null || _b === void 0 ? void 0 : _b.props) !== null && _c !== void 0 ? _c : [], options);
         data.source = sourceWithGroups;
-        this.providers.data.setGrouping({ depth });
+        this.providers.data.setGrouping({
+            depth,
+            customRenderer: options.groupLabelTemplate,
+            cellRenderer: options.groupCellTemplate,
+        });
         this.updateTrimmed(trimmed, oldNewIndexMap, undefined, sourceWithGroups);
     }
     /**

package/dist/esm/{column.service-C6hByxPy.js → column.service-BnFqXqQG.js}

@@ -1,7 +1,7 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { Q as toFinite, U as keys, V as isArrayLike, W as baseIteratee, N as isArray, G as GRID_INTERNALS, X as isIterateeCall, a as getVisibleSourceItem, o as DISABLED_CLASS, C as CELL_CLASS, b as getSourceItem } from './dimension.helpers-CGKwSvw6.js';
+import { Q as toFinite, U as keys, V as isArrayLike, W as baseIteratee, N as isArray, G as GRID_INTERNALS, X as isIterateeCall, a as getVisibleSourceItem, o as DISABLED_CLASS, C as CELL_CLASS, b as getSourceItem } from './dimension.helpers-CXrsUc6f.js';
 
 /**
  * Converts `value` to an integer.
@@ -434,8 +434,9 @@ const GROUP_EXPAND_BTN = `group-expand`;
 const GROUP_EXPAND_EVENT = `groupexpandclick`;
 const GROUPING_ROW_TYPE = 'rgRow';
 
-function getGroupValueDefault(item, prop) {
-    return item[prop] || null;
+function getGroupValueDefault(item, prop, emptyGroupValue) {
+    var _a;
+    return (_a = item[prop]) !== null && _a !== void 0 ? _a : emptyGroupValue;
 }
 function isDataRow(item) {
     return item != null;
@@ -541,13 +542,15 @@ function flattenGroupMaps({ groupedValues, parentIds, isExpanded, itemIndex, exp
  * @param columnProps - ids of groups
  * @param expanded - potentially expanded items if present
  */
-function gatherGrouping(array, columnProps, { prevExpanded = {}, expandedAll = false, getGroupValue = getGroupValueDefault, }) {
+function gatherGrouping(array, columnProps, { prevExpanded = {}, expandedAll = false, getGroupValue, emptyGroupValue = '', }) {
     const groupedItems = new Map();
     array.forEach((item, originalIndex) => {
         if (!isDataRow(item)) {
             return;
         }
-        const groupLevelValues = columnProps.map(groupId => getGroupValue(item, groupId));
+        const groupLevelValues = columnProps.map(groupId => getGroupValue
+            ? getGroupValue(item, groupId)
+            : getGroupValueDefault(item, groupId, emptyGroupValue));
         const lastLevelValue = groupLevelValues.pop();
         let currentGroupLevel = groupedItems;
         groupLevelValues.forEach(value => {

package/dist/{revo-grid/dimension.helpers-CGKwSvw6.js → esm/dimension.helpers-CXrsUc6f.js}

@@ -3141,7 +3141,7 @@ class DataStore {
         return this.dataStore;
     }
     constructor(type, storeData) {
-        const store = (this.dataStore = createStore(Object.assign({ items: [], proxyItems: [], source: [], groupingDepth: 0, groups: {}, type, trimmed: {}, groupingCustomRenderer: undefined }, storeData)));
+        const store = (this.dataStore = createStore(Object.assign({ items: [], proxyItems: [], source: [], groupingDepth: 0, groups: {}, type, trimmed: {}, groupingCustomRenderer: undefined, groupingCellRenderer: undefined }, storeData)));
         store.use(proxyPlugin(store));
         store.use(trimmedPlugin(store));
     }
@@ -3181,6 +3181,7 @@ class DataStore {
                 // if groups are not provided, we will consider that there is only one group with all items
                 groups: grouping.groups,
                 groupingCustomRenderer: grouping.customRenderer,
+                groupingCellRenderer: grouping.cellRenderer,
             });
         }
     }

package/dist/esm/{edit.utils-Dnnbd0xG.js → edit.utils-CXmmCnxE.js}

@@ -1,7 +1,7 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { O as KeyCodesEnum, P as OsPlatform, I as codesLetter, J as keyValues, E as EDIT_INPUT_WR } from './dimension.helpers-CGKwSvw6.js';
+import { O as KeyCodesEnum, P as OsPlatform, I as codesLetter, J as keyValues, E as EDIT_INPUT_WR } from './dimension.helpers-CXrsUc6f.js';
 
 function isMetaKey(code) {
     const keys = [

package/dist/{revo-grid/header-cell-renderer-BMmXRsd_.js → esm/header-cell-renderer-B3mYpZD3.js}

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

package/dist/{revo-grid/index-Db3qZoW5.js → esm/index-DBqlJITb.js}

@@ -1,7 +1,7 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import './dimension.helpers-CGKwSvw6.js';
+import './dimension.helpers-CXrsUc6f.js';
 
 /* Generate range on size
  */

package/dist/esm/index.js

@@ -1,17 +1,17 @@
 /*!
  * Built by Revolist OU ❤️
  */
-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-C6hByxPy.js';
-import { B as BasePlugin } from './column.drag.plugin-DKkf7Zqb.js';
-export { A as AutoSizeColumnPlugin, n as BEFORE_COLUMN_DRAG_END_EVENT, m as COLUMN_DRAG_END_EVENT, l as COLUMN_DRAG_MOVE_EVENT, o as COLUMN_DRAG_START_EVENT, C as ColumnAutoSizeMode, p as ColumnMovePlugin, D as DimensionStore, b as ExportCsv, E as ExportFilePlugin, c as FILTER_CONFIG_CHANGED_EVENT, F as FILTER_TRIMMED_TYPE, d as FILTE_PANEL, e as FilterPlugin, G as GroupingRowPlugin, S as SelectionStore, s as SortingPlugin, a as StretchColumn, w as defaultCellCompare, x as descCellCompare, j as doCollapse, k as doExpand, f as filterCoreFunctionsIndexedByType, h as filterNames, g as filterTypes, r as getColumnDragPosition, z as getComparer, q as getLeftRelative, y as getNextOrder, u as getSortingIndex, t as hasActiveSorting, i as isStretchPlugin, v as sortIndexByItems } from './column.drag.plugin-DKkf7Zqb.js';
-export { d as dispatch, a as dispatchByEvent } from './header-cell-renderer-BMmXRsd_.js';
-export { C as CellRenderer, G as GroupingRowRenderer, S as SortingSign, e as expandEvent, a as expandSvgIconVNode } from './cell-renderer-CLTRlCa5.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-Db3qZoW5.js';
-export { T as TextEditor } from './text-editor-C3RUSwH5.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-Dnnbd0xG.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-BnFqXqQG.js';
+import { B as BasePlugin } from './column.drag.plugin-Cf9DYdQj.js';
+export { A as AutoSizeColumnPlugin, n as BEFORE_COLUMN_DRAG_END_EVENT, m as COLUMN_DRAG_END_EVENT, l as COLUMN_DRAG_MOVE_EVENT, o as COLUMN_DRAG_START_EVENT, C as ColumnAutoSizeMode, p as ColumnMovePlugin, D as DimensionStore, b as ExportCsv, E as ExportFilePlugin, c as FILTER_CONFIG_CHANGED_EVENT, F as FILTER_TRIMMED_TYPE, d as FILTE_PANEL, e as FilterPlugin, G as GroupingRowPlugin, S as SelectionStore, s as SortingPlugin, a as StretchColumn, w as defaultCellCompare, x as descCellCompare, j as doCollapse, k as doExpand, f as filterCoreFunctionsIndexedByType, h as filterNames, g as filterTypes, r as getColumnDragPosition, z as getComparer, q as getLeftRelative, y as getNextOrder, u as getSortingIndex, t as hasActiveSorting, i as isStretchPlugin, v as sortIndexByItems } from './column.drag.plugin-Cf9DYdQj.js';
+export { d as dispatch, a as dispatchByEvent } from './header-cell-renderer-B3mYpZD3.js';
+export { C as CellRenderer, G as GroupingRowRenderer, S as SortingSign, e as expandEvent, a as expandSvgIconVNode, r as renderGroupCells } from './cell-renderer-BQjko1zB.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-DBqlJITb.js';
+export { T as TextEditor } from './text-editor-DQtz2Y7B.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-CXmmCnxE.js';
 export { h } from './index-Chp_81rd.js';
-export { C as CELL_CLASS, z as CELL_HANDLER_CLASS, m as DATA_COL, n as DATA_ROW, o as DISABLED_CLASS, x as DRAGGABLE_CLASS, A as DRAGG_TEXT, w as DRAG_ICON_CLASS, D as DataStore, E as EDIT_INPUT_WR, F as FOCUS_CLASS, G as GRID_INTERNALS, v as HEADER_ACTUAL_ROW_CLASS, H as HEADER_CLASS, u as HEADER_ROW_CLASS, r as HEADER_SORTABLE_CLASS, M as MIN_COL_SIZE, y as MOBILE_CLASS, R as RESIZE_INTERVAL, B as ROW_FOCUSED_CLASS, q as ROW_HEADER_TYPE, S as SELECTION_BORDER_CLASS, T as TMP_SELECTION_BG_CLASS, i as calculateDimensionData, I as codesLetter, h as gatherTrimmedItems, k as getItemByIndex, j as getItemByPosition, g as getPhysical, b as getSourceItem, f as getSourceItemVirtualIndexByProp, c as getSourcePhysicalIndex, a as getVisibleSourceItem, J as keyValues, p as proxyPlugin, e as setItems, d as setSourceByPhysicalIndex, s as setSourceByVirtualIndex, l as setStore, t as trimmedPlugin } from './dimension.helpers-CGKwSvw6.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-_c579YyM.js';
+export { C as CELL_CLASS, z as CELL_HANDLER_CLASS, m as DATA_COL, n as DATA_ROW, o as DISABLED_CLASS, x as DRAGGABLE_CLASS, A as DRAGG_TEXT, w as DRAG_ICON_CLASS, D as DataStore, E as EDIT_INPUT_WR, F as FOCUS_CLASS, G as GRID_INTERNALS, v as HEADER_ACTUAL_ROW_CLASS, H as HEADER_CLASS, u as HEADER_ROW_CLASS, r as HEADER_SORTABLE_CLASS, M as MIN_COL_SIZE, y as MOBILE_CLASS, R as RESIZE_INTERVAL, B as ROW_FOCUSED_CLASS, q as ROW_HEADER_TYPE, S as SELECTION_BORDER_CLASS, T as TMP_SELECTION_BG_CLASS, i as calculateDimensionData, I as codesLetter, h as gatherTrimmedItems, k as getItemByIndex, j as getItemByPosition, g as getPhysical, b as getSourceItem, f as getSourceItemVirtualIndexByProp, c as getSourcePhysicalIndex, a as getVisibleSourceItem, J as keyValues, p as proxyPlugin, e as setItems, d as setSourceByPhysicalIndex, s as setSourceByVirtualIndex, l as setStore, t as trimmedPlugin } from './dimension.helpers-CXrsUc6f.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-D5jEuhLq.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-B-RBiF67.js';
 import './debounce-PCRWZliA.js';
 

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

@@ -2,17 +2,17 @@
  * Built by Revolist OU ❤️
  */
 import { h, r as registerInstance, d as createEvent, e as Host, g as getElement } from './index-Chp_81rd.js';
-import { c as columnTypes, J as reduce, C as getColumnType, r as rowTypes, i as isRowType, D as getColumnSizes, a as cropCellToMax, n as nextCell, I as getColumnByProp, F as getColumns } from './column.service-C6hByxPy.js';
-import { D as DataStore, b as getSourceItem, f as getSourceItemVirtualIndexByProp, d as setSourceByPhysicalIndex, s as setSourceByVirtualIndex, a as getVisibleSourceItem, h as gatherTrimmedItems, k as getItemByIndex, R as RESIZE_INTERVAL } from './dimension.helpers-CGKwSvw6.js';
+import { c as columnTypes, J as reduce, C as getColumnType, r as rowTypes, i as isRowType, D as getColumnSizes, a as cropCellToMax, n as nextCell, I as getColumnByProp, F as getColumns } from './column.service-BnFqXqQG.js';
+import { D as DataStore, b as getSourceItem, f as getSourceItemVirtualIndexByProp, d as setSourceByPhysicalIndex, s as setSourceByVirtualIndex, a as getVisibleSourceItem, h as gatherTrimmedItems, k as getItemByIndex, R as RESIZE_INTERVAL } from './dimension.helpers-CXrsUc6f.js';
 import { d as debounce } from './debounce-PCRWZliA.js';
 import { g as getScrollDimension, v as viewportDataPartition, F as FOOTER_SLOT, C as CONTENT_SLOT, H as HEADER_SLOT, D as DATA_SLOT } from './viewport.helpers-CoCAvmZs.js';
-import { D as DimensionStore, S as SelectionStore, B as BasePlugin, G as GroupingRowPlugin, a as StretchColumn, i as isStretchPlugin, A as AutoSizeColumnPlugin, e as FilterPlugin, E as ExportFilePlugin, s as SortingPlugin, p as ColumnMovePlugin } from './column.drag.plugin-DKkf7Zqb.js';
-import { V as ViewportStore } from './viewport.store-_c579YyM.js';
+import { D as DimensionStore, S as SelectionStore, B as BasePlugin, G as GroupingRowPlugin, a as StretchColumn, i as isStretchPlugin, A as AutoSizeColumnPlugin, e as FilterPlugin, E as ExportFilePlugin, s as SortingPlugin, p as ColumnMovePlugin } from './column.drag.plugin-Cf9DYdQj.js';
+import { V as ViewportStore } from './viewport.store-D5jEuhLq.js';
 import { T as ThemeService } from './theme.service-BmnDvr6P.js';
-import { t as timeout } from './index-Db3qZoW5.js';
+import { t as timeout } from './index-DBqlJITb.js';
 import { g as getPropertyFromEvent } from './events-BvSmBueA.js';
 import './filter.button-B-RBiF67.js';
-import './header-cell-renderer-BMmXRsd_.js';
+import './header-cell-renderer-B3mYpZD3.js';
 
 class ColumnDataProvider {
     get stores() {
@@ -217,8 +217,12 @@ class DataProvider {
         const items = this.stores[type].store.get('items');
         this.stores[type].setData({ items: [...items] });
     }
-    setGrouping({ depth }, type = 'rgRow') {
-        this.stores[type].setData({ groupingDepth: depth });
+    setGrouping({ depth, customRenderer, cellRenderer, }, type = 'rgRow') {
+        this.stores[type].setData({
+            groupingDepth: depth,
+            groupingCustomRenderer: customRenderer,
+            groupingCellRenderer: cellRenderer,
+        });
     }
     setTrimmed(trimmed, type = 'rgRow') {
         const store = this.stores[type];

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

@@ -2,13 +2,13 @@
  * Built by Revolist OU ❤️
  */
 import { r as registerInstance, h, e as Host, d as createEvent, g as getElement } from './index-Chp_81rd.js';
-import { k as getItemByIndex, b as getSourceItem, j as getItemByPosition, F as FOCUS_CLASS, I as codesLetter, R as RESIZE_INTERVAL, y as MOBILE_CLASS, z as CELL_HANDLER_CLASS, S as SELECTION_BORDER_CLASS, D as DataStore, q as ROW_HEADER_TYPE, T as TMP_SELECTION_BG_CLASS } from './dimension.helpers-CGKwSvw6.js';
+import { k as getItemByIndex, b as getSourceItem, j as getItemByPosition, F as FOCUS_CLASS, I as codesLetter, R as RESIZE_INTERVAL, y as MOBILE_CLASS, z as CELL_HANDLER_CLASS, S as SELECTION_BORDER_CLASS, D as DataStore, q as ROW_HEADER_TYPE, T as TMP_SELECTION_BG_CLASS } from './dimension.helpers-CXrsUc6f.js';
 import { g as getPropertyFromEvent, v as verifyTouchTarget } from './events-BvSmBueA.js';
-import { g as getRange, M as ColumnService, z as getCellData, N as getCellEditor, b as isRangeSingleCell } from './column.service-C6hByxPy.js';
-import { l as isShortcutModifier, m as isEditInput, c as isClear, d as isTab, f as isEnterKeyValue, h as isCopy, g as isCut, j as isPaste, k as isAll } from './edit.utils-Dnnbd0xG.js';
-import { t as timeout, g as getScrollbarSize } from './index-Db3qZoW5.js';
+import { g as getRange, M as ColumnService, z as getCellData, N as getCellEditor, b as isRangeSingleCell } from './column.service-BnFqXqQG.js';
+import { l as isShortcutModifier, m as isEditInput, c as isClear, d as isTab, f as isEnterKeyValue, h as isCopy, g as isCut, j as isPaste, k as isAll } from './edit.utils-CXmmCnxE.js';
+import { t as timeout, g as getScrollbarSize } from './index-DBqlJITb.js';
 import { d as debounce } from './debounce-PCRWZliA.js';
-import { V as ViewportStore, j as calculateRowHeaderSize } from './viewport.store-_c579YyM.js';
+import { V as ViewportStore, j as calculateRowHeaderSize } from './viewport.store-D5jEuhLq.js';
 import { H as HEADER_SLOT } from './viewport.helpers-CoCAvmZs.js';
 import { L as LocalScrollTimer, a as LocalScrollService, g as getContentSize, t as throttle } from './throttle-Cpk1LoGk.js';
 

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

@@ -2,11 +2,11 @@
  * Built by Revolist OU ❤️
  */
 import { r as registerInstance, d as createEvent, h, e as Host, g as getElement } from './index-Chp_81rd.js';
-import { E as EDIT_INPUT_WR, j as getItemByPosition, b as getSourceItem, A as DRAGG_TEXT } from './dimension.helpers-CGKwSvw6.js';
-import { T as TextEditor } from './text-editor-C3RUSwH5.js';
-import { n as isEditorCtrConstructible } from './edit.utils-Dnnbd0xG.js';
+import { E as EDIT_INPUT_WR, j as getItemByPosition, b as getSourceItem, A as DRAGG_TEXT } from './dimension.helpers-CXrsUc6f.js';
+import { T as TextEditor } from './text-editor-DQtz2Y7B.js';
+import { n as isEditorCtrConstructible } from './edit.utils-CXmmCnxE.js';
 import { d as debounce } from './debounce-PCRWZliA.js';
-import './index-Db3qZoW5.js';
+import './index-DBqlJITb.js';
 
 const Clipboard = class {
     constructor(hostRef) {

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

@@ -2,11 +2,11 @@
  * Built by Revolist OU ❤️
  */
 import { r as registerInstance, d as createEvent, h, e as Host, g as getElement } from './index-Chp_81rd.js';
-import { M as ColumnService, u as isGrouping } from './column.service-C6hByxPy.js';
-import { B as ROW_FOCUSED_CLASS, b as getSourceItem, n as DATA_ROW, m as DATA_COL, M as MIN_COL_SIZE, r as HEADER_SORTABLE_CLASS, H as HEADER_CLASS, F as FOCUS_CLASS, k as getItemByIndex, u as HEADER_ROW_CLASS, v as HEADER_ACTUAL_ROW_CLASS } from './dimension.helpers-CGKwSvw6.js';
-import { G as GroupingRowRenderer, C as CellRenderer, R as RowRenderer, P as PADDING_DEPTH, S as SortingSign } from './cell-renderer-CLTRlCa5.js';
+import { M as ColumnService, u as isGrouping } from './column.service-BnFqXqQG.js';
+import { B as ROW_FOCUSED_CLASS, b as getSourceItem, n as DATA_ROW, m as DATA_COL, M as MIN_COL_SIZE, r as HEADER_SORTABLE_CLASS, H as HEADER_CLASS, F as FOCUS_CLASS, k as getItemByIndex, u as HEADER_ROW_CLASS, v as HEADER_ACTUAL_ROW_CLASS } from './dimension.helpers-CXrsUc6f.js';
+import { G as GroupingRowRenderer, C as CellRenderer, R as RowRenderer, P as PADDING_DEPTH, S as SortingSign } from './cell-renderer-BQjko1zB.js';
 import { c as FilterButton } from './filter.button-B-RBiF67.js';
-import { H as HeaderCellRenderer } from './header-cell-renderer-BMmXRsd_.js';
+import { H as HeaderCellRenderer } from './header-cell-renderer-B3mYpZD3.js';
 import { t as throttle, L as LocalScrollTimer, a as LocalScrollService, g as getContentSize } from './throttle-Cpk1LoGk.js';
 import { H as HEADER_SLOT, C as CONTENT_SLOT, F as FOOTER_SLOT } from './viewport.helpers-CoCAvmZs.js';
 import './debounce-PCRWZliA.js';
@@ -167,6 +167,7 @@ const RevogrData = class {
         const rowsEls = [];
         const depth = this.dataStore.get('groupingDepth');
         const groupingCustomRenderer = this.dataStore.get('groupingCustomRenderer');
+        const groupingCellRenderer = this.dataStore.get('groupingCellRenderer');
         const groupDepth = this.columnService.hasGrouping ? depth : 0;
         const rowRenderOffset = this.viewportRow.get('renderOffset') || 0;
         const colRenderOffset = this.viewportCol.get('renderOffset') || 0;
@@ -175,6 +176,7 @@ const RevogrData = class {
             // #region Grouping
             if (isGrouping(dataItem)) {
                 const gmodel = Object.assign(Object.assign({}, rgRow), { start: rgRow.start - rowRenderOffset, index: rgRow.itemIndex, model: dataItem, groupingCustomRenderer,
+                    groupingCellRenderer, additionalData: this.additionalData,
                     // Only show expand button if grouping is enabled and not in row headers
                     hasExpand: this.columnService.hasGrouping && this.colType !== 'rowHeaders', columnItems: cols, providers: this.providers });
                 rowsEls.push(h(GroupingRowRenderer, Object.assign({}, gmodel)));

package/dist/{revo-grid/text-editor-C3RUSwH5.js → esm/text-editor-DQtz2Y7B.js}

@@ -1,8 +1,8 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { d as isTab, f as isEnterKeyValue } from './edit.utils-Dnnbd0xG.js';
-import { t as timeout } from './index-Db3qZoW5.js';
+import { d as isTab, f as isEnterKeyValue } from './edit.utils-CXmmCnxE.js';
+import { t as timeout } from './index-DBqlJITb.js';
 
 class TextEditor {
     constructor(data, saveCallback) {

package/dist/{revo-grid/viewport.store-_c579YyM.js → esm/viewport.store-D5jEuhLq.js}

@@ -1,7 +1,7 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { j as getItemByPosition, K as createStore, l as setStore } from './dimension.helpers-CGKwSvw6.js';
+import { j as getItemByPosition, K as createStore, l as setStore } from './dimension.helpers-CXrsUc6f.js';
 
 const LETTER_BLOCK_SIZE = 10;
 const calculateRowHeaderSize = (itemsLength, rowHeaderColumn, minWidth = 50) => {

package/dist/{esm/cell-renderer-CLTRlCa5.js → revo-grid/cell-renderer-BQjko1zB.js}

@@ -2,8 +2,8 @@
  * Built by Revolist OU ❤️
  */
 import { h, f as Build } from './index-Chp_81rd.js';
-import { n as DATA_ROW, w as DRAG_ICON_CLASS, x as DRAGGABLE_CLASS } from './dimension.helpers-CGKwSvw6.js';
-import { l as GROUP_EXPAND_BTN, m as GROUP_EXPAND_EVENT, G as GROUP_DEPTH, h as GROUP_EXPANDED, P as PSEUDO_GROUP_ITEM, O as isRowDragService, B as getCellDataParsed } from './column.service-C6hByxPy.js';
+import { n as DATA_ROW, b as getSourceItem, m as DATA_COL, C as CELL_CLASS, w as DRAG_ICON_CLASS, x as DRAGGABLE_CLASS } from './dimension.helpers-CXrsUc6f.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-BnFqXqQG.js';
 
 /**
  * Renders sorting direction and optional additive sorting rank.
@@ -53,8 +53,58 @@ function expandEvent(e, model, virtualIndex) {
     });
     (_a = e.target) === null || _a === void 0 ? void 0 : _a.dispatchEvent(event);
 }
+function renderGroupCells(props, { name, expanded, depth, }) {
+    const { additionalData, columnItems, groupingCellRenderer, hasExpand, itemIndex, model, providers, size, start, end, } = props;
+    if (!groupingCellRenderer) {
+        return [];
+    }
+    const renderOffset = providers.viewport.get('renderOffset') || 0;
+    const data = providers.data.get('source');
+    const rowItem = { itemIndex, size, start, end };
+    const onExpand = (event) => expandEvent(event, model, itemIndex);
+    return columnItems.map(columnItem => {
+        const column = getSourceItem(providers.columns, columnItem.itemIndex);
+        if (!column) {
+            return null;
+        }
+        const isLabelColumn = isGroupingColumn(column);
+        const templateProps = {
+            prop: column.prop,
+            model,
+            data,
+            column,
+            rowIndex: itemIndex,
+            colIndex: columnItem.itemIndex,
+            colType: providers.colType,
+            type: providers.type,
+            value: getCellRaw(model, column),
+            providers,
+            columnItem,
+            rowItem,
+            group: {
+                name,
+                depth,
+                expanded,
+                prop: model[GROUP_COLUMN_PROP],
+                isLabelColumn,
+                canExpand: hasExpand,
+                onExpand,
+            },
+        };
+        return (h("div", { key: columnItem.itemIndex, class: {
+                [CELL_CLASS]: true,
+                groupingCell: true,
+                groupingLabelCell: isLabelColumn,
+            }, [DATA_COL]: columnItem.itemIndex,
+            [DATA_ROW]: itemIndex, style: {
+                width: `${columnItem.size}px`,
+                transform: `translateX(${columnItem.start - renderOffset}px)`,
+                height: size ? `${size}px` : undefined,
+            } }, groupingCellRenderer(h, templateProps, additionalData)));
+    });
+}
 const GroupingRowRenderer = (props) => {
-    const { model, itemIndex, hasExpand, groupingCustomRenderer } = props;
+    const { model, itemIndex, hasExpand, groupingCustomRenderer, groupingCellRenderer, } = props;
     const name = model[PSEUDO_GROUP_ITEM];
     const expanded = model[GROUP_EXPANDED];
     const depth = parseInt(model[GROUP_DEPTH], 10) || 0;
@@ -63,6 +113,9 @@ const GroupingRowRenderer = (props) => {
         depth,
         expanded,
     };
+    if (groupingCellRenderer) {
+        return (h(RowRenderer, Object.assign({ index: props.index, size: props.size, start: props.start }, groupRowAttrs), renderGroupCells(props, { name, expanded, depth })));
+    }
     if (groupingCustomRenderer) {
         return (h(RowRenderer, Object.assign({}, props, groupRowAttrs), h("div", { onClick: e => expandEvent(e, model, itemIndex) }, groupingCustomRenderer(h, Object.assign(Object.assign({}, props), { colType: props.providers.colType, name,
             expanded,
@@ -70,7 +123,7 @@ const GroupingRowRenderer = (props) => {
     }
     return (h(RowRenderer, Object.assign({}, props, groupRowAttrs), hasExpand && [
         h("button", { class: { [GROUP_EXPAND_BTN]: true }, onClick: e => expandEvent(e, model, itemIndex) }, expandSvgIconVNode(expanded)),
-        name,
+        String(name),
     ]));
 };
 const expandSvgIconVNode = (expanded = false) => {
@@ -115,4 +168,4 @@ const CellRenderer = ({ renderProps, cellProps, }) => {
     return (h("div", Object.assign({}, cellProps, { redraw: render }), render()));
 };
 
-export { CellRenderer as C, GroupingRowRenderer as G, PADDING_DEPTH as P, RowRenderer as R, SortingSign as S, expandSvgIconVNode as a, expandEvent as e };
+export { CellRenderer as C, GroupingRowRenderer as G, PADDING_DEPTH as P, RowRenderer as R, SortingSign as S, expandSvgIconVNode as a, expandEvent as e, renderGroupCells as r };

package/dist/revo-grid/{column.drag.plugin-DKkf7Zqb.js → column.drag.plugin-Cf9DYdQj.js}

@@ -1,14 +1,14 @@
 /*!
  * Built by Revolist OU ❤️
  */
-import { J as reduce, g as getRange, K as baseEach, C as getColumnType, c as columnTypes, L as toInteger, u as isGrouping, t as getGroupingName, r as rowTypes, B as getCellDataParsed, A as getCellRaw, j as GROUP_COLUMN_PROP, I as getColumnByProp, h as GROUP_EXPANDED, x as getParsedGroup, y as isSameGroup, G as GROUP_DEPTH, e as PSEUDO_GROUP_ITEM_VALUE, d as PSEUDO_GROUP_ITEM_ID, o as GROUPING_ROW_TYPE, p as getSource, f as PSEUDO_GROUP_COLUMN, s as gatherGrouping, m as GROUP_EXPAND_EVENT, v as isGroupingColumn, q as getExpanded, E as isColGrouping } from './column.service-C6hByxPy.js';
-import { K as createStore, l as setStore, i as calculateDimensionData, L as identity, N as isArray, b as getSourceItem, g as getPhysical, e as setItems, j as getItemByPosition } from './dimension.helpers-CGKwSvw6.js';
-import { j as calculateRowHeaderSize } from './viewport.store-_c579YyM.js';
-import { g as getScrollbarSize, t as timeout } from './index-Db3qZoW5.js';
+import { J as reduce, g as getRange, K as baseEach, C as getColumnType, c as columnTypes, L as toInteger, u as isGrouping, t as getGroupingName, r as rowTypes, B as getCellDataParsed, A as getCellRaw, j as GROUP_COLUMN_PROP, I as getColumnByProp, h as GROUP_EXPANDED, x as getParsedGroup, y as isSameGroup, G as GROUP_DEPTH, e as PSEUDO_GROUP_ITEM_VALUE, d as PSEUDO_GROUP_ITEM_ID, o as GROUPING_ROW_TYPE, p as getSource, f as PSEUDO_GROUP_COLUMN, s as gatherGrouping, m as GROUP_EXPAND_EVENT, v as isGroupingColumn, q as getExpanded, E as isColGrouping } from './column.service-BnFqXqQG.js';
+import { K as createStore, l as setStore, i as calculateDimensionData, L as identity, N as isArray, b as getSourceItem, g as getPhysical, e as setItems, j as getItemByPosition } from './dimension.helpers-CXrsUc6f.js';
+import { j as calculateRowHeaderSize } from './viewport.store-D5jEuhLq.js';
+import { g as getScrollbarSize, t as timeout } from './index-DBqlJITb.js';
 import { h } from './index-Chp_81rd.js';
 import { b as FILTER_PROP, i as isFilterBtn } from './filter.button-B-RBiF67.js';
 import { d as debounce } from './debounce-PCRWZliA.js';
-import { O as ON_COLUMN_CLICK, d as dispatch } from './header-cell-renderer-BMmXRsd_.js';
+import { O as ON_COLUMN_CLICK, d as dispatch } from './header-cell-renderer-B3mYpZD3.js';
 
 function calculateRealSize({ count, originItemSize, sizes, }) {
     const safeCount = Math.max(0, count);
@@ -2452,7 +2452,7 @@ class GroupingRowPlugin extends BasePlugin {
      * Initiated when need to reapply grouping
      */
     doSourceUpdate(options) {
-        var _a;
+        var _a, _b;
         /**
          * Get source without grouping
          * @param newOldIndexMap - provides us mapping with new indexes vs old indexes, we would use it for trimmed mapping
@@ -2464,10 +2464,11 @@ class GroupingRowPlugin extends BasePlugin {
          * Group again
          * @param oldNewIndexMap - provides us mapping with new indexes vs old indexes
          */
-        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.props) || [], expanded);
+        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, (_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.props) !== null && _b !== void 0 ? _b : [], expanded);
         const customRenderer = options === null || options === void 0 ? void 0 : options.groupLabelTemplate;
+        const cellRenderer = options === null || options === void 0 ? void 0 : options.groupCellTemplate;
         // setup source
-        this.providers.data.setData(sourceWithGroups, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, { depth, customRenderer }, true);
+        this.providers.data.setData(sourceWithGroups, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, { depth, customRenderer, cellRenderer }, true);
         this.updateTrimmed(trimmed, oldNewIndexes !== null && oldNewIndexes !== void 0 ? oldNewIndexes : {}, oldNewIndexMap, sourceWithGroups);
     }
     /**
@@ -2476,17 +2477,21 @@ class GroupingRowPlugin extends BasePlugin {
      * If source came from other plugin
      */
     onDataSet(data) {
-        var _a, _b;
+        var _a, _b, _c;
         let preservedExpanded = {};
         if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.preserveGroupingOnUpdate) !== false) {
             let { prevExpanded } = getSource(this.getStore().get('source'), this.getStore().get('proxyItems'), true);
             preservedExpanded = prevExpanded;
         }
         const source = data.source.filter(s => !isGrouping(s));
-        const options = Object.assign(Object.assign({}, (this.revogrid.grouping || {})), { prevExpanded: preservedExpanded });
-        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.props) || [], options);
+        const options = Object.assign(Object.assign({}, this.options), { prevExpanded: preservedExpanded });
+        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, (_c = (_b = this.options) === null || _b === void 0 ? void 0 : _b.props) !== null && _c !== void 0 ? _c : [], options);
         data.source = sourceWithGroups;
-        this.providers.data.setGrouping({ depth });
+        this.providers.data.setGrouping({
+            depth,
+            customRenderer: options.groupLabelTemplate,
+            cellRenderer: options.groupCellTemplate,
+        });
         this.updateTrimmed(trimmed, oldNewIndexMap, undefined, sourceWithGroups);
     }
     /**