@opencorestack/opengridx 2.0.4 → 3.0.0

package/lib/hooks/useRowGrouping.ts

@@ -1,4 +1,4 @@
-import { useState, useMemo, useEffect, useCallback } from 'react';
+import { useState, useMemo, useCallback } from 'react';
 import type {
     GridRowModel,
     GridRowId,
@@ -10,8 +10,14 @@ import type {
     GridRowMeta,
     GridColDef
 } from '../types';
-import { isRowMatchingFilter } from '../utils/filtering';
-import { compareValues } from '../utils/sorting';
+import { createRowFilter } from '../utils/filtering';
+import { sortItemsBySortModel, type GridSortValue } from '../utils/sorting';
+import { callSafely, getCellValue } from '../utils/values';
+import type { GridColumnLookup } from '../utils/columnLookup';
+import { computeAggregations } from '../utils/aggregation';
+
+/** Where a group's aggregates are shown: on the group row, on a subtotal row after its children, or not at all. */
+export type GridGroupAggregationPosition = 'inline' | 'footer' | null;
 
 export interface UseRowGroupingParams<R extends GridRowModel> {
     rows: R[];
@@ -22,19 +28,118 @@ export interface UseRowGroupingParams<R extends GridRowModel> {
     defaultGroupingExpansionDepth?: number;
     filterModel?: GridFilterModel;
     sortModel?: GridSortItem[];
-    getAggregationPosition?: (groupNode: GridTreeNode | null) => 'inline' | 'footer' | null;
+    getAggregationPosition?: (groupNode: GridTreeNode | null) => GridGroupAggregationPosition;
+    /** Column definitions, so filter and sort read leaf cells through valueGetter and use the column type. */
+    columnLookup?: GridColumnLookup;
+    /** 'server': the rows arrive filtered, so the groups are built from them as they are. */
+    filterMode?: 'client' | 'server';
+    /** 'server': the rows arrive sorted, so groups and leaves keep the order the server sent them in. */
+    sortingMode?: 'client' | 'server';
 }
 
-const defaultGetAggregationPosition = (groupNode: GridTreeNode | null): 'inline' | 'footer' | null => {
+// Group rows show their aggregates inline; the grand total (null) is the grid's footer row.
+const defaultGetAggregationPosition = (groupNode: GridTreeNode | null): GridGroupAggregationPosition =>
+    groupNode === null ? 'footer' : 'inline';
+
+// A getAggregationPosition that throws falls back to the default position for that node.
+function callAggregationPosition(
+    getAggregationPosition: (groupNode: GridTreeNode | null) => GridGroupAggregationPosition,
+    groupNode: GridTreeNode | null,
+): GridGroupAggregationPosition {
+    return callSafely(
+        () => getAggregationPosition(groupNode),
+        defaultGetAggregationPosition(groupNode),
+        'getAggregationPosition',
+        'getAggregationPosition threw; the default position is used',
+    );
+}
 
-    return groupNode?.depth === -1 ? 'footer' : 'inline';
-};
+// The group-row label: the column's groupingValueFormatter, or "field: value" (also when it throws).
+function formatGroupLabel(colDef: GridColDef | undefined, field: string, value: unknown): string {
+    const fallback = `${field}: ${String(value)}`;
+    const formatter = colDef?.groupingValueFormatter;
+    if (!formatter) return fallback;
+    return callSafely(
+        () => formatter({ field, value }),
+        fallback,
+        `groupingValueFormatter:${field}`,
+        `groupingValueFormatter for column "${field}" threw; the group is labelled "${field}: value"`,
+    );
+}
 
 // Stable empty defaults — module-level constants prevent new object identity
 // on every render, which would otherwise invalidate useMemo deps and cause
 // infinite re-render loops when callers omit optional params.
 const EMPTY_ROW_GROUPING_MODEL: GridRowGroupingModel = [];
 const EMPTY_AGGREGATION_MODEL: GridAggregationModel = {};
+const EMPTY_OVERRIDES: Map<GridRowId, boolean> = new Map();
+
+const FIELD_SEPARATOR = '\u001f';
+
+/** Options of the hierarchy hooks' getVisibleRows. */
+export interface GridHierarchyVisibleRowsOptions {
+    /** Walk every group regardless of expansion (exports, getAllFilteredRows). */
+    expandAll?: boolean;
+    /** The column that shows the hierarchy: sorting by it orders group rows by their grouping value / label. */
+    labelField?: string;
+}
+
+interface ExpansionOverrides {
+    configKey: string;
+    overrides: Map<GridRowId, boolean>;
+}
+
+/**
+ * The bucket key of a grouping value. Distinct values never share a key, so `null` and `'null'`,
+ * `1` and `'1'`, `true` and `'true'` are separate groups; equal dates share one. Strings keep their
+ * own text, so the group ids of string values stay readable.
+ */
+function groupKeyOf(value: unknown): string {
+    if (typeof value === 'string') return value;
+    if (value === null) return `${FIELD_SEPARATOR}null`;
+    if (value === undefined) return `${FIELD_SEPARATOR}undefined`;
+    if (value instanceof Date) return `${FIELD_SEPARATOR}date:${value.getTime()}`;
+    if (typeof value === 'object') {
+        try {
+            return `${FIELD_SEPARATOR}object:${JSON.stringify(value)}`;
+        } catch {
+            return `${FIELD_SEPARATOR}object:${String(value)}`;
+        }
+    }
+    return `${FIELD_SEPARATOR}${typeof value}:${String(value)}`;
+}
+
+const groupIdOf = (field: string, key: string, parentId: GridRowId | null): string =>
+    `auto-group-${field}-${key}-${parentId ?? 'root'}`;
+
+/** The id of the subtotal row shown after a group's children when its aggregates are in 'footer' position. */
+const footerIdOf = (groupId: GridRowId): string => `${groupId}${FIELD_SEPARATOR}footer`;
+
+interface GroupRowVariants<R> {
+    /** The group row carrying its aggregates. */
+    inline: R;
+    /** The group row without aggregates ('footer' and null positions). */
+    bare: R;
+    /** The subtotal row, when there is an aggregation model. */
+    footer: R | null;
+}
+
+interface GroupingBuild<R extends GridRowModel> {
+    treeNodes: Map<GridRowId, GridTreeNode>;
+    rootIds: GridRowId[];
+    groupIds: GridRowId[];
+    groupRowVariants: Map<GridRowId, GroupRowVariants<R>>;
+    /** Synthetic rows by id: every group row (with its aggregates) and every subtotal row. */
+    groupingRows: Map<GridRowId, R>;
+    /** The leaf rows in the tree, by id. */
+    rowLookup: Map<GridRowId, R>;
+}
+
+const encodePosition = (position: GridGroupAggregationPosition): string =>
+    position === 'footer' ? 'f' : position === null ? 'n' : 'i';
+
+const decodePosition = (code: string | undefined): GridGroupAggregationPosition =>
+    code === 'f' ? 'footer' : code === 'n' ? null : 'inline';
 
 export function useRowGrouping<R extends GridRowModel>(params: UseRowGroupingParams<R>) {
     const {
@@ -46,39 +151,80 @@ export function useRowGrouping<R extends GridRowModel>(params: UseRowGroupingPar
         defaultGroupingExpansionDepth = 0,
         filterModel,
         sortModel,
-        getAggregationPosition = defaultGetAggregationPosition
+        getAggregationPosition = defaultGetAggregationPosition,
+        columnLookup,
+        filterMode = 'client',
+        sortingMode = 'client',
     } = params;
 
+    // Keyed by value, so an inline `rowGroupingModel={['region']}` or aggregation model does not
+    // rebuild (and re-aggregate) every group on each parent render.
+    const requestedModelKey = rowGroupingModel.join(FIELD_SEPARATOR);
+    const requestedModel = useMemo<GridRowGroupingModel>(
+        () => (requestedModelKey === '' ? [] : requestedModelKey.split(FIELD_SEPARATOR)),
+        [requestedModelKey]
+    );
+    const aggregationModelKey = JSON.stringify(Object.entries(aggregationModel));
+    const stableAggregationModel = useMemo<GridAggregationModel>(
+        () => Object.fromEntries(JSON.parse(aggregationModelKey) as Array<[string, string]>),
+        [aggregationModelKey]
+    );
+    const hasAggregation = Object.keys(stableAggregationModel).length > 0;
+
     const columnsLookup = useMemo(() => {
         const map = new Map<string, GridColDef<R>>();
         (columns ?? []).forEach(col => map.set(col.field, col));
         return map;
     }, [columns]);
 
-    const [expandedGroupIds, setExpandedGroupIds] = useState<Set<GridRowId>>(new Set());
-
-    const { treeNodes, rootIds, groupingRows } = useMemo(() => {
+    const isActive = requestedModel.length > 0;
+
+    // Fields with `groupable: false` are dropped before building, so the remaining levels keep their
+    // depths (indent, defaultGroupingExpansionDepth and export depth) as if the field was never listed.
+    const groupingFields = useMemo(
+        () => requestedModel.filter(field => columnsLookup.get(field)?.groupable !== false),
+        [requestedModel, columnsLookup]
+    );
+    const groupingFieldsKey = groupingFields.join(FIELD_SEPARATOR);
+
+    // User expand/collapse choices are stored as overrides on top of the depth-based
+    // default, keyed by the grouping config. Rebuilding the tree (row edits, new rows
+    // arrays) keeps them because group ids are deterministic; changing the grouping
+    // config itself discards them.
+    const configKey = `${groupingFieldsKey}|${defaultGroupingExpansionDepth}`;
+    const [expansionState, setExpansionState] = useState<ExpansionOverrides>(() => ({
+        configKey,
+        overrides: new Map(),
+    }));
+    const overrides = expansionState.configKey === configKey ? expansionState.overrides : EMPTY_OVERRIDES;
+
+    // Groups hold only the rows that pass the filter, so group subtotals, the "(n)" counts and the set
+    // of groups all describe what is shown. With filterMode 'server' the rows already are the result.
+    // null = every row passes.
+    const matchingRows = useMemo<Set<R> | null>(() => {
+        if (!isActive || filterMode === 'server') return null;
+        const rowFilter = createRowFilter(filterModel, columnLookup);
+        return rowFilter ? new Set(rows.filter(row => rowFilter(row))) : null;
+    }, [isActive, rows, filterMode, filterModel, columnLookup]);
+
+    const build = useMemo<GroupingBuild<R>>(() => {
         const treeNodes = new Map<GridRowId, GridTreeNode>();
-        const groupingRows = new Map<GridRowId, R>();
         const rootIds: GridRowId[] = [];
+        const groupIds: GridRowId[] = [];
+        const groupRowVariants = new Map<GridRowId, GroupRowVariants<R>>();
+        const groupingRows = new Map<GridRowId, R>();
+        const rowLookup = new Map<GridRowId, R>();
 
-        if (rowGroupingModel.length === 0) {
-            return { treeNodes, rootIds, groupingRows };
+        if (!isActive) {
+            return { treeNodes, rootIds, groupIds, groupRowVariants, groupingRows, rowLookup };
         }
 
-        const getGroupId = (field: string, value: unknown, parentId: GridRowId | null) => {
-            return `auto-group-${field}-${value}-${parentId || 'root'}`;
-        };
-
-        const groupRows = (
-            currentRows: R[], 
-            depth: number, 
-            parentId: GridRowId | null
-        ) => {
-            if (depth >= rowGroupingModel.length) {
-
-                return currentRows.map(row => {
+        const groupRows = (currentRows: R[], depth: number, parentId: GridRowId | null): GridRowId[] => {
+            if (depth >= groupingFields.length) {
+                const leaves = matchingRows ? currentRows.filter(row => matchingRows.has(row)) : currentRows;
+                return leaves.map(row => {
                     const id = getRowId(row);
+                    rowLookup.set(id, row);
                     treeNodes.set(id, {
                         id,
                         parentId,
@@ -90,249 +236,222 @@ export function useRowGrouping<R extends GridRowModel>(params: UseRowGroupingPar
                 });
             }
 
-            const field = rowGroupingModel[depth];
-
-            // Skip fields where the column has explicitly opted out of grouping.
+            const field = groupingFields[depth];
             const colDef = columnsLookup.get(field);
-            if (colDef && colDef.groupable === false) {
-                return groupRows(currentRows, depth + 1, parentId);
-            }
-
-            const groups = new Map<string, R[]>();
 
-            // Group current rows by value of the current field
-            currentRows.forEach(row => {
-                const value = row[field];
-                const key = String(value); // reliable map key
-                if (!groups.has(key)) {
-                    groups.set(key, []);
+            // Bucket by the value the cell shows (through valueGetter), keyed so distinct values stay apart.
+            const buckets = new Map<string, { value: unknown; rows: R[] }>();
+            for (const row of currentRows) {
+                const value = getCellValue(row, field, colDef as GridColDef | undefined);
+                const key = groupKeyOf(value);
+                let bucket = buckets.get(key);
+                if (!bucket) {
+                    bucket = { value, rows: [] };
+                    buckets.set(key, bucket);
                 }
-                groups.get(key)!.push(row);
-            });
-
-            const groupIds: GridRowId[] = [];
-
-            // Create group rows
-            groups.forEach((groupRowsList, key) => {
-                // Use the raw value from the first row of the group for the groupingValue
-                const firstRow = groupRowsList[0];
-                const rawValue = firstRow[field];
+                bucket.rows.push(row);
+            }
 
-                const groupId = getGroupId(field, key, parentId);
+            const ids: GridRowId[] = [];
+            buckets.forEach((bucket, key) => {
+                // Group order is the order of first appearance among all rows, so filtering never
+                // reorders the groups; a group with no matching row is left out.
+                const matching = matchingRows ? bucket.rows.filter(row => matchingRows.has(row)) : bucket.rows;
+                if (matching.length === 0) return;
+                const groupId = groupIdOf(field, key, parentId);
+                ids.push(groupId);
                 groupIds.push(groupId);
 
-                // Calculate Aggregations for this group
-                const aggregatedValues: Record<string, unknown> = {};
-                if (aggregationModel) {
-                    Object.entries(aggregationModel).forEach(([aggField, aggType]) => {
-                        const values = groupRowsList.map(r => r[aggField]);
-                        if (aggType === 'sum') {
-                            aggregatedValues[aggField] = values.reduce((a: number, b) => a + (Number(b) || 0), 0);
-                        } else if (aggType === 'min') {
-                            aggregatedValues[aggField] = Math.min(...values.map(v => Number(v) || 0));
-                        } else if (aggType === 'max') {
-                            aggregatedValues[aggField] = Math.max(...values.map(v => Number(v) || 0));
-                        } else if (aggType === 'avg') {
-                            const sum = values.reduce((a: number, b) => a + (Number(b) || 0), 0);
-                            aggregatedValues[aggField] = values.length ? sum / values.length : 0;
-                        } else if (aggType === 'count') {
-                            aggregatedValues[aggField] = values.length;
-                        }
-                    });
-                }
+                // Aggregated over this group's (filtered) leaf rows.
+                const aggregatedValues: Record<string, unknown> = hasAggregation
+                    ? computeAggregations(matching, stableAggregationModel, columnsLookup, 'useRowGrouping')
+                    : {};
 
-                const groupRow = {
-                    [field]: rawValue,
-                    ...aggregatedValues,
-                    id: groupId
-                } as unknown as R;
-
-                groupingRows.set(groupId, groupRow);
+                const inline = { [field]: bucket.value, ...aggregatedValues, id: groupId } as unknown as R;
+                const bare = { [field]: bucket.value, id: groupId } as unknown as R;
+                const footer = hasAggregation
+                    ? ({ ...aggregatedValues, id: footerIdOf(groupId) } as unknown as R)
+                    : null;
+                groupRowVariants.set(groupId, { inline, bare, footer });
+                groupingRows.set(groupId, inline);
+                if (footer) groupingRows.set(footer.id, footer);
 
                 const treeNode: GridTreeNode = {
                     id: groupId,
                     parentId,
                     depth,
-                    groupingKey: key,
+                    groupingKey: String(bucket.value),
                     groupingField: field,
-                    groupingValue: rawValue,
+                    groupingValue: bucket.value,
                     aggregatedValues,
                     isExpanded: false,
-                    children: [], 
-                    label: colDef?.groupingValueFormatter
-                        ? colDef.groupingValueFormatter({ field, value: rawValue })
-                        : `${field}: ${String(rawValue)}` 
+                    children: [],
+                    label: formatGroupLabel(colDef, field, bucket.value),
+                    descendantCount: matching.length,
                 };
-
-                treeNode.aggregationPosition = getAggregationPosition(treeNode);
-
                 treeNodes.set(groupId, treeNode);
-
-                const childrenIds = groupRows(groupRowsList, depth + 1, groupId);
-                treeNodes.get(groupId)!.children = childrenIds;
-
-                const descendantCount = groupRowsList.length;
-                treeNodes.get(groupId)!.descendantCount = descendantCount;
+                treeNode.children = groupRows(bucket.rows, depth + 1, groupId);
             });
-
-            return groupIds;
+            return ids;
         };
 
-        const topLevelIds = groupRows(rows, 0, null);
-        rootIds.push(...topLevelIds);
-
-        return { treeNodes, rootIds, groupingRows };
+        rootIds.push(...groupRows(rows, 0, null));
+        return { treeNodes, rootIds, groupIds, groupRowVariants, groupingRows, rowLookup };
+    }, [isActive, rows, matchingRows, groupingFields, hasAggregation, stableAggregationModel, getRowId, columnsLookup]);
 
-    }, [rows, rowGroupingModel, aggregationModel, getRowId, getAggregationPosition, columnsLookup]);
+    const { treeNodes, rootIds, groupIds, groupRowVariants, groupingRows, rowLookup } = build;
 
-    useEffect(() => {
-        if (defaultGroupingExpansionDepth === -1) {
+    const isDefaultExpanded = useCallback((node: GridTreeNode | undefined) => (
+        Boolean(node?.children && node.children.length > 0) &&
+        (defaultGroupingExpansionDepth === -1 || (node?.depth ?? 0) < defaultGroupingExpansionDepth)
+    ), [defaultGroupingExpansionDepth]);
 
-            const allGroupIds = new Set<GridRowId>();
-            treeNodes.forEach((node, id) => {
-                if (node.children && node.children.length > 0) {
-                    allGroupIds.add(id);
-                }
-            });
-            setExpandedGroupIds(allGroupIds);
-        } else if (defaultGroupingExpansionDepth > 0) {
-            const depthIds = new Set<GridRowId>();
-            treeNodes.forEach((node, id) => {
-                if (node.depth < defaultGroupingExpansionDepth && node.children && node.children.length > 0) {
-                    depthIds.add(id);
-                }
-            });
-            setExpandedGroupIds(depthIds);
-        } else {
-
-            setExpandedGroupIds(new Set());
-        }
-
-    }, [rowGroupingModel, defaultGroupingExpansionDepth, treeNodes]);
+    const expandedGroupIds = useMemo<Set<GridRowId>>(() => {
+        const ids = new Set<GridRowId>();
+        treeNodes.forEach((node, id) => {
+            if (!node.children || node.children.length === 0) return;
+            if (overrides.get(id) ?? isDefaultExpanded(node)) ids.add(id);
+        });
+        return ids;
+    }, [treeNodes, overrides, isDefaultExpanded]);
 
     const toggleExpansion = useCallback((id: GridRowId) => {
-        setExpandedGroupIds(prev => {
-            const next = new Set(prev);
-            if (next.has(id)) {
-                next.delete(id);
-            } else {
-                next.add(id);
-            }
-            return next;
+        setExpansionState(prev => {
+            const base = prev.configKey === configKey ? prev.overrides : EMPTY_OVERRIDES;
+            const current = base.get(id) ?? isDefaultExpanded(treeNodes.get(id));
+            const next = new Map(base);
+            next.set(id, !current);
+            return { configKey, overrides: next };
         });
-    }, []);
+    }, [configKey, treeNodes, isDefaultExpanded]);
 
     const isGroupExpanded = useCallback((id: GridRowId) => {
         return expandedGroupIds.has(id);
     }, [expandedGroupIds]);
 
-    const getVisibleRows = useCallback(() => {
-        if (rowGroupingModel.length === 0) return null;
-
-        const result: R[] = [];
-        const seenIds = new Set<GridRowId>();
-
-        const rowLookup = new Map<GridRowId, R>();
-        rows.forEach(r => rowLookup.set(getRowId(r), r));
-
-        const doesNodeMatchFilter = (nodeId: GridRowId): boolean => {
-            const node = treeNodes.get(nodeId);
-            if (!node) return false;
-
-            if (!node.children || node.children.length === 0) {
-
-                const row = rowLookup.get(nodeId);
-                if (!row) return false;
-
-                if (filterModel) {
-                    if (!isRowMatchingFilter(row, filterModel)) return false;
+    // getAggregationPosition runs once per group per render (it receives the group's current
+    // expansion state), but only its answers are memoized on, so an inline callback does not
+    // rebuild the rows or the row metadata.
+    const positionsKey = hasAggregation
+        ? groupIds.map(id => {
+            const node = treeNodes.get(id);
+            return node ? encodePosition(callAggregationPosition(getAggregationPosition, { ...node, isExpanded: expandedGroupIds.has(id) })) : 'i';
+        }).join('')
+        : '';
+    const aggregationPositions = useMemo<Map<GridRowId, GridGroupAggregationPosition>>(() => {
+        const map = new Map<GridRowId, GridGroupAggregationPosition>();
+        groupIds.forEach((id, index) => map.set(id, decodePosition(positionsKey[index])));
+        return map;
+    }, [groupIds, positionsKey]);
+
+    /** Where the grand total goes: `null` hides the grid's aggregation footer. */
+    const rootAggregationPosition: GridGroupAggregationPosition = hasAggregation ? callAggregationPosition(getAggregationPosition, null) : 'footer';
+
+    const isClientSort = sortingMode !== 'server' && Boolean(sortModel && sortModel.length > 0);
+
+    /**
+     * The rows to render, in order. `labelField` is the column that shows the group labels: sorting
+     * by it orders the groups by their grouping value (a group row has no value of its own there).
+     */
+    const getVisibleRows = useCallback((options?: GridHierarchyVisibleRowsOptions): R[] | null => {
+        if (!isActive) return null;
+        const labelField = options?.labelField;
+        const expandAll = options?.expandAll ?? false;
+
+        const activeSortModel = isClientSort && sortModel ? sortModel : [];
+
+        const readSortValue = (id: GridRowId, sortItem: GridSortItem): GridSortValue => {
+            const node = treeNodes.get(id);
+            if (node && groupRowVariants.has(id)) {
+                const groupingField = node.groupingField ?? '';
+                if (sortItem.field === groupingField || sortItem.field === labelField) {
+                    return { value: node.groupingValue, type: columnLookup?.byField.get(groupingField)?.type };
+                }
+                if (node.aggregatedValues && Object.prototype.hasOwnProperty.call(node.aggregatedValues, sortItem.field)) {
+                    return { value: node.aggregatedValues[sortItem.field], type: columnLookup?.byField.get(sortItem.field)?.type };
                 }
-                return true;
+                return { value: undefined };
             }
-
-            return node.children.some(childId => doesNodeMatchFilter(childId));
+            const row = rowLookup.get(id);
+            const colDef = columnLookup?.byField.get(sortItem.field);
+            return { value: row ? getCellValue(row, sortItem.field, colDef) : undefined, type: colDef?.type };
         };
 
-        const traverse = (ids: GridRowId[]) => {
-
-            let visibleIds = ids;
-            if (filterModel) {
-                visibleIds = ids.filter(doesNodeMatchFilter);
-            }
-
-            if (sortModel && sortModel.length > 0) {
-                visibleIds.sort((aId, bId) => {
-                    const rowA = groupingRows.get(aId) || rowLookup.get(aId);
-                    const rowB = groupingRows.get(bId) || rowLookup.get(bId);
-
-                    if (!rowA || !rowB) return 0;
-
-                    for (const sortItem of sortModel) {
-                        const valA = rowA[sortItem.field];
-                        const valB = rowB[sortItem.field];
-                        const compareResult = compareValues(valA, valB, sortItem.sort);
-                        if (compareResult !== 0) return compareResult;
-                    }
-                    return 0;
-                });
-            }
+        const result: R[] = [];
+        const seenIds = new Set<GridRowId>();
 
-            visibleIds.forEach(id => {
-                if (seenIds.has(id)) return; 
+        const traverse = (ids: readonly GridRowId[]) => {
+            const ordered = activeSortModel.length > 0 ? sortItemsBySortModel(ids, activeSortModel, readSortValue) : ids;
+            for (const id of ordered) {
+                if (seenIds.has(id)) continue;
+                seenIds.add(id);
+
+                const variants = groupRowVariants.get(id);
+                if (!variants) {
+                    // Hierarchy info travels in rowMetaMap; the consumer's row object is passed through unchanged.
+                    const row = rowLookup.get(id);
+                    if (row) result.push(row);
+                    continue;
+                }
 
                 const node = treeNodes.get(id);
-                const isGroup = node?.children && node.children.length > 0;
-
-                const row = isGroup ? groupingRows.get(id) : rowLookup.get(id);
-
-                if (row && node) {
-                     seenIds.add(id);
-
-                     const enhancedRow = {
-                        ...row,
-                        _treeDepth: node.depth,
-                        _isExpanded: expandedGroupIds.has(id),
-                        _hasChildren: isGroup,
-                        _groupingField: node.groupingField,
-                        _groupingValue: node.groupingValue,
-                        _descendantCount: node.descendantCount
-                    };
-                    result.push(enhancedRow);
-
-                    if (isExpandedGroupIds.has(id) && isGroup) {
-                        traverse(node.children!);
-                    }
+                const isExpanded = expandedGroupIds.has(id);
+                // null is a position ("hidden"), so no `??` default here.
+                const position = aggregationPositions.has(id) ? aggregationPositions.get(id) ?? null : 'inline';
+                // 'footer' moves the aggregates below the children; while collapsed there is no
+                // subtotal row, so they stay on the group row instead of disappearing.
+                const showInline = position === 'inline' || (position === 'footer' && !isExpanded);
+                result.push(showInline ? variants.inline : variants.bare);
+
+                if ((isExpanded || expandAll) && node?.children) {
+                    traverse(node.children);
+                    // expandAll (exports) walks the data only; exporters write their own subtotals.
+                    if (isExpanded && !expandAll && position === 'footer' && variants.footer) result.push(variants.footer);
                 }
-            });
+            }
         };
 
-        const isExpandedGroupIds = expandedGroupIds; 
-
         traverse(rootIds);
-
         return result;
-
-    }, [rows, getRowId, treeNodes, rootIds, groupingRows, filterModel, sortModel, expandedGroupIds, rowGroupingModel]);
+    }, [isActive, isClientSort, sortModel, treeNodes, groupRowVariants, rowLookup, columnLookup, expandedGroupIds, aggregationPositions, rootIds]);
 
     const getNode = useCallback((id: GridRowId) => treeNodes.get(id), [treeNodes]);
 
     const rowMetaMap = useMemo<Map<GridRowId, GridRowMeta>>(() => {
         const map = new Map<GridRowId, GridRowMeta>();
         treeNodes.forEach((node, id) => {
-            const isGroup = Boolean(node.children && node.children.length > 0);
-            map.set(id, {
-                hasChildren: isGroup,
+            const variants = groupRowVariants.get(id);
+            if (!variants) {
+                map.set(id, {
+                    hasChildren: false,
+                    treeDepth: node.depth,
+                    isGroupRow: false,
+                });
+                return;
+            }
+            const groupMeta: GridRowMeta = {
+                hasChildren: true,
                 treeDepth: node.depth,
                 groupingField: node.groupingField,
                 groupingValue: node.groupingValue,
                 groupLabel: node.label,
                 descendantCount: node.descendantCount,
-                isGroupRow: isGroup,
-                isExpanded: isGroup ? expandedGroupIds.has(id) : undefined,
-            });
+                isGroupRow: true,
+                isExpanded: expandedGroupIds.has(id),
+            };
+            map.set(id, groupMeta);
+            if (variants.footer && aggregationPositions.get(id) === 'footer') {
+                map.set(variants.footer.id, {
+                    ...groupMeta,
+                    hasChildren: false,
+                    treeDepth: node.depth + 1,
+                    isExpanded: undefined,
+                    isGroupFooter: true,
+                });
+            }
         });
         return map;
-    }, [treeNodes, expandedGroupIds]);
+    }, [treeNodes, groupRowVariants, expandedGroupIds, aggregationPositions]);
 
     return useMemo(() => ({
         treeNodes,
@@ -342,5 +461,7 @@ export function useRowGrouping<R extends GridRowModel>(params: UseRowGroupingPar
         getVisibleRows,
         getNode,
         rowMetaMap,
-    }), [treeNodes, groupingRows, toggleExpansion, isGroupExpanded, getVisibleRows, getNode, rowMetaMap]);
+        aggregationPositions,
+        rootAggregationPosition,
+    }), [treeNodes, groupingRows, toggleExpansion, isGroupExpanded, getVisibleRows, getNode, rowMetaMap, aggregationPositions, rootAggregationPosition]);
 }