@infinite-table/infinite-react 0.0.10 → 0.1.3

package/index.esm.js

@@ -622,7 +622,7 @@ import {
   createElement as createElement33,
   memo as memo13,
   useEffect as useEffect24,
-  useLayoutEffect as useLayoutEffect6
+  useLayoutEffect as useLayoutEffect5
 } from "react";
 
 // src/components/InfiniteTable/internalProps.ts
@@ -703,6 +703,24 @@ var ScrollListener = class {
   }
 };
 
+// src/components/InfiniteTable/utils/toMap.ts
+function toMap(mapOrObject, weakMapCache) {
+  if (!mapOrObject) {
+    return new Map();
+  }
+  if (mapOrObject instanceof Map) {
+    return mapOrObject;
+  }
+  if (weakMapCache && weakMapCache.has(mapOrObject)) {
+    return weakMapCache.get(mapOrObject);
+  }
+  const result = new Map(Object.entries(mapOrObject));
+  if (weakMapCache) {
+    weakMapCache.set(mapOrObject, result);
+  }
+  return result;
+}
+
 // src/components/InfiniteTable/state/computeColumnGroupsDepths.ts
 function computeColumnGroupsDepths(columnGroups) {
   const map2 = new Map();
@@ -726,21 +744,10 @@ function computeColumnGroupsDepths(columnGroups) {
 }
 
 // src/components/InfiniteTable/state/getInitialState.ts
-function toMap(mapOrObject) {
-  if (!mapOrObject) {
-    return new Map();
-  }
-  if (mapOrObject instanceof Map) {
-    return mapOrObject;
-  }
-  return new Map(Object.entries(mapOrObject));
-}
-function toColumnTypesMap(mapOrObject) {
-  return toMap(mapOrObject);
-}
 function initSetupState() {
   const columnsGeneratedForGrouping = new Map();
   return {
+    propsCache: new Map([]),
     columnShifts: null,
     domRef: createRef(),
     scrollerDOMRef: createRef(),
@@ -765,12 +772,8 @@ function initSetupState() {
     columnsWhenInlineGroupRenderStrategy: void 0
   };
 }
-var forwardProps = () => {
+var forwardProps = (setupState) => {
   return {
-    columns: (columns) => {
-      var _a;
-      return (_a = toMap(columns)) != null ? _a : new Map();
-    },
     scrollTopId: 1,
     components: 1,
     loadingText: 1,
@@ -788,6 +791,7 @@ var forwardProps = () => {
     onBlurWithin: 1,
     onScrollToTop: 1,
     onScrollToBottom: 1,
+    onScrollStop: 1,
     scrollToBottomOffset: 1,
     rowStyle: 1,
     rowProps: 1,
@@ -798,12 +802,14 @@ var forwardProps = () => {
     pivotRowLabelsColumn: 1,
     pivotColumnGroups: 1,
     onScrollbarsChange: 1,
+    scrollStopDelay: (scrollStopDelay) => scrollStopDelay != null ? scrollStopDelay : 100,
     viewportReservedWidth: (viewportReservedWidth) => viewportReservedWidth != null ? viewportReservedWidth : 0,
     activeIndex: (activeIndex) => activeIndex != null ? activeIndex : 0,
     columnMinWidth: (columnMinWidth) => columnMinWidth != null ? columnMinWidth : 30,
     columnMaxWidth: (columnMaxWidth) => columnMaxWidth != null ? columnMaxWidth : 2e3,
     columnDefaultWidth: (columnDefaultWidth) => columnDefaultWidth != null ? columnDefaultWidth : 200,
     draggableColumns: (draggableColumns) => draggableColumns != null ? draggableColumns : true,
+    showSeparatePivotColumnForSingleAggregation: (showSeparatePivotColumnForSingleAggregation) => showSeparatePivotColumnForSingleAggregation != null ? showSeparatePivotColumnForSingleAggregation : false,
     sortable: (sortable) => sortable != null ? sortable : true,
     hideEmptyGroupColumns: (hideEmptyGroupColumns) => hideEmptyGroupColumns != null ? hideEmptyGroupColumns : false,
     pivotTotalColumnPosition: (pivotTotalColumnPosition) => pivotTotalColumnPosition != null ? pivotTotalColumnPosition : "end",
@@ -815,31 +821,25 @@ var forwardProps = () => {
     virtualizeColumns: (virtualizeColumns) => virtualizeColumns != null ? virtualizeColumns : true,
     rowHeight: (rowHeight) => typeof rowHeight === "number" ? rowHeight : 0,
     headerHeight: (headerHeight) => typeof headerHeight === "number" ? headerHeight : 0,
-    columnVisibility: (columnVisibility) => columnVisibility != null ? columnVisibility : new Map(),
-    columnPinning: (columnPinning) => columnPinning != null ? columnPinning : new Map(),
-    columnSizing: (columnSizing) => {
-      var _a;
-      return (_a = toMap(columnSizing)) != null ? _a : new Map();
-    },
-    columnTypes: (columnTypes) => {
-      var _a;
-      return (_a = toColumnTypesMap(columnTypes)) != null ? _a : new Map();
-    },
-    columnAggregations: (columnAggregations) => columnAggregations != null ? columnAggregations : new Map(),
+    columns: (columns) => toMap(columns, setupState.propsCache.get("columns")),
+    columnVisibility: (columnVisibility) => columnVisibility != null ? columnVisibility : {},
+    columnPinning: (columnPinning) => toMap(columnPinning, setupState.propsCache.get("columnPinning")),
+    columnSizing: (columnSizing) => toMap(columnSizing, setupState.propsCache.get("columnSizing")),
+    columnTypes: (columnTypes) => toMap(columnTypes, setupState.propsCache.get("columnTypes")),
     collapsedColumnGroups: (collapsedColumnGroups) => collapsedColumnGroups != null ? collapsedColumnGroups : new Map(),
-    columnGroups: (columnGroups) => columnGroups != null ? columnGroups : new Map()
+    columnGroups: (columnGroups) => toMap(columnGroups, setupState.propsCache.get("columnGroups"))
   };
 };
 function getGroupRenderStrategy(options) {
-  const { groupRowsBy, groupColumn, groupRenderStrategy } = options;
+  const { groupBy, groupColumn, groupRenderStrategy } = options;
   if (groupRenderStrategy) {
     return groupRenderStrategy;
   }
   if (groupColumn != null && typeof groupColumn === "object") {
     return "single-column";
   }
-  const columnsInGroupRowsBy = groupRowsBy.filter((g) => g.column);
-  if (columnsInGroupRowsBy.length) {
+  const columnsInGroupBy = groupBy.filter((g) => g.column);
+  if (columnsInGroupBy.length) {
     return "multi-column";
   }
   return "multi-column";
@@ -850,16 +850,17 @@ var mapPropsToState = (params) => {
   const computedColumnGroups = state.pivotColumnGroups || state.columnGroups;
   const virtualizeHeader = header && virtualizeColumns && (!computedColumnGroups || (computedColumnGroups == null ? void 0 : computedColumnGroups.size) === 0);
   const columnGroupsDepthsMap = state.columnGroups && state.columnGroups != (oldState == null ? void 0 : oldState.columnGroups) || state.pivotColumnGroups && state.pivotColumnGroups != (oldState == null ? void 0 : oldState.pivotColumnGroups) ? computeColumnGroupsDepths(computedColumnGroups) : state.columnGroupsDepthsMap;
-  const groupRowsBy = parentState == null ? void 0 : parentState.groupRowsBy;
+  const groupBy = parentState == null ? void 0 : parentState.groupBy;
   const groupRenderStrategy = getGroupRenderStrategy({
     groupRenderStrategy: props.groupRenderStrategy,
-    groupRowsBy,
+    groupBy,
     groupColumn: props.groupColumn
   });
+  const computedColumns = state.computedPivotColumns || state.columnsWhenGrouping || state.columnsWhenInlineGroupRenderStrategy || state.columns;
   return {
     groupRenderStrategy,
-    groupRowsBy,
-    computedColumns: state.computedPivotColumns || state.columnsWhenGrouping || state.columnsWhenInlineGroupRenderStrategy || state.columns,
+    groupBy,
+    computedColumns,
     virtualizeHeader,
     columnGroupsDepthsMap,
     columnGroupsMaxDepth: columnGroupsDepthsMap != state.columnGroupsDepthsMap ? Math.max(...columnGroupsDepthsMap.values(), 0) : state.columnGroupsMaxDepth,
@@ -1209,11 +1210,11 @@ function getColumnComputedType(column, columnTypes) {
 // src/components/InfiniteTable/utils/getComputedVisibleColumns.ts
 var logError = err("getComputedVisibleColumns");
 var isColumnVisible = (columnVisibility, _columnVisibilityAssumeVisible, colId) => {
-  return !columnVisibility.has(colId) || columnVisibility.get(colId) !== false;
+  return columnVisibility[colId] !== false;
 };
 var getComputedPinned = (colId, columnPinning) => {
   const pinned = columnPinning.get(colId);
-  const computedPinned = pinned === "start" || pinned === true ? "start" : pinned === "end" ? "end" : false;
+  const computedPinned = pinned === "start" ? "start" : pinned === "end" ? "end" : false;
   return computedPinned;
 };
 var getComputedVisibleColumns = ({
@@ -1245,7 +1246,9 @@ var getComputedVisibleColumns = ({
       logError(`Column with id "${colId}" specified in columnOrder array cannot be found in the columns map.`);
       return false;
     }
-    return isColumnVisible(columnVisibility, columnVisibilityAssumeVisible, colId);
+    const result2 = isColumnVisible(columnVisibility, columnVisibilityAssumeVisible, colId);
+    console.log(columnVisibility, colId, result2);
+    return result2;
   });
   const columnsArray = visibleColumnOrder.map((columnId) => columns.get(columnId)).filter(Boolean);
   const sortedMap = (sortInfo != null ? sortInfo : []).reduce((acc, info, index) => {
@@ -1271,10 +1274,13 @@ var getComputedVisibleColumns = ({
       const colTypeSizing = {
         minWidth: colType == null ? void 0 : colType.minWidth,
         maxWidth: colType == null ? void 0 : colType.maxWidth,
-        width: colType == null ? void 0 : colType.width,
-        flex: colType == null ? void 0 : colType.flex
+        width: colType == null ? void 0 : colType.defaultWidth,
+        flex: colType == null ? void 0 : colType.defaultFlex
+      };
+      let colSizing = columnSizing.get(colId) || {
+        width: column == null ? void 0 : column.defaultWidth,
+        flex: column == null ? void 0 : column.defaultFlex
       };
-      let colSizing = columnSizing.get(colId) || {};
       if (colSizing.width != null) {
         delete colTypeSizing.flex;
       }
@@ -1325,7 +1331,7 @@ var getComputedVisibleColumns = ({
   });
   const firstPinnedEndAbsoluteOffset = bodySize.width - totalPinnedEndWidth;
   columnsArray.forEach((c, i) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     const id = visibleColumnOrder[i];
     const nextColumnId = visibleColumnOrder[i + 1];
     const colType = getColumnComputedType(c, columnTypes);
@@ -1386,6 +1392,7 @@ var getComputedVisibleColumns = ({
     const result2 = __spreadProps(__spreadValues({
       align: colType.align,
       verticalAlign: colType.verticalAlign,
+      valueGetter: colType.valueGetter,
       renderValue: colType.renderValue,
       render: colType.render
     }, c), {
@@ -1393,7 +1400,7 @@ var getComputedVisibleColumns = ({
       computedAbsoluteOffset,
       computedPinningOffset,
       computedOffset,
-      computedSortable: (_e = (_d = c.sortable) != null ? _d : sortable) != null ? _e : true,
+      computedSortable: (_f = (_e = (_d = c.sortable) != null ? _d : colType.sortable) != null ? _e : sortable) != null ? _f : true,
       computedSortInfo,
       computedSortIndex,
       computedMultiSort: multiSort,
@@ -1402,14 +1409,14 @@ var getComputedVisibleColumns = ({
       computedSortedDesc,
       computedVisibleIndex: i,
       computedPinned,
-      computedDraggable: (_g = (_f = c.draggable) != null ? _f : draggableColumns) != null ? _g : true,
+      computedDraggable: (_h = (_g = c.draggable) != null ? _g : draggableColumns) != null ? _h : true,
       computedFirstInCategory,
       computedLastInCategory,
       computedFirst: i === 0,
       computedLast,
       toggleSort,
       id,
-      header: (_i = (_h = c.header) != null ? _h : c.name) != null ? _i : c.field
+      header: (_k = (_j = (_i = c.header) != null ? _i : colType.header) != null ? _j : c.name) != null ? _k : c.field
     });
     computedOffset += computedWidth;
     computedVisibleColumnsMap.set(result2.id, result2);
@@ -1560,7 +1567,6 @@ var useComputedVisibleColumns = ({
   const columnsSizingRenderId = useRerenderOnKeyChange(columnSizing);
   const columnTypesRenderId = useRerenderOnKeyChange(columnTypes);
   const columnsRenderId = useRerenderOnKeyChange(columns);
-  const visibilityRenderId = useRerenderOnKeyChange(columnVisibility);
   const pinningRenderId = useRerenderOnKeyChange(columnPinning);
   const {
     computedRemainingSpace,
@@ -1616,7 +1622,6 @@ var useComputedVisibleColumns = ({
     pinnedStartMaxWidth,
     columnPinning,
     columnsRenderId,
-    visibilityRenderId,
     columnsSizingRenderId,
     pinningRenderId,
     columnTypesRenderId
@@ -1641,52 +1646,21 @@ var useComputedVisibleColumns = ({
   return result;
 };
 
-// src/utils/sortAscending.ts
+// src/utils/DeepMap/sortAscending.ts
 var sortAscending = (a, b) => a - b;
 
 // src/components/InfiniteTable/hooks/useComputed.ts
-import { useCallback as useCallback5, useState as useState5 } from "react";
-
-// src/components/InfiniteTable/hooks/useColumnAggregations.ts
-import { useEffect as useEffect5 } from "react";
-
-// src/components/DataSource/publicHooks/useDataSourceActions.ts
-import {
-  useContext as useContext2
-} from "react";
-
-// src/components/DataSource/DataSourceContext.ts
-import {
-  createContext as createContext2
-} from "react";
-var DSContext;
-function getDataSourceContext() {
-  if (DSContext) {
-    return DSContext;
-  }
-  return DSContext = createContext2({
-    getState: () => null,
-    componentState: null,
-    componentActions: null
-  });
-}
-
-// src/components/DataSource/publicHooks/useDataSourceActions.ts
-function useDataSourceActions() {
-  const DataSourceContext = getDataSourceContext();
-  const contextValue = useContext2(DataSourceContext);
-  return contextValue.componentActions;
-}
+import { useCallback as useCallback5, useEffect as useEffect10, useState as useState5 } from "react";
 
 // src/components/hooks/useComponentState.tsx
 import {
   createElement as createElement2,
   memo,
-  useContext as useContext3
+  useContext as useContext2
 } from "react";
 import {
   useReducer,
-  createContext as createContext3,
+  createContext as createContext2,
   useMemo as useMemo3,
   useEffect as useEffect4,
   useState as useState2,
@@ -1766,7 +1740,7 @@ function getComponentStateContext() {
   if (ComponentContext) {
     return ComponentContext;
   }
-  return ComponentContext = createContext3(null);
+  return ComponentContext = createContext2(null);
 }
 function getReducerGeneratedActions(dispatch, getState, getProps, propsToForward, allowedControlledPropOverrides, interceptedActions) {
   const state = getState();
@@ -1779,9 +1753,14 @@ function getReducerGeneratedActions(dispatch, getState, getProps, propsToForward
       if (currentValue === value) {
         return;
       }
-      notifyChange(props, stateKey, value);
+      let notifyTheChange = true;
       if (interceptedActions && typeof interceptedActions[key] === "function") {
-        interceptedActions[key](value, { actions, state: state2 });
+        if (interceptedActions[key](value, { actions, state: state2 }) === false) {
+          notifyTheChange = false;
+        }
+      }
+      if (notifyTheChange) {
+        notifyChange(props, stateKey, value);
       }
       const forwardFn = propsToForward[key];
       if (typeof forwardFn === "function") {
@@ -1822,12 +1801,14 @@ function forwardProps2(propsToForward, props) {
 function getComponentStateRoot(config) {
   return memo(function ComponentStateRoot(props) {
     var _a, _b;
+    const [initialSetupState] = useState2(() => {
+      return config.initSetupState ? config.initSetupState() : {};
+    });
     const propsToStateSetRef = useRef4(new Set());
-    const propsToForward = useMemo3(() => config.forwardProps ? config.forwardProps() : {}, []);
+    const propsToForward = useMemo3(() => config.forwardProps ? config.forwardProps(initialSetupState) : {}, [initialSetupState]);
     const parentState = (_b = (_a = config.getParentState) == null ? void 0 : _a.call(config)) != null ? _b : null;
     const getParentState = useLatest(parentState);
     const [wholeState] = useState2(() => {
-      const initialSetupState = config.initSetupState ? config.initSetupState() : {};
       let mappedState = {};
       if (propsToForward) {
         mappedState = forwardProps2(propsToForward, props);
@@ -1857,9 +1838,12 @@ function getComponentStateRoot(config) {
     const getProps = useLatest(props);
     const theReducer = (previousState, action) => {
       var _a2;
+      if (action.type === "REPLACE_STATE") {
+        return action.payload;
+      }
       const parentState2 = (_a2 = getParentState == null ? void 0 : getParentState()) != null ? _a2 : null;
       const mappedState = action.payload.mappedState;
-      const updatedProps = action.payload.updatedProps;
+      const updatedProps = action.payload.updatedPropsToState;
       const newState = Object.assign({}, previousState);
       if (mappedState) {
         Object.assign(newState, mappedState);
@@ -1913,8 +1897,9 @@ function getComponentStateRoot(config) {
       const currentProps = props;
       const newMappedState = {};
       let newMappedStateCount = 0;
-      const updatedProps = {};
-      let updatedPropsCount = 0;
+      const updatedPropsToState = {};
+      let updatedPropsToStateCount = 0;
+      const rawUpdatedProps = {};
       for (var k in props) {
         const key = k;
         const oldValue = prevProps[key];
@@ -1925,7 +1910,8 @@ function getComponentStateRoot(config) {
         if (oldValue === newValue) {
           continue;
         }
-        if (isControlled(key, props)) {
+        rawUpdatedProps[key] = { newValue, oldValue };
+        if (isControlled(key, props) || isControlled(key, prevProps)) {
           if (propsToForward.hasOwnProperty(k)) {
             let valueToSet = newValue;
             const forwardFn = propsToForward[k];
@@ -1937,22 +1923,30 @@ function getComponentStateRoot(config) {
               newMappedStateCount++;
             }
           } else if (propsToStateSetRef.current.has(k)) {
-            updatedProps[key] = currentProps[key];
-            updatedPropsCount++;
+            updatedPropsToState[key] = currentProps[key];
+            updatedPropsToStateCount++;
           }
         }
       }
-      if (updatedPropsCount > 0 || newMappedStateCount > 0) {
+      if (updatedPropsToStateCount > 0 || newMappedStateCount > 0) {
         debug2("Triggered by new values for the following props", ...[
           ...Object.keys(newMappedState != null ? newMappedState : {}),
-          ...Object.keys(updatedProps != null ? updatedProps : {})
+          ...Object.keys(updatedPropsToState != null ? updatedPropsToState : {})
         ]);
-        dispatch({
+        const action = {
           payload: {
             mappedState: newMappedStateCount ? newMappedState : null,
-            updatedProps: updatedPropsCount ? updatedProps : null
+            updatedPropsToState: updatedPropsToStateCount ? updatedPropsToState : null
           }
-        });
+        };
+        dispatch(action);
+        if (config.onPropChange) {
+          for (var prop in rawUpdatedProps)
+            if (rawUpdatedProps.hasOwnProperty(prop)) {
+              const { newValue, oldValue } = rawUpdatedProps[prop];
+              config.onPropChange({ name: prop, newValue, oldValue }, props, actions);
+            }
+        }
       }
     });
     return /* @__PURE__ */ createElement2(Context.Provider, {
@@ -1962,56 +1956,44 @@ function getComponentStateRoot(config) {
 }
 function useComponentState() {
   const Context = getComponentStateContext();
-  return useContext3(Context);
-}
-
-// src/components/InfiniteTable/hooks/useColumnAggregations.ts
-function useColumnAggregations() {
-  const {
-    componentState: { columnAggregations },
-    getComponentState
-  } = useComponentState();
-  const dataSourceActions = useDataSourceActions();
-  useEffect5(() => {
-    function updateDataSourceAggregations() {
-      const reducers = [];
-      const componentState = getComponentState();
-      columnAggregations.forEach((aggregator, key) => {
-        var _a;
-        const colField = (_a = componentState.computedColumns.get(key)) == null ? void 0 : _a.field;
-        const newAggregator = __spreadValues({
-          getter: (data) => colField ? data[colField] : data
-        }, aggregator);
-        reducers.push(newAggregator);
-      });
-      dataSourceActions.aggregationReducers = reducers;
-    }
-    updateDataSourceAggregations();
-    return interceptMap(columnAggregations, {
-      clear: updateDataSourceAggregations,
-      delete: updateDataSourceAggregations,
-      set: updateDataSourceAggregations
-    });
-  }, [columnAggregations]);
+  return useContext2(Context);
 }
 
 // src/components/DataSource/publicHooks/useDataSource.ts
 import {
-  useContext as useContext4
+  useContext as useContext3
+} from "react";
+
+// src/components/DataSource/DataSourceContext.ts
+import {
+  createContext as createContext3
 } from "react";
+var DSContext;
+function getDataSourceContext() {
+  if (DSContext) {
+    return DSContext;
+  }
+  return DSContext = createContext3({
+    getState: () => null,
+    componentState: null,
+    componentActions: null
+  });
+}
+
+// src/components/DataSource/publicHooks/useDataSource.ts
 function useDataSource() {
   const DataSourceContext = getDataSourceContext();
-  const contextValue = useContext4(DataSourceContext);
+  const contextValue = useContext3(DataSourceContext);
   return contextValue.componentState;
 }
 function useDataSourceContextValue() {
   const DataSourceContext = getDataSourceContext();
-  const contextValue = useContext4(DataSourceContext);
+  const contextValue = useContext3(DataSourceContext);
   return contextValue;
 }
 
 // src/components/InfiniteTable/hooks/useColumnGroups.ts
-import { useEffect as useEffect6 } from "react";
+import { useEffect as useEffect5 } from "react";
 function useColumnGroups() {
   const {
     componentState: {
@@ -2021,7 +2003,7 @@ function useColumnGroups() {
     componentActions,
     getComponentState
   } = useComponentState();
-  useEffect6(() => {
+  useEffect5(() => {
     const recompute = () => {
       componentActions.columnGroupsDepthsMap = computeColumnGroupsDepths(computedColumnGroups);
     };
@@ -2032,39 +2014,42 @@ function useColumnGroups() {
       set: update
     });
   }, [computedColumnGroups]);
-  useEffect6(() => {
+  useEffect5(() => {
     return interceptMap(collapsedColumnGroups, {
       set: (key, visibleCol) => {
         const colIds = key.slice(1);
-        const { columnVisibility } = getComponentState();
+        const columnVisibility = __spreadValues({}, getComponentState().columnVisibility);
         colIds.forEach((colId) => {
-          columnVisibility.set(colId, false);
+          columnVisibility[colId] = false;
         });
-        columnVisibility.delete(visibleCol);
+        delete columnVisibility[visibleCol];
+        componentActions.columnVisibility = columnVisibility;
       },
       beforeClear: (currentCollapsedGroups) => {
-        const { columnVisibility } = getComponentState();
+        const columnVisibility = __spreadValues({}, getComponentState().columnVisibility);
         const keys = [...currentCollapsedGroups.keys()];
         keys.forEach((key) => {
           const colIds = key.slice(1);
           colIds.forEach((colId) => {
-            columnVisibility.delete(colId);
+            delete columnVisibility[colId];
           });
         });
+        componentActions.columnVisibility = columnVisibility;
       },
       delete: (key) => {
-        const { columnVisibility } = getComponentState();
+        const columnVisibility = __spreadValues({}, getComponentState().columnVisibility);
         const colIds = key.slice(1);
         colIds.forEach((colId) => {
-          columnVisibility.delete(colId);
+          delete columnVisibility[colId];
         });
+        componentActions.columnVisibility = columnVisibility;
       }
     });
   }, [collapsedColumnGroups]);
 }
 
 // src/components/InfiniteTable/hooks/useColumnsWhen.ts
-import { useEffect as useEffect10, useMemo as useMemo5 } from "react";
+import { useEffect as useEffect9, useMemo as useMemo4 } from "react";
 
 // src/components/InfiniteTable/state/getComputedPivotColumnsFromDataSourcePivotColumns.tsx
 import {
@@ -2077,27 +2062,14 @@ var join = (...args) => args.filter((x) => !!`${x}`).join(" ");
 // src/components/InfiniteTable/components/icons/ExpanderIcon.tsx
 import {
   createElement as createElement3,
-  useEffect as useEffect7
+  useEffect as useEffect6
 } from "react";
 import { useState as useState3 } from "react";
 
-// src/components/InfiniteTable/utilities.css.ts
-var alignItems = { center: "_16lm1iw11", stretch: "_16lm1iw12" };
-var cssEllipsisClassName = "_16lm1iw1a _16lm1iw1b _16lm1iw16";
-var cursor = { pointer: "_16lm1iwb" };
-var display = { flex: "_16lm1iwj", block: "_16lm1iwk", inlineBlock: "_16lm1iwl" };
-var fill = { currentColor: "_16lm1iw5", accentColor: "_16lm1iw6" };
-var flex = { "1": "_16lm1iwc", none: "_16lm1iwd" };
-var flexFlow = { column: "_16lm1iwz", row: "_16lm1iw10" };
-var justifyContent = { center: "_16lm1iw13", start: "_16lm1iw14", end: "_16lm1iw15" };
-var left = { "0": "_16lm1iwt", "100%": "_16lm1iwu" };
-var position = { relative: "_16lm1iw1", absolute: "_16lm1iw2", sticky: "_16lm1iw3", fixed: "_16lm1iw4" };
-var top = { "0": "_16lm1iwr", "100%": "_16lm1iws" };
-var transform = { translateZero: "_16lm1iw9", rotate90: "_16lm1iwa" };
-var transformTranslateZero = "_16lm1iw8";
-var userSelect = { none: "_16lm1iwm" };
-var willChange = { transform: "_16lm1iw19" };
-var zIndex = { "1": "_16lm1iwe", "10": "_16lm1iwf", "1000": "_16lm1iwg", "10000": "_16lm1iwh", "100000": "_16lm1iwi" };
+// src/components/InfiniteTable/components/icons/ExpanderIcon.css.ts
+var import_createRuntimeFn = __toModule(require_vanilla_extract_recipes_createRuntimeFn_cjs());
+var ExpanderIconCls = "_16lm1iw6 _16lm1iwd _16lm1iwb";
+var ExpanderIconClsVariants = (0, import_createRuntimeFn.createRuntimeFn)({ defaultClassName: "", variantClassNames: { expanded: { true: "_16lm1iwa", false: "_198z9782" } }, defaultVariants: {}, compoundVariants: [] });
 
 // src/components/InfiniteTable/components/icons/ExpanderIcon.tsx
 function ExpanderIcon(props) {
@@ -2111,7 +2083,7 @@ function ExpanderIcon(props) {
       setExpanded(!expanded);
     }
   };
-  useEffect7(() => {
+  useEffect6(() => {
     if (isControlled("expanded", props)) {
       setExpanded(props.expanded);
     }
@@ -2124,18 +2096,37 @@ function ExpanderIcon(props) {
     width: `${size}px`,
     style: props.style,
     onClick,
-    className: join(props.className, fill.accentColor, flex.none, cursor.pointer, expanded ? fill.accentColor : "", expanded ? transform.rotate90 : "", "InfiniteIcon", "InfiniteIcon-expander", `InfiniteIcon-expander--${expanded ? "expanded" : "collapsed"}`)
+    className: join(props.className, ExpanderIconCls, ExpanderIconClsVariants({
+      expanded
+    }), "InfiniteIcon", "InfiniteIcon-expander", `InfiniteIcon-expander--${expanded ? "expanded" : "collapsed"}`)
   }, /* @__PURE__ */ createElement3("path", {
     d: "M8.59 16.59L13.17 12 8.59 7.41 10 6l6 6-6 6-1.41-1.41z"
   }));
 }
 
 // src/components/InfiniteTable/components/InfiniteTableRow/row.css.ts
-var import_createRuntimeFn = __toModule(require_vanilla_extract_recipes_createRuntimeFn_cjs());
+var import_createRuntimeFn2 = __toModule(require_vanilla_extract_recipes_createRuntimeFn_cjs());
 var GroupRowExpanderCls = "_7pupv0b";
-var RowClsRecipe = (0, import_createRuntimeFn.createRuntimeFn)({ defaultClassName: "_7pupv00", variantClassNames: { zebra: { false: "_7pupv02", even: "_7pupv03", odd: "_7pupv04" }, groupRow: { true: "_7pupv05", false: "_7pupv06" }, inlineGroupRow: { true: "_7pupv07", false: "_7pupv08" }, showHoverRows: { true: "_7pupv09", false: "_7pupv0a" } }, defaultVariants: {}, compoundVariants: [] });
+var RowClsRecipe = (0, import_createRuntimeFn2.createRuntimeFn)({ defaultClassName: "_7pupv00", variantClassNames: { zebra: { false: "_7pupv02", even: "_7pupv03", odd: "_7pupv04" }, groupRow: { true: "_7pupv05", false: "_7pupv06" }, inlineGroupRow: { true: "_7pupv07", false: "_7pupv08" }, showHoverRows: { true: "_7pupv09", false: "_7pupv0a" } }, defaultVariants: {}, compoundVariants: [] });
 var RowHoverCls = "_7pupv01";
 
+// src/components/InfiniteTable/utilities.css.ts
+var alignItems = { center: "_16lm1iw11", stretch: "_16lm1iw12" };
+var cssEllipsisClassName = "_16lm1iw1a _16lm1iw1b _16lm1iw16";
+var cursor = { pointer: "_16lm1iwb" };
+var display = { flex: "_16lm1iwj", block: "_16lm1iwk", inlineBlock: "_16lm1iwl" };
+var flex = { "1": "_16lm1iwc", none: "_16lm1iwd" };
+var flexFlow = { column: "_16lm1iwz", row: "_16lm1iw10" };
+var justifyContent = { center: "_16lm1iw13", start: "_16lm1iw14", end: "_16lm1iw15" };
+var left = { "0": "_16lm1iwt", "100%": "_16lm1iwu" };
+var position = { relative: "_16lm1iw1", absolute: "_16lm1iw2", sticky: "_16lm1iw3", fixed: "_16lm1iw4" };
+var top = { "0": "_16lm1iwr", "100%": "_16lm1iws" };
+var transform = { translateZero: "_16lm1iw9", rotate90: "_16lm1iwa" };
+var transformTranslateZero = "_16lm1iw8";
+var userSelect = { none: "_16lm1iwm" };
+var willChange = { transform: "_16lm1iw19" };
+var zIndex = { "1": "_16lm1iwe", "10": "_16lm1iwf", "1000": "_16lm1iwg", "10000": "_16lm1iwh", "100000": "_16lm1iwi" };
+
 // src/components/InfiniteTable/state/getComputedPivotColumnsFromDataSourcePivotColumns.tsx
 function getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, params) {
   if (!pivotColumns) {
@@ -2145,7 +2136,7 @@ function getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, params)
     pivotColumn,
     pivotRowLabelsColumn,
     pivotBy,
-    groupRowsBy,
+    groupBy,
     pivotTotalColumnPosition,
     toggleGroupRow
   } = params;
@@ -2162,7 +2153,7 @@ function getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, params)
           column = __spreadValues(__spreadValues({}, column), pivotColumn({
             column,
             pivotBy,
-            groupRowsBy
+            groupBy
           }));
         } else {
           column = __spreadValues(__spreadValues({}, column), pivotColumn);
@@ -2174,7 +2165,7 @@ function getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, params)
           column = __spreadValues(__spreadValues({}, column), pivotRowLabelsColumn({
             column,
             pivotBy,
-            groupRowsBy
+            groupBy
           }));
         } else {
           column = __spreadValues(__spreadValues({}, column), pivotRowLabelsColumn);
@@ -2183,11 +2174,11 @@ function getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, params)
       if (!column.render) {
         column.render = (renderOptions) => {
           var _a;
-          let { value, rowInfo, column: column2, groupRowsBy: groupRowsBy2 } = renderOptions;
+          let { value, rowInfo, column: column2, groupBy: groupBy2 } = renderOptions;
           if (column2.renderValue) {
             value = column2.renderValue(renderOptions);
           }
-          const showExpanderIcon = (((_a = rowInfo.groupKeys) == null ? void 0 : _a.length) || 0) < groupRowsBy2.length;
+          const showExpanderIcon = (((_a = rowInfo.groupKeys) == null ? void 0 : _a.length) || 0) < groupBy2.length;
           return /* @__PURE__ */ createElement4("div", {
             className: join(display.flex, alignItems.center, GroupRowExpanderCls)
           }, showExpanderIcon ? /* @__PURE__ */ createElement4(ExpanderIcon, {
@@ -2287,7 +2278,7 @@ function getColumnForGroupBy(options, toggleGroupRow, groupColumnFromProps) {
 function getSingleGroupColumn(options, toggleGroupRow, groupColumnFromProps) {
   let generatedGroupColumn = {
     header: `Group`,
-    groupByField: options.groupRowsBy.map((g) => g.field),
+    groupByField: options.groupBy.map((g) => g.field),
     sortable: false,
     render: (renderOptions) => {
       let { value, rowInfo, column } = renderOptions;
@@ -2403,166 +2394,9 @@ var getMultisortFunction = (sortInfo, get) => {
 };
 
 // src/components/DataSource/privateHooks/useLoadData.ts
-import { useEffect as useEffect9, useLayoutEffect as useLayoutEffect3, useRef as useRef6, useState as useState4 } from "react";
-
-// src/components/hooks/useEffectWithChanges.ts
-import { useEffect as useEffect8, useRef as useRef5 } from "react";
-function useEffectWithChanges(fn, deps) {
-  const prevRef = useRef5({});
-  const oldValuesRef = useRef5({});
-  const oldValues = oldValuesRef.current;
-  const changesRef = useRef5({});
-  const changes = changesRef.current;
-  const useEffectDeps = [];
-  for (let k in deps) {
-    if (deps.hasOwnProperty(k)) {
-      if (deps[k] !== prevRef.current[k]) {
-        changes[k] = deps[k];
-        oldValues[k] = prevRef.current[k];
-      }
-      useEffectDeps.push(deps[k]);
-    }
-  }
-  prevRef.current = deps;
-  useEffect8(() => {
-    const changes2 = changesRef.current;
-    const result = fn(changes2, oldValues);
-    changesRef.current = {};
-    oldValuesRef.current = {};
-    return result;
-  }, useEffectDeps);
-}
-
-// src/components/DataSource/privateHooks/useLoadData.ts
-function buildDataSourceDataParams(componentState) {
-  var _a, _b;
-  const sortInfo = componentState.multiSort ? componentState.sortInfo : (_b = (_a = componentState.sortInfo) == null ? void 0 : _a[0]) != null ? _b : null;
-  const dataSourceParams = {
-    originalDataArray: componentState.originalDataArray,
-    sortInfo,
-    groupRowsBy: componentState.groupRowsBy,
-    pivotBy: componentState.pivotBy
-  };
-  if (componentState.livePagination !== void 0) {
-    dataSourceParams.livePaginationCursor = componentState.livePaginationCursor;
-  }
-  return dataSourceParams;
-}
-function notifyDataParamsChanged(componentState, actions) {
-  var _a;
-  if (typeof componentState.data === "function") {
-    loadData(componentState.data, componentState, actions);
-  }
-  const dataParams = buildDataSourceDataParams(componentState);
-  (_a = componentState.onDataParamsChange) == null ? void 0 : _a.call(componentState, dataParams);
-}
-function loadData(data, componentState, actions) {
-  const dataParams = buildDataSourceDataParams(componentState);
-  if (typeof data === "function") {
-    data = data(dataParams);
-  }
-  const dataIsPromise = typeof data === "object" && typeof data.then === "function";
-  if (dataIsPromise) {
-    actions.loading = true;
-  }
-  Promise.resolve(data).then((dataParam) => {
-    let dataArray = [];
-    if (Array.isArray(dataParam.data)) {
-      const remoteData = dataParam;
-      dataArray = remoteData.data;
-      if (remoteData.livePaginationCursor !== void 0) {
-        actions.livePaginationCursor = remoteData.livePaginationCursor;
-      }
-    } else {
-      dataArray = dataParam;
-    }
-    actions.originalDataArray = dataArray;
-    if (dataIsPromise) {
-      actions.loading = false;
-    }
-  });
-}
-function useLoadData() {
-  const {
-    getComponentState,
-    componentActions: actions,
-    componentState: { data }
-  } = useComponentState();
-  useLayoutEffect3(() => {
-    loadData(data, getComponentState(), actions);
-  }, [data]);
-  useLivePagination();
-}
-function useLivePagination() {
-  const {
-    getComponentState,
-    componentActions: actions,
-    componentState
-  } = useComponentState();
-  const {
-    notifyScrollbarsChange,
-    sortInfo,
-    groupRowsBy,
-    pivotBy,
-    livePaginationCursor,
-    scrollBottomId
-  } = componentState;
-  const [scrollbars, setScrollbars] = useState4({
-    vertical: false,
-    horizontal: false
-  });
-  const scrollbarsRef = useRef6(scrollbars);
-  useEffect9(() => {
-    notifyScrollbarsChange.onChange((scrollbars2) => {
-      if (!scrollbars2) {
-        return;
-      }
-      scrollbarsRef.current = scrollbars2;
-      setScrollbars(scrollbars2);
-    });
-    return () => notifyScrollbarsChange.destroy();
-  }, [notifyScrollbarsChange]);
-  const [cursorId, updateCursorId] = useState4(void 0);
-  useEffect9(() => {
-    const frameId = requestAnimationFrame(() => {
-      var _a;
-      if (!((_a = scrollbarsRef.current) == null ? void 0 : _a.vertical)) {
-        updateCursorId(livePaginationCursor);
-      }
-    });
-    return () => cancelAnimationFrame(frameId);
-  }, [livePaginationCursor]);
-  useEffect9(() => {
-    const { livePaginationCursor: livePaginationCursor2, livePagination } = getComponentState();
-    if (!scrollbars.vertical && livePagination) {
-      updateCursorId(livePaginationCursor2);
-    }
-  }, [scrollbars.vertical]);
-  useEffect9(() => {
-    updateCursorId(scrollBottomId);
-  }, [scrollBottomId]);
-  const depsObject = {
-    sortInfo,
-    groupRowsBy,
-    pivotBy,
-    cursorId
-  };
-  useEffectWithChanges(() => {
-    if (cursorId === void 0) {
-      return;
-    }
-    notifyDataParamsChanged(getComponentState(), actions);
-  }, depsObject);
-}
+import { useEffect as useEffect8, useRef as useRef6, useState as useState4 } from "react";
 
-// src/components/DataSource/state/normalizeSortInfo.ts
-var normalizeSortInfo = (sortInfo) => {
-  sortInfo = sortInfo != null ? sortInfo : [];
-  return Array.isArray(sortInfo) ? sortInfo : [sortInfo];
-};
-
-// src/components/hooks/useOnce.ts
-import { useMemo as useMemo4 } from "react";
+// src/utils/DeepMap/once.ts
 function once(fn) {
   let called = false;
   let result = null;
@@ -2576,14 +2410,8 @@ function once(fn) {
   };
   return onceFn;
 }
-function useOnce(fn) {
-  const onceFn = useMemo4(() => {
-    return once(fn);
-  }, []);
-  return onceFn();
-}
 
-// src/utils/DeepMap.ts
+// src/utils/DeepMap/index.ts
 var SORT_ASC_REVISION = (p1, p2) => sortAscending(p1.revision, p2.revision);
 var DeepMap = class {
   constructor(initial) {
@@ -2624,6 +2452,13 @@ var DeepMap = class {
       });
     }
   }
+  static clone(map2) {
+    const clone = new DeepMap();
+    map2.visit((pair, keys) => {
+      clone.set(keys, pair.value);
+    });
+    return clone;
+  }
   set(keys, value) {
     let currentMap = this.map;
     if (!keys.length) {
@@ -2828,285 +2663,141 @@ var DeepMap = class {
   }
 };
 
-// src/components/DataSource/GroupRowsState.ts
-var GroupRowsState = class {
-  constructor(state) {
-    this.update(state instanceof GroupRowsState ? state.getState() : state);
-  }
-  getState() {
-    var _a, _b, _c, _d;
-    return {
-      expandedRows: this.expandedAll ? true : (_b = (_a = this.expandedMap) == null ? void 0 : _a.topDownKeys()) != null ? _b : [],
-      collapsedRows: this.collapsedAll ? true : (_d = (_c = this.collapsedMap) == null ? void 0 : _c.topDownKeys()) != null ? _d : []
-    };
-  }
-  destroy() {
-    var _a, _b;
-    (_a = this.expandedMap) == null ? void 0 : _a.clear();
-    (_b = this.collapsedMap) == null ? void 0 : _b.clear();
-    delete this.expandedMap;
-    delete this.collapsedMap;
-  }
-  update(state) {
-    var _a, _b, _c, _d;
-    this.initialState = state;
-    const { collapsedRows, expandedRows } = this.initialState;
-    this.collapsedAll = collapsedRows === true;
-    this.expandedAll = expandedRows === true;
-    if (this.collapsedAll && this.expandedAll) {
-      throw `Cannot have both collapsedRows and expandedRows be true!`;
-    }
-    if (collapsedRows !== true) {
-      (_a = this.collapsedMap) == null ? void 0 : _a.clear();
-      this.collapsedMap = (_b = this.collapsedMap) != null ? _b : new DeepMap(collapsedRows.map((keys) => [keys, true]));
-    }
-    if (expandedRows !== true) {
-      (_c = this.expandedMap) == null ? void 0 : _c.clear();
-      this.expandedMap = (_d = this.expandedMap) != null ? _d : new DeepMap(expandedRows.map((keys) => [keys, true]));
-    }
-  }
-  areAllCollapsed() {
-    return this.collapsedAll && (this.expandedMap ? this.expandedMap.size === 0 : true);
-  }
-  areAllExpanded() {
-    return this.expandedAll && (this.collapsedMap ? this.collapsedMap.size === 0 : true);
-  }
-  collapseAll() {
-    this.update({
-      collapsedRows: true,
-      expandedRows: []
-    });
-  }
-  expandAll() {
-    this.update({
-      expandedRows: true,
-      collapsedRows: []
-    });
-  }
-  isGroupRowExpanded(keys) {
-    var _a, _b;
-    if (this.expandedAll === true) {
-      if (this.collapsedAll === true) {
-        throw 'Cannot have both expandedRows and collapsedRows be "true"';
-      }
-      return !((_a = this.collapsedMap) == null ? void 0 : _a.has(keys));
-    }
-    return (_b = this.expandedMap) == null ? void 0 : _b.has(keys);
-  }
-  isGroupRowCollapsed(keys) {
-    return !this.isGroupRowExpanded(keys);
-  }
-  setGroupRowExpanded(keys, shouldExpand) {
-    var _a;
-    if (shouldExpand === this.isGroupRowExpanded(keys)) {
-      return;
-    }
-    if (shouldExpand) {
-      if (this.collapsedAll === true) {
-        if (!this.expandedMap) {
-          throw `No expandedMap found when trying to expand group row ${keys.join(",")}`;
-        }
-        this.expandedMap.set(keys, true);
-      } else if (this.expandedAll === true) {
-        if (!this.collapsedMap) {
-          throw `No collapsedMap found when trying to expand group row ${keys.join(",")}`;
-        }
-        this.collapsedMap.delete(keys);
-      }
-    } else {
-      if (this.expandedAll === true) {
-        if (!this.collapsedMap) {
-          throw `No collapsedMap found when trying to collapse group row ${keys.join(",")}`;
-        }
-        this.collapsedMap.set(keys, true);
-      } else if (this.collapsedAll === true) {
-        if (!this.expandedMap) {
-          throw `No expandedMap found when trying to collapse group row ${keys.join(",")}`;
-        }
-        (_a = this.expandedMap) == null ? void 0 : _a.delete(keys);
-      }
-    }
-  }
-  collapseGroupRow(keys) {
-    this.setGroupRowExpanded(keys, false);
-  }
-  expandGroupRow(keys) {
-    this.setGroupRowExpanded(keys, true);
-  }
-  toggleGroupRow(keys) {
-    this.setGroupRowExpanded(keys, !this.isGroupRowExpanded(keys));
-  }
-};
-
-// src/utils/shallowEqualObjects.ts
-function shallowEqualObjects(objA, objB) {
-  if (objA === objB) {
-    return true;
-  }
-  if (!objA || !objB) {
-    return false;
-  }
-  var aKeys = Object.keys(objA);
-  var bKeys = Object.keys(objB);
-  var len = aKeys.length;
-  if (bKeys.length !== len) {
-    return false;
-  }
-  for (var i = 0; i < len; i++) {
-    var key = aKeys[i];
-    if (objA[key] !== objB[key] || !Object.prototype.hasOwnProperty.call(objB, key)) {
-      return false;
-    }
-  }
-  return true;
-}
-
-// src/components/utils/discardCallsWithEqualArg.ts
-var map = new WeakMap();
-var getCompareDefault = (a) => a;
-function discardCallsWithEqualArg(fn, timeframe = 50, getCompareObject2) {
-  map.set(fn, {
-    lastCallTime: 0,
-    lastCallArg: null
-  });
-  const getCompare = getCompareObject2 != null ? getCompareObject2 : getCompareDefault;
-  return (arg) => {
-    const { lastCallTime, lastCallArg } = map.get(fn) || {
-      lastCallTime: 0,
-      lastCallArg: null
-    };
-    const now = Date.now();
-    const diff = now - lastCallTime;
-    const objectsEqual = shallowEqualObjects(getCompare(lastCallArg), getCompare(arg));
-    if (diff < timeframe && objectsEqual) {
-      return;
-    }
-    map.set(fn, {
-      lastCallTime: now,
-      lastCallArg: arg
-    });
-    fn(arg);
-  };
-}
-
-// src/components/DataSource/state/getInitialState.ts
-function initSetupState2() {
-  const now = Date.now();
-  const originalDataArray = [];
-  const dataArray = [];
-  return {
-    dataParams: void 0,
-    notifyScrollbarsChange: buildSubscriptionCallback(),
-    pivotTotalColumnPosition: "end",
-    originalDataArray,
-    scrollBottomId: Symbol("scrollBottomId"),
-    pivotColumns: void 0,
-    pivotColumnGroups: void 0,
-    dataArray,
-    updatedAt: now,
-    groupedAt: 0,
-    sortedAt: 0,
-    reducedAt: now,
-    generateGroupRows: true,
-    aggregationReducers: void 0,
-    groupDeepMap: void 0,
-    postSortDataArray: void 0,
-    postGroupDataArray: void 0,
-    lastSortDataArray: void 0,
-    lastGroupDataArray: void 0
-  };
-}
-function getCompareObject(dataParams) {
-  const obj = __spreadValues({}, dataParams);
-  delete obj.originalDataArray;
-  return obj;
-}
-var forwardProps3 = () => {
-  return {
-    onDataParamsChange: (fn) => fn ? discardCallsWithEqualArg(fn, 100, getCompareObject) : void 0,
-    remoteCount: 1,
-    data: 1,
-    pivotBy: 1,
-    primaryKey: 1,
-    livePagination: 1,
-    livePaginationCursor: 1,
-    loading: (loading) => loading != null ? loading : false,
-    sortInfo: (sortInfo) => normalizeSortInfo(sortInfo),
-    groupRowsBy: (groupRowsBy) => groupRowsBy != null ? groupRowsBy : [],
-    groupRowsState: (groupRowsState) => {
-      return groupRowsState || new GroupRowsState({
-        expandedRows: true,
-        collapsedRows: []
-      });
-    }
-  };
-};
-function mapPropsToState2(params) {
-  const { props } = params;
-  const controlledSort = isControlledValue(props.sortInfo);
-  return {
-    controlledSort,
-    multiSort: Array.isArray(controlledSort ? props.sortInfo : props.defaultSortInfo)
-  };
-}
-function getInterceptActions() {
-  return {
-    sortInfo: (sortInfo, { actions, state }) => {
-      const dataParams = buildDataSourceDataParams(state);
-      dataParams.sortInfo = sortInfo;
-      actions.dataParams = dataParams;
-    }
-  };
-}
-
 // src/utils/groupAndPivot/index.ts
+var LAZY_ROOT_KEY_FOR_GROUPS = "____root____";
 function DEFAULT_TO_KEY(value) {
   return value;
 }
 function initReducers(reducers) {
-  if (!reducers || !reducers.length) {
-    return [];
+  if (!reducers || !Object.keys(reducers).length) {
+    return {};
   }
-  return reducers.map((reducer) => reducer.initialValue);
+  const result = {};
+  for (let key in reducers)
+    if (reducers.hasOwnProperty(key)) {
+      result[key] = reducers[key].initialValue;
+    }
+  return result;
 }
 function computeReducersFor(data, reducers, reducerResults) {
-  if (!reducers || !reducers.length) {
+  var _a, _b;
+  if (!reducers || !Object.keys(reducers).length) {
     return;
   }
-  reducers.forEach((reducer, index) => {
-    const currentValue = reducerResults[index];
-    reducerResults[index] = reducer.reducer(currentValue, reducer.getter(data), data);
-  });
+  for (let key in reducers)
+    if (reducers.hasOwnProperty(key)) {
+      const reducer = reducers[key];
+      if (typeof reducer.reducer !== "function") {
+        continue;
+      }
+      const currentValue = reducerResults[key];
+      const value = reducer.field ? data[reducer.field] : (_b = (_a = reducer.getter) == null ? void 0 : _a.call(reducer, data)) != null ? _b : null;
+      reducerResults[key] = reducer.reducer(currentValue, value, data);
+    }
 }
-function group(groupParams, data) {
+function lazyGroup(groupParams, rootData) {
   const {
-    groupBy,
-    defaultToKey = DEFAULT_TO_KEY,
+    reducers = {},
     pivot,
-    reducers
+    groupBy,
+    mappings
   } = groupParams;
-  const groupByLength = groupBy.length;
-  const topLevelPivotColumns = pivot ? new DeepMap() : void 0;
   const deepMap = new DeepMap();
-  let currentGroupKeys = [];
+  function traverseValues(pivotDeepMap, container, pivot2, pivotIndex = 0, currentPivotKeys2 = []) {
+    const last = pivotIndex === pivot2.length - 1;
+    const values = container[(mappings == null ? void 0 : mappings.values) || "values"] || {};
+    for (var k in values)
+      if (values.hasOwnProperty(k)) {
+        const pivotKey = k;
+        currentPivotKeys2.push(pivotKey);
+        topLevelPivotColumns.set(currentPivotKeys2, true);
+        pivotDeepMap.set(currentPivotKeys2, {
+          reducerResults: values[k][(mappings == null ? void 0 : mappings.totals) || "totals"] || {},
+          items: []
+        });
+        if (!last) {
+          traverseValues(pivotDeepMap, values[k], pivot2, pivotIndex + 1, currentPivotKeys2);
+        }
+        currentPivotKeys2.pop();
+      }
+  }
+  const topLevelPivotColumns = pivot ? new DeepMap() : void 0;
   let currentPivotKeys = [];
   const initialReducerValue = initReducers(reducers);
-  const globalReducerResults = [...initialReducerValue];
-  for (let i = 0, len = data.length; i < len; i++) {
-    let item = data[i];
-    for (let groupByIndex = 0; groupByIndex < groupByLength; groupByIndex++) {
-      const { field: groupByProperty, toKey: groupToKey } = groupBy[groupByIndex];
-      const key = (groupToKey || defaultToKey)(item[groupByProperty], item);
-      currentGroupKeys.push(key);
-      if (!deepMap.has(currentGroupKeys)) {
-        const deepMapGroupValue = {
+  const globalReducerResults = __spreadValues({}, initialReducerValue);
+  rootData.visitDepthFirst((lazyGroupRowInfo, keys, _index, next) => {
+    const [_rootKey, ...currentGroupKeys] = keys;
+    const dataArray = lazyGroupRowInfo.items;
+    for (let i = 0, len = dataArray.length; i < len; i++) {
+      if (!dataArray[i]) {
+        const deepMapGroupValue2 = {
           items: [],
-          reducerResults: [...initialReducerValue]
+          reducerResults: {}
         };
-        if (pivot) {
-          deepMapGroupValue.pivotDeepMap = new DeepMap();
-        }
-        deepMap.set(currentGroupKeys, deepMapGroupValue);
+        deepMap.set([...currentGroupKeys, `not-loaded-yet-${i}`], deepMapGroupValue2);
+        continue;
+      }
+      const dataObject = dataArray[i].data;
+      const dataKeys = dataArray[i].keys;
+      let item = dataObject;
+      const { field: groupByProperty } = groupBy[dataKeys.length - 1];
+      const key = item[groupByProperty];
+      currentGroupKeys.push(key);
+      const deepMapGroupValue = {
+        items: [],
+        reducerResults: dataArray[i].aggregations || {}
+      };
+      deepMap.set(currentGroupKeys, deepMapGroupValue);
+      if (pivot) {
+        const pivotDeepMap = deepMapGroupValue.pivotDeepMap = new DeepMap();
+        const pivotContainer = dataArray[i].pivot;
+        traverseValues(pivotDeepMap, pivotContainer, pivot, 0, currentPivotKeys);
+      }
+      currentGroupKeys.pop();
+    }
+    next == null ? void 0 : next();
+  });
+  const result = {
+    deepMap,
+    groupParams,
+    initialData: rootData,
+    reducerResults: globalReducerResults
+  };
+  if (pivot) {
+    result.topLevelPivotColumns = topLevelPivotColumns;
+    result.pivot = pivot;
+  }
+  return result;
+}
+function group(groupParams, data) {
+  const {
+    groupBy,
+    defaultToKey = DEFAULT_TO_KEY,
+    pivot,
+    reducers
+  } = groupParams;
+  const groupByLength = groupBy.length;
+  const topLevelPivotColumns = pivot ? new DeepMap() : void 0;
+  const deepMap = new DeepMap();
+  let currentGroupKeys = [];
+  let currentPivotKeys = [];
+  const initialReducerValue = initReducers(reducers);
+  const globalReducerResults = __spreadValues({}, initialReducerValue);
+  for (let i = 0, len = data.length; i < len; i++) {
+    let item = data[i];
+    for (let groupByIndex = 0; groupByIndex < groupByLength; groupByIndex++) {
+      const { field: groupByProperty, toKey: groupToKey } = groupBy[groupByIndex];
+      const key = (groupToKey || defaultToKey)(item[groupByProperty], item);
+      currentGroupKeys.push(key);
+      if (!deepMap.has(currentGroupKeys)) {
+        const deepMapGroupValue = {
+          items: [],
+          reducerResults: __spreadValues({}, initialReducerValue)
+        };
+        if (pivot) {
+          deepMapGroupValue.pivotDeepMap = new DeepMap();
+        }
+        deepMap.set(currentGroupKeys, deepMapGroupValue);
       }
       const {
         items: currentGroupItems,
@@ -3125,7 +2816,7 @@ function group(groupParams, data) {
           if (!pivotDeepMap.has(currentPivotKeys)) {
             topLevelPivotColumns.set(currentPivotKeys, true);
             pivotDeepMap == null ? void 0 : pivotDeepMap.set(currentPivotKeys, {
-              reducerResults: [...initialReducerValue],
+              reducerResults: __spreadValues({}, initialReducerValue),
               items: []
             });
           }
@@ -3182,196 +2873,870 @@ function flatten(groupResult) {
       const items = deepMap.get(key).items;
       acc.push(...items);
     }
-    return acc;
-  }, result);
-  return result;
-}
-function getEnhancedGroupData(options, deepMapValue) {
-  const { groupBy, groupKeys, collapsed, parents } = options;
-  const groupNesting = groupKeys.length;
-  const { items: groupItems, reducerResults, pivotDeepMap } = deepMapValue;
-  const enhancedGroupData = {
-    data: null,
-    groupCount: groupItems.length,
-    groupData: groupItems,
-    groupKeys,
-    id: groupKeys,
-    collapsed,
-    parents,
-    collapsedChildrenCount: 0,
-    collapsedGroupsCount: 0,
-    indexInParentGroups: options.indexInParentGroups,
-    indexInGroup: options.indexInGroup,
-    indexInAll: options.indexInAll,
-    value: groupKeys[groupKeys.length - 1],
-    groupBy: groupBy.slice(0, groupNesting),
-    isGroupRow: true,
-    pivotValuesMap: pivotDeepMap,
-    groupNesting,
-    reducerResults
+    return acc;
+  }, result);
+  return result;
+}
+function getEnhancedGroupData(options, deepMapValue) {
+  const { groupBy, groupKeys, collapsed, parents, reducers } = options;
+  const groupNesting = groupKeys.length;
+  const { items: groupItems, reducerResults, pivotDeepMap } = deepMapValue;
+  let data = null;
+  if (Object.keys(reducerResults).length > 0) {
+    data = {};
+    for (let key in reducers)
+      if (reducers.hasOwnProperty(key)) {
+        const reducer = reducers[key];
+        const field = reducer.field;
+        if (field) {
+          data[field] = reducerResults[key];
+        }
+      }
+  }
+  const enhancedGroupData = {
+    data,
+    groupCount: groupItems.length,
+    groupData: groupItems,
+    groupKeys,
+    id: groupKeys,
+    collapsed,
+    parents,
+    collapsedChildrenCount: 0,
+    collapsedGroupsCount: 0,
+    indexInParentGroups: options.indexInParentGroups,
+    indexInGroup: options.indexInGroup,
+    indexInAll: options.indexInAll,
+    value: groupKeys[groupKeys.length - 1],
+    groupBy: groupBy.slice(0, groupNesting),
+    isGroupRow: true,
+    pivotValuesMap: pivotDeepMap,
+    groupNesting,
+    reducerResults
+  };
+  return enhancedGroupData;
+}
+function completeReducers(reducers, reducerResults, items) {
+  if (reducers) {
+    for (let key in reducers)
+      if (reducers.hasOwnProperty(key)) {
+        const reducer = reducers[key];
+        if (reducer.done) {
+          reducerResults[key] = reducer.done(reducerResults[key], items);
+        }
+      }
+  }
+  return reducerResults;
+}
+function enhancedFlatten(param) {
+  const {
+    groupResult,
+    toPrimaryKey,
+    groupRowsState,
+    generateGroupRows,
+    reducers = {}
+  } = param;
+  const { groupParams, deepMap, pivot } = groupResult;
+  const { groupBy } = groupParams;
+  const groupByStrings = groupBy.map((g) => g.field);
+  const result = [];
+  const parents = [];
+  const indexInParentGroups = [];
+  deepMap.visitDepthFirst((deepMapValue, groupKeys, indexInGroup, next) => {
+    var _a;
+    const items = deepMapValue.items;
+    const groupNesting = groupKeys.length;
+    const collapsed = (_a = groupRowsState == null ? void 0 : groupRowsState.isGroupRowCollapsed(groupKeys)) != null ? _a : false;
+    const enhancedGroupData = getEnhancedGroupData({
+      groupBy: groupByStrings,
+      parents: Array.from(parents),
+      reducers,
+      indexInGroup,
+      indexInParentGroups: Array.from(indexInParentGroups),
+      indexInAll: result.length,
+      groupKeys,
+      collapsed
+    }, deepMapValue);
+    const include = generateGroupRows || collapsed;
+    if (include) {
+      result.push(enhancedGroupData);
+    }
+    if (collapsed) {
+      parents.forEach((parent) => {
+        parent.collapsedChildrenCount += enhancedGroupData.groupCount;
+        parent.collapsedGroupsCount += 1;
+      });
+    }
+    indexInParentGroups.push(indexInGroup);
+    parents.push(enhancedGroupData);
+    if (!collapsed) {
+      if (!next) {
+        if (!pivot) {
+          const startIndex = result.length;
+          result.push(...items.map((item, index) => {
+            return {
+              id: toPrimaryKey(item),
+              data: item,
+              isGroupRow: false,
+              collapsed: false,
+              groupKeys,
+              parents: Array.from(parents),
+              indexInParentGroups: [...indexInParentGroups, index],
+              indexInGroup: index,
+              indexInAll: startIndex + index,
+              groupBy: groupByStrings,
+              groupNesting,
+              groupCount: enhancedGroupData.groupCount
+            };
+          }));
+        }
+      } else {
+        next();
+      }
+    }
+    parents.pop();
+    indexInParentGroups.pop();
+  });
+  return {
+    data: result
+  };
+}
+
+// src/components/hooks/useEffectWithChanges.ts
+import { useEffect as useEffect7, useRef as useRef5 } from "react";
+function useEffectWithChanges(fn, deps) {
+  const prevRef = useRef5({});
+  const oldValuesRef = useRef5({});
+  const oldValues = oldValuesRef.current;
+  const changesRef = useRef5({});
+  const changes = changesRef.current;
+  const useEffectDeps = [];
+  for (let k in deps) {
+    if (deps.hasOwnProperty(k)) {
+      if (deps[k] !== prevRef.current[k]) {
+        changes[k] = deps[k];
+        oldValues[k] = prevRef.current[k];
+      }
+      useEffectDeps.push(deps[k]);
+    }
+  }
+  prevRef.current = deps;
+  useEffect7(() => {
+    const changes2 = changesRef.current;
+    const result = fn(changes2, oldValues);
+    changesRef.current = {};
+    oldValuesRef.current = {};
+    return result;
+  }, useEffectDeps);
+}
+
+// src/components/DataSource/privateHooks/useLoadData.ts
+var SKIP_DATA_CHANGES_KEYS = {
+  originalDataArray: true,
+  changes: true
+};
+function buildDataSourceDataParams(componentState, overrides) {
+  var _a, _b;
+  const sortInfo = componentState.multiSort ? componentState.sortInfo : (_b = (_a = componentState.sortInfo) == null ? void 0 : _a[0]) != null ? _b : null;
+  const dataSourceParams = {
+    originalDataArray: componentState.originalDataArray,
+    sortInfo,
+    groupBy: componentState.groupBy,
+    pivotBy: componentState.pivotBy,
+    aggregationReducers: componentState.aggregationReducers
+  };
+  if (componentState.livePagination !== void 0) {
+    dataSourceParams.livePaginationCursor = componentState.livePaginationCursor;
+    dataSourceParams.cursorId = componentState.cursorId;
+  }
+  if (componentState.fullLazyLoad) {
+    if (componentState.lazyLoadBatchSize != null && componentState.lazyLoadBatchSize > 0) {
+      dataSourceParams.lazyLoadBatchSize = componentState.lazyLoadBatchSize;
+      dataSourceParams.lazyLoadStartIndex = 0;
+    }
+    dataSourceParams.groupKeys = [];
+  }
+  if (overrides) {
+    Object.assign(dataSourceParams, overrides);
+  }
+  const changes = {};
+  const oldDataSourceParams = componentState.dataParams || {};
+  for (let k in dataSourceParams) {
+    if (dataSourceParams.hasOwnProperty(k) && !SKIP_DATA_CHANGES_KEYS[k]) {
+      const key = k;
+      if (dataSourceParams[key] !== oldDataSourceParams[key]) {
+        changes[key] = true;
+      }
+    }
+  }
+  dataSourceParams.changes = changes;
+  return dataSourceParams;
+}
+function loadData(data, componentState, actions, overrides) {
+  const dataParams = buildDataSourceDataParams(componentState, overrides);
+  if (typeof data === "function") {
+    data = data(dataParams);
+  }
+  const dataIsPromise = typeof data === "object" && typeof data.then === "function";
+  if (dataIsPromise) {
+    actions.loading = true;
+  }
+  Promise.resolve(data).then((dataParam) => {
+    var _a, _b, _c;
+    let dataArray = [];
+    let skipAssign = false;
+    if (Array.isArray(dataParam.data)) {
+      const remoteData = dataParam;
+      dataArray = remoteData.data;
+      if (remoteData.livePaginationCursor !== void 0) {
+        actions.livePaginationCursor = remoteData.livePaginationCursor;
+      }
+      if (remoteData.mappings) {
+        actions.pivotMappings = remoteData.mappings;
+      }
+      if (componentState.fullLazyLoad && dataParams.groupKeys) {
+        const lazyGroupData = DeepMap.clone(componentState.originalLazyGroupData);
+        const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys];
+        const newGroupRowInfo = {
+          totalCount: (_a = remoteData.totalCount) != null ? _a : dataArray.length,
+          items: dataArray
+        };
+        if (dataParams.lazyLoadBatchSize) {
+          const existingGroupRowInfo = lazyGroupData.get(key);
+          const currentGroupRowInfo = existingGroupRowInfo != null ? existingGroupRowInfo : {
+            items: [],
+            totalCount: newGroupRowInfo.totalCount
+          };
+          currentGroupRowInfo.items.length = currentGroupRowInfo.totalCount;
+          const start = (_b = dataParams.lazyLoadStartIndex) != null ? _b : 0;
+          const end = start + ((_c = dataParams.lazyLoadBatchSize) != null ? _c : dataArray.length);
+          for (let i = start; i < end; i++) {
+            currentGroupRowInfo.items[i] = newGroupRowInfo.items[i - start];
+          }
+          if (!existingGroupRowInfo) {
+            lazyGroupData.set(key, currentGroupRowInfo);
+          }
+        } else {
+          lazyGroupData.set(key, newGroupRowInfo);
+        }
+        skipAssign = true;
+        actions.originalLazyGroupData = lazyGroupData;
+      }
+    } else {
+      dataArray = dataParam;
+    }
+    if (!skipAssign) {
+      actions.originalDataArray = dataArray;
+    }
+    if (dataIsPromise) {
+      actions.loading = false;
+    }
+  });
+}
+function useLoadData() {
+  const {
+    getComponentState,
+    componentActions: actions,
+    componentState
+  } = useComponentState();
+  const {
+    data,
+    notifyScrollbarsChange,
+    sortInfo,
+    groupBy,
+    pivotBy,
+    livePagination,
+    livePaginationCursor,
+    cursorId: stateCursorId,
+    lazyLoadBatchSize,
+    notifyScrollStop
+  } = componentState;
+  const [scrollbars, setScrollbars] = useState4({
+    vertical: false,
+    horizontal: false
+  });
+  const scrollbarsRef = useRef6(scrollbars);
+  useEffect8(() => {
+    notifyScrollbarsChange.onChange((scrollbars2) => {
+      if (!scrollbars2) {
+        return;
+      }
+      scrollbarsRef.current = scrollbars2;
+      setScrollbars(scrollbars2);
+    });
+    return () => notifyScrollbarsChange.destroy();
+  }, [notifyScrollbarsChange]);
+  useEffect8(() => {
+    const frameId = requestAnimationFrame(() => {
+      var _a;
+      if (!((_a = scrollbarsRef.current) == null ? void 0 : _a.vertical) && livePaginationCursor) {
+        actions.cursorId = livePaginationCursor;
+      }
+    });
+    return () => cancelAnimationFrame(frameId);
+  }, [livePaginationCursor]);
+  useEffect8(() => {
+    const { livePaginationCursor: livePaginationCursor2, livePagination: livePagination2 } = getComponentState();
+    if (!scrollbars.vertical && livePagination2) {
+      if (livePaginationCursor2) {
+        actions.cursorId = livePaginationCursor2;
+      }
+    }
+  }, [scrollbars.vertical]);
+  const depsObject = {
+    sortInfo,
+    groupBy,
+    pivotBy,
+    cursorId: livePagination ? stateCursorId : null
+  };
+  const initialRef = useRef6(true);
+  useEffect8(() => {
+    if (lazyLoadBatchSize && lazyLoadBatchSize > 0) {
+      return notifyScrollStop.onChange((param) => {
+        console.log("scroll stop", param);
+        if (!param) {
+          return;
+        }
+        const componentState2 = getComponentState();
+        const {
+          firstVisibleRowIndex: startIndex,
+          lastVisibleRowIndex: endIndex
+        } = param;
+        const firstBatchStart = Math.floor(startIndex / lazyLoadBatchSize) * lazyLoadBatchSize;
+        const lastBatchStart = Math.floor(endIndex / lazyLoadBatchSize) * lazyLoadBatchSize;
+        const isRowLoaded = (index) => componentState2.dataArray[index].data != null;
+        for (let batchStartIndex = firstBatchStart; batchStartIndex <= lastBatchStart; batchStartIndex = batchStartIndex + lazyLoadBatchSize) {
+          if (!isRowLoaded(batchStartIndex)) {
+            loadData(componentState2.data, componentState2, actions, {
+              lazyLoadBatchSize,
+              lazyLoadStartIndex: batchStartIndex
+            });
+          }
+        }
+      });
+    }
+    return;
+  }, [lazyLoadBatchSize]);
+  useEffectWithChanges(() => {
+    const componentState2 = getComponentState();
+    if (typeof componentState2.data !== "function") {
+      loadData(componentState2.data, componentState2, actions);
+    }
+  }, { data });
+  useEffectWithChanges(() => {
+    const componentState2 = getComponentState();
+    if (typeof componentState2.data === "function") {
+      loadData(componentState2.data, componentState2, actions);
+    }
+  }, __spreadProps(__spreadValues({}, depsObject), { data }));
+  useEffectWithChanges((_changes, _prevValues) => {
+    const componentState2 = getComponentState();
+    if (initialRef.current) {
+      initialRef.current = false;
+      actions.dataParams = buildDataSourceDataParams(componentState2);
+    }
+  }, depsObject);
+}
+
+// src/components/DataSource/state/normalizeSortInfo.ts
+var EMPTY_ARRAY = Object.freeze([]);
+var normalizeSortInfo = (initialSortInfo, weakMap) => {
+  const sortInfo = initialSortInfo != null ? initialSortInfo : EMPTY_ARRAY;
+  const result = Array.isArray(sortInfo) ? sortInfo : [sortInfo];
+  if (weakMap && weakMap.has(sortInfo)) {
+    const prevResult = weakMap.get(sortInfo);
+    if (prevResult && prevResult.length === result.length) {
+      return prevResult;
+    }
+  }
+  if (weakMap && sortInfo) {
+    weakMap.set(sortInfo, result);
+  }
+  return result;
+};
+
+// src/components/DataSource/GroupRowsState.ts
+var GroupRowsState = class {
+  constructor(state) {
+    this.update(state instanceof GroupRowsState ? state.getState() : state);
+  }
+  getState() {
+    var _a, _b, _c, _d;
+    return {
+      expandedRows: this.expandedAll ? true : (_b = (_a = this.expandedMap) == null ? void 0 : _a.topDownKeys()) != null ? _b : [],
+      collapsedRows: this.collapsedAll ? true : (_d = (_c = this.collapsedMap) == null ? void 0 : _c.topDownKeys()) != null ? _d : []
+    };
+  }
+  destroy() {
+    var _a, _b;
+    (_a = this.expandedMap) == null ? void 0 : _a.clear();
+    (_b = this.collapsedMap) == null ? void 0 : _b.clear();
+    delete this.expandedMap;
+    delete this.collapsedMap;
+  }
+  update(state) {
+    var _a, _b, _c, _d;
+    this.initialState = state;
+    const { collapsedRows, expandedRows } = this.initialState;
+    this.collapsedAll = collapsedRows === true;
+    this.expandedAll = expandedRows === true;
+    if (this.collapsedAll && this.expandedAll) {
+      throw `Cannot have both collapsedRows and expandedRows be true!`;
+    }
+    if (collapsedRows !== true) {
+      (_a = this.collapsedMap) == null ? void 0 : _a.clear();
+      this.collapsedMap = (_b = this.collapsedMap) != null ? _b : new DeepMap(collapsedRows.map((keys) => [keys, true]));
+    }
+    if (expandedRows !== true) {
+      (_c = this.expandedMap) == null ? void 0 : _c.clear();
+      this.expandedMap = (_d = this.expandedMap) != null ? _d : new DeepMap(expandedRows.map((keys) => [keys, true]));
+    }
+  }
+  areAllCollapsed() {
+    return this.collapsedAll && (this.expandedMap ? this.expandedMap.size === 0 : true);
+  }
+  areAllExpanded() {
+    return this.expandedAll && (this.collapsedMap ? this.collapsedMap.size === 0 : true);
+  }
+  collapseAll() {
+    this.update({
+      collapsedRows: true,
+      expandedRows: []
+    });
+  }
+  expandAll() {
+    this.update({
+      expandedRows: true,
+      collapsedRows: []
+    });
+  }
+  isGroupRowExpanded(keys) {
+    var _a, _b;
+    if (this.expandedAll === true) {
+      if (this.collapsedAll === true) {
+        throw 'Cannot have both expandedRows and collapsedRows be "true"';
+      }
+      return !((_a = this.collapsedMap) == null ? void 0 : _a.has(keys));
+    }
+    return (_b = this.expandedMap) == null ? void 0 : _b.has(keys);
+  }
+  isGroupRowCollapsed(keys) {
+    return !this.isGroupRowExpanded(keys);
+  }
+  setGroupRowExpanded(keys, shouldExpand) {
+    var _a;
+    if (shouldExpand === this.isGroupRowExpanded(keys)) {
+      return;
+    }
+    if (shouldExpand) {
+      if (this.collapsedAll === true) {
+        if (!this.expandedMap) {
+          throw `No expandedMap found when trying to expand group row ${keys.join(",")}`;
+        }
+        this.expandedMap.set(keys, true);
+      } else if (this.expandedAll === true) {
+        if (!this.collapsedMap) {
+          throw `No collapsedMap found when trying to expand group row ${keys.join(",")}`;
+        }
+        this.collapsedMap.delete(keys);
+      }
+    } else {
+      if (this.expandedAll === true) {
+        if (!this.collapsedMap) {
+          throw `No collapsedMap found when trying to collapse group row ${keys.join(",")}`;
+        }
+        this.collapsedMap.set(keys, true);
+      } else if (this.collapsedAll === true) {
+        if (!this.expandedMap) {
+          throw `No expandedMap found when trying to collapse group row ${keys.join(",")}`;
+        }
+        (_a = this.expandedMap) == null ? void 0 : _a.delete(keys);
+      }
+    }
+  }
+  collapseGroupRow(keys) {
+    this.setGroupRowExpanded(keys, false);
+  }
+  expandGroupRow(keys) {
+    this.setGroupRowExpanded(keys, true);
+  }
+  toggleGroupRow(keys) {
+    this.setGroupRowExpanded(keys, !this.isGroupRowExpanded(keys));
+  }
+};
+
+// src/utils/shallowEqualObjects.ts
+function shallowEqualObjects(objA, objB, ignoreKeys) {
+  if (objA === objB) {
+    return true;
+  }
+  if (!objA || !objB) {
+    return false;
+  }
+  var aKeys = Object.keys(objA);
+  var bKeys = Object.keys(objB);
+  if (ignoreKeys) {
+    aKeys = aKeys.filter((key2) => !ignoreKeys.has(key2));
+    bKeys = bKeys.filter((key2) => !ignoreKeys.has(key2));
+  }
+  var len = aKeys.length;
+  if (bKeys.length !== len) {
+    return false;
+  }
+  for (var i = 0; i < len; i++) {
+    var key = aKeys[i];
+    if (ignoreKeys) {
+      if (ignoreKeys.has(key)) {
+        continue;
+      }
+    }
+    if (objA[key] !== objB[key] || !Object.prototype.hasOwnProperty.call(objB, key)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// src/components/utils/discardCallsWithEqualArg.ts
+var map = new WeakMap();
+var getCompareDefault = (a) => a;
+function discardCallsWithEqualArg(fn, timeframe = 50, getCompareObject) {
+  map.set(fn, {
+    lastCallTime: 0,
+    lastCallArg: null
+  });
+  const getCompare = getCompareObject != null ? getCompareObject : getCompareDefault;
+  return (arg) => {
+    const { lastCallTime, lastCallArg } = map.get(fn) || {
+      lastCallTime: 0,
+      lastCallArg: null
+    };
+    const now = Date.now();
+    const diff = now - lastCallTime;
+    const objectsEqual = shallowEqualObjects(getCompare(lastCallArg), getCompare(arg));
+    if (diff < timeframe && objectsEqual) {
+      return;
+    }
+    map.set(fn, {
+      lastCallTime: now,
+      lastCallArg: arg
+    });
+    fn(arg);
+  };
+}
+
+// src/components/DataSource/state/getInitialState.ts
+var defaultCursorId = Symbol("cursorId");
+function initSetupState2() {
+  const now = Date.now();
+  const originalDataArray = [];
+  const dataArray = [];
+  const originalLazyGroupData = new DeepMap();
+  return {
+    dataParams: void 0,
+    notifyScrollbarsChange: buildSubscriptionCallback(),
+    notifyScrollStop: buildSubscriptionCallback(),
+    pivotTotalColumnPosition: "end",
+    originalLazyGroupData,
+    originalDataArray,
+    cursorId: defaultCursorId,
+    showSeparatePivotColumnForSingleAggregation: false,
+    propsCache: new Map([
+      ["sortInfo", new WeakMap()]
+    ]),
+    pivotMappings: void 0,
+    pivotColumns: void 0,
+    pivotColumnGroups: void 0,
+    dataArray,
+    updatedAt: now,
+    groupedAt: 0,
+    sortedAt: 0,
+    reducedAt: now,
+    generateGroupRows: true,
+    groupDeepMap: void 0,
+    postSortDataArray: void 0,
+    postGroupDataArray: void 0,
+    lastSortDataArray: void 0,
+    lastGroupDataArray: void 0
+  };
+}
+function getCompareObjectForDataParams(dataParams) {
+  const obj = __spreadValues({}, dataParams);
+  delete obj.originalDataArray;
+  return obj;
+}
+var forwardProps3 = (setupState) => {
+  return {
+    onDataParamsChange: (fn) => fn ? discardCallsWithEqualArg(fn, 100, getCompareObjectForDataParams) : void 0,
+    fullLazyLoad: 1,
+    data: 1,
+    pivotBy: 1,
+    primaryKey: 1,
+    livePagination: 1,
+    lazyLoadBatchSize: (lazyLoadBatchSize) => lazyLoadBatchSize != null ? lazyLoadBatchSize : -1,
+    aggregationReducers: 1,
+    collapseGroupRowsOnDataFunctionChange: (collapseGroupRowsOnDataFunctionChange) => collapseGroupRowsOnDataFunctionChange != null ? collapseGroupRowsOnDataFunctionChange : true,
+    loading: (loading) => loading != null ? loading : false,
+    sortInfo: (sortInfo) => normalizeSortInfo(sortInfo, setupState.propsCache.get("sortInfo")),
+    groupBy: (groupBy) => groupBy != null ? groupBy : [],
+    groupRowsState: (groupRowsState) => {
+      return groupRowsState || new GroupRowsState({
+        expandedRows: true,
+        collapsedRows: []
+      });
+    }
   };
-  return enhancedGroupData;
+};
+function getLivePaginationCursorValue(livePaginationCursorProp, state) {
+  const livePaginationCursor = typeof livePaginationCursorProp === "function" ? livePaginationCursorProp({
+    array: state.originalDataArray,
+    length: state.originalDataArray.length,
+    lastItem: state.originalDataArray[state.originalDataArray.length - 1]
+  }) : livePaginationCursorProp;
+  return livePaginationCursor;
 }
-function completeReducers(reducers, reducerResults, items) {
-  if (reducers && reducers.length) {
-    reducers == null ? void 0 : reducers.forEach((reducer, index) => {
-      if (reducer.done) {
-        reducerResults[index] = reducer.done(reducerResults[index], items);
-      }
-    });
+function mapPropsToState2(params) {
+  const { props, state, oldState } = params;
+  const controlledSort = isControlledValue(props.sortInfo);
+  const result = {
+    controlledSort,
+    multiSort: Array.isArray(controlledSort ? props.sortInfo : props.defaultSortInfo)
+  };
+  if (props.livePagination) {
+    const dataArrayChanged = !oldState || oldState.originalDataArray !== state.originalDataArray;
+    const livePaginationCursor = typeof props.livePaginationCursor === "function" ? dataArrayChanged ? getLivePaginationCursorValue(props.livePaginationCursor, state) : state.livePaginationCursor : props.livePaginationCursor;
+    result.livePaginationCursor = livePaginationCursor;
   }
-  return reducerResults;
+  return result;
 }
-function enhancedFlatten(param) {
-  const { groupResult, toPrimaryKey, groupRowsState, generateGroupRows } = param;
-  const { groupParams, deepMap, pivot } = groupResult;
-  const { groupBy } = groupParams;
-  const groupByStrings = groupBy.map((g) => g.field);
-  const result = [];
-  const parents = [];
-  const indexInParentGroups = [];
-  deepMap.visitDepthFirst((deepMapValue, groupKeys, indexInGroup, next) => {
-    var _a;
-    const items = deepMapValue.items;
-    const groupNesting = groupKeys.length;
-    const collapsed = (_a = groupRowsState == null ? void 0 : groupRowsState.isGroupRowCollapsed(groupKeys)) != null ? _a : false;
-    const enhancedGroupData = getEnhancedGroupData({
-      groupBy: groupByStrings,
-      parents: Array.from(parents),
-      indexInGroup,
-      indexInParentGroups: Array.from(indexInParentGroups),
-      indexInAll: result.length,
-      groupKeys,
-      collapsed
-    }, deepMapValue);
-    const include = generateGroupRows || collapsed;
-    if (include) {
-      result.push(enhancedGroupData);
-    }
-    if (collapsed) {
-      parents.forEach((parent) => {
-        parent.collapsedChildrenCount += enhancedGroupData.groupCount;
-        parent.collapsedGroupsCount += 1;
+var debugFullLazyLoad = dbg("DataSource:fullLazyLoad");
+function onPropChange(params, props, actions) {
+  const { name, newValue } = params;
+  if (name === "data" && typeof newValue === "function" && !props.groupRowsState) {
+    if (props.fullLazyLoad) {
+      debugFullLazyLoad(`"data" function prop has changed`);
+    }
+    if (props.collapseGroupRowsOnDataFunctionChange !== false) {
+      actions.groupRowsState = new GroupRowsState({
+        collapsedRows: true,
+        expandedRows: []
       });
     }
-    indexInParentGroups.push(indexInGroup);
-    parents.push(enhancedGroupData);
-    if (!collapsed) {
-      if (!next) {
-        if (!pivot) {
-          const startIndex = result.length;
-          result.push(...items.map((item, index) => {
-            return {
-              id: toPrimaryKey(item),
-              data: item,
-              isGroupRow: false,
-              collapsed: false,
-              groupKeys,
-              parents: Array.from(parents),
-              indexInParentGroups: [...indexInParentGroups, index],
-              indexInGroup: index,
-              indexInAll: startIndex + index,
-              groupBy: groupByStrings,
-              groupNesting,
-              groupCount: enhancedGroupData.groupCount
-            };
-          }));
-        }
-      } else {
-        next();
+  }
+}
+var debugDataParams = dbg("DataSource:dataParams");
+function getInterceptActions() {
+  return {
+    sortInfo: (sortInfo, { actions, state }) => {
+      const dataParams = buildDataSourceDataParams(state, {
+        sortInfo,
+        livePaginationCursor: null
+      });
+      actions.dataParams = dataParams;
+      if (state.livePagination) {
+        requestAnimationFrame(() => {
+          actions.livePaginationCursor = null;
+        });
+      }
+    },
+    groupBy: (groupBy, { actions, state }) => {
+      const dataParams = buildDataSourceDataParams(state, {
+        groupBy,
+        livePaginationCursor: null
+      });
+      actions.dataParams = dataParams;
+      if (state.livePagination) {
+        requestAnimationFrame(() => {
+          actions.livePaginationCursor = null;
+        });
+      }
+    },
+    pivotBy: (pivotBy, { actions, state }) => {
+      const dataParams = buildDataSourceDataParams(state, {
+        pivotBy,
+        livePaginationCursor: null
+      });
+      actions.dataParams = dataParams;
+      if (state.livePagination) {
+        requestAnimationFrame(() => {
+          actions.livePaginationCursor = null;
+        });
+      }
+    },
+    cursorId: (cursorId, { actions, state }) => {
+      const dataParams = buildDataSourceDataParams(state, {
+        cursorId
+      });
+      actions.dataParams = dataParams;
+    },
+    livePaginationCursor: (livePaginationCursor, { actions, state }) => {
+      const dataParams = buildDataSourceDataParams(state, {
+        livePaginationCursor
+      });
+      actions.dataParams = dataParams;
+    },
+    dataParams: (dataParams, { state }) => {
+      if (shallowEqualObjects(dataParams, state.dataParams, new Set([
+        "changes",
+        "originalDataArray"
+      ]))) {
+        return false;
       }
+      debugDataParams("onDataParamsChange triggered because the following values have changed", dataParams == null ? void 0 : dataParams.changes);
+      return true;
     }
-    parents.pop();
-    indexInParentGroups.pop();
-  });
-  return {
-    data: result
   };
 }
 
 // src/utils/groupAndPivot/getPivotColumnsAndColumnGroups.ts
-function getPivotColumnsAndColumnGroups(deepMap, pivotBy, pivotTotalColumnPosition) {
+function prepareColumn(column) {
+  const { pivotByAtIndex: pivotByForColumn } = column;
+  if (pivotByForColumn == null ? void 0 : pivotByForColumn.column) {
+    if (typeof pivotByForColumn.column === "function") {
+      Object.assign(column, pivotByForColumn.column({ column }));
+    } else {
+      Object.assign(column, pivotByForColumn.column);
+    }
+  }
+  return column;
+}
+function prepareColumnGroup(columnGroup) {
+  const { pivotByAtIndex: pivotByForColumnGroup } = columnGroup;
+  if (pivotByForColumnGroup == null ? void 0 : pivotByForColumnGroup.columnGroup) {
+    if (typeof pivotByForColumnGroup.columnGroup === "function") {
+      Object.assign(columnGroup, pivotByForColumnGroup.columnGroup({ columnGroup }));
+    } else {
+      Object.assign(columnGroup, pivotByForColumnGroup.columnGroup);
+    }
+  }
+  return columnGroup;
+}
+function getPivotColumnsAndColumnGroups({
+  deepMap,
+  pivotBy,
+  pivotTotalColumnPosition,
+  reducers = {},
+  showSeparatePivotColumnForSingleAggregation = false
+}) {
   const pivotLength = pivotBy.length;
+  const aggregationReducers = Object.keys(reducers).map((key) => {
+    return __spreadProps(__spreadValues({}, reducers[key]), { id: key });
+  });
   const columns = new Map([
     [
       "labels",
       {
         header: "Row labels",
+        pivotBy,
         valueGetter: (params) => {
           var _a;
           const { rowInfo } = params;
+          if (!rowInfo.data) {
+            return "Loading ... TODO replace this with a loading indicator";
+          }
           return rowInfo.groupKeys ? rowInfo.groupKeys[((_a = rowInfo.groupKeys) == null ? void 0 : _a.length) - 1] : null;
         }
       }
     ]
   ]);
   const columnGroups = new Map();
+  const isSingleAggregationColumn = !showSeparatePivotColumnForSingleAggregation && aggregationReducers.length === 1;
   deepMap.visitDepthFirst((_value, keys, _indexInGroup, next) => {
     keys = [...keys];
     if (pivotTotalColumnPosition === "end") {
       next == null ? void 0 : next();
     }
     if (keys.length === pivotLength) {
-      const parentKeys = keys.slice(0, -1);
-      let columnGroupId = parentKeys.join("/");
       const pivotByForColumn = pivotBy[keys.length - 1];
-      let computedPivotColumn = __spreadValues({
-        pivotBy,
-        pivotColumn: true,
-        pivotGroupKeys: keys,
-        pivotGroupKeyForColumn: keys[keys.length - 1],
-        pivotIndexForColumn: keys.length - 1,
-        pivotByForColumn,
-        sortable: false,
-        columnGroup: parentKeys.length ? `${columnGroupId}` : void 0,
-        header: keys[keys.length - 1],
-        valueGetter: ({ rowInfo }) => {
-          var _a, _b, _c;
-          const value = (_c = (_b = (_a = rowInfo.pivotValuesMap) == null ? void 0 : _a.get(keys)) == null ? void 0 : _b.reducerResults[0]) != null ? _c : null;
-          return value;
-        }
-      }, pivotByForColumn.column);
-      if (pivotByForColumn.column) {
-        if (typeof pivotByForColumn.column === "function") {
-          Object.assign(computedPivotColumn, pivotByForColumn.column({ column: computedPivotColumn }));
-        } else {
-          Object.assign(computedPivotColumn, pivotByForColumn.column);
-        }
-      }
-      columns.set(`${keys.join("/")}`, computedPivotColumn);
-    } else {
-      const colGroupId = keys.join("/");
       const parentKeys = keys.slice(0, -1);
-      columnGroups.set(colGroupId, {
-        columnGroup: parentKeys.length ? parentKeys.join("/") : void 0,
-        header: keys.join(" >> ")
-      });
-      if (pivotTotalColumnPosition !== false) {
-        const pivotByForColumn = pivotBy[keys.length - 1];
-        let computedPivotColumn = __spreadValues({
-          columnGroup: parentKeys.length ? parentKeys.join("/") : void 0,
-          header: `${keys.join("/")} total `,
-          pivotTotalColumn: true,
+      let parentColumnGroupId = parentKeys.join("/");
+      if (!isSingleAggregationColumn) {
+        const columnGroupId = parentColumnGroupId;
+        parentColumnGroupId = keys.join("/");
+        const pivotGroupKey = keys[keys.length - 1];
+        columnGroups.set(parentColumnGroupId, prepareColumnGroup({
+          header: pivotGroupKey,
+          columnGroup: columnGroupId,
+          pivotBy,
           pivotGroupKeys: keys,
-          pivotGroupKeyForColumn: keys[keys.length - 1],
-          pivotByForColumn,
-          pivotIndexForColumn: keys.length - 1,
+          pivotByAtIndex: pivotByForColumn,
+          pivotIndex: keys.length - 1,
+          pivotGroupKey
+        }));
+      }
+      aggregationReducers.forEach((reducer, index) => {
+        const header = isSingleAggregationColumn ? keys[keys.length - 1] : reducer.name || reducer.id;
+        const computedPivotColumn = prepareColumn({
           pivotBy,
+          pivotColumn: true,
+          pivotTotalColumn: false,
+          pivotAggregator: reducer,
+          pivotAggregatorIndex: index,
+          pivotGroupKeys: keys,
+          pivotGroupKey: keys[keys.length - 1],
+          pivotIndex: keys.length - 1,
+          pivotByAtIndex: pivotByForColumn,
           sortable: false,
+          columnGroup: parentColumnGroupId,
+          header,
           valueGetter: ({ rowInfo }) => {
-            var _a, _b, _c;
-            const value = (_c = (_b = (_a = rowInfo.pivotValuesMap) == null ? void 0 : _a.get(keys)) == null ? void 0 : _b.reducerResults[0]) != null ? _c : null;
-            return value;
-          }
-        }, pivotByForColumn.column);
-        if (pivotByForColumn.column) {
-          if (typeof pivotByForColumn.column === "function") {
-            Object.assign(computedPivotColumn, pivotByForColumn.column({ column: computedPivotColumn }));
-          } else {
-            Object.assign(computedPivotColumn, pivotByForColumn.column);
+            var _a, _b;
+            return (_b = (_a = rowInfo.pivotValuesMap) == null ? void 0 : _a.get(keys)) == null ? void 0 : _b.reducerResults[reducer.id];
           }
+        });
+        const columnId = `${reducer.id}:${keys.join("/")}`;
+        columns.set(columnId, computedPivotColumn);
+      });
+    } else {
+      const colGroupId = keys.join("/");
+      const parentKeys = keys.slice(0, -1);
+      columnGroups.set(colGroupId, prepareColumnGroup({
+        columnGroup: parentKeys.length ? parentKeys.join("/") : void 0,
+        header: keys[keys.length - 1],
+        pivotBy,
+        pivotGroupKeys: keys,
+        pivotIndex: keys.length - 1,
+        pivotByAtIndex: pivotBy[keys.length - 1],
+        pivotGroupKey: keys[keys.length - 1]
+      }));
+      if (pivotTotalColumnPosition !== false) {
+        const pivotByForColumn = pivotBy[keys.length - 1];
+        let columnGroupId = parentKeys.length ? parentKeys.join("/") : void 0;
+        if (!isSingleAggregationColumn) {
+          let parentGroupForTotalsGroup = columnGroupId;
+          columnGroupId = `total:${keys.join("/")}`;
+          columnGroups.set(columnGroupId, prepareColumnGroup({
+            header: `${keys[keys.length - 1]} total`,
+            columnGroup: parentGroupForTotalsGroup,
+            pivotBy,
+            pivotTotalColumnGroup: true,
+            pivotGroupKeys: keys,
+            pivotIndex: keys.length - 1,
+            pivotByAtIndex: pivotByForColumn,
+            pivotGroupKey: keys[keys.length - 1]
+          }));
         }
-        columns.set(`${keys.join("/")}-total`, computedPivotColumn);
+        aggregationReducers.forEach((reducer, index) => {
+          const header = isSingleAggregationColumn ? `${keys[keys.length - 1]} total ` : `${reducer.name || reducer.id} total`;
+          const computedPivotColumn = prepareColumn({
+            columnGroup: columnGroupId,
+            header,
+            pivotAggregator: reducer,
+            pivotAggregatorIndex: index,
+            pivotColumn: true,
+            pivotTotalColumn: true,
+            pivotGroupKeys: keys,
+            pivotGroupKey: keys[keys.length - 1],
+            pivotByAtIndex: pivotByForColumn,
+            pivotIndex: keys.length - 1,
+            pivotBy,
+            sortable: false,
+            valueGetter: ({ rowInfo }) => {
+              var _a, _b;
+              return (_b = (_a = rowInfo.pivotValuesMap) == null ? void 0 : _a.get(keys)) == null ? void 0 : _b.reducerResults[reducer.id];
+            }
+          });
+          columns.set(`total:${reducer.id}:${keys.join("/")}`, computedPivotColumn);
+        });
       }
     }
     if (pivotTotalColumnPosition === "start" || pivotTotalColumnPosition === false) {
@@ -3379,12 +3744,22 @@ function getPivotColumnsAndColumnGroups(deepMap, pivotBy, pivotTotalColumnPositi
     }
   });
   if (columns.size === 1) {
-    columns.set("single", {
-      header: "Reduced",
-      valueGetter: ({ rowInfo }) => {
-        var _a;
-        return (_a = rowInfo.reducerResults) == null ? void 0 : _a[0];
-      }
+    aggregationReducers.forEach((reducer, index) => {
+      columns.set(`total:${reducer.id}`, prepareColumn({
+        header: `${reducer.name || reducer.id} total`,
+        pivotBy,
+        pivotColumn: true,
+        pivotTotalColumn: true,
+        pivotAggregator: reducer,
+        pivotAggregatorIndex: index,
+        pivotGroupKeys: [],
+        pivotGroupKey: "",
+        pivotIndex: -1,
+        valueGetter: ({ rowInfo }) => {
+          var _a;
+          return (_a = rowInfo.reducerResults) == null ? void 0 : _a[reducer.id];
+        }
+      }));
     });
   }
   const result = {
@@ -3407,29 +3782,39 @@ var haveDepsChanged = (state1, state2, deps) => {
   return false;
 };
 function toRowInfo(data, id, index) {
-  return { data, collapsed: true, id, indexInAll: index, indexInGroup: index };
+  return {
+    data,
+    collapsed: true,
+    id,
+    indexInAll: index,
+    indexInGroup: index,
+    isGroupRow: false
+  };
 }
 function concludeReducer(params) {
   var _a;
   const { state, previousState } = params;
   const sortInfo = state.sortInfo;
   const shouldSort = !!(sortInfo == null ? void 0 : sortInfo.length) && !state.controlledSort;
-  const sortDepsChanged = haveDepsChanged(previousState, state, [
-    "originalDataArray",
-    "sortInfo"
+  const originalDataArrayChanged = haveDepsChanged(previousState, state, [
+    "originalDataArray"
   ]);
+  const sortInfoChanged = haveDepsChanged(previousState, state, ["sortInfo"]);
+  const sortDepsChanged = originalDataArrayChanged || sortInfoChanged;
   const shouldSortAgain = shouldSort && (sortDepsChanged || !state.lastSortDataArray);
-  const groupBy = state.groupRowsBy;
+  const groupBy = state.groupBy;
   const pivotBy = state.pivotBy;
   const shouldGroup = groupBy.length || pivotBy;
   const groupsDepsChanged = haveDepsChanged(previousState, state, [
     "generateGroupRows",
     "originalDataArray",
-    "groupRowsBy",
+    "originalLazyGroupData",
+    "groupBy",
     "groupRowsState",
     "pivotBy",
     "aggregationReducers",
     "pivotTotalColumnPosition",
+    "showSeparatePivotColumnForSingleAggregation",
     "sortInfo"
   ]);
   const shouldGroupAgain = shouldGroup && (groupsDepsChanged || !state.lastGroupDataArray);
@@ -3448,20 +3833,32 @@ function concludeReducer(params) {
   };
   if (shouldGroup) {
     if (shouldGroupAgain) {
-      const groupResult = group({
+      const groupResult = state.fullLazyLoad ? lazyGroup({
+        groupBy,
+        pivot: pivotBy,
+        mappings: state.pivotMappings,
+        reducers: state.aggregationReducers
+      }, state.originalLazyGroupData) : group({
         groupBy,
         pivot: pivotBy,
         reducers: state.aggregationReducers
       }, dataArray);
       const flattenResult = enhancedFlatten({
         groupResult,
+        reducers: state.aggregationReducers,
         toPrimaryKey,
         groupRowsState: state.groupRowsState,
         generateGroupRows: state.generateGroupRows
       });
       rowInfoDataArray = flattenResult.data;
       state.groupDeepMap = groupResult.deepMap;
-      const pivotGroupsAndCols = pivotBy ? getPivotColumnsAndColumnGroups(groupResult.topLevelPivotColumns, pivotBy, (_a = state.pivotTotalColumnPosition) != null ? _a : "end") : void 0;
+      const pivotGroupsAndCols = pivotBy ? getPivotColumnsAndColumnGroups({
+        deepMap: groupResult.topLevelPivotColumns,
+        pivotBy,
+        pivotTotalColumnPosition: (_a = state.pivotTotalColumnPosition) != null ? _a : "end",
+        reducers: state.aggregationReducers,
+        showSeparatePivotColumnForSingleAggregation: state.showSeparatePivotColumnForSingleAggregation
+      }) : void 0;
       state.pivotColumns = pivotGroupsAndCols == null ? void 0 : pivotGroupsAndCols.columns;
       state.pivotColumnGroups = pivotGroupsAndCols == null ? void 0 : pivotGroupsAndCols.columnGroups;
     } else {
@@ -3509,6 +3906,7 @@ var DataSourceRoot = getComponentStateRoot({
   forwardProps: forwardProps3,
   concludeReducer,
   mapPropsToState: mapPropsToState2,
+  onPropChange,
   interceptActions: getInterceptActions()
 });
 function DataSourceCmp({ children }) {
@@ -3540,57 +3938,63 @@ function DataSource(props) {
 function useToggleGroupRow() {
   const { getState: getDataSourceState, componentActions: dataSourceActions } = useDataSourceContextValue();
   const toggleGroupRow = useCallback4((groupKeys) => {
-    const newState = new GroupRowsState(getDataSourceState().groupRowsState);
+    const state = getDataSourceState();
+    const newState = new GroupRowsState(state.groupRowsState);
     newState.toggleGroupRow(groupKeys);
     dataSourceActions.groupRowsState = newState;
+    if (state.fullLazyLoad && newState.isGroupRowExpanded(groupKeys)) {
+      loadData(state.data, state, dataSourceActions, {
+        groupKeys
+      });
+    }
   }, []);
   return toggleGroupRow;
 }
 
 // src/components/InfiniteTable/hooks/useColumnsWhen.ts
-function useGroupRowsMap(groupRowsBy) {
-  const groupRowsMap = useMemo5(() => {
-    return groupRowsBy.reduce((acc, groupBy, index) => {
-      acc.set(groupBy.field, {
-        groupBy,
+function useGroupByMap(groupBy) {
+  const groupByMap = useMemo4(() => {
+    return groupBy.reduce((acc, groupBy2, index) => {
+      acc.set(groupBy2.field, {
+        groupBy: groupBy2,
         groupIndex: index
       });
       return acc;
     }, new Map());
-  }, [groupRowsBy]);
-  return groupRowsMap;
+  }, [groupBy]);
+  return groupByMap;
 }
 function useColumnsWhen() {
   const {
-    componentState: { groupRowsBy },
+    componentState: { groupBy },
     componentActions: dataSourceActions
   } = useDataSourceContextValue();
   const {
     componentState: { groupRenderStrategy, pivotTotalColumnPosition }
   } = useComponentState();
-  const groupRowsMap = useGroupRowsMap(groupRowsBy);
-  useEffect10(() => {
+  const groupByMap = useGroupByMap(groupBy);
+  useEffect9(() => {
     dataSourceActions.generateGroupRows = groupRenderStrategy !== "inline";
   }, [groupRenderStrategy]);
-  useEffect10(() => {
+  useEffect9(() => {
     dataSourceActions.pivotTotalColumnPosition = pivotTotalColumnPosition;
   }, [pivotTotalColumnPosition]);
-  useColumnsWhenInlineGroupRenderStrategy(groupRowsMap);
+  useColumnsWhenInlineGroupRenderStrategy(groupByMap);
   useColumnsWhenPivoting();
   useColumnsWhenGrouping();
-  useHideEmptyGroupColumns(groupRowsMap);
+  useHideEmptyGroupColumns(groupByMap);
 }
-function useColumnsWhenInlineGroupRenderStrategy(groupRowsMap) {
+function useColumnsWhenInlineGroupRenderStrategy(groupByMap) {
   const toggleGroupRow = useToggleGroupRow();
   const {
     componentActions,
     componentState: { columns, groupRenderStrategy }
   } = useComponentState();
-  function computeColumnsWhenInlineGroupRenderStrategy(columns2, groupRowsMap2, groupRenderStrategy2, toggleGroupRow2) {
+  function computeColumnsWhenInlineGroupRenderStrategy(columns2, groupByMap2, groupRenderStrategy2, toggleGroupRow2) {
     const computedColumns = new Map();
     columns2.forEach((column, id) => {
       let base = {};
-      const groupByForColumn = groupRowsMap2.get(column.field);
+      const groupByForColumn = groupByMap2.get(column.field);
       if (groupByForColumn && groupRenderStrategy2 === "inline") {
         const { groupIndex } = groupByForColumn;
         const field = groupByForColumn.groupBy.field;
@@ -3635,9 +4039,9 @@ function useColumnsWhenInlineGroupRenderStrategy(groupRowsMap) {
     });
     return computedColumns.size === 0 ? void 0 : computedColumns;
   }
-  useEffect10(() => {
+  useEffect9(() => {
     const update = () => {
-      componentActions.columnsWhenInlineGroupRenderStrategy = computeColumnsWhenInlineGroupRenderStrategy(columns, groupRowsMap, groupRenderStrategy, toggleGroupRow);
+      componentActions.columnsWhenInlineGroupRenderStrategy = computeColumnsWhenInlineGroupRenderStrategy(columns, groupByMap, groupRenderStrategy, toggleGroupRow);
     };
     update();
     return interceptMap(columns, {
@@ -3645,11 +4049,11 @@ function useColumnsWhenInlineGroupRenderStrategy(groupRowsMap) {
       delete: update,
       clear: update
     });
-  }, [columns, groupRowsMap, groupRenderStrategy, toggleGroupRow]);
+  }, [columns, groupByMap, groupRenderStrategy, toggleGroupRow]);
 }
 function useColumnsWhenPivoting() {
   const {
-    componentState: { groupRowsBy, pivotBy }
+    componentState: { groupBy, pivotBy }
   } = useDataSourceContextValue();
   const {
     componentActions,
@@ -3661,13 +4065,13 @@ function useColumnsWhenPivoting() {
     }
   } = useComponentState();
   const toggleGroupRow = useToggleGroupRow();
-  useEffect10(() => {
+  useEffect9(() => {
     const computedPivotColumns = getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, {
       pivotColumn,
       pivotRowLabelsColumn,
       pivotTotalColumnPosition,
       pivotBy,
-      groupRowsBy,
+      groupBy,
       toggleGroupRow
     });
     componentActions.computedPivotColumns = computedPivotColumns;
@@ -3675,14 +4079,14 @@ function useColumnsWhenPivoting() {
 }
 function useColumnsWhenGrouping() {
   const {
-    componentState: { groupRowsBy }
+    componentState: { groupBy }
   } = useDataSourceContextValue();
   const {
     componentActions,
     componentState: { columns, groupColumn, groupRenderStrategy, pivotColumns }
   } = useComponentState();
   const toggleGroupRow = useToggleGroupRow();
-  useEffect10(() => {
+  useEffect9(() => {
     if (pivotColumns) {
       return;
     }
@@ -3691,7 +4095,7 @@ function useColumnsWhenGrouping() {
         columns,
         groupColumn,
         groupRenderStrategy,
-        groupRowsBy,
+        groupBy,
         pivotColumns,
         toggleGroupRow
       });
@@ -3703,11 +4107,11 @@ function useColumnsWhenGrouping() {
       delete: update,
       clear: update
     });
-  }, [groupRowsBy, groupColumn, groupRenderStrategy, pivotColumns]);
+  }, [columns, groupBy, groupColumn, groupRenderStrategy, pivotColumns]);
 }
 function useHideEmptyGroupColumns(groupRowsMap) {
   const {
-    componentState: { groupRowsBy, groupRowsState },
+    componentState: { groupBy, groupRowsState },
     getState: getDataSourceState
   } = useDataSourceContextValue();
   const {
@@ -3719,11 +4123,11 @@ function useHideEmptyGroupColumns(groupRowsMap) {
       groupRenderStrategy
     }
   } = useComponentState();
-  useEffect10(() => {
-    if (groupRenderStrategy === "single-column") {
+  useEffect9(() => {
+    if (groupRenderStrategy !== "multi-column") {
       return;
     }
-    const groupsLength = groupRowsBy.length;
+    const groupsLength = groupBy.length;
     let expandedGroupsLevel = 0;
     const { dataArray } = getDataSourceState();
     const len = dataArray.length;
@@ -3737,20 +4141,20 @@ function useHideEmptyGroupColumns(groupRowsMap) {
     const currentState = getComponentState();
     const { computedColumns } = currentState;
     let updated = false;
-    const columnVisibility = new Map(currentState.columnVisibility);
+    const columnVisibility = __spreadValues({}, currentState.columnVisibility);
     const cols = computedColumns;
-    groupRowsBy.forEach(({ field }, index) => {
-      const colId = groupRenderStrategy === "multi-column" ? `group-by-${field}` : field;
-      const col = cols.get(colId);
+    groupBy.forEach(({ field, column: groupColumn }, index) => {
+      const colId = (groupColumn == null ? void 0 : groupColumn.id) || `group-by-${field}`;
+      let col = cols.get(colId);
       if (!col) {
         return;
       }
-      const shouldBeHidden = index > expandedGroupsLevel;
+      const shouldBeHidden = index > expandedGroupsLevel && hideEmptyGroupColumns;
       updated = true;
-      if (shouldBeHidden && hideEmptyGroupColumns) {
-        columnVisibility.set(colId, false);
+      if (shouldBeHidden) {
+        columnVisibility[colId] = false;
       } else {
-        columnVisibility.delete(colId);
+        delete columnVisibility[colId];
       }
     });
     if (updated) {
@@ -3760,7 +4164,7 @@ function useHideEmptyGroupColumns(groupRowsMap) {
     getDataSourceState,
     groupRenderStrategy,
     generatedColumns,
-    groupRowsBy,
+    groupBy,
     groupRowsMap,
     hideEmptyGroupColumns ? groupRowsState : null,
     hideEmptyGroupColumns
@@ -3769,7 +4173,7 @@ function useHideEmptyGroupColumns(groupRowsMap) {
 function getColumnsWhenGrouping(params) {
   const {
     pivotColumns,
-    groupRowsBy,
+    groupBy,
     groupColumn,
     groupRenderStrategy,
     toggleGroupRow,
@@ -3783,10 +4187,10 @@ function getColumnsWhenGrouping(params) {
   }
   const computedColumns = new Map();
   if (groupRenderStrategy === "multi-column") {
-    groupRowsBy.forEach((groupByForColumn, groupIndexForColumn, arr) => {
+    groupBy.forEach((groupByForColumn, groupIndexForColumn, arr) => {
       const generatedGroupColumn = getColumnForGroupBy({
         groupByForColumn,
-        groupRowsBy,
+        groupBy,
         groupIndexForColumn,
         groupCount: arr.length,
         groupRenderStrategy
@@ -3795,8 +4199,8 @@ function getColumnsWhenGrouping(params) {
     });
   } else if (groupRenderStrategy === "single-column") {
     const singleGroupColumn = getSingleGroupColumn({
-      groupCount: groupRowsBy.length,
-      groupRowsBy,
+      groupCount: groupBy.length,
+      groupBy,
       groupRenderStrategy
     }, toggleGroupRow, groupColumn);
     computedColumns.set(singleGroupColumn.id || "group-by", singleGroupColumn);
@@ -3813,7 +4217,8 @@ function useComputed() {
   const { componentActions, componentState } = useComponentState();
   const {
     componentActions: dataSourceActions,
-    componentState: dataSourceState
+    componentState: dataSourceState,
+    getState: getDataSourceState
   } = useDataSourceContextValue();
   const {
     columnOrder,
@@ -3821,7 +4226,8 @@ function useComputed() {
     columnPinning,
     columnSizing,
     columnTypes,
-    bodySize
+    bodySize,
+    showSeparatePivotColumnForSingleAggregation
   } = componentState;
   useState5(() => {
     componentState.onRowHeightCSSVarChange.onChange((rowHeight) => {
@@ -3835,7 +4241,9 @@ function useComputed() {
       }
     });
   });
-  useColumnAggregations();
+  useEffect10(() => {
+    dataSourceActions.showSeparatePivotColumnForSingleAggregation = showSeparatePivotColumnForSingleAggregation;
+  }, [showSeparatePivotColumnForSingleAggregation]);
   const { multiSort } = dataSourceState;
   useColumnGroups();
   useColumnsWhen();
@@ -3843,7 +4251,7 @@ function useComputed() {
     var _a2;
     const newSortInfo = multiSort ? sortInfo : (_a2 = sortInfo[0]) != null ? _a2 : null;
     dataSourceActions.sortInfo = newSortInfo;
-  }, []);
+  }, [getDataSourceState]);
   const columns = componentState.computedColumns;
   const {
     computedColumnOrder,
@@ -3994,11 +4402,11 @@ function VerticalScrollbarPlaceholderFn(props) {
 var VerticalScrollbarPlaceholder = memo2(VerticalScrollbarPlaceholderFn);
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/header.css.ts
-var import_createRuntimeFn2 = __toModule(require_vanilla_extract_recipes_createRuntimeFn_cjs());
+var import_createRuntimeFn3 = __toModule(require_vanilla_extract_recipes_createRuntimeFn_cjs());
 var CellCls = "_1eexc2a5 _16lm1iwj _16lm1iw10 _16lm1iw11 _16lm1iw2 _16lm1iw19 _16lm1iw1a";
 var HeaderCellProxy = "_12zfob10";
-var HeaderCellRecipe = (0, import_createRuntimeFn2.createRuntimeFn)({ defaultClassName: "_12zfob1c", variantClassNames: { dragging: { true: "_12zfob1d", false: "_12zfob1e" }, first: { true: "_12zfob1f", false: "_12zfob1g" }, last: { true: "_12zfob1h", false: "_12zfob1i" }, groupByField: { true: "_12zfob1j", false: "_12zfob1k" }, firstInCategory: { true: "_12zfob1l", false: "_12zfob1m" }, lastInCategory: { true: "_12zfob1n", false: "_12zfob1o" }, pinned: { start: "_12zfob1p", end: "_12zfob1q", false: "_12zfob1r" } }, defaultVariants: {}, compoundVariants: [[{ pinned: "start", lastInCategory: true }, "_12zfob1s"], [{ pinned: "end", firstInCategory: true }, "_12zfob1t"], [{ pinned: false, lastInCategory: true }, "_12zfob1u"]] });
-var HeaderClsRecipe = (0, import_createRuntimeFn2.createRuntimeFn)({ defaultClassName: "_12zfob12 _16lm1iw10", variantClassNames: { pinned: { start: "_12zfob13", end: "_12zfob14", false: "_12zfob15" }, virtualized: { true: "_12zfob16", false: "_12zfob17" }, overflow: { true: "_12zfob18", false: "_12zfob19" } }, defaultVariants: {}, compoundVariants: [[{ overflow: true, pinned: "start" }, "_12zfob1a"], [{ overflow: true, pinned: "end" }, "_12zfob1b"]] });
+var HeaderCellRecipe = (0, import_createRuntimeFn3.createRuntimeFn)({ defaultClassName: "_12zfob1c", variantClassNames: { dragging: { true: "_12zfob1d", false: "_12zfob1e" }, first: { true: "_12zfob1f", false: "_12zfob1g" }, last: { true: "_12zfob1h", false: "_12zfob1i" }, groupByField: { true: "_12zfob1j", false: "_12zfob1k" }, firstInCategory: { true: "_12zfob1l", false: "_12zfob1m" }, lastInCategory: { true: "_12zfob1n", false: "_12zfob1o" }, pinned: { start: "_12zfob1p", end: "_12zfob1q", false: "_12zfob1r" } }, defaultVariants: {}, compoundVariants: [[{ pinned: "start", lastInCategory: true }, "_12zfob1s"], [{ pinned: "end", firstInCategory: true }, "_12zfob1t"], [{ pinned: false, lastInCategory: true }, "_12zfob1u"]] });
+var HeaderClsRecipe = (0, import_createRuntimeFn3.createRuntimeFn)({ defaultClassName: "_12zfob12 _16lm1iw10", variantClassNames: { pinned: { start: "_12zfob13", end: "_12zfob14", false: "_12zfob15" }, virtualized: { true: "_12zfob16", false: "_12zfob17" }, overflow: { true: "_12zfob18", false: "_12zfob19" } }, defaultVariants: {}, compoundVariants: [[{ overflow: true, pinned: "start" }, "_12zfob1a"], [{ overflow: true, pinned: "end" }, "_12zfob1b"]] });
 var HeaderGroupCls = "_16lm1iwz _16lm1iwj";
 var HeaderGroup_Children = "_16lm1iwj _16lm1iw10 _16lm1iw12 _16lm1iwc";
 var HeaderGroup_Header = "_12zfob1x _16lm1iwj _16lm1iw10 _16lm1iw11";
@@ -4026,18 +4434,18 @@ import {
 } from "react";
 
 // src/components/InfiniteTable/hooks/useInfiniteTableState.ts
-import { useContext as useContext5 } from "react";
+import { useContext as useContext4 } from "react";
 var useInfiniteTableState = () => {
   const TableContext2 = getInfiniteTableContext();
-  const { componentState } = useContext5(TableContext2);
+  const { componentState } = useContext4(TableContext2);
   return componentState;
 };
 
 // src/components/InfiniteTable/components/cell.css.ts
-var import_createRuntimeFn3 = __toModule(require_vanilla_extract_recipes_createRuntimeFn_cjs());
+var import_createRuntimeFn4 = __toModule(require_vanilla_extract_recipes_createRuntimeFn_cjs());
 var CellCls2 = "_1eexc2a5 _16lm1iwj _16lm1iw10 _16lm1iw11 _16lm1iw2 _16lm1iw19 _16lm1iw1a";
 var CellClsVariants = { shifting: "_1eexc2a3", dragging: "_1eexc2a4" };
-var ColumnCellRecipe = (0, import_createRuntimeFn3.createRuntimeFn)({ defaultClassName: "_16lm1iw2 _16lm1iwo _16lm1iw7 _16lm1iwr", variantClassNames: { dragging: { false: "_1eexc2a7" }, first: { true: "_1eexc2a8", false: "_1eexc2a9" }, last: { true: "_1eexc2aa", false: "_1eexc2ab" }, groupByField: { true: "_1eexc2ac", false: "_1eexc2ad" }, firstInCategory: { true: "_1eexc2ae", false: "_1eexc2af" }, lastInCategory: { true: "_1eexc2ag", false: "_1eexc2ah" }, pinned: { start: "_1eexc2ai", end: "_1eexc2aj", false: "_1eexc2ak" } }, defaultVariants: {}, compoundVariants: [[{ pinned: "start", lastInCategory: true }, "_1eexc2al"], [{ pinned: "end", firstInCategory: true }, "_1eexc2am"]] });
+var ColumnCellRecipe = (0, import_createRuntimeFn4.createRuntimeFn)({ defaultClassName: "_16lm1iw2 _16lm1iwo _16lm1iw7 _16lm1iwr", variantClassNames: { dragging: { false: "_1eexc2a7" }, first: { true: "_1eexc2a8", false: "_1eexc2a9" }, last: { true: "_1eexc2aa", false: "_1eexc2ab" }, groupByField: { true: "_1eexc2ac", false: "_1eexc2ad" }, firstInCategory: { true: "_1eexc2ae", false: "_1eexc2af" }, lastInCategory: { true: "_1eexc2ag", false: "_1eexc2ah" }, pinned: { start: "_1eexc2ai", end: "_1eexc2aj", false: "_1eexc2ak" } }, defaultVariants: {}, compoundVariants: [[{ pinned: "start", lastInCategory: true }, "_1eexc2al"], [{ pinned: "end", firstInCategory: true }, "_1eexc2am"]] });
 var columnAlignCellStyle = { center: "_1eexc2a0", start: "_1eexc2a1", end: "_1eexc2a2" };
 
 // src/components/InfiniteTable/components/InfiniteTableRow/InfiniteTableCell.tsx
@@ -4097,7 +4505,7 @@ var InfiniteTableCell = memo3(InfiniteTableCellFn);
 var import_binary_search = __toModule(require_binary_search());
 import {
   useCallback as useCallback6,
-  useMemo as useMemo6,
+  useMemo as useMemo5,
   useRef as useRef7,
   useState as useState6
 } from "react";
@@ -4144,8 +4552,8 @@ var useColumnPointerEvents = ({
   const dragging = draggingDiff != null;
   const { componentActions, computed } = useInfiniteTable();
   const { computedColumnOrder } = computed;
-  const column = useMemo6(() => columns.get(columnId), [columnId, columns]);
-  const { columnIndex, columnWidth, columnsArray } = useMemo6(() => {
+  const column = useMemo5(() => columns.get(columnId), [columnId, columns]);
+  const { columnIndex, columnWidth, columnsArray } = useMemo5(() => {
     const columnsArray2 = Array.from(columns.values());
     return {
       columnsArray: columnsArray2,
@@ -4468,10 +4876,10 @@ import {
   createElement as createElement12,
   memo as memo4
 } from "react";
-import { useLayoutEffect as useLayoutEffect4, useState as useState8 } from "react";
+import { useLayoutEffect as useLayoutEffect3, useState as useState8 } from "react";
 function AvoidReactDiffFn(props) {
   const [children, setChildren] = useState8(props.updater.get());
-  useLayoutEffect4(() => {
+  useLayoutEffect3(() => {
     const remove = props.updater.onChange((children2) => {
       setChildren(children2);
     });
@@ -4482,7 +4890,7 @@ function AvoidReactDiffFn(props) {
 var AvoidReactDiff = memo4(AvoidReactDiffFn);
 
 // src/components/RawList/useVirtualRenderer.ts
-import { useMemo as useMemo7 } from "react";
+import { useMemo as useMemo6 } from "react";
 
 // src/components/RawList/ReactVirtualRenderer.tsx
 import {
@@ -4798,7 +5206,7 @@ function createRenderer(brain) {
 function useVirtualRenderer({
   brain
 }) {
-  return useMemo7(() => {
+  return useMemo6(() => {
     return createRenderer(brain);
   }, [brain]);
 }
@@ -4890,7 +5298,7 @@ var InfiniteTableHeader = memo6(InfiniteTableHeaderFn);
 import {
   createElement as createElement18,
   memo as memo7,
-  useMemo as useMemo8,
+  useMemo as useMemo7,
   useRef as useRef10
 } from "react";
 
@@ -5104,7 +5512,7 @@ function InfiniteTableHeaderUnvirtualizedFn(props) {
   } = useInfiniteTable();
   const domRef = useRef10(null);
   const hasColumnGroups = computedColumnGroups.size > 0;
-  const columnHeaderGroups = useMemo8(() => {
+  const columnHeaderGroups = useMemo7(() => {
     return hasColumnGroups ? renderColumnHeaderGroups({
       columnGroups: computedColumnGroups,
       columnGroupsDepthsMap,
@@ -5189,6 +5597,9 @@ function TableHeaderWrapper(props) {
   const hasPinnedStart = computedPinnedStartColumns.length > 0;
   const hasPinnedEnd = computedPinnedEndColumns.length > 0;
   const height = columnGroupsMaxDepth ? columnGroupsMaxDepth * headerHeight : headerHeight;
+  const unvirtualizedStyle = !virtualizeHeader && computedPinnedStartColumnsWidth ? {
+    left: computedPinnedStartWidth
+  } : void 0;
   const header = virtualizeHeader ? /* @__PURE__ */ createElement19(InfiniteTableHeader, {
     columns: computedUnpinnedColumns,
     repaintId: virtualizeHeader ? repaintId : void 0,
@@ -5203,6 +5614,7 @@ function TableHeaderWrapper(props) {
     availableWidth: computedUnpinnedColumnsWidth,
     totalWidth: computedUnpinnedColumnsWidth
   }) : /* @__PURE__ */ createElement19(InfiniteTableHeaderUnvirtualized, {
+    style: unvirtualizedStyle,
     brain,
     scrollable: true,
     pinning: false,
@@ -5359,7 +5771,7 @@ import {
 import { useRef as useRef12, useEffect as useEffect17, useState as useState9 } from "react";
 
 // src/components/VirtualList/VirtualList.css.ts
-var VirtualListCls = "mlx2t0 _16lm1iw0";
+var VirtualListCls = "_16lm1iw1 _16lm1iw8 _16lm1iw0";
 var VirtualListClsOrientation = { horizontal: "mlx2t1", vertical: "mlx2t2" };
 var scrollTransformTargetCls = "mlx2t3";
 
@@ -5513,32 +5925,38 @@ function InfiniteTableColumnCellFn(props) {
   const groupRowInfo = null;
   let value = isGroupRow && groupBy && column.groupByField ? rowInfo.value : isColumnWithField(column) ? data == null ? void 0 : data[column.field] : null;
   if (column.valueGetter) {
-    value = column.valueGetter({
-      data,
-      rowInfo,
-      groupRowInfo
+    value = column.valueGetter(isGroupRow ? {
+      data: rowInfo.data,
+      rowInfo
+    } : {
+      data: rowInfo.data,
+      rowInfo
     });
   }
   const { componentState: computedDataSource } = useDataSourceContextValue();
-  const stylingRenderParam = {
-    value,
-    column,
+  const rest = rowInfo.isGroupRow ? {
     rowInfo,
-    data
+    data: rowInfo.data
+  } : {
+    rowInfo,
+    data: rowInfo.data
   };
+  const stylingRenderParam = __spreadValues({
+    value,
+    column
+  }, rest);
   let renderValue = value;
   if (column.render || column.renderValue) {
-    const renderParam = {
+    const renderParam = __spreadProps(__spreadValues({
       value,
       column,
-      rowInfo,
-      groupRowInfo,
-      data,
+      groupRowInfo
+    }, rest), {
       rowIndex,
       toggleGroupRow,
       toggleCurrentGroupRow: () => toggleGroupRow(rowInfo.groupKeys),
-      groupRowsBy: computedDataSource.groupRowsBy
-    };
+      groupBy: computedDataSource.groupBy
+    });
     if (column.render) {
       renderValue = column.render(renderParam);
     } else if (column.renderValue) {
@@ -5620,12 +6038,11 @@ function useRowDOMProps(props, rowProps, rowStyle, rowClassName, groupRenderStra
     domRefFromProps(node);
     domRef.current = node;
   }, []);
-  const rowPropsAndStyleArgs = {
-    data: rowInfo.data,
-    rowInfo,
+  const rest = rowInfo.isGroupRow ? { data: rowInfo.data, rowInfo } : { data: rowInfo.data, rowInfo };
+  const rowPropsAndStyleArgs = __spreadProps(__spreadValues({}, rest), {
     rowIndex,
-    groupRowsBy: rowInfo.groupBy
-  };
+    groupBy: rowInfo.groupBy
+  });
   if (typeof rowProps === "function") {
     rowProps = rowProps(rowPropsAndStyleArgs);
   }
@@ -5894,17 +6311,16 @@ function useUnpinnedRendering(params) {
 import { useCallback as useCallback13, useEffect as useEffect18, useRef as useRef15 } from "react";
 
 // src/components/InfiniteTable/InfiniteCls.css.ts
-var import_createRuntimeFn4 = __toModule(require_vanilla_extract_recipes_createRuntimeFn_cjs());
+var import_createRuntimeFn5 = __toModule(require_vanilla_extract_recipes_createRuntimeFn_cjs());
 var FooterCls = "_16lm1iw1";
 var InfiniteCls = "_1yeub2v0 _16lm1iw1 _16lm1iwj _16lm1iwz _16lm1iw0";
-var InfiniteClsRecipe = (0, import_createRuntimeFn4.createRuntimeFn)({ defaultClassName: "", variantClassNames: { focused: { true: "_1yeub2v2", false: "_1yeub2v3" }, focusedWithin: { true: "_1yeub2v4", false: "_1yeub2v5" }, hasPinnedStart: { true: "_1yeub2v6", false: "_1yeub2v7" }, hasPinnedEnd: { true: "_1yeub2v8", false: "_1yeub2v9" }, hasPinnedStartOverflow: { true: "_1yeub2va", false: "_1yeub2vb" }, hasPinnedEndOverflow: { true: "_1yeub2vc", false: "_1yeub2vd" } }, defaultVariants: {}, compoundVariants: [] });
+var InfiniteClsRecipe = (0, import_createRuntimeFn5.createRuntimeFn)({ defaultClassName: "", variantClassNames: { focused: { true: "_1yeub2v2", false: "_1yeub2v3" }, focusedWithin: { true: "_1yeub2v4", false: "_1yeub2v5" }, hasPinnedStart: { true: "_1yeub2v6", false: "_1yeub2v7" }, hasPinnedEnd: { true: "_1yeub2v8", false: "_1yeub2v9" }, hasPinnedStartOverflow: { true: "_1yeub2va", false: "_1yeub2vb" }, hasPinnedEndOverflow: { true: "_1yeub2vc", false: "_1yeub2vd" } }, defaultVariants: {}, compoundVariants: [] });
 var InfiniteClsScrolling = "_1yeub2v1";
 var InfiniteClsShiftingColumns = "_16lm1iwm";
 var PinnedRowsClsVariants = { pinnedStart: "_1yeub2ve", pinnedEnd: "_1yeub2vf", overflow: "_1yeub2vg" };
-var PinnedRowsContainerClsVariants = (0, import_createRuntimeFn4.createRuntimeFn)({ defaultClassName: "", variantClassNames: { pinned: { start: "_1yeub2vh", end: "_1yeub2vi", false: "_1yeub2vj" } }, defaultVariants: {}, compoundVariants: [] });
+var PinnedRowsContainerClsVariants = (0, import_createRuntimeFn5.createRuntimeFn)({ defaultClassName: "", variantClassNames: { pinned: { start: "_1yeub2vh", end: "_1yeub2vi", false: "_1yeub2vj" } }, defaultVariants: {}, compoundVariants: [] });
 
 // src/components/InfiniteTable/hooks/useOnContainerScroll.ts
-var DELAY = 200;
 var TableClassName = internalProps.rootClassName;
 var TableClassName__Scrolling = `${TableClassName}--scrolling`;
 var SCROLL_BOTTOM_OFFSET = 1;
@@ -5915,15 +6331,25 @@ var useOnContainerScroll = ({
 }) => {
   const {
     componentState: {
+      scrollStopDelay,
       scrollerDOMRef,
       domRef,
       scrollToBottomOffset,
       onScrollToBottom,
       onScrollToTop,
+      onScrollStop: onScrollStopFromProps,
       bodySize
     }
   } = useInfiniteTable();
-  const { componentActions: dataSourceActions, getState: getDataSourceState } = useDataSourceContextValue();
+  const {
+    componentActions: dataSourceActions,
+    getState: getDataSourceState,
+    componentState: { notifyScrollStop }
+  } = useDataSourceContextValue();
+  const onScrollStop = useCallback13((param) => {
+    onScrollStopFromProps == null ? void 0 : onScrollStopFromProps(param);
+    notifyScrollStop(param);
+  }, [onScrollStopFromProps, notifyScrollStop]);
   const timeoutIdRef = useRef15(0);
   const scrollingRef = useRef15(false);
   const scrollTopMaxRef = useRef15(0);
@@ -5942,9 +6368,17 @@ var useOnContainerScroll = ({
       timeoutIdRef.current = setTimeout(() => {
         setScrolling(false);
         timeoutIdRef.current = 0;
-      }, DELAY);
+      }, scrollStopDelay);
     }
     if (prevScrolling !== scrolling) {
+      if (!scrolling) {
+        const range = verticalVirtualBrain.getRenderRange();
+        onScrollStop({
+          scrollTop: scrollPositionRef.current.scrollTop,
+          firstVisibleRowIndex: range.renderStartIndex,
+          lastVisibleRowIndex: range.renderEndIndex
+        });
+      }
       const classList = (_a = domRef.current) == null ? void 0 : _a.classList;
       if (!classList) {
         return;
@@ -5955,7 +6389,7 @@ var useOnContainerScroll = ({
         classList.remove(InfiniteClsScrolling, TableClassName__Scrolling);
       }
     }
-  }, []);
+  }, [scrollStopDelay, onScrollStop]);
   const onContainerScroll = useCallback13((scrollInfo) => {
     verticalVirtualBrain.setScrollPosition(scrollInfo);
     horizontalVirtualBrain.setScrollPosition(scrollInfo);
@@ -5985,7 +6419,7 @@ var useOnContainerScroll = ({
     if (isScrollBottom) {
       onScrollToBottom == null ? void 0 : onScrollToBottom();
       if (getDataSourceState().livePagination) {
-        dataSourceActions.scrollBottomId = Date.now();
+        dataSourceActions.cursorId = Date.now();
       }
     }
   }, [onContainerScroll, scrollToBottomOffset, onScrollToBottom, onScrollToTop]);
@@ -5998,7 +6432,7 @@ var useOnContainerScroll = ({
 // src/components/InfiniteTable/hooks/usePinnedRendering.tsx
 import {
   createElement as createElement29,
-  useMemo as useMemo9
+  useMemo as useMemo8
 } from "react";
 import { useCallback as useCallback15 } from "react";
 
@@ -6104,7 +6538,7 @@ function PinnedRowsContainer(props) {
     brain,
     renderRow
   } = props;
-  const style = useMemo9(() => {
+  const style = useMemo8(() => {
     const result = pinning === "end" ? {
       width: rowWidth,
       height,
@@ -6277,6 +6711,15 @@ function usePinnedStartRendering(params) {
 // src/components/InfiniteTable/hooks/useYourBrain.ts
 import { useEffect as useEffect21 } from "react";
 
+// src/components/hooks/useOnce.ts
+import { useMemo as useMemo9 } from "react";
+function useOnce(fn) {
+  const onceFn = useMemo9(() => {
+    return once(fn);
+  }, []);
+  return onceFn();
+}
+
 // src/components/VirtualBrain/index.ts
 var import_binary_search2 = __toModule(require_binary_search());
 var initialScrollPosition2 = {
@@ -6866,7 +7309,6 @@ function useListRendering(param) {
         setColumnVisibility: (columnVisibility) => {
           componentActions.columnVisibility = columnVisibility;
         },
-        setColumnAggregations: (columnAggregations) => componentActions.columnAggregations = columnAggregations,
         getState,
         getDataSourceState
       };
@@ -7173,7 +7615,7 @@ var useLicense = (licenseKey = "") => {
   const valid = useMemo11(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.0.10"
+      version: "0.1.3"
     });
     if (!licenseKey && !valid2 && isInsideSandbox) {
       return true;
@@ -7187,7 +7629,7 @@ var useLicense = (licenseKey = "") => {
 import {
   createElement as createElement31,
   useCallback as useCallback19,
-  useLayoutEffect as useLayoutEffect5
+  useLayoutEffect as useLayoutEffect4
 } from "react";
 import { useRef as useRef19 } from "react";
 var error = err("CSSVariableWatch");
@@ -7210,7 +7652,7 @@ var useCSSVariableWatch = (params) => {
     }
   }, [params.onChange]);
   useResizeObserver(params.ref, onResize, { earlyAttach: true });
-  useLayoutEffect5(() => {
+  useLayoutEffect4(() => {
     const value = params.ref.current.getBoundingClientRect().height;
     if (value) {
       lastValueRef.current = value;
@@ -7412,7 +7854,7 @@ var InfiniteTableComponent = memo13(function InfiniteTableComponent2() {
   const licenseValid = useLicense(licenseKey);
   const domProps = useDOMProps(componentState.domProps);
   const LoadMaskCmp = (_a = components == null ? void 0 : components.LoadMask) != null ? _a : LoadMask;
-  useLayoutEffect6(() => {
+  useLayoutEffect5(() => {
     const dataSourceState = getDataSourceState();
     const { onScrollbarsChange } = getInfiniteTableState();
     const { notifyScrollbarsChange } = dataSourceState;
@@ -7518,5 +7960,6 @@ export {
   interceptMap,
   multisort,
   useComponentState,
-  useDataSource
+  useDataSource,
+  useEffectWithChanges
 };