@revolist/revogrid 4.12.2 → 4.12.4

package/hydrate/index.mjs

@@ -2585,6 +2585,12 @@ var registerHost = (elm, cmpMeta) => {
   elm["s-rc"] = [];
   return hostRefs.set(elm, hostRef);
 };
+var Build = {
+  isDev: false,
+  isBrowser: false,
+  isServer: true,
+  isTesting: false
+};
 var styles = /* @__PURE__ */ new Map();
 
 
@@ -6636,6 +6642,7 @@ const trimmedPlugin$1 = (store) => ({
                 // full sorted items list
                 const proxy = store.get('proxyItems');
                 const trimmed = gatherTrimmedItems(newVal);
+                // filter our physical indexes which are not trimmed
                 const newItems = proxy.filter(v => !trimmed[v]);
                 // set trimmed items in store
                 store.set('items', newItems);
@@ -6856,7 +6863,7 @@ function getCellData(val) {
     }
     return val;
 }
-function getCellRaw(model, column) {
+function getCellRaw(model = {}, column) {
     if (!column) {
         return;
     }
@@ -8787,13 +8794,70 @@ function getSource(source, items, withoutGrouping = false) {
 function getExpanded(model = {}) {
     return model[GROUP_EXPANDED];
 }
+function flattenGroupMaps({ groupedValues, parentIds, isExpanded, itemIndex, expandedAll, prevExpanded, columnProps, }) {
+    const depth = parentIds.length;
+    const sourceWithGroups = [];
+    // collapse all groups in the beginning
+    let trimmed = {};
+    // index mapping
+    let oldNewIndexMap = {};
+    groupedValues.forEach((innerGroupedValues, groupId) => {
+        const levelIds = [...parentIds, groupId];
+        const mergedIds = levelIds.join(',');
+        const isGroupExpanded = isExpanded && (!!expandedAll || !!prevExpanded[mergedIds]);
+        sourceWithGroups.push({
+            [PSEUDO_GROUP_ITEM]: groupId,
+            [GROUP_DEPTH]: depth,
+            [PSEUDO_GROUP_ITEM_ID]: JSON.stringify(levelIds),
+            [PSEUDO_GROUP_ITEM_VALUE]: mergedIds,
+            [GROUP_EXPANDED]: isGroupExpanded,
+            [GROUP_COLUMN_PROP]: columnProps[depth],
+            [columnProps[depth]]: groupId,
+        });
+        itemIndex += 1;
+        if (!isGroupExpanded && depth) {
+            trimmed[itemIndex] = true;
+        }
+        if (Array.isArray(innerGroupedValues)) {
+            innerGroupedValues.forEach(value => {
+                itemIndex += 1;
+                if (!isGroupExpanded) {
+                    trimmed[itemIndex] = true;
+                }
+                oldNewIndexMap[value[GROUP_ORIGINAL_INDEX]] = itemIndex;
+            });
+            sourceWithGroups.push(...innerGroupedValues);
+        }
+        else {
+            const children = flattenGroupMaps({
+                groupedValues: innerGroupedValues,
+                parentIds: levelIds,
+                isExpanded: isGroupExpanded,
+                itemIndex,
+                expandedAll,
+                prevExpanded,
+                columnProps,
+            });
+            sourceWithGroups.push(...children.source);
+            trimmed = Object.assign(Object.assign({}, children.trimmed), trimmed);
+            oldNewIndexMap = Object.assign(Object.assign({}, children.oldNewIndexMap), oldNewIndexMap);
+            itemIndex = children.itemIndex;
+        }
+    });
+    return {
+        source: sourceWithGroups,
+        oldNewIndexMap,
+        trimmed,
+        itemIndex,
+    };
+}
 /**
  * Gather data for grouping
  * @param array - flat data array
  * @param columnProps - ids of groups
  * @param expanded - potentially expanded items if present
  */
-function gatherGrouping(array, columnProps, { prevExpanded, expandedAll, getGroupValue = getGroupValueDefault, }) {
+function gatherGrouping(array, columnProps, { prevExpanded = {}, expandedAll = false, getGroupValue = getGroupValueDefault, }) {
     const groupedItems = new Map();
     array.forEach((item, originalIndex) => {
         const groupLevelValues = columnProps.map(groupId => getGroupValue(item, groupId));
@@ -8806,72 +8870,31 @@ function gatherGrouping(array, columnProps, { prevExpanded, expandedAll, getGrou
             currentGroupLevel = currentGroupLevel.get(value);
         });
         if (!currentGroupLevel.has(lastLevelValue)) {
-            currentGroupLevel.set(lastLevelValue, []);
+            const groupItems = [];
+            currentGroupLevel.set(lastLevelValue, groupItems);
         }
         const lastLevelItems = currentGroupLevel.get(lastLevelValue);
         lastLevelItems.push(Object.assign(Object.assign({}, item), { [GROUP_ORIGINAL_INDEX]: originalIndex }));
     });
-    let itemIndex = -1;
     const groupingDepth = columnProps.length;
-    // collapse all groups in the beginning
-    const trimmed = {};
-    // index mapping
-    const oldNewIndexMap = {};
-    // check if group header exists
-    const pseudoGroupTest = {};
-    const sourceWithGroups = [];
-    function flattenGroupMaps(groupedValues, parentIds, isExpanded) {
-        const depth = parentIds.length;
-        groupedValues.forEach((innerGroupedValues, groupId) => {
-            const levelIds = [...parentIds, groupId];
-            const mergedIds = levelIds.join(',');
-            const isGroupExpanded = isExpanded && (!!expandedAll || !!(prevExpanded === null || prevExpanded === void 0 ? void 0 : prevExpanded[mergedIds]));
-            sourceWithGroups.push({
-                [PSEUDO_GROUP_ITEM]: groupId,
-                [GROUP_DEPTH]: depth,
-                [PSEUDO_GROUP_ITEM_ID]: JSON.stringify(levelIds),
-                [PSEUDO_GROUP_ITEM_VALUE]: mergedIds,
-                [GROUP_EXPANDED]: isGroupExpanded,
-                [GROUP_COLUMN_PROP]: columnProps[depth],
-                [columnProps[depth]]: groupId,
-            });
-            itemIndex += 1;
-            if (!isGroupExpanded && depth) {
-                trimmed[itemIndex] = true;
-            }
-            if (Array.isArray(innerGroupedValues)) {
-                innerGroupedValues.forEach(value => {
-                    itemIndex += 1;
-                    if (!isGroupExpanded) {
-                        trimmed[itemIndex] = true;
-                    }
-                    oldNewIndexMap[value[GROUP_ORIGINAL_INDEX]] = itemIndex;
-                    const pseudoGroupTestIds = levelIds.map((_value, index) => levelIds.slice(0, index + 1).join(','));
-                    pseudoGroupTestIds.forEach(pseudoGroupTestId => {
-                        if (!pseudoGroupTest[pseudoGroupTestId]) {
-                            pseudoGroupTest[pseudoGroupTestId] = [];
-                        }
-                        pseudoGroupTest[pseudoGroupTestId].push(itemIndex);
-                    });
-                });
-                sourceWithGroups.push(...innerGroupedValues);
-            }
-            else {
-                flattenGroupMaps(innerGroupedValues, levelIds, isGroupExpanded);
-            }
-        });
-    }
-    flattenGroupMaps(groupedItems, [], true);
+    const { source: sourceWithGroups, trimmed, oldNewIndexMap } = flattenGroupMaps({
+        groupedValues: groupedItems,
+        parentIds: [],
+        isExpanded: true,
+        itemIndex: -1,
+        expandedAll,
+        prevExpanded,
+        columnProps
+    });
     return {
         sourceWithGroups, // updates source mirror
         depth: groupingDepth, // largest depth for grouping
         trimmed, // used for expand/collapse grouping values
         oldNewIndexMap, // used for mapping old values to new
-        childrenByGroup: pseudoGroupTest, // used to get child items in group
     };
 }
 function getGroupingName(rgRow) {
-    return rgRow && rgRow[PSEUDO_GROUP_ITEM];
+    return rgRow === null || rgRow === void 0 ? void 0 : rgRow[PSEUDO_GROUP_ITEM];
 }
 function isGrouping(rgRow) {
     return typeof (rgRow === null || rgRow === void 0 ? void 0 : rgRow[PSEUDO_GROUP_ITEM]) !== 'undefined';
@@ -11736,11 +11759,7 @@ class FilterPlugin extends BasePlugin {
         if (defaultPrevented) {
             return;
         }
-        // check is trimmed event prevented
-        const isAddedEvent = await this.revogrid.addTrimmed(detail.itemsToFilter, FILTER_TRIMMED_TYPE);
-        if (isAddedEvent.defaultPrevented) {
-            return;
-        }
+        this.providers.data.setTrimmed({ [FILTER_TRIMMED_TYPE]: detail.itemsToFilter });
         // applies the hasFilter to the columns to show filter icon
         this.providers.column.updateColumns(columnsToUpdate);
         this.emit('afterfilterapply', {
@@ -12752,6 +12771,56 @@ function processDoubleConversionTrimmed(initiallyTrimed, firstLevelMap, secondLe
     return trimemedOptionsToUpgrade;
 }
 
+const PADDING_DEPTH = 10;
+const RowRenderer = ({ rowClass, index, size, start, depth }, cells) => {
+    const props = Object.assign({ [DATA_ROW]: index });
+    return (hAsync("div", Object.assign({}, props, { class: `rgRow ${rowClass || ''}`, style: {
+            height: `${size}px`,
+            transform: `translateY(${start}px)`,
+            paddingLeft: depth ? `${PADDING_DEPTH * depth}px` : undefined,
+        } }), cells));
+};
+
+function expandEvent(e, model, virtualIndex) {
+    var _a;
+    const event = new CustomEvent('groupexpandclick', {
+        detail: {
+            model,
+            virtualIndex,
+        },
+        cancelable: true,
+        bubbles: true,
+    });
+    (_a = e.target) === null || _a === void 0 ? void 0 : _a.dispatchEvent(event);
+}
+const GroupingRowRenderer = (props) => {
+    const { model, itemIndex, hasExpand, groupingCustomRenderer, providers } = props;
+    const name = model[PSEUDO_GROUP_ITEM];
+    const expanded = model[GROUP_EXPANDED];
+    const depth = parseInt(model[GROUP_DEPTH], 10) || 0;
+    if (!hasExpand) {
+        return hAsync(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }));
+    }
+    if (groupingCustomRenderer) {
+        return (hAsync(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }),
+            hAsync("div", { onClick: e => expandEvent(e, model, itemIndex) }, groupingCustomRenderer(hAsync, {
+                name,
+                model,
+                itemIndex,
+                expanded,
+                depth,
+                providers,
+            }))));
+    }
+    return (hAsync(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }),
+        hAsync("button", { class: { [GROUP_EXPAND_BTN]: true }, onClick: e => expandEvent(e, model, itemIndex) }, expandSvgIconVNode(expanded)),
+        name));
+};
+const expandSvgIconVNode = (expanded = false) => {
+    return (hAsync("svg", { "aria-hidden": "true", style: { transform: `rotate(${!expanded ? -90 : 0}deg)` }, focusable: "false", viewBox: "0 0 448 512" },
+        hAsync("path", { fill: "currentColor", d: "M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z" })));
+};
+
 class GroupingRowPlugin extends BasePlugin {
     getStore(type = GROUPING_ROW_TYPE) {
         return this.providers.data.stores[type].store;
@@ -12835,53 +12904,6 @@ class GroupingRowPlugin extends BasePlugin {
         const sortingPlugin = this.providers.plugins.getByClass(SortingPlugin);
         return !!(sortingPlugin === null || sortingPlugin === void 0 ? void 0 : sortingPlugin.sortingPromise);
     }
-    // subscribe to grid events to process them accordingly
-    subscribe() {
-        /** if grouping present and new data source arrived */
-        this.addEventListener('beforesourceset', ({ detail }) => {
-            var _a, _b, _c;
-            if (!(((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.length) && ((_c = detail === null || detail === void 0 ? void 0 : detail.source) === null || _c === void 0 ? void 0 : _c.length))) {
-                return;
-            }
-            // if sorting is running don't apply grouping, wait for sorting, then it'll apply in @aftersortingapply
-            if (this.isSortingRunning()) {
-                return;
-            }
-            this.onDataSet(detail);
-        });
-        this.addEventListener('beforecolumnsset', ({ detail }) => {
-            this.setColumns(detail);
-        });
-        /**
-         * filter applied need to clear grouping and apply again
-         * based on new results can be new grouping
-         */
-        this.addEventListener('beforetrimmed', ({ detail: { trimmed, trimmedType } }) => this.beforeTrimmedApply(trimmed, trimmedType));
-        /**
-         * sorting applied need to clear grouping and apply again
-         * based on new results whole grouping order will changed
-         */
-        this.addEventListener('aftersortingapply', () => {
-            var _a, _b;
-            if (!((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.length)) {
-                return;
-            }
-            this.doSourceUpdate(Object.assign({}, this.options));
-        });
-        /**
-         * Apply logic for focus inside of grouping
-         * We can't focus on grouping rows, navigation only inside of groups for now
-         */
-        this.addEventListener('beforecellfocus', e => this.onFocus(e));
-        /**
-         * Prevent rgRow drag outside the group
-         */
-        this.addEventListener('roworderchanged', e => this.onDrag(e));
-        /**
-         * When grouping expand icon was clicked
-         */
-        this.addEventListener('groupexpandclick', e => this.onExpand(e.detail));
-    }
     /**
      * Starts global source update with group clearing and applying new one
      * Initiated when need to reapply grouping
@@ -12898,11 +12920,11 @@ class GroupingRowPlugin extends BasePlugin {
          * Group again
          * @param oldNewIndexMap - provides us mapping with new indexes vs old indexes
          */
-        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, childrenByGroup, } = gatherGrouping(source, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.props) || [], expanded);
+        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, } = gatherGrouping(source, ((_a = this.options) === null || _a === void 0 ? void 0 : _a.props) || [], expanded);
         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, childrenByGroup, oldNewIndexes !== null && oldNewIndexes !== void 0 ? oldNewIndexes : {}, oldNewIndexMap);
+        this.updateTrimmed(trimmed, oldNewIndexes !== null && oldNewIndexes !== void 0 ? oldNewIndexes : {}, oldNewIndexMap);
     }
     /**
      * Apply grouping on data set
@@ -12918,13 +12940,13 @@ class GroupingRowPlugin extends BasePlugin {
         }
         const source = data.source.filter(s => !isGrouping(s));
         const options = Object.assign(Object.assign({}, (this.revogrid.grouping || {})), { prevExpanded: preservedExpanded });
-        const { sourceWithGroups, depth, trimmed, oldNewIndexMap, childrenByGroup, } = gatherGrouping(source, ((_b = this.options) === null || _b === void 0 ? void 0 : _b.props) || [], options);
+        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, childrenByGroup, oldNewIndexMap);
+        this.updateTrimmed(trimmed, oldNewIndexMap);
     }
     /**
-     * Externam call to apply grouping. Called by revogrid when prop changed.
+     * External call to apply grouping. Called by revogrid when prop changed.
      */
     setGrouping(options) {
         var _a, _b;
@@ -12936,12 +12958,12 @@ class GroupingRowPlugin extends BasePlugin {
             this.clearGrouping();
             return;
         }
-        // props exist and source inited
+        // props exist and source initd
         const { source } = getSource(this.getStore().get('source'), this.getStore().get('proxyItems'));
         if (source.length) {
             this.doSourceUpdate(Object.assign({}, options));
         }
-        // props exist and columns inited
+        // props exist and columns initd
         for (let t of columnTypes) {
             if (this.setColumnGrouping(this.providers.column.getColumns(t))) {
                 this.providers.column.refreshByType(t);
@@ -12949,7 +12971,50 @@ class GroupingRowPlugin extends BasePlugin {
             }
         }
         // if has any grouping subscribe to events again
-        this.subscribe();
+        /** if grouping present and new data source arrived */
+        this.addEventListener('beforesourceset', ({ detail }) => {
+            var _a, _b, _c;
+            if (!(((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.length) && ((_c = detail === null || detail === void 0 ? void 0 : detail.source) === null || _c === void 0 ? void 0 : _c.length))) {
+                return;
+            }
+            // if sorting is running don't apply grouping, wait for sorting, then it'll apply in @aftersortingapply
+            if (this.isSortingRunning()) {
+                return;
+            }
+            this.onDataSet(detail);
+        });
+        this.addEventListener('beforecolumnsset', ({ detail }) => {
+            this.setColumns(detail);
+        });
+        /**
+         * filter applied need to clear grouping and apply again
+         * based on new results can be new grouping
+         */
+        this.addEventListener('beforetrimmed', ({ detail: { trimmed, trimmedType } }) => this.beforeTrimmedApply(trimmed, trimmedType));
+        /**
+         * sorting applied need to clear grouping and apply again
+         * based on new results whole grouping order will changed
+         */
+        this.addEventListener('aftersortingapply', () => {
+            var _a, _b;
+            if (!((_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.props) === null || _b === void 0 ? void 0 : _b.length)) {
+                return;
+            }
+            this.doSourceUpdate(Object.assign({}, this.options));
+        });
+        /**
+         * Apply logic for focus inside of grouping
+         * We can't focus on grouping rows, navigation only inside of groups for now
+         */
+        this.addEventListener('beforecellfocus', e => this.onFocus(e));
+        /**
+         * Prevent rgRow drag outside the group
+         */
+        this.addEventListener('roworderchanged', e => this.onDrag(e));
+        /**
+         * When grouping expand icon was clicked
+         */
+        this.addEventListener('groupexpandclick', e => this.onExpand(e.detail));
     }
     // clear grouping
     clearGrouping() {
@@ -12973,7 +13038,7 @@ class GroupingRowPlugin extends BasePlugin {
         this.providers.data.setData(source, GROUPING_ROW_TYPE, this.revogrid.disableVirtualY, undefined, true);
         this.updateTrimmed(undefined, undefined, oldNewIndexes);
     }
-    updateTrimmed(trimmedGroup = {}, _childrenByGroup = {}, firstLevelMap = {}, secondLevelMap) {
+    updateTrimmed(trimmedGroup = {}, firstLevelMap = {}, secondLevelMap) {
         // map previously trimmed data
         const trimemedOptionsToUpgrade = processDoubleConversionTrimmed(this.getStore().get('trimmed'), firstLevelMap, secondLevelMap);
         for (let type in trimemedOptionsToUpgrade) {
@@ -15257,47 +15322,6 @@ class RevoGridExtra {
     }; }
 }
 
-const PADDING_DEPTH = 10;
-const RowRenderer = ({ rowClass, index, size, start, depth }, cells) => {
-    const props = Object.assign({ [DATA_ROW]: index });
-    return (hAsync("div", Object.assign({}, props, { class: `rgRow ${rowClass || ''}`, style: {
-            height: `${size}px`,
-            transform: `translateY(${start}px)`,
-            paddingLeft: depth ? `${PADDING_DEPTH * depth}px` : undefined,
-        } }), cells));
-};
-
-function expandEvent(e, model, virtualIndex) {
-    var _a;
-    const event = new CustomEvent('groupexpandclick', {
-        detail: {
-            model,
-            virtualIndex,
-        },
-        cancelable: true,
-        bubbles: true,
-    });
-    (_a = e.target) === null || _a === void 0 ? void 0 : _a.dispatchEvent(event);
-}
-const GroupingRowRenderer = (props) => {
-    const { model, itemIndex, hasExpand, groupingCustomRenderer } = props;
-    const name = model[PSEUDO_GROUP_ITEM];
-    const expanded = model[GROUP_EXPANDED];
-    const depth = parseInt(model[GROUP_DEPTH], 10) || 0;
-    if (!hasExpand) {
-        return hAsync(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }));
-    }
-    if (groupingCustomRenderer) {
-        return (hAsync(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }),
-            hAsync("div", { onClick: e => expandEvent(e, model, itemIndex) }, groupingCustomRenderer(hAsync, { name, model, itemIndex, expanded, depth }))));
-    }
-    return (hAsync(RowRenderer, Object.assign({}, props, { rowClass: "groupingRow", depth: depth }),
-        hAsync("button", { class: { [GROUP_EXPAND_BTN]: true }, onClick: e => expandEvent(e, model, itemIndex) },
-            hAsync("svg", { "aria-hidden": "true", style: { transform: `rotate(${!expanded ? -90 : 0}deg)` }, focusable: "false", viewBox: "0 0 448 512" },
-                hAsync("path", { fill: "currentColor", d: "M207.029 381.476L12.686 187.132c-9.373-9.373-9.373-24.569 0-33.941l22.667-22.667c9.357-9.357 24.522-9.375 33.901-.04L224 284.505l154.745-154.021c9.379-9.335 24.544-9.317 33.901.04l22.667 22.667c9.373 9.373 9.373 24.569 0 33.941L240.971 381.476c-9.373 9.372-24.569 9.372-33.942 0z" }))),
-        name));
-};
-
 /**
  * Class is responsible for highlighting rows in a table.
  */
@@ -15372,6 +15396,10 @@ function renderCell(v) {
     // #region Regular cell
     else {
         if (!v.schemaModel.column) {
+            // something is wrong with data
+            if (Build === null || Build === void 0 ? void 0 : Build.isDev) {
+                console.error('Investigate column problem.', v.schemaModel);
+            }
             return '';
         }
         // Row drag
@@ -15505,7 +15533,8 @@ class RevogrData {
             const dataItem = getSourceItem(this.dataStore, rgRow.itemIndex);
             // #region Grouping
             if (isGrouping(dataItem)) {
-                rowsEls.push(hAsync(GroupingRowRenderer, Object.assign({}, rgRow, { index: rgRow.itemIndex, model: dataItem, groupingCustomRenderer: groupingCustomRenderer, hasExpand: this.columnService.hasGrouping })));
+                const gmodel = Object.assign(Object.assign({}, rgRow), { index: rgRow.itemIndex, model: dataItem, groupingCustomRenderer, hasExpand: this.columnService.hasGrouping, providers: this.providers });
+                rowsEls.push(hAsync(GroupingRowRenderer, Object.assign({}, gmodel)));
                 continue;
             }
             // #endregion

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revolist/revogrid",
-  "version": "4.12.2",
+  "version": "4.12.4",
   "type": "module",
   "description": "Virtual reactive data grid spreadsheet component - RevoGrid.",
   "license": "MIT",

package/standalone/column.service.js

@@ -195,7 +195,7 @@ function getCellData(val) {
     }
     return val;
 }
-function getCellRaw(model, column) {
+function getCellRaw(model = {}, column) {
     if (!column) {
         return;
     }
@@ -773,6 +773,7 @@ const GROUP_EXPANDED = `${GRID_INTERNALS}-expanded`;
 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 GROUPING_ROW_TYPE = 'rgRow';
 
 function getGroupValueDefault(item, prop) {
@@ -810,13 +811,70 @@ function getSource(source, items, withoutGrouping = false) {
 function getExpanded(model = {}) {
     return model[GROUP_EXPANDED];
 }
+function flattenGroupMaps({ groupedValues, parentIds, isExpanded, itemIndex, expandedAll, prevExpanded, columnProps, }) {
+    const depth = parentIds.length;
+    const sourceWithGroups = [];
+    // collapse all groups in the beginning
+    let trimmed = {};
+    // index mapping
+    let oldNewIndexMap = {};
+    groupedValues.forEach((innerGroupedValues, groupId) => {
+        const levelIds = [...parentIds, groupId];
+        const mergedIds = levelIds.join(',');
+        const isGroupExpanded = isExpanded && (!!expandedAll || !!prevExpanded[mergedIds]);
+        sourceWithGroups.push({
+            [PSEUDO_GROUP_ITEM]: groupId,
+            [GROUP_DEPTH]: depth,
+            [PSEUDO_GROUP_ITEM_ID]: JSON.stringify(levelIds),
+            [PSEUDO_GROUP_ITEM_VALUE]: mergedIds,
+            [GROUP_EXPANDED]: isGroupExpanded,
+            [GROUP_COLUMN_PROP]: columnProps[depth],
+            [columnProps[depth]]: groupId,
+        });
+        itemIndex += 1;
+        if (!isGroupExpanded && depth) {
+            trimmed[itemIndex] = true;
+        }
+        if (Array.isArray(innerGroupedValues)) {
+            innerGroupedValues.forEach(value => {
+                itemIndex += 1;
+                if (!isGroupExpanded) {
+                    trimmed[itemIndex] = true;
+                }
+                oldNewIndexMap[value[GROUP_ORIGINAL_INDEX]] = itemIndex;
+            });
+            sourceWithGroups.push(...innerGroupedValues);
+        }
+        else {
+            const children = flattenGroupMaps({
+                groupedValues: innerGroupedValues,
+                parentIds: levelIds,
+                isExpanded: isGroupExpanded,
+                itemIndex,
+                expandedAll,
+                prevExpanded,
+                columnProps,
+            });
+            sourceWithGroups.push(...children.source);
+            trimmed = Object.assign(Object.assign({}, children.trimmed), trimmed);
+            oldNewIndexMap = Object.assign(Object.assign({}, children.oldNewIndexMap), oldNewIndexMap);
+            itemIndex = children.itemIndex;
+        }
+    });
+    return {
+        source: sourceWithGroups,
+        oldNewIndexMap,
+        trimmed,
+        itemIndex,
+    };
+}
 /**
  * Gather data for grouping
  * @param array - flat data array
  * @param columnProps - ids of groups
  * @param expanded - potentially expanded items if present
  */
-function gatherGrouping(array, columnProps, { prevExpanded, expandedAll, getGroupValue = getGroupValueDefault, }) {
+function gatherGrouping(array, columnProps, { prevExpanded = {}, expandedAll = false, getGroupValue = getGroupValueDefault, }) {
     const groupedItems = new Map();
     array.forEach((item, originalIndex) => {
         const groupLevelValues = columnProps.map(groupId => getGroupValue(item, groupId));
@@ -829,72 +887,31 @@ function gatherGrouping(array, columnProps, { prevExpanded, expandedAll, getGrou
             currentGroupLevel = currentGroupLevel.get(value);
         });
         if (!currentGroupLevel.has(lastLevelValue)) {
-            currentGroupLevel.set(lastLevelValue, []);
+            const groupItems = [];
+            currentGroupLevel.set(lastLevelValue, groupItems);
         }
         const lastLevelItems = currentGroupLevel.get(lastLevelValue);
         lastLevelItems.push(Object.assign(Object.assign({}, item), { [GROUP_ORIGINAL_INDEX]: originalIndex }));
     });
-    let itemIndex = -1;
     const groupingDepth = columnProps.length;
-    // collapse all groups in the beginning
-    const trimmed = {};
-    // index mapping
-    const oldNewIndexMap = {};
-    // check if group header exists
-    const pseudoGroupTest = {};
-    const sourceWithGroups = [];
-    function flattenGroupMaps(groupedValues, parentIds, isExpanded) {
-        const depth = parentIds.length;
-        groupedValues.forEach((innerGroupedValues, groupId) => {
-            const levelIds = [...parentIds, groupId];
-            const mergedIds = levelIds.join(',');
-            const isGroupExpanded = isExpanded && (!!expandedAll || !!(prevExpanded === null || prevExpanded === void 0 ? void 0 : prevExpanded[mergedIds]));
-            sourceWithGroups.push({
-                [PSEUDO_GROUP_ITEM]: groupId,
-                [GROUP_DEPTH]: depth,
-                [PSEUDO_GROUP_ITEM_ID]: JSON.stringify(levelIds),
-                [PSEUDO_GROUP_ITEM_VALUE]: mergedIds,
-                [GROUP_EXPANDED]: isGroupExpanded,
-                [GROUP_COLUMN_PROP]: columnProps[depth],
-                [columnProps[depth]]: groupId,
-            });
-            itemIndex += 1;
-            if (!isGroupExpanded && depth) {
-                trimmed[itemIndex] = true;
-            }
-            if (Array.isArray(innerGroupedValues)) {
-                innerGroupedValues.forEach(value => {
-                    itemIndex += 1;
-                    if (!isGroupExpanded) {
-                        trimmed[itemIndex] = true;
-                    }
-                    oldNewIndexMap[value[GROUP_ORIGINAL_INDEX]] = itemIndex;
-                    const pseudoGroupTestIds = levelIds.map((_value, index) => levelIds.slice(0, index + 1).join(','));
-                    pseudoGroupTestIds.forEach(pseudoGroupTestId => {
-                        if (!pseudoGroupTest[pseudoGroupTestId]) {
-                            pseudoGroupTest[pseudoGroupTestId] = [];
-                        }
-                        pseudoGroupTest[pseudoGroupTestId].push(itemIndex);
-                    });
-                });
-                sourceWithGroups.push(...innerGroupedValues);
-            }
-            else {
-                flattenGroupMaps(innerGroupedValues, levelIds, isGroupExpanded);
-            }
-        });
-    }
-    flattenGroupMaps(groupedItems, [], true);
+    const { source: sourceWithGroups, trimmed, oldNewIndexMap } = flattenGroupMaps({
+        groupedValues: groupedItems,
+        parentIds: [],
+        isExpanded: true,
+        itemIndex: -1,
+        expandedAll,
+        prevExpanded,
+        columnProps
+    });
     return {
         sourceWithGroups, // updates source mirror
         depth: groupingDepth, // largest depth for grouping
         trimmed, // used for expand/collapse grouping values
         oldNewIndexMap, // used for mapping old values to new
-        childrenByGroup: pseudoGroupTest, // used to get child items in group
     };
 }
 function getGroupingName(rgRow) {
-    return rgRow && rgRow[PSEUDO_GROUP_ITEM];
+    return rgRow === null || rgRow === void 0 ? void 0 : rgRow[PSEUDO_GROUP_ITEM];
 }
 function isGrouping(rgRow) {
     return typeof (rgRow === null || rgRow === void 0 ? void 0 : rgRow[PSEUDO_GROUP_ITEM]) !== 'undefined';
@@ -1277,6 +1294,6 @@ function doPropMerge(existing, extra) {
     return props;
 }
 
-export { PSEUDO_GROUP_ITEM_VALUE as A, GROUPING_ROW_TYPE as B, PSEUDO_GROUP_COLUMN as C, SelectionStoreConnector as D, EMPTY_INDEX as E, doPropMerge as F, GROUP_EXPANDED as G, GROUP_EXPAND_BTN as H, PSEUDO_GROUP_ITEM as I, isRowDragService as J, ColumnService as K, getCellEditor as L, PSEUDO_GROUP_ITEM_ID as P, SelectionStore as S, isRangeSingleCell as a, getSource as b, cropCellToMax as c, getExpanded as d, gatherGrouping as e, getGroupingName as f, getRange as g, isGrouping as h, isHiddenStore as i, isGroupingColumn as j, getParsedGroup as k, isSameGroup as l, measureEqualDepth as m, nextCell as n, getCellData as o, getCellRaw as p, getCellDataParsed as q, getColumnType as r, getColumnSizes as s, isColGrouping as t, getColumns as u, gatherGroup as v, getColumnByProp as w, reduce as x, baseEach$1 as y, GROUP_DEPTH as z };
+export { getColumnType as A, getColumnSizes as B, isColGrouping as C, getColumns as D, gatherGroup as E, getColumnByProp as F, GROUP_DEPTH as G, reduce as H, baseEach$1 as I, EMPTY_INDEX as J, SelectionStoreConnector as K, doPropMerge as L, isRowDragService as M, ColumnService as N, getCellEditor as O, PSEUDO_GROUP_ITEM as P, SelectionStore as S, isRangeSingleCell as a, PSEUDO_GROUP_ITEM_ID as b, cropCellToMax as c, PSEUDO_GROUP_ITEM_VALUE as d, PSEUDO_GROUP_COLUMN as e, GROUP_EXPANDED as f, getRange as g, GROUP_COLUMN_PROP as h, isHiddenStore as i, GROUP_ORIGINAL_INDEX as j, GROUP_EXPAND_BTN as k, GROUP_EXPAND_EVENT as l, GROUPING_ROW_TYPE as m, nextCell as n, getSource as o, getExpanded as p, gatherGrouping as q, getGroupingName as r, isGrouping as s, isGroupingColumn as t, measureEqualDepth as u, getParsedGroup as v, isSameGroup as w, getCellData as x, getCellRaw as y, getCellDataParsed as z };
 
 //# sourceMappingURL=column.service.js.map