@infinite-table/infinite-react 0.0.10 → 0.1.3

package/index.js

@@ -635,11 +635,12 @@ __export(exports, {
   interceptMap: () => interceptMap,
   multisort: () => multisort,
   useComponentState: () => useComponentState,
-  useDataSource: () => useDataSource
+  useDataSource: () => useDataSource,
+  useEffectWithChanges: () => useEffectWithChanges
 });
 
 // src/components/InfiniteTable/index.tsx
-var React36 = __toModule(require("react"));
+var React35 = __toModule(require("react"));
 
 // src/components/InfiniteTable/internalProps.ts
 var rootClassName = "Infinite";
@@ -719,6 +720,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();
@@ -742,21 +761,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: (0, import_react2.createRef)(),
     scrollerDOMRef: (0, import_react2.createRef)(),
@@ -781,12 +789,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,
@@ -804,6 +808,7 @@ var forwardProps = () => {
     onBlurWithin: 1,
     onScrollToTop: 1,
     onScrollToBottom: 1,
+    onScrollStop: 1,
     scrollToBottomOffset: 1,
     rowStyle: 1,
     rowProps: 1,
@@ -814,12 +819,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",
@@ -831,31 +838,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";
@@ -866,16 +867,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,
@@ -1217,11 +1219,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 = ({
@@ -1253,7 +1255,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) => {
@@ -1279,10 +1283,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;
       }
@@ -1333,7 +1340,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);
@@ -1394,6 +1401,7 @@ var getComputedVisibleColumns = ({
     const result2 = __spreadProps(__spreadValues({
       align: colType.align,
       verticalAlign: colType.verticalAlign,
+      valueGetter: colType.valueGetter,
       renderValue: colType.renderValue,
       render: colType.render
     }, c), {
@@ -1401,7 +1409,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,
@@ -1410,14 +1418,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);
@@ -1568,7 +1576,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,
@@ -1624,7 +1631,6 @@ var useComputedVisibleColumns = ({
     pinnedStartMaxWidth,
     columnPinning,
     columnsRenderId,
-    visibilityRenderId,
     columnsSizingRenderId,
     pinningRenderId,
     columnTypesRenderId
@@ -1649,41 +1655,14 @@ 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
-var import_react20 = __toModule(require("react"));
-
-// src/components/InfiniteTable/hooks/useColumnAggregations.ts
-var import_react12 = __toModule(require("react"));
-
-// src/components/DataSource/publicHooks/useDataSourceActions.ts
-var React3 = __toModule(require("react"));
-
-// src/components/DataSource/DataSourceContext.ts
-var React2 = __toModule(require("react"));
-var DSContext;
-function getDataSourceContext() {
-  if (DSContext) {
-    return DSContext;
-  }
-  return DSContext = React2.createContext({
-    getState: () => null,
-    componentState: null,
-    componentActions: null
-  });
-}
-
-// src/components/DataSource/publicHooks/useDataSourceActions.ts
-function useDataSourceActions() {
-  const DataSourceContext = getDataSourceContext();
-  const contextValue = React3.useContext(DataSourceContext);
-  return contextValue.componentActions;
-}
+var import_react18 = __toModule(require("react"));
 
 // src/components/hooks/useComponentState.tsx
-var React4 = __toModule(require("react"));
+var React2 = __toModule(require("react"));
 var import_react11 = __toModule(require("react"));
 
 // src/utils/proxyFnCall.ts
@@ -1772,9 +1751,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") {
@@ -1813,14 +1797,16 @@ function forwardProps2(propsToForward, props) {
   return mappedState;
 }
 function getComponentStateRoot(config) {
-  return React4.memo(function ComponentStateRoot(props) {
+  return React2.memo(function ComponentStateRoot(props) {
     var _a, _b;
+    const [initialSetupState] = (0, import_react11.useState)(() => {
+      return config.initSetupState ? config.initSetupState() : {};
+    });
     const propsToStateSetRef = (0, import_react11.useRef)(new Set());
-    const propsToForward = (0, import_react11.useMemo)(() => config.forwardProps ? config.forwardProps() : {}, []);
+    const propsToForward = (0, import_react11.useMemo)(() => 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] = (0, import_react11.useState)(() => {
-      const initialSetupState = config.initSetupState ? config.initSetupState() : {};
       let mappedState = {};
       if (propsToForward) {
         mappedState = forwardProps2(propsToForward, props);
@@ -1850,9 +1836,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);
@@ -1906,8 +1895,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];
@@ -1918,7 +1908,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];
@@ -1930,79 +1921,73 @@ 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__ */ React4.createElement(Context.Provider, {
+    return /* @__PURE__ */ React2.createElement(Context.Provider, {
       value: contextValue
     }, props.children);
   });
 }
 function useComponentState() {
   const Context = getComponentStateContext();
-  return React4.useContext(Context);
+  return React2.useContext(Context);
 }
 
-// src/components/InfiniteTable/hooks/useColumnAggregations.ts
-function useColumnAggregations() {
-  const {
-    componentState: { columnAggregations },
-    getComponentState
-  } = useComponentState();
-  const dataSourceActions = useDataSourceActions();
-  (0, import_react12.useEffect)(() => {
-    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]);
+// src/components/DataSource/publicHooks/useDataSource.ts
+var React4 = __toModule(require("react"));
+
+// src/components/DataSource/DataSourceContext.ts
+var React3 = __toModule(require("react"));
+var DSContext;
+function getDataSourceContext() {
+  if (DSContext) {
+    return DSContext;
+  }
+  return DSContext = React3.createContext({
+    getState: () => null,
+    componentState: null,
+    componentActions: null
+  });
 }
 
 // src/components/DataSource/publicHooks/useDataSource.ts
-var React5 = __toModule(require("react"));
 function useDataSource() {
   const DataSourceContext = getDataSourceContext();
-  const contextValue = React5.useContext(DataSourceContext);
+  const contextValue = React4.useContext(DataSourceContext);
   return contextValue.componentState;
 }
 function useDataSourceContextValue() {
   const DataSourceContext = getDataSourceContext();
-  const contextValue = React5.useContext(DataSourceContext);
+  const contextValue = React4.useContext(DataSourceContext);
   return contextValue;
 }
 
 // src/components/InfiniteTable/hooks/useColumnGroups.ts
-var import_react13 = __toModule(require("react"));
+var import_react12 = __toModule(require("react"));
 function useColumnGroups() {
   const {
     componentState: {
@@ -2012,7 +1997,7 @@ function useColumnGroups() {
     componentActions,
     getComponentState
   } = useComponentState();
-  (0, import_react13.useEffect)(() => {
+  (0, import_react12.useEffect)(() => {
     const recompute = () => {
       componentActions.columnGroupsDepthsMap = computeColumnGroupsDepths(computedColumnGroups);
     };
@@ -2023,73 +2008,63 @@ function useColumnGroups() {
       set: update
     });
   }, [computedColumnGroups]);
-  (0, import_react13.useEffect)(() => {
+  (0, import_react12.useEffect)(() => {
     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
-var import_react19 = __toModule(require("react"));
+var import_react17 = __toModule(require("react"));
 
 // src/components/InfiniteTable/state/getComputedPivotColumnsFromDataSourcePivotColumns.tsx
-var React7 = __toModule(require("react"));
+var React6 = __toModule(require("react"));
 
 // src/utils/join.ts
 var join = (...args) => args.filter((x) => !!`${x}`).join(" ");
 
 // src/components/InfiniteTable/components/icons/ExpanderIcon.tsx
-var React6 = __toModule(require("react"));
-var import_react14 = __toModule(require("react"));
+var React5 = __toModule(require("react"));
+var import_react13 = __toModule(require("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) {
   var _a;
   const { size = 24 } = props;
-  const [expanded, setExpanded] = (0, import_react14.useState)((_a = props.expanded) != null ? _a : props.defaultExpanded);
+  const [expanded, setExpanded] = (0, import_react13.useState)((_a = props.expanded) != null ? _a : props.defaultExpanded);
   const onClick = () => {
     var _a2;
     (_a2 = props.onChange) == null ? void 0 : _a2.call(props, !expanded);
@@ -2097,12 +2072,12 @@ function ExpanderIcon(props) {
       setExpanded(!expanded);
     }
   };
-  React6.useEffect(() => {
+  React5.useEffect(() => {
     if (isControlled("expanded", props)) {
       setExpanded(props.expanded);
     }
   }, [props.expanded]);
-  return /* @__PURE__ */ React6.createElement("svg", {
+  return /* @__PURE__ */ React5.createElement("svg", {
     "data-name": "expander-icon",
     xmlns: "http://www.w3.org/2000/svg",
     height: `${size}px`,
@@ -2110,18 +2085,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"}`)
-  }, /* @__PURE__ */ React6.createElement("path", {
+    className: join(props.className, ExpanderIconCls, ExpanderIconClsVariants({
+      expanded
+    }), "InfiniteIcon", "InfiniteIcon-expander", `InfiniteIcon-expander--${expanded ? "expanded" : "collapsed"}`)
+  }, /* @__PURE__ */ React5.createElement("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) {
@@ -2131,7 +2125,7 @@ function getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, params)
     pivotColumn,
     pivotRowLabelsColumn,
     pivotBy,
-    groupRowsBy,
+    groupBy,
     pivotTotalColumnPosition,
     toggleGroupRow
   } = params;
@@ -2148,7 +2142,7 @@ function getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, params)
           column = __spreadValues(__spreadValues({}, column), pivotColumn({
             column,
             pivotBy,
-            groupRowsBy
+            groupBy
           }));
         } else {
           column = __spreadValues(__spreadValues({}, column), pivotColumn);
@@ -2160,7 +2154,7 @@ function getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, params)
           column = __spreadValues(__spreadValues({}, column), pivotRowLabelsColumn({
             column,
             pivotBy,
-            groupRowsBy
+            groupBy
           }));
         } else {
           column = __spreadValues(__spreadValues({}, column), pivotRowLabelsColumn);
@@ -2169,19 +2163,19 @@ 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;
-          return /* @__PURE__ */ React7.createElement("div", {
+          const showExpanderIcon = (((_a = rowInfo.groupKeys) == null ? void 0 : _a.length) || 0) < groupBy2.length;
+          return /* @__PURE__ */ React6.createElement("div", {
             className: join(display.flex, alignItems.center, GroupRowExpanderCls)
-          }, showExpanderIcon ? /* @__PURE__ */ React7.createElement(ExpanderIcon, {
+          }, showExpanderIcon ? /* @__PURE__ */ React6.createElement(ExpanderIcon, {
             expanded: !rowInfo.collapsed,
             onChange: () => {
               toggleGroupRow(rowInfo.groupKeys);
             }
-          }) : null, /* @__PURE__ */ React7.createElement("div", {
+          }) : null, /* @__PURE__ */ React6.createElement("div", {
             className: cssEllipsisClassName
           }, value != null ? value : null));
         };
@@ -2198,7 +2192,7 @@ function getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, params)
 }
 
 // src/components/InfiniteTable/utils/getColumnForGroupBy.tsx
-var React8 = __toModule(require("react"));
+var React7 = __toModule(require("react"));
 function getGroupColumnRender({
   groupIndexForColumn,
   groupRenderStrategy,
@@ -2231,14 +2225,14 @@ function getGroupColumnRender({
         return null;
       }
     }
-    return /* @__PURE__ */ React8.createElement("div", {
+    return /* @__PURE__ */ React7.createElement("div", {
       className: join(display.flex, alignItems.center)
-    }, /* @__PURE__ */ React8.createElement(ExpanderIcon, {
+    }, /* @__PURE__ */ React7.createElement(ExpanderIcon, {
       expanded: !collapsed,
       onChange: () => {
         toggleGroupRow(groupKeys);
       }
-    }), /* @__PURE__ */ React8.createElement("div", {
+    }), /* @__PURE__ */ React7.createElement("div", {
       className: cssEllipsisClassName
     }, value != null ? value : null));
   };
@@ -2271,7 +2265,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;
@@ -2281,14 +2275,14 @@ function getSingleGroupColumn(options, toggleGroupRow, groupColumnFromProps) {
       if (column.renderValue) {
         value = column.renderValue(renderOptions);
       }
-      return /* @__PURE__ */ React8.createElement("div", {
+      return /* @__PURE__ */ React7.createElement("div", {
         className: join(display.flex, alignItems.center, GroupRowExpanderCls)
-      }, /* @__PURE__ */ React8.createElement(ExpanderIcon, {
+      }, /* @__PURE__ */ React7.createElement(ExpanderIcon, {
         expanded: !rowInfo.collapsed,
         onChange: () => {
           toggleGroupRow(rowInfo.groupKeys);
         }
-      }), /* @__PURE__ */ React8.createElement("div", {
+      }), /* @__PURE__ */ React7.createElement("div", {
         className: cssEllipsisClassName
       }, value != null ? value : null));
     }
@@ -2304,10 +2298,10 @@ function getSingleGroupColumn(options, toggleGroupRow, groupColumnFromProps) {
 }
 
 // src/components/InfiniteTable/hooks/useToggleGroupRow.ts
-var import_react18 = __toModule(require("react"));
+var import_react16 = __toModule(require("react"));
 
 // src/components/DataSource/index.tsx
-var React9 = __toModule(require("react"));
+var React8 = __toModule(require("react"));
 
 // src/utils/multisort/sortTypes.ts
 var numberComparator = function(first, second) {
@@ -2384,166 +2378,9 @@ var getMultisortFunction = (sortInfo, get) => {
 };
 
 // src/components/DataSource/privateHooks/useLoadData.ts
-var import_react16 = __toModule(require("react"));
-
-// src/components/hooks/useEffectWithChanges.ts
 var import_react15 = __toModule(require("react"));
-function useEffectWithChanges(fn, deps) {
-  const prevRef = (0, import_react15.useRef)({});
-  const oldValuesRef = (0, import_react15.useRef)({});
-  const oldValues = oldValuesRef.current;
-  const changesRef = (0, import_react15.useRef)({});
-  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;
-  (0, import_react15.useEffect)(() => {
-    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();
-  (0, import_react16.useLayoutEffect)(() => {
-    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] = (0, import_react16.useState)({
-    vertical: false,
-    horizontal: false
-  });
-  const scrollbarsRef = (0, import_react16.useRef)(scrollbars);
-  (0, import_react16.useEffect)(() => {
-    notifyScrollbarsChange.onChange((scrollbars2) => {
-      if (!scrollbars2) {
-        return;
-      }
-      scrollbarsRef.current = scrollbars2;
-      setScrollbars(scrollbars2);
-    });
-    return () => notifyScrollbarsChange.destroy();
-  }, [notifyScrollbarsChange]);
-  const [cursorId, updateCursorId] = (0, import_react16.useState)(void 0);
-  (0, import_react16.useEffect)(() => {
-    const frameId = requestAnimationFrame(() => {
-      var _a;
-      if (!((_a = scrollbarsRef.current) == null ? void 0 : _a.vertical)) {
-        updateCursorId(livePaginationCursor);
-      }
-    });
-    return () => cancelAnimationFrame(frameId);
-  }, [livePaginationCursor]);
-  (0, import_react16.useEffect)(() => {
-    const { livePaginationCursor: livePaginationCursor2, livePagination } = getComponentState();
-    if (!scrollbars.vertical && livePagination) {
-      updateCursorId(livePaginationCursor2);
-    }
-  }, [scrollbars.vertical]);
-  (0, import_react16.useEffect)(() => {
-    updateCursorId(scrollBottomId);
-  }, [scrollBottomId]);
-  const depsObject = {
-    sortInfo,
-    groupRowsBy,
-    pivotBy,
-    cursorId
-  };
-  useEffectWithChanges(() => {
-    if (cursorId === void 0) {
-      return;
-    }
-    notifyDataParamsChanged(getComponentState(), actions);
-  }, depsObject);
-}
-
-// src/components/DataSource/state/normalizeSortInfo.ts
-var normalizeSortInfo = (sortInfo) => {
-  sortInfo = sortInfo != null ? sortInfo : [];
-  return Array.isArray(sortInfo) ? sortInfo : [sortInfo];
-};
 
-// src/components/hooks/useOnce.ts
-var import_react17 = __toModule(require("react"));
+// src/utils/DeepMap/once.ts
 function once(fn) {
   let called = false;
   let result = null;
@@ -2557,14 +2394,8 @@ function once(fn) {
   };
   return onceFn;
 }
-function useOnce(fn) {
-  const onceFn = (0, import_react17.useMemo)(() => {
-    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) {
@@ -2605,6 +2436,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) {
@@ -2809,287 +2647,143 @@ 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 {
+      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,
         reducerResults,
         pivotDeepMap
@@ -3106,7 +2800,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: []
             });
           }
@@ -3168,11 +2862,23 @@ function flatten(groupResult) {
   return result;
 }
 function getEnhancedGroupData(options, deepMapValue) {
-  const { groupBy, groupKeys, collapsed, parents } = options;
+  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: null,
+    data,
     groupCount: groupItems.length,
     groupData: groupItems,
     groupKeys,
@@ -3194,17 +2900,25 @@ function getEnhancedGroupData(options, deepMapValue) {
   return enhancedGroupData;
 }
 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);
+  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 } = param;
+  const {
+    groupResult,
+    toPrimaryKey,
+    groupRowsState,
+    generateGroupRows,
+    reducers = {}
+  } = param;
   const { groupParams, deepMap, pivot } = groupResult;
   const { groupBy } = groupParams;
   const groupByStrings = groupBy.map((g) => g.field);
@@ -3219,6 +2933,7 @@ function enhancedFlatten(param) {
     const enhancedGroupData = getEnhancedGroupData({
       groupBy: groupByStrings,
       parents: Array.from(parents),
+      reducers,
       indexInGroup,
       indexInParentGroups: Array.from(indexInParentGroups),
       indexInAll: result.length,
@@ -3262,97 +2977,750 @@ function enhancedFlatten(param) {
         next();
       }
     }
-    parents.pop();
-    indexInParentGroups.pop();
-  });
-  return {
-    data: result
+    parents.pop();
+    indexInParentGroups.pop();
+  });
+  return {
+    data: result
+  };
+}
+
+// src/components/hooks/useEffectWithChanges.ts
+var import_react14 = __toModule(require("react"));
+function useEffectWithChanges(fn, deps) {
+  const prevRef = (0, import_react14.useRef)({});
+  const oldValuesRef = (0, import_react14.useRef)({});
+  const oldValues = oldValuesRef.current;
+  const changesRef = (0, import_react14.useRef)({});
+  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;
+  (0, import_react14.useEffect)(() => {
+    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] = (0, import_react15.useState)({
+    vertical: false,
+    horizontal: false
+  });
+  const scrollbarsRef = (0, import_react15.useRef)(scrollbars);
+  (0, import_react15.useEffect)(() => {
+    notifyScrollbarsChange.onChange((scrollbars2) => {
+      if (!scrollbars2) {
+        return;
+      }
+      scrollbarsRef.current = scrollbars2;
+      setScrollbars(scrollbars2);
+    });
+    return () => notifyScrollbarsChange.destroy();
+  }, [notifyScrollbarsChange]);
+  (0, import_react15.useEffect)(() => {
+    const frameId = requestAnimationFrame(() => {
+      var _a;
+      if (!((_a = scrollbarsRef.current) == null ? void 0 : _a.vertical) && livePaginationCursor) {
+        actions.cursorId = livePaginationCursor;
+      }
+    });
+    return () => cancelAnimationFrame(frameId);
+  }, [livePaginationCursor]);
+  (0, import_react15.useEffect)(() => {
+    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 = (0, import_react15.useRef)(true);
+  (0, import_react15.useEffect)(() => {
+    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: []
+      });
+    }
+  };
+};
+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 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 result;
+}
+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: []
+      });
+    }
+  }
+}
+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;
+    }
   };
 }
 
 // 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) {
@@ -3360,12 +3728,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 = {
@@ -3388,29 +3766,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);
@@ -3429,20 +3817,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 {
@@ -3483,13 +3883,14 @@ function DataSourceWithContext(props) {
   if (typeof children === "function") {
     children = children(computedValues);
   }
-  return /* @__PURE__ */ React9.createElement(React9.Fragment, null, children);
+  return /* @__PURE__ */ React8.createElement(React8.Fragment, null, children);
 }
 var DataSourceRoot = getComponentStateRoot({
   initSetupState: initSetupState2,
   forwardProps: forwardProps3,
   concludeReducer,
   mapPropsToState: mapPropsToState2,
+  onPropChange,
   interceptActions: getInterceptActions()
 });
 function DataSourceCmp({ children }) {
@@ -3505,14 +3906,14 @@ function DataSourceCmp({ children }) {
     globalThis.getDataSourceState = getState;
   }
   useLoadData();
-  return /* @__PURE__ */ React9.createElement(DataSourceContext.Provider, {
+  return /* @__PURE__ */ React8.createElement(DataSourceContext.Provider, {
     value: contextValue
-  }, /* @__PURE__ */ React9.createElement(DataSourceWithContext, {
+  }, /* @__PURE__ */ React8.createElement(DataSourceWithContext, {
     children
   }));
 }
 function DataSource(props) {
-  return /* @__PURE__ */ React9.createElement(DataSourceRoot, __spreadValues({}, props), /* @__PURE__ */ React9.createElement(DataSourceCmp, {
+  return /* @__PURE__ */ React8.createElement(DataSourceRoot, __spreadValues({}, props), /* @__PURE__ */ React8.createElement(DataSourceCmp, {
     children: props.children
   }));
 }
@@ -3520,58 +3921,64 @@ function DataSource(props) {
 // src/components/InfiniteTable/hooks/useToggleGroupRow.ts
 function useToggleGroupRow() {
   const { getState: getDataSourceState, componentActions: dataSourceActions } = useDataSourceContextValue();
-  const toggleGroupRow = (0, import_react18.useCallback)((groupKeys) => {
-    const newState = new GroupRowsState(getDataSourceState().groupRowsState);
+  const toggleGroupRow = (0, import_react16.useCallback)((groupKeys) => {
+    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 = (0, import_react19.useMemo)(() => {
-    return groupRowsBy.reduce((acc, groupBy, index) => {
-      acc.set(groupBy.field, {
-        groupBy,
+function useGroupByMap(groupBy) {
+  const groupByMap = (0, import_react17.useMemo)(() => {
+    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);
-  (0, import_react19.useEffect)(() => {
+  const groupByMap = useGroupByMap(groupBy);
+  (0, import_react17.useEffect)(() => {
     dataSourceActions.generateGroupRows = groupRenderStrategy !== "inline";
   }, [groupRenderStrategy]);
-  (0, import_react19.useEffect)(() => {
+  (0, import_react17.useEffect)(() => {
     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;
@@ -3616,9 +4023,9 @@ function useColumnsWhenInlineGroupRenderStrategy(groupRowsMap) {
     });
     return computedColumns.size === 0 ? void 0 : computedColumns;
   }
-  (0, import_react19.useEffect)(() => {
+  (0, import_react17.useEffect)(() => {
     const update = () => {
-      componentActions.columnsWhenInlineGroupRenderStrategy = computeColumnsWhenInlineGroupRenderStrategy(columns, groupRowsMap, groupRenderStrategy, toggleGroupRow);
+      componentActions.columnsWhenInlineGroupRenderStrategy = computeColumnsWhenInlineGroupRenderStrategy(columns, groupByMap, groupRenderStrategy, toggleGroupRow);
     };
     update();
     return interceptMap(columns, {
@@ -3626,11 +4033,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,
@@ -3642,13 +4049,13 @@ function useColumnsWhenPivoting() {
     }
   } = useComponentState();
   const toggleGroupRow = useToggleGroupRow();
-  (0, import_react19.useEffect)(() => {
+  (0, import_react17.useEffect)(() => {
     const computedPivotColumns = getComputedPivotColumnsFromDataSourcePivotColumns(pivotColumns, {
       pivotColumn,
       pivotRowLabelsColumn,
       pivotTotalColumnPosition,
       pivotBy,
-      groupRowsBy,
+      groupBy,
       toggleGroupRow
     });
     componentActions.computedPivotColumns = computedPivotColumns;
@@ -3656,14 +4063,14 @@ function useColumnsWhenPivoting() {
 }
 function useColumnsWhenGrouping() {
   const {
-    componentState: { groupRowsBy }
+    componentState: { groupBy }
   } = useDataSourceContextValue();
   const {
     componentActions,
     componentState: { columns, groupColumn, groupRenderStrategy, pivotColumns }
   } = useComponentState();
   const toggleGroupRow = useToggleGroupRow();
-  (0, import_react19.useEffect)(() => {
+  (0, import_react17.useEffect)(() => {
     if (pivotColumns) {
       return;
     }
@@ -3672,7 +4079,7 @@ function useColumnsWhenGrouping() {
         columns,
         groupColumn,
         groupRenderStrategy,
-        groupRowsBy,
+        groupBy,
         pivotColumns,
         toggleGroupRow
       });
@@ -3684,11 +4091,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 {
@@ -3700,11 +4107,11 @@ function useHideEmptyGroupColumns(groupRowsMap) {
       groupRenderStrategy
     }
   } = useComponentState();
-  (0, import_react19.useEffect)(() => {
-    if (groupRenderStrategy === "single-column") {
+  (0, import_react17.useEffect)(() => {
+    if (groupRenderStrategy !== "multi-column") {
       return;
     }
-    const groupsLength = groupRowsBy.length;
+    const groupsLength = groupBy.length;
     let expandedGroupsLevel = 0;
     const { dataArray } = getDataSourceState();
     const len = dataArray.length;
@@ -3718,20 +4125,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) {
@@ -3741,7 +4148,7 @@ function useHideEmptyGroupColumns(groupRowsMap) {
     getDataSourceState,
     groupRenderStrategy,
     generatedColumns,
-    groupRowsBy,
+    groupBy,
     groupRowsMap,
     hideEmptyGroupColumns ? groupRowsState : null,
     hideEmptyGroupColumns
@@ -3750,7 +4157,7 @@ function useHideEmptyGroupColumns(groupRowsMap) {
 function getColumnsWhenGrouping(params) {
   const {
     pivotColumns,
-    groupRowsBy,
+    groupBy,
     groupColumn,
     groupRenderStrategy,
     toggleGroupRow,
@@ -3764,10 +4171,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
@@ -3776,8 +4183,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);
@@ -3794,7 +4201,8 @@ function useComputed() {
   const { componentActions, componentState } = useComponentState();
   const {
     componentActions: dataSourceActions,
-    componentState: dataSourceState
+    componentState: dataSourceState,
+    getState: getDataSourceState
   } = useDataSourceContextValue();
   const {
     columnOrder,
@@ -3802,9 +4210,10 @@ function useComputed() {
     columnPinning,
     columnSizing,
     columnTypes,
-    bodySize
+    bodySize,
+    showSeparatePivotColumnForSingleAggregation
   } = componentState;
-  (0, import_react20.useState)(() => {
+  (0, import_react18.useState)(() => {
     componentState.onRowHeightCSSVarChange.onChange((rowHeight) => {
       if (rowHeight) {
         componentActions.rowHeight = rowHeight;
@@ -3816,15 +4225,17 @@ function useComputed() {
       }
     });
   });
-  useColumnAggregations();
+  (0, import_react18.useEffect)(() => {
+    dataSourceActions.showSeparatePivotColumnForSingleAggregation = showSeparatePivotColumnForSingleAggregation;
+  }, [showSeparatePivotColumnForSingleAggregation]);
   const { multiSort } = dataSourceState;
   useColumnGroups();
   useColumnsWhen();
-  const setSortInfo = (0, import_react20.useCallback)((sortInfo) => {
+  const setSortInfo = (0, import_react18.useCallback)((sortInfo) => {
     var _a2;
     const newSortInfo = multiSort ? sortInfo : (_a2 = sortInfo[0]) != null ? _a2 : null;
     dataSourceActions.sortInfo = newSortInfo;
-  }, []);
+  }, [getDataSourceState]);
   const columns = componentState.computedColumns;
   const {
     computedColumnOrder,
@@ -3911,7 +4322,7 @@ function useComputed() {
 }
 
 // src/components/InfiniteTable/components/InfiniteTableBody/InfiniteTableBody.tsx
-var React10 = __toModule(require("react"));
+var React9 = __toModule(require("react"));
 
 // src/components/InfiniteTable/hooks/useInternalProps.ts
 var useInternalProps = () => {
@@ -3919,9 +4330,9 @@ var useInternalProps = () => {
 };
 
 // src/components/InfiniteTable/components/InfiniteTableBody/InfiniteTableBody.tsx
-var InfiniteTableBody = React10.forwardRef(function InfiniteTableBody2(props, ref) {
+var InfiniteTableBody = React9.forwardRef(function InfiniteTableBody2(props, ref) {
   const { rootClassName: rootClassName12 } = useInternalProps();
-  return /* @__PURE__ */ React10.createElement("div", __spreadProps(__spreadValues({
+  return /* @__PURE__ */ React9.createElement("div", __spreadProps(__spreadValues({
     ref
   }, props), {
     className: join(`${rootClassName12}Body`, position.relative, flex["1"], transformTranslateZero, props.className)
@@ -3929,16 +4340,16 @@ var InfiniteTableBody = React10.forwardRef(function InfiniteTableBody2(props, re
 });
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/InfiniteTableHeaderWrapper.tsx
-var React22 = __toModule(require("react"));
+var React21 = __toModule(require("react"));
 
 // src/components/InfiniteTable/components/ScrollbarPlaceholder.tsx
-var React11 = __toModule(require("react"));
+var React10 = __toModule(require("react"));
 function HorizontalScrollbarPlaceholderFn(props) {
   const scrollbarWidth2 = getScrollbarWidth();
   if (!scrollbarWidth2) {
     return null;
   }
-  return /* @__PURE__ */ React11.createElement("div", {
+  return /* @__PURE__ */ React10.createElement("div", {
     "data-name": "horizontal-scrollbar-placeholder",
     style: __spreadValues({
       position: "absolute",
@@ -3948,13 +4359,13 @@ function HorizontalScrollbarPlaceholderFn(props) {
     }, props.style)
   });
 }
-var HorizontalScrollbarPlaceholder = React11.memo(HorizontalScrollbarPlaceholderFn);
+var HorizontalScrollbarPlaceholder = React10.memo(HorizontalScrollbarPlaceholderFn);
 function VerticalScrollbarPlaceholderFn(props) {
   const scrollbarWidth2 = getScrollbarWidth();
   if (!scrollbarWidth2) {
     return null;
   }
-  return /* @__PURE__ */ React11.createElement("div", {
+  return /* @__PURE__ */ React10.createElement("div", {
     "data-name": "vertical-scrollbar-placeholder",
     style: __spreadValues({
       position: "absolute",
@@ -3964,14 +4375,14 @@ function VerticalScrollbarPlaceholderFn(props) {
     }, props.style)
   });
 }
-var VerticalScrollbarPlaceholder = React11.memo(VerticalScrollbarPlaceholderFn);
+var VerticalScrollbarPlaceholder = React10.memo(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";
@@ -3979,29 +4390,29 @@ var HeaderSortIconCls = "_12zfob11 _16lm1iw1";
 var HeaderWrapperCls = "_12zfob1v _16lm1iw16 _16lm1iw1 _16lm1iwj _16lm1iw10";
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/InfiniteTableHeader.tsx
-var React18 = __toModule(require("react"));
-var import_react28 = __toModule(require("react"));
+var React17 = __toModule(require("react"));
+var import_react26 = __toModule(require("react"));
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/InfiniteTableHeaderCell.tsx
-var React14 = __toModule(require("react"));
-var import_react24 = __toModule(require("react"));
+var React13 = __toModule(require("react"));
+var import_react22 = __toModule(require("react"));
 
 // src/components/InfiniteTable/components/InfiniteTableRow/InfiniteTableCell.tsx
-var React12 = __toModule(require("react"));
+var React11 = __toModule(require("react"));
 
 // src/components/InfiniteTable/hooks/useInfiniteTableState.ts
-var import_react21 = __toModule(require("react"));
+var import_react19 = __toModule(require("react"));
 var useInfiniteTableState = () => {
   const TableContext2 = getInfiniteTableContext();
-  const { componentState } = (0, import_react21.useContext)(TableContext2);
+  const { componentState } = (0, import_react19.useContext)(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
@@ -4046,20 +4457,20 @@ function InfiniteTableCellFn(props) {
       style.transform = `translate3d(${shiftLeft}px, 0px, 0px)`;
     }
   }
-  return /* @__PURE__ */ React12.createElement("div", __spreadProps(__spreadValues({}, domProps), {
+  return /* @__PURE__ */ React11.createElement("div", __spreadProps(__spreadValues({}, domProps), {
     ref: domRef,
     style,
     "data-name": `Cell`,
     className: join(domProps.className, columnAlignCellStyle[(_b = column.align) != null ? _b : "start"], justifyContent[(_c = column.align) != null ? _c : "start"], InfiniteTableCellClassName, CellCls2, shifting ? `${InfiniteTableCellClassName}--shifting ${CellClsVariants.shifting}` : "")
-  }), beforeChildren, cssEllipsis ? /* @__PURE__ */ React12.createElement("div", {
+  }), beforeChildren, cssEllipsis ? /* @__PURE__ */ React11.createElement("div", {
     className: `${rootClassName2}Cell_content ${cssEllipsisClassName}`
   }, children) : children, afterChildren);
 }
-var InfiniteTableCell = React12.memo(InfiniteTableCellFn);
+var InfiniteTableCell = React11.memo(InfiniteTableCellFn);
 
 // src/components/InfiniteTable/hooks/useColumnPointerEvents.ts
 var import_binary_search = __toModule(require_binary_search());
-var import_react22 = __toModule(require("react"));
+var import_react20 = __toModule(require("react"));
 
 // src/components/InfiniteTable/utils/moveXatY.ts
 var moveXatY = (arr, dragIndex, dropIndex) => {
@@ -4093,18 +4504,18 @@ var useColumnPointerEvents = ({
   columns,
   computedRemainingSpace
 }) => {
-  const [draggingDiff, setDraggingDiff] = (0, import_react22.useState)(null);
-  const [proxyOffset, setProxyOffset] = (0, import_react22.useState)(null);
-  const breakpointsRef = (0, import_react22.useRef)([]);
-  const pointerMoveRef = (0, import_react22.useRef)(null);
-  const didDragRef = (0, import_react22.useRef)(false);
-  const initialClientPos = (0, import_react22.useRef)(null);
-  const currentDropIndexRef = (0, import_react22.useRef)(null);
+  const [draggingDiff, setDraggingDiff] = (0, import_react20.useState)(null);
+  const [proxyOffset, setProxyOffset] = (0, import_react20.useState)(null);
+  const breakpointsRef = (0, import_react20.useRef)([]);
+  const pointerMoveRef = (0, import_react20.useRef)(null);
+  const didDragRef = (0, import_react20.useRef)(false);
+  const initialClientPos = (0, import_react20.useRef)(null);
+  const currentDropIndexRef = (0, import_react20.useRef)(null);
   const dragging = draggingDiff != null;
   const { componentActions, computed } = useInfiniteTable();
   const { computedColumnOrder } = computed;
-  const column = (0, import_react22.useMemo)(() => columns.get(columnId), [columnId, columns]);
-  const { columnIndex, columnWidth, columnsArray } = (0, import_react22.useMemo)(() => {
+  const column = (0, import_react20.useMemo)(() => columns.get(columnId), [columnId, columns]);
+  const { columnIndex, columnWidth, columnsArray } = (0, import_react20.useMemo)(() => {
     const columnsArray2 = Array.from(columns.values());
     return {
       columnsArray: columnsArray2,
@@ -4112,8 +4523,8 @@ var useColumnPointerEvents = ({
       columnWidth: column.computedWidth
     };
   }, [columns, columnId, column]);
-  let cursorRef = (0, import_react22.useRef)("auto");
-  const onPointerDown = (0, import_react22.useCallback)((e) => {
+  let cursorRef = (0, import_react20.useRef)("auto");
+  const onPointerDown = (0, import_react20.useCallback)((e) => {
     const target = domRef.current;
     cursorRef.current = target.style.cursor;
     didDragRef.current = false;
@@ -4176,7 +4587,7 @@ var useColumnPointerEvents = ({
     target.addEventListener("pointermove", onPointerMove);
     target.setPointerCapture(e.pointerId);
   }, [columns, column, columnIndex, columnsArray, computedRemainingSpace]);
-  const onPointerUp = (0, import_react22.useCallback)((e) => {
+  const onPointerUp = (0, import_react20.useCallback)((e) => {
     const target = domRef.current;
     target.style.cursor = cursorRef.current;
     target.releasePointerCapture(e.pointerId);
@@ -4250,8 +4661,8 @@ function useCellClassName(column, baseClasses, variants, extraFlags) {
 var import_react_dom = __toModule(require("react-dom"));
 
 // src/components/InfiniteTable/components/icons/SortIcon.tsx
-var React13 = __toModule(require("react"));
-var import_react23 = __toModule(require("react"));
+var React12 = __toModule(require("react"));
+var import_react21 = __toModule(require("react"));
 var defaultLineStyle = {
   marginTop: 2,
   marginBottom: 2,
@@ -4259,8 +4670,8 @@ var defaultLineStyle = {
 };
 function SortIcon(props) {
   var _a;
-  const [rendered, setRendered] = (0, import_react23.useState)(true);
-  const [opacity, setOpacity] = (0, import_react23.useState)(0);
+  const [rendered, setRendered] = (0, import_react21.useState)(true);
+  const [opacity, setOpacity] = (0, import_react21.useState)(0);
   const { direction, lineWidth = 1, style, className, index } = props;
   const showIndex = index != null && index > 0;
   const size = (_a = props.size) != null ? _a : 16;
@@ -4274,7 +4685,7 @@ function SortIcon(props) {
   }), props.lineStyle), {
     opacity
   });
-  (0, import_react23.useEffect)(() => {
+  (0, import_react21.useEffect)(() => {
     const newOpacity = direction != 0 ? 1 : 0;
     if (!rendered && newOpacity) {
       setRendered(true);
@@ -4304,18 +4715,18 @@ function SortIcon(props) {
   if (direction === -1) {
     indexStyle.top = "100%";
   }
-  return /* @__PURE__ */ React13.createElement("div", {
+  return /* @__PURE__ */ React12.createElement("div", {
     style: __spreadProps(__spreadValues({}, style), { width: size }),
     className: join(className, "ITableIcon", "ITableIcon-sort")
-  }, showIndex ? /* @__PURE__ */ React13.createElement("div", {
+  }, showIndex ? /* @__PURE__ */ React12.createElement("div", {
     "data-name": "index",
     style: indexStyle
-  }, index) : null, /* @__PURE__ */ React13.createElement("div", {
+  }, index) : null, /* @__PURE__ */ React12.createElement("div", {
     style: __spreadValues({ width: sizes[0] }, lineStyle),
     onTransitionEnd
-  }), /* @__PURE__ */ React13.createElement("div", {
+  }), /* @__PURE__ */ React12.createElement("div", {
     style: __spreadValues({ width: sizes[1] }, lineStyle)
-  }), /* @__PURE__ */ React13.createElement("div", {
+  }), /* @__PURE__ */ React12.createElement("div", {
     style: __spreadValues({ width: sizes[2] }, lineStyle)
   }));
 }
@@ -4346,13 +4757,13 @@ function InfiniteTableHeaderCell(props) {
     });
   }
   header = header != null ? header : column.name;
-  const sortTool = /* @__PURE__ */ React14.createElement(SortIcon, {
+  const sortTool = /* @__PURE__ */ React13.createElement(SortIcon, {
     index: column.computedMultiSort ? column.computedSortIndex + 1 : void 0,
     className: `${baseCls}__sort-icon ${HeaderSortIconCls}`,
     direction: column.computedSorted ? column.computedSortedAsc ? 1 : -1 : 0
   });
-  const domRef = (0, import_react24.useRef)(null);
-  const ref = (0, import_react24.useCallback)((node) => {
+  const domRef = (0, import_react22.useRef)(null);
+  const ref = (0, import_react22.useCallback)((node) => {
     var _a2;
     domRef.current = node;
     (_a2 = props.domRef) == null ? void 0 : _a2.call(props, node);
@@ -4361,7 +4772,7 @@ function InfiniteTableHeaderCell(props) {
     computed: { computedRemainingSpace },
     componentState: { portalDOMRef }
   } = useInfiniteTable();
-  (0, import_react24.useEffect)(() => {
+  (0, import_react22.useEffect)(() => {
     let clearOnResize = null;
     const node = domRef.current;
     if (onResize && node) {
@@ -4384,7 +4795,7 @@ function InfiniteTableHeaderCell(props) {
   let offset = offsetFromProps != null ? offsetFromProps : virtualized ? 0 : column.computedPinningOffset;
   let draggingProxy = null;
   if (dragging) {
-    draggingProxy = /* @__PURE__ */ React14.createElement("div", {
+    draggingProxy = /* @__PURE__ */ React13.createElement("div", {
       className: `${baseCls}Proxy ${HeaderCellProxy}`,
       style: {
         position: "absolute",
@@ -4397,7 +4808,7 @@ function InfiniteTableHeaderCell(props) {
     }, header);
     draggingProxy = (0, import_react_dom.createPortal)(draggingProxy, portalDOMRef.current);
   }
-  return /* @__PURE__ */ React14.createElement(React14.Fragment, null, /* @__PURE__ */ React14.createElement(InfiniteTableCell, {
+  return /* @__PURE__ */ React13.createElement(React13.Fragment, null, /* @__PURE__ */ React13.createElement(InfiniteTableCell, {
     domRef: ref,
     column,
     "data-name": `HeaderCell`,
@@ -4413,29 +4824,29 @@ function InfiniteTableHeaderCell(props) {
 }
 
 // src/components/RawList/index.tsx
-var React17 = __toModule(require("react"));
-var import_react27 = __toModule(require("react"));
+var React16 = __toModule(require("react"));
+var import_react25 = __toModule(require("react"));
 
 // src/components/RawList/AvoidReactDiff.tsx
-var React15 = __toModule(require("react"));
-var import_react25 = __toModule(require("react"));
+var React14 = __toModule(require("react"));
+var import_react23 = __toModule(require("react"));
 function AvoidReactDiffFn(props) {
-  const [children, setChildren] = (0, import_react25.useState)(props.updater.get());
-  (0, import_react25.useLayoutEffect)(() => {
+  const [children, setChildren] = (0, import_react23.useState)(props.updater.get());
+  (0, import_react23.useLayoutEffect)(() => {
     const remove = props.updater.onChange((children2) => {
       setChildren(children2);
     });
     return remove;
   }, [props.updater]);
-  return /* @__PURE__ */ React15.createElement(React15.Fragment, null, children);
+  return /* @__PURE__ */ React14.createElement(React14.Fragment, null, children);
 }
-var AvoidReactDiff = React15.memo(AvoidReactDiffFn);
+var AvoidReactDiff = React14.memo(AvoidReactDiffFn);
 
 // src/components/RawList/useVirtualRenderer.ts
-var import_react26 = __toModule(require("react"));
+var import_react24 = __toModule(require("react"));
 
 // src/components/RawList/ReactVirtualRenderer.tsx
-var React16 = __toModule(require("react"));
+var React15 = __toModule(require("react"));
 
 // src/components/RawList/MappedItems.ts
 var MappedItems = class extends Logger {
@@ -4680,7 +5091,7 @@ var ReactVirtualRenderer = class extends Logger {
     };
     this.itemDOMRefs[elementIndex] = domRef;
     this.updaters[elementIndex] = buildSubscriptionCallback();
-    const item = /* @__PURE__ */ React16.createElement(AvoidReactDiff, {
+    const item = /* @__PURE__ */ React15.createElement(AvoidReactDiff, {
       key: elementIndex,
       name: `${elementIndex}`,
       updater: this.updaters[elementIndex]
@@ -4746,7 +5157,7 @@ function createRenderer(brain) {
 function useVirtualRenderer({
   brain
 }) {
-  return (0, import_react26.useMemo)(() => {
+  return (0, import_react24.useMemo)(() => {
     return createRenderer(brain);
   }, [brain]);
 }
@@ -4759,7 +5170,7 @@ function RawListFn(props) {
     debugChannel
   });
   const getRenderItem = useLatest(renderItem);
-  (0, import_react27.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     const renderRange = brain.getRenderRange();
     renderer.renderRange(renderRange, {
       renderItem,
@@ -4767,7 +5178,7 @@ function RawListFn(props) {
       onRender: onRenderUpdater
     });
   }, [brain, renderItem, onRenderUpdater]);
-  (0, import_react27.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     const remove = brain.onRenderRangeChange((renderRange) => {
       renderer.renderRange(renderRange, {
         force: false,
@@ -4777,11 +5188,11 @@ function RawListFn(props) {
     });
     return remove;
   }, [brain, onRenderUpdater]);
-  return /* @__PURE__ */ React17.createElement(AvoidReactDiff, {
+  return /* @__PURE__ */ React16.createElement(AvoidReactDiff, {
     updater: onRenderUpdater
   });
 }
-var RawList = React17.memo(RawListFn);
+var RawList = React16.memo(RawListFn);
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/InfiniteTableHeader.tsx
 var debug3 = dbg("Header");
@@ -4794,7 +5205,7 @@ function InfiniteTableHeaderFn(props) {
     componentState: { headerHeight }
   } = useInfiniteTable();
   const { computedVisibleColumnsMap } = computed;
-  const renderColumn = (0, import_react28.useCallback)(({ domRef: domRef2, itemIndex: columnIndex }) => {
+  const renderColumn = (0, import_react26.useCallback)(({ domRef: domRef2, itemIndex: columnIndex }) => {
     const column = columns[columnIndex];
     if (!column) {
       if (true) {
@@ -4802,21 +5213,21 @@ function InfiniteTableHeaderFn(props) {
       }
       return null;
     }
-    return /* @__PURE__ */ React18.createElement(InfiniteTableHeaderCell, {
+    return /* @__PURE__ */ React17.createElement(InfiniteTableHeaderCell, {
       domRef: domRef2,
       column,
       headerHeight,
       columns: computedVisibleColumnsMap
     });
   }, [computedVisibleColumnsMap, columns, repaintId, headerHeight]);
-  (0, import_react28.useEffect)(() => {
+  (0, import_react26.useEffect)(() => {
     const onScroll = (scrollPosition) => {
       domRef.current.style.transform = `translate3d(-${scrollPosition.scrollLeft}px, 0px, 0px)`;
     };
     const removeOnScroll = brain.onScroll(onScroll);
     return removeOnScroll;
   }, [brain]);
-  const domRef = (0, import_react28.useRef)(null);
+  const domRef = (0, import_react26.useRef)(null);
   const headerCls = HeaderClsRecipe({
     pinned: pinning,
     overflow: false,
@@ -4827,18 +5238,18 @@ function InfiniteTableHeaderFn(props) {
     className: join(TableHeaderClassName, `${TableHeaderClassName}--virtualized`, className, headerCls),
     style
   };
-  return /* @__PURE__ */ React18.createElement("div", __spreadValues({}, domProps), /* @__PURE__ */ React18.createElement(RawList, {
+  return /* @__PURE__ */ React17.createElement("div", __spreadValues({}, domProps), /* @__PURE__ */ React17.createElement(RawList, {
     brain,
     renderItem: renderColumn
   }));
 }
-var InfiniteTableHeader = React18.memo(InfiniteTableHeaderFn);
+var InfiniteTableHeader = React17.memo(InfiniteTableHeaderFn);
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/InfiniteTableHeaderUnvirtualized.tsx
-var React21 = __toModule(require("react"));
+var React20 = __toModule(require("react"));
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/renderColumnHeaderGroups.tsx
-var React20 = __toModule(require("react"));
+var React19 = __toModule(require("react"));
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/buildColumnAndGroupTree.ts
 function buildColumnAndGroupTree(columns, columnGroups, columnGroupsDepthsMap) {
@@ -4928,7 +5339,7 @@ function assignGroupOffsetsAndComputedWidths(items, groupOffset = 0) {
 }
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/InfiniteTableHeaderGroup.tsx
-var React19 = __toModule(require("react"));
+var React18 = __toModule(require("react"));
 var TableHeaderGroupClassName = `${rootClassName}HeaderGroup`;
 function InfiniteTableHeaderGroup(props) {
   const { columnGroup, height, headerHeight } = props;
@@ -4942,16 +5353,16 @@ function InfiniteTableHeaderGroup(props) {
     width: columnGroup.computedWidth,
     height
   };
-  return /* @__PURE__ */ React19.createElement("div", {
+  return /* @__PURE__ */ React18.createElement("div", {
     "data-group-id": columnGroup.id,
     className: join(HeaderGroupCls, TableHeaderGroupClassName, `${TableHeaderGroupClassName}--unvirtualized`),
     style
-  }, /* @__PURE__ */ React19.createElement("div", {
+  }, /* @__PURE__ */ React18.createElement("div", {
     className: join(`${TableHeaderGroupClassName}__header`, HeaderGroup_Header),
     style: { height: headerHeight }
-  }, /* @__PURE__ */ React19.createElement("div", {
+  }, /* @__PURE__ */ React18.createElement("div", {
     className: join(`${TableHeaderGroupClassName}__header-content`, cssEllipsisClassName)
-  }, header)), /* @__PURE__ */ React19.createElement("div", {
+  }, header)), /* @__PURE__ */ React18.createElement("div", {
     className: join(`${TableHeaderGroupClassName}__children`, HeaderGroup_Children)
   }, props.children));
 }
@@ -4974,7 +5385,7 @@ function renderColumnHeaderGroups(config) {
     return items2.map((colGroupItem) => {
       if (colGroupItem.type === "column") {
         const col = colGroupItem.ref;
-        return /* @__PURE__ */ React20.createElement(InfiniteTableHeaderCell, {
+        return /* @__PURE__ */ React19.createElement(InfiniteTableHeaderCell, {
           key: col.id,
           headerHeight: (columnGroupsMaxDepth - colGroupItem.depth + 2) * headerHeight,
           column: col,
@@ -4988,7 +5399,7 @@ function renderColumnHeaderGroups(config) {
         colIds.push(col.id);
         return col;
       });
-      return /* @__PURE__ */ React20.createElement(InfiniteTableHeaderGroup, {
+      return /* @__PURE__ */ React19.createElement(InfiniteTableHeaderGroup, {
         key: `${colGroupItem.uniqueGroupId.join("/")}`,
         columns: columns2,
         height: (columnGroupsMaxDepth - colGroupItem.depth + 2) * headerHeight,
@@ -5008,7 +5419,7 @@ function renderColumnHeaderGroups(config) {
 }
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/InfiniteTableHeaderUnvirtualized.tsx
-var import_react29 = __toModule(require("react"));
+var import_react27 = __toModule(require("react"));
 var { rootClassName: rootClassName5 } = internalProps;
 var TableHeaderClassName2 = `${rootClassName5}Header`;
 var UPDATE_SCROLL = (node, scrollPosition) => {
@@ -5041,9 +5452,9 @@ function InfiniteTableHeaderUnvirtualizedFn(props) {
     },
     computed: { computedVisibleColumnsMap: columnsMap }
   } = useInfiniteTable();
-  const domRef = React21.useRef(null);
+  const domRef = React20.useRef(null);
   const hasColumnGroups = computedColumnGroups.size > 0;
-  const columnHeaderGroups = React21.useMemo(() => {
+  const columnHeaderGroups = React20.useMemo(() => {
     return hasColumnGroups ? renderColumnHeaderGroups({
       columnGroups: computedColumnGroups,
       columnGroupsDepthsMap,
@@ -5062,7 +5473,7 @@ function InfiniteTableHeaderUnvirtualizedFn(props) {
     columnGroupsMaxDepth
   ]);
   const children = hasColumnGroups ? columnHeaderGroups : columns.map((c) => {
-    return /* @__PURE__ */ React21.createElement(InfiniteTableHeaderCell, {
+    return /* @__PURE__ */ React20.createElement(InfiniteTableHeaderCell, {
       key: c.id,
       headerHeight,
       column: c,
@@ -5074,7 +5485,7 @@ function InfiniteTableHeaderUnvirtualizedFn(props) {
   if (totalWidth != null) {
     style.width = availableWidth;
   }
-  (0, import_react29.useEffect)(() => {
+  (0, import_react27.useEffect)(() => {
     const scroller = brain || scrollListener;
     if (!scroller || !scrollable) {
       return;
@@ -5085,20 +5496,20 @@ function InfiniteTableHeaderUnvirtualizedFn(props) {
     const removeOnScroll = scroller.onScroll(onScroll);
     return removeOnScroll;
   }, [brain, scrollListener]);
-  return /* @__PURE__ */ React21.createElement("div", __spreadProps(__spreadValues({}, domProps), {
+  return /* @__PURE__ */ React20.createElement("div", __spreadProps(__spreadValues({}, domProps), {
     className: join(TableHeaderClassName2, `${TableHeaderClassName2}--unvirtualized`, pinning ? `${TableHeaderClassName2}--pinned ${TableHeaderClassName2}-${pinning}` : "", scrollable ? `${TableHeaderClassName2}--overflow` : "", domProps.className, HeaderClsRecipe({
       pinned: pinning,
       virtualized: false,
       overflow: scrollable
     })),
     style
-  }), /* @__PURE__ */ React21.createElement("div", {
+  }), /* @__PURE__ */ React20.createElement("div", {
     style: { width: totalWidth },
     className: join(flexFlow.row, display.flex),
     ref: domRef
   }, children));
 }
-var InfiniteTableHeaderUnvirtualized = React21.memo(InfiniteTableHeaderUnvirtualizedFn);
+var InfiniteTableHeaderUnvirtualized = React20.memo(InfiniteTableHeaderUnvirtualizedFn);
 
 // src/components/InfiniteTable/components/InfiniteTableHeader/InfiniteTableHeaderWrapper.tsx
 function TableHeaderWrapper(props) {
@@ -5128,7 +5539,10 @@ function TableHeaderWrapper(props) {
   const hasPinnedStart = computedPinnedStartColumns.length > 0;
   const hasPinnedEnd = computedPinnedEndColumns.length > 0;
   const height = columnGroupsMaxDepth ? columnGroupsMaxDepth * headerHeight : headerHeight;
-  const header = virtualizeHeader ? /* @__PURE__ */ React22.createElement(InfiniteTableHeader, {
+  const unvirtualizedStyle = !virtualizeHeader && computedPinnedStartColumnsWidth ? {
+    left: computedPinnedStartWidth
+  } : void 0;
+  const header = virtualizeHeader ? /* @__PURE__ */ React21.createElement(InfiniteTableHeader, {
     columns: computedUnpinnedColumns,
     repaintId: virtualizeHeader ? repaintId : void 0,
     brain,
@@ -5141,7 +5555,8 @@ function TableHeaderWrapper(props) {
     },
     availableWidth: computedUnpinnedColumnsWidth,
     totalWidth: computedUnpinnedColumnsWidth
-  }) : /* @__PURE__ */ React22.createElement(InfiniteTableHeaderUnvirtualized, {
+  }) : /* @__PURE__ */ React21.createElement(InfiniteTableHeaderUnvirtualized, {
+    style: unvirtualizedStyle,
     brain,
     scrollable: true,
     pinning: false,
@@ -5149,12 +5564,12 @@ function TableHeaderWrapper(props) {
     availableWidth: computedUnpinnedColumnsWidth,
     totalWidth: computedUnpinnedColumnsWidth
   });
-  return /* @__PURE__ */ React22.createElement("div", {
+  return /* @__PURE__ */ React21.createElement("div", {
     className: HeaderWrapperCls,
     style: {
       height: virtualizeHeader ? height : void 0
     }
-  }, hasPinnedStart ? /* @__PURE__ */ React22.createElement(InfiniteTableHeaderUnvirtualized, {
+  }, hasPinnedStart ? /* @__PURE__ */ React21.createElement(InfiniteTableHeaderUnvirtualized, {
     style: {
       left: 0,
       position: "absolute",
@@ -5166,7 +5581,7 @@ function TableHeaderWrapper(props) {
     scrollable: computedPinnedStartOverflow,
     pinning: "start",
     scrollListener: computedPinnedStartOverflow ? pinnedStartScrollListener : void 0
-  }) : null, header, hasPinnedEnd ? /* @__PURE__ */ React22.createElement(InfiniteTableHeaderUnvirtualized, {
+  }) : null, header, hasPinnedEnd ? /* @__PURE__ */ React21.createElement(InfiniteTableHeaderUnvirtualized, {
     style: {
       right: scrollbars.vertical ? getScrollbarWidth() : 0,
       position: "absolute",
@@ -5178,7 +5593,7 @@ function TableHeaderWrapper(props) {
     scrollable: computedPinnedEndOverflow,
     pinning: "end",
     scrollListener: computedPinnedEndOverflow ? pinnedEndScrollListener : void 0
-  }) : null, scrollbars.vertical ? /* @__PURE__ */ React22.createElement(VerticalScrollbarPlaceholder, {
+  }) : null, scrollbars.vertical ? /* @__PURE__ */ React21.createElement(VerticalScrollbarPlaceholder, {
     style: {
       height: "100%",
       right: 0
@@ -5187,13 +5602,13 @@ function TableHeaderWrapper(props) {
 }
 
 // src/components/VirtualScrollContainer/index.tsx
-var React23 = __toModule(require("react"));
-var import_react31 = __toModule(require("react"));
+var React22 = __toModule(require("react"));
+var import_react29 = __toModule(require("react"));
 
 // src/components/hooks/useOnScroll.ts
-var import_react30 = __toModule(require("react"));
+var import_react28 = __toModule(require("react"));
 var useOnScroll = (domRef, onScroll) => {
-  (0, import_react30.useEffect)(() => {
+  (0, import_react28.useEffect)(() => {
     const domNode = domRef == null ? void 0 : domRef.current;
     const scrollFn = (event) => {
       const node = event.target;
@@ -5231,7 +5646,7 @@ var getScrollableClassName = (scrollable) => {
 
 // src/components/VirtualScrollContainer/index.tsx
 var rootClassName6 = "InfiniteVirtualScrollContainer";
-var VirtualScrollContainer = React23.forwardRef(function VirtualScrollContainer2(props, ref) {
+var VirtualScrollContainer = React22.forwardRef(function VirtualScrollContainer2(props, ref) {
   const {
     children,
     scrollable = true,
@@ -5239,9 +5654,9 @@ var VirtualScrollContainer = React23.forwardRef(function VirtualScrollContainer2
     className,
     style
   } = props;
-  const domRef = ref != null ? ref : (0, import_react31.useRef)(null);
+  const domRef = ref != null ? ref : (0, import_react29.useRef)(null);
   useOnScroll(domRef, onContainerScroll);
-  return /* @__PURE__ */ React23.createElement("div", {
+  return /* @__PURE__ */ React22.createElement("div", {
     ref: domRef,
     style,
     className: join(className, rootClassName6, VirtualScrollContainerCls, getScrollableClassName(scrollable))
@@ -5249,7 +5664,7 @@ var VirtualScrollContainer = React23.forwardRef(function VirtualScrollContainer2
 });
 
 // src/components/VirtualList/SpacePlaceholder.tsx
-var React24 = __toModule(require("react"));
+var React23 = __toModule(require("react"));
 function SpacePlaceholderFn(props) {
   const { height, width, count } = props;
   const style = {
@@ -5259,7 +5674,7 @@ function SpacePlaceholderFn(props) {
     opacity: 0,
     pointerEvents: "none"
   };
-  return /* @__PURE__ */ React24.createElement("div", {
+  return /* @__PURE__ */ React23.createElement("div", {
     "data-count": count,
     "data-placeholder-width": true ? width : void 0,
     "data-placeholder-height": true ? height : void 0,
@@ -5267,24 +5682,24 @@ function SpacePlaceholderFn(props) {
     style
   });
 }
-var SpacePlaceholder = React24.memo(SpacePlaceholderFn);
+var SpacePlaceholder = React23.memo(SpacePlaceholderFn);
 
 // src/components/InfiniteTable/hooks/useListRendering.tsx
-var import_react42 = __toModule(require("react"));
+var import_react41 = __toModule(require("react"));
 
 // src/components/InfiniteTable/hooks/useUnpinnedRendering.tsx
-var React30 = __toModule(require("react"));
-var import_react35 = __toModule(require("react"));
+var React29 = __toModule(require("react"));
+var import_react33 = __toModule(require("react"));
 
 // src/components/VirtualList/VirtualRowList.tsx
-var React26 = __toModule(require("react"));
+var React25 = __toModule(require("react"));
 
 // src/components/VirtualList/VirtualList.tsx
-var React25 = __toModule(require("react"));
-var import_react32 = __toModule(require("react"));
+var React24 = __toModule(require("react"));
+var import_react30 = __toModule(require("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";
 
@@ -5324,11 +5739,11 @@ var VirtualList = (props) => {
     "onContainerScroll",
     "children"
   ]);
-  const domRef = (0, import_react32.useRef)(null);
+  const domRef = (0, import_react30.useRef)(null);
   const [, rerender] = useRerender();
-  const [totalSize, setTotalSize] = (0, import_react32.useState)(0);
-  const renderCountRef = (0, import_react32.useRef)(0);
-  (0, import_react32.useEffect)(() => {
+  const [totalSize, setTotalSize] = (0, import_react30.useState)(0);
+  const renderCountRef = (0, import_react30.useRef)(0);
+  (0, import_react30.useEffect)(() => {
     const removeOnRenderCount = virtualBrain.onRenderCountChange((renderCount) => {
       renderCountRef.current = renderCount;
       if (true) {
@@ -5347,7 +5762,7 @@ var VirtualList = (props) => {
       removeOnTotalSizeChange();
     };
   }, [virtualBrain]);
-  (0, import_react32.useEffect)(() => {
+  (0, import_react30.useEffect)(() => {
     const onScroll = (scrollPosition) => {
       UPDATE_SCROLL2(domRef.current, scrollPosition);
     };
@@ -5362,19 +5777,19 @@ var VirtualList = (props) => {
   if (true) {
     domProps["data-cmp-name"] = `VirtualList`;
   }
-  return /* @__PURE__ */ React25.createElement(React25.Fragment, null, /* @__PURE__ */ React25.createElement("div", __spreadValues({}, domProps), /* @__PURE__ */ React25.createElement(VirtualScrollContainer, {
+  return /* @__PURE__ */ React24.createElement(React24.Fragment, null, /* @__PURE__ */ React24.createElement("div", __spreadValues({}, domProps), /* @__PURE__ */ React24.createElement(VirtualScrollContainer, {
     scrollable,
     onContainerScroll
-  }, /* @__PURE__ */ React25.createElement("div", {
+  }, /* @__PURE__ */ React24.createElement("div", {
     ref: domRef,
     className: scrollTransformTargetCls,
     "data-name": "scroll-transform-target"
-  }, /* @__PURE__ */ React25.createElement(RawList, {
+  }, /* @__PURE__ */ React24.createElement(RawList, {
     brain: virtualBrain,
     renderItem,
     repaintId,
     debugChannel: "VirtualList-" + mainAxis
-  })), children, /* @__PURE__ */ React25.createElement(SpacePlaceholder, {
+  })), children, /* @__PURE__ */ React24.createElement(SpacePlaceholder, {
     count,
     width,
     height
@@ -5384,14 +5799,14 @@ var VirtualList = (props) => {
 // src/components/VirtualList/VirtualRowList.tsx
 var VirtualRowList = (props) => {
   const _a = props, { rowWidth, rowHeight, renderRow } = _a, listProps = __objRest(_a, ["rowWidth", "rowHeight", "renderRow"]);
-  const renderItem = React26.useCallback((renderProps) => {
+  const renderItem = React25.useCallback((renderProps) => {
     return renderRow({
       domRef: renderProps.domRef,
       rowHeight: renderProps.itemSize,
       rowIndex: renderProps.itemIndex
     });
   }, [renderRow]);
-  return /* @__PURE__ */ React26.createElement(VirtualList, __spreadProps(__spreadValues({}, listProps), {
+  return /* @__PURE__ */ React25.createElement(VirtualList, __spreadProps(__spreadValues({}, listProps), {
     renderItem,
     mainAxis: "vertical",
     itemMainAxisSize: rowHeight,
@@ -5400,11 +5815,11 @@ var VirtualRowList = (props) => {
 };
 
 // src/components/InfiniteTable/components/InfiniteTableRow/InfiniteTableRow.tsx
-var React28 = __toModule(require("react"));
-var import_react34 = __toModule(require("react"));
+var React27 = __toModule(require("react"));
+var import_react32 = __toModule(require("react"));
 
 // src/components/InfiniteTable/components/InfiniteTableRow/InfiniteTableColumnCell.tsx
-var React27 = __toModule(require("react"));
+var React26 = __toModule(require("react"));
 var { rootClassName: rootClassName8 } = internalProps;
 var InfiniteTableColumnCellClassName = `${rootClassName8}ColumnCell`;
 function isColumnWithField(c) {
@@ -5431,32 +5846,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) {
@@ -5491,7 +5912,7 @@ function InfiniteTableColumnCellFn(props) {
       }
     }
   }
-  return /* @__PURE__ */ React27.createElement(InfiniteTableCell, __spreadProps(__spreadValues({
+  return /* @__PURE__ */ React26.createElement(InfiniteTableCell, __spreadProps(__spreadValues({
     domRef,
     offsetProperty
   }, dataset), {
@@ -5502,10 +5923,10 @@ function InfiniteTableColumnCellFn(props) {
     className: join(useCellClassName(column, [InfiniteTableColumnCellClassName, InfiniteTableCellClassName], ColumnCellRecipe, { dragging: false }), colClassName)
   }), hidden ? null : renderValue);
 }
-var InfiniteTableColumnCell = React27.memo(InfiniteTableColumnCellFn);
+var InfiniteTableColumnCell = React26.memo(InfiniteTableColumnCellFn);
 
 // src/components/InfiniteTable/components/InfiniteTableRow/useRowDOMProps.ts
-var import_react33 = __toModule(require("react"));
+var import_react31 = __toModule(require("react"));
 
 // src/components/InfiniteTable/components/InfiniteTableRow/InfiniteTableRowClassName.ts
 var { rootClassName: rootClassName9 } = internalProps;
@@ -5530,17 +5951,16 @@ function useRowDOMProps(props, rowProps, rowStyle, rowClassName, groupRenderStra
     domRef: domRefFromProps,
     rowInfo
   } = props;
-  const domRef = (0, import_react33.useRef)(null);
-  const rowDOMRef = (0, import_react33.useCallback)((node) => {
+  const domRef = (0, import_react31.useRef)(null);
+  const rowDOMRef = (0, import_react31.useCallback)((node) => {
     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);
   }
@@ -5563,7 +5983,7 @@ function useRowDOMProps(props, rowProps, rowStyle, rowClassName, groupRenderStra
   }), `${InfiniteTableRowClassName}--${rowInfo.isGroupRow ? "group" : "normal"}-row`, inlineGroupRoot ? `${InfiniteTableRowClassName}--inline-group-row` : "", showZebraRows ? `${InfiniteTableRowClassName}--${odd ? "odd" : "even"}` : null, showHoverRows ? `${InfiniteTableRowClassName}--show-hover` : null, domProps == null ? void 0 : domProps.className, rowProps == null ? void 0 : rowProps.className, rowComputedClassName);
   const initialMouseEnter = rowProps == null ? void 0 : rowProps.onMouseEnter;
   const initialMouseLeave = rowProps == null ? void 0 : rowProps.onMouseLeave;
-  const onMouseEnter = (0, import_react33.useCallback)((event) => {
+  const onMouseEnter = (0, import_react31.useCallback)((event) => {
     var _a;
     initialMouseEnter == null ? void 0 : initialMouseEnter(event);
     const rowIndex2 = ((_a = event.currentTarget) == null ? void 0 : _a.dataset.rowIndex) * 1;
@@ -5577,7 +5997,7 @@ function useRowDOMProps(props, rowProps, rowStyle, rowClassName, groupRenderStra
     const rows = parentNode.querySelectorAll(hoverSelector.join(","));
     rows.forEach((row) => row.classList.add(InfiniteTableRowClassName__hover, RowHoverCls));
   }, [initialMouseEnter, showHoverRows]);
-  const onMouseLeave = (0, import_react33.useCallback)((event) => {
+  const onMouseLeave = (0, import_react31.useCallback)((event) => {
     var _a;
     initialMouseLeave == null ? void 0 : initialMouseLeave(event);
     const rowIndex2 = (_a = event.currentTarget) == null ? void 0 : _a.dataset.rowIndex;
@@ -5633,13 +6053,13 @@ function InfiniteTableRowFn(props) {
     width: rowWidth,
     height: rowHeight
   }, domProps.style);
-  const renderCellRef = (0, import_react34.useRef)(null);
-  const renderCell = React28.useCallback(({ domRef, itemIndex }) => {
+  const renderCellRef = (0, import_react32.useRef)(null);
+  const renderCell = React27.useCallback(({ domRef, itemIndex }) => {
     const column = columns[itemIndex];
     if (!column) {
     }
     const hidden = false;
-    return /* @__PURE__ */ React28.createElement(InfiniteTableColumnCell, {
+    return /* @__PURE__ */ React27.createElement(InfiniteTableColumnCell, {
       getData,
       rowInfo,
       groupRenderStrategy,
@@ -5666,18 +6086,18 @@ function InfiniteTableRowFn(props) {
   if (true) {
     domProps["data-cmp-name"] = "ITableRow";
   }
-  return /* @__PURE__ */ React28.createElement("div", __spreadProps(__spreadValues({}, domProps), {
+  return /* @__PURE__ */ React27.createElement("div", __spreadProps(__spreadValues({}, domProps), {
     style
-  }), /* @__PURE__ */ React28.createElement(RawList, {
+  }), /* @__PURE__ */ React27.createElement(RawList, {
     brain,
     renderItem: renderCell,
     debugChannel: `${rowIndex}`
   }));
 }
-var InfiniteTableRow = React28.memo(InfiniteTableRowFn);
+var InfiniteTableRow = React27.memo(InfiniteTableRowFn);
 
 // src/components/InfiniteTable/components/InfiniteTableRow/InfiniteTableRowUnvirtualized.tsx
-var React29 = __toModule(require("react"));
+var React28 = __toModule(require("react"));
 function TableRowUnvirtualizedFn(props) {
   const {
     rowHeight,
@@ -5698,7 +6118,7 @@ function TableRowUnvirtualizedFn(props) {
   }, domProps.style);
   const children = columns.map((col) => {
     const hidden = false;
-    return /* @__PURE__ */ React29.createElement(InfiniteTableColumnCell, {
+    return /* @__PURE__ */ React28.createElement(InfiniteTableColumnCell, {
       key: col.id,
       virtualized: false,
       rowHeight,
@@ -5711,11 +6131,11 @@ function TableRowUnvirtualizedFn(props) {
       column: col
     });
   });
-  return /* @__PURE__ */ React29.createElement("div", __spreadProps(__spreadValues({}, domProps), {
+  return /* @__PURE__ */ React28.createElement("div", __spreadProps(__spreadValues({}, domProps), {
     style
   }), children);
 }
-var TableRowUnvirtualized = React29.memo(TableRowUnvirtualizedFn);
+var TableRowUnvirtualized = React28.memo(TableRowUnvirtualizedFn);
 
 // src/components/InfiniteTable/hooks/useUnpinnedRendering.tsx
 function useUnpinnedRendering(params) {
@@ -5737,7 +6157,7 @@ function useUnpinnedRendering(params) {
   } = params;
   const { virtualizeColumns } = getState();
   const shouldVirtualizeColumns = typeof virtualizeColumns === "function" ? virtualizeColumns(computedUnpinnedColumns) : virtualizeColumns != null ? virtualizeColumns : true;
-  const renderRowUnpinned = (0, import_react35.useCallback)((rowParams) => {
+  const renderRowUnpinned = (0, import_react33.useCallback)((rowParams) => {
     const dataArray = getData();
     const rowInfo = dataArray[rowParams.rowIndex];
     const { showZebraRows, showHoverRows } = getState();
@@ -5758,7 +6178,7 @@ function useUnpinnedRendering(params) {
       rowProps.repaintId = repaintId;
     }
     const TableRowComponent = shouldVirtualizeColumns ? InfiniteTableRow : TableRowUnvirtualized;
-    return /* @__PURE__ */ React30.createElement(TableRowComponent, __spreadValues({}, rowProps));
+    return /* @__PURE__ */ React29.createElement(TableRowComponent, __spreadValues({}, rowProps));
   }, [
     repaintId,
     rowHeight,
@@ -5768,7 +6188,7 @@ function useUnpinnedRendering(params) {
     horizontalVirtualBrain,
     verticalVirtualBrain
   ]);
-  const fakeScrollbar = getScrollbarWidth() ? /* @__PURE__ */ React30.createElement("div", {
+  const fakeScrollbar = getScrollbarWidth() ? /* @__PURE__ */ React29.createElement("div", {
     "data-name": "horizontal-scrollbar-placeholder--fake",
     style: {
       position: "absolute",
@@ -5779,10 +6199,10 @@ function useUnpinnedRendering(params) {
       overflow: "auto",
       visibility: columnShifts ? "visible" : "hidden"
     }
-  }, /* @__PURE__ */ React30.createElement("div", {
+  }, /* @__PURE__ */ React29.createElement("div", {
     style: { height: "100%", width: computedUnpinnedColumnsWidth }
   })) : null;
-  return rowHeight != 0 ? /* @__PURE__ */ React30.createElement(VirtualRowList, {
+  return rowHeight != 0 ? /* @__PURE__ */ React29.createElement(VirtualRowList, {
     repaintId: `${repaintId}-unpinned-`,
     brain: verticalVirtualBrain,
     onContainerScroll: applyScrollHorizontal,
@@ -5803,20 +6223,19 @@ function useUnpinnedRendering(params) {
 }
 
 // src/components/InfiniteTable/hooks/useOnContainerScroll.ts
-var import_react36 = __toModule(require("react"));
+var import_react34 = __toModule(require("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;
@@ -5827,23 +6246,33 @@ var useOnContainerScroll = ({
 }) => {
   const {
     componentState: {
+      scrollStopDelay,
       scrollerDOMRef,
       domRef,
       scrollToBottomOffset,
       onScrollToBottom,
       onScrollToTop,
+      onScrollStop: onScrollStopFromProps,
       bodySize
     }
   } = useInfiniteTable();
-  const { componentActions: dataSourceActions, getState: getDataSourceState } = useDataSourceContextValue();
-  const timeoutIdRef = (0, import_react36.useRef)(0);
-  const scrollingRef = (0, import_react36.useRef)(false);
-  const scrollTopMaxRef = (0, import_react36.useRef)(0);
-  (0, import_react36.useEffect)(() => {
+  const {
+    componentActions: dataSourceActions,
+    getState: getDataSourceState,
+    componentState: { notifyScrollStop }
+  } = useDataSourceContextValue();
+  const onScrollStop = (0, import_react34.useCallback)((param) => {
+    onScrollStopFromProps == null ? void 0 : onScrollStopFromProps(param);
+    notifyScrollStop(param);
+  }, [onScrollStopFromProps, notifyScrollStop]);
+  const timeoutIdRef = (0, import_react34.useRef)(0);
+  const scrollingRef = (0, import_react34.useRef)(false);
+  const scrollTopMaxRef = (0, import_react34.useRef)(0);
+  (0, import_react34.useEffect)(() => {
     const { current: node } = scrollerDOMRef;
     scrollTopMaxRef.current = node.scrollHeight - node.clientHeight;
   }, [reservedContentHeight, bodySize.height]);
-  const setScrolling = (0, import_react36.useCallback)((scrolling) => {
+  const setScrolling = (0, import_react34.useCallback)((scrolling) => {
     var _a;
     const prevScrolling = scrollingRef.current;
     scrollingRef.current = scrolling;
@@ -5854,9 +6283,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;
@@ -5867,8 +6304,8 @@ var useOnContainerScroll = ({
         classList.remove(InfiniteClsScrolling, TableClassName__Scrolling);
       }
     }
-  }, []);
-  const onContainerScroll = (0, import_react36.useCallback)((scrollInfo) => {
+  }, [scrollStopDelay, onScrollStop]);
+  const onContainerScroll = (0, import_react34.useCallback)((scrollInfo) => {
     verticalVirtualBrain.setScrollPosition(scrollInfo);
     horizontalVirtualBrain.setScrollPosition(scrollInfo);
     setScrolling(true);
@@ -5878,15 +6315,15 @@ var useOnContainerScroll = ({
     domRef.current,
     setScrolling
   ]);
-  const scrollPositionRef = (0, import_react36.useRef)({
+  const scrollPositionRef = (0, import_react34.useRef)({
     scrollLeft: 0,
     scrollTop: 0
   });
-  const applyScrollHorizontal = (0, import_react36.useCallback)(({ scrollLeft }) => {
+  const applyScrollHorizontal = (0, import_react34.useCallback)(({ scrollLeft }) => {
     scrollPositionRef.current.scrollLeft = scrollLeft;
     onContainerScroll(scrollPositionRef.current);
   }, [onContainerScroll]);
-  const applyScrollVertical = (0, import_react36.useCallback)(({ scrollTop }) => {
+  const applyScrollVertical = (0, import_react34.useCallback)(({ scrollTop }) => {
     scrollPositionRef.current.scrollTop = scrollTop;
     onContainerScroll(scrollPositionRef.current);
     if (scrollTop === 0) {
@@ -5897,7 +6334,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]);
@@ -5908,17 +6345,17 @@ var useOnContainerScroll = ({
 };
 
 // src/components/InfiniteTable/hooks/usePinnedRendering.tsx
-var React32 = __toModule(require("react"));
-var import_react39 = __toModule(require("react"));
+var React31 = __toModule(require("react"));
+var import_react37 = __toModule(require("react"));
 
 // src/components/VirtualList/RowListWithExternalScrolling.tsx
-var React31 = __toModule(require("react"));
-var import_react38 = __toModule(require("react"));
+var React30 = __toModule(require("react"));
+var import_react36 = __toModule(require("react"));
 
 // src/components/hooks/useOnMount.ts
-var import_react37 = __toModule(require("react"));
+var import_react35 = __toModule(require("react"));
 function useOnMount(domRef, props) {
-  (0, import_react37.useEffect)(() => {
+  (0, import_react35.useEffect)(() => {
     const { onMount, onUnmount } = props;
     const node = domRef == null ? void 0 : domRef.current;
     onMount == null ? void 0 : onMount(node);
@@ -5949,8 +6386,8 @@ var RowListWithExternalScrolling = (props) => {
     onMount,
     onUnmount
   } = props;
-  const domRef = (0, import_react38.useRef)(null);
-  const renderItem = (0, import_react38.useCallback)((renderProps) => renderRow({
+  const domRef = (0, import_react36.useRef)(null);
+  const renderItem = (0, import_react36.useCallback)((renderProps) => renderRow({
     domRef: renderProps.domRef,
     rowHeight: renderProps.itemSize,
     rowIndex: renderProps.itemIndex
@@ -5959,7 +6396,7 @@ var RowListWithExternalScrolling = (props) => {
     onMount,
     onUnmount
   });
-  (0, import_react38.useEffect)(() => {
+  (0, import_react36.useEffect)(() => {
     const onScroll = (scrollPosition) => {
       const node = domRef.current;
       if (node) {
@@ -5988,7 +6425,7 @@ var RowListWithExternalScrolling = (props) => {
   if (true) {
     domProps["data-cmp-name"] = "RowListWithExternalScrolling";
   }
-  return /* @__PURE__ */ React31.createElement("div", __spreadValues({}, domProps), /* @__PURE__ */ React31.createElement(RawList, {
+  return /* @__PURE__ */ React30.createElement("div", __spreadValues({}, domProps), /* @__PURE__ */ React30.createElement(RawList, {
     brain,
     renderItem,
     repaintId
@@ -6011,7 +6448,7 @@ function PinnedRowsContainer(props) {
     brain,
     renderRow
   } = props;
-  const style = React32.useMemo(() => {
+  const style = React31.useMemo(() => {
     const result = pinning === "end" ? {
       width: rowWidth,
       height,
@@ -6026,7 +6463,7 @@ function PinnedRowsContainer(props) {
     }
     return result;
   }, [height, rowWidth, pinning, hasOverflow]);
-  const updateScroll = (0, import_react39.useCallback)((node, scrollPosition) => {
+  const updateScroll = (0, import_react37.useCallback)((node, scrollPosition) => {
     UPDATE_SCROLL3(node, scrollPosition, hasOverflow ? pinnedScrollListener.getScrollPosition() : void 0);
   }, [hasOverflow, pinnedScrollListener]);
   const rowListProps = {
@@ -6037,7 +6474,7 @@ function PinnedRowsContainer(props) {
     className: join(`${PinnedRowsContainerClassName}`, PinnedRowsClsVariants[pinning === "start" ? "pinnedStart" : "pinnedEnd"], `${PinnedRowsContainerClassName}--pinned-${pinning}`, `${PinnedRowsContainerClassName}--overflow`, PinnedRowsClsVariants.overflow)
   };
   if (hasOverflow) {
-    return /* @__PURE__ */ React32.createElement(VirtualScrollContainer, {
+    return /* @__PURE__ */ React31.createElement(VirtualScrollContainer, {
       scrollable: {
         horizontal: true,
         vertical: false
@@ -6053,22 +6490,22 @@ function PinnedRowsContainer(props) {
       className: join(PinnedRowsContainerClsVariants({
         pinned: pinning
       }), `${PinnedRowsContainerClassName}Container`, `${PinnedRowsContainerClassName}Container--pinned-${pinning}`)
-    }, /* @__PURE__ */ React32.createElement(RowListWithExternalScrolling, __spreadProps(__spreadValues({}, rowListProps), {
+    }, /* @__PURE__ */ React31.createElement(RowListWithExternalScrolling, __spreadProps(__spreadValues({}, rowListProps), {
       onMount: (node) => {
         pinnedScrollListener == null ? void 0 : pinnedScrollListener.onScroll((scrollPosition) => {
           updateScroll(node, brain.getScrollPosition(), scrollPosition);
         });
       }
-    })), /* @__PURE__ */ React32.createElement(SpacePlaceholder, {
+    })), /* @__PURE__ */ React31.createElement(SpacePlaceholder, {
       width: rowWidth,
       height: 1
     }));
   }
-  return /* @__PURE__ */ React32.createElement(RowListWithExternalScrolling, __spreadValues({}, rowListProps));
+  return /* @__PURE__ */ React31.createElement(RowListWithExternalScrolling, __spreadValues({}, rowListProps));
 }
 function useRenderPinnedRow(params) {
   const { getData, getState, columnsWidth, columns, verticalBrain } = params;
-  const renderPinnedRow = (0, import_react39.useCallback)((rowParams) => {
+  const renderPinnedRow = (0, import_react37.useCallback)((rowParams) => {
     const dataArray = getData();
     const rowInfo = dataArray[rowParams.rowIndex];
     const { showZebraRows, showHoverRows } = getState();
@@ -6084,7 +6521,7 @@ function useRenderPinnedRow(params) {
       rowWidth: columnsWidth,
       columns
     }, rowParams);
-    return /* @__PURE__ */ React32.createElement(TableRowUnvirtualized, __spreadValues({}, rowProps));
+    return /* @__PURE__ */ React31.createElement(TableRowUnvirtualized, __spreadValues({}, rowProps));
   }, [columnsWidth, columns, verticalBrain]);
   return renderPinnedRow;
 }
@@ -6127,7 +6564,7 @@ function usePinnedRenderingForSide(side, params) {
     columns,
     columnsWidth
   });
-  const pinnedList = columns.length && rowHeight !== 0 ? /* @__PURE__ */ React32.createElement(PinnedRowsContainer, {
+  const pinnedList = columns.length && rowHeight !== 0 ? /* @__PURE__ */ React31.createElement(PinnedRowsContainer, {
     pinning: side,
     pinnedScrollListener,
     hasOverflow,
@@ -6140,7 +6577,7 @@ function usePinnedRenderingForSide(side, params) {
     brain: verticalVirtualBrain,
     renderRow: renderRowPinned
   }) : null;
-  const pinnedScrollbarPlaceholder = pinnedList && hasHorizontalScrollbar && !hasOverflow ? /* @__PURE__ */ React32.createElement(HorizontalScrollbarPlaceholder, {
+  const pinnedScrollbarPlaceholder = pinnedList && hasHorizontalScrollbar && !hasOverflow ? /* @__PURE__ */ React31.createElement(HorizontalScrollbarPlaceholder, {
     style: side === "end" ? {
       width: columnsWidth,
       right: hasVerticalScrollbar ? getScrollbarWidth() : 0
@@ -6182,7 +6619,16 @@ function usePinnedStartRendering(params) {
 }
 
 // src/components/InfiniteTable/hooks/useYourBrain.ts
-var import_react41 = __toModule(require("react"));
+var import_react40 = __toModule(require("react"));
+
+// src/components/hooks/useOnce.ts
+var import_react38 = __toModule(require("react"));
+function useOnce(fn) {
+  const onceFn = (0, import_react38.useMemo)(() => {
+    return once(fn);
+  }, []);
+  return onceFn();
+}
 
 // src/components/VirtualBrain/index.ts
 var import_binary_search2 = __toModule(require_binary_search());
@@ -6620,9 +7066,9 @@ var VirtualBrain = class extends Logger {
 };
 
 // src/components/InfiniteTable/hooks/useColumnSizeFn.ts
-var import_react40 = __toModule(require("react"));
+var import_react39 = __toModule(require("react"));
 function useColumnSizeFn(computedUnpinnedColumns) {
-  const columnSize = (0, import_react40.useCallback)((index) => {
+  const columnSize = (0, import_react39.useCallback)((index) => {
     const column = computedUnpinnedColumns[index];
     if (!column) {
       console.log("cannot find column at index", index, computedUnpinnedColumns);
@@ -6661,7 +7107,7 @@ function useYourBrain(param) {
     });
     return brain;
   });
-  (0, import_react41.useEffect)(() => {
+  (0, import_react40.useEffect)(() => {
     return () => {
       horizontalVirtualBrain.destroy();
       verticalVirtualBrain.destroy();
@@ -6669,13 +7115,13 @@ function useYourBrain(param) {
   }, []);
   horizontalVirtualBrain.update(computedUnpinnedColumns.length, columnSize);
   verticalVirtualBrain.update(dataArray.length, rowHeight, rowSpan);
-  (0, import_react41.useEffect)(() => {
+  (0, import_react40.useEffect)(() => {
     verticalVirtualBrain.setAvailableSize({
       height: bodySize.height,
       width: 0
     });
   }, [bodySize, verticalVirtualBrain]);
-  (0, import_react41.useEffect)(() => {
+  (0, import_react40.useEffect)(() => {
     horizontalVirtualBrain.setAvailableSize({
       height: 0,
       width: Math.max(bodySize.width - computedPinnedStartWidth - computedPinnedEndWidth, 0)
@@ -6713,12 +7159,12 @@ function useListRendering(param) {
     pinnedEndScrollListener
   } = componentState;
   const prevDataSourceTimestamp = usePrevious(dataSourceState.updatedAt);
-  const repaintIdRef = (0, import_react42.useRef)(0);
+  const repaintIdRef = (0, import_react41.useRef)(0);
   if (!shallowEqualObjects(prevComputed, computed) || prevDataSourceTimestamp !== dataSourceState.updatedAt) {
     repaintIdRef.current++;
   }
   const repaintId = repaintIdRef.current;
-  const rowSpan = (0, import_react42.useMemo)(() => {
+  const rowSpan = (0, import_react41.useMemo)(() => {
     const colsWithRowspan = computedVisibleColumns.filter((col) => typeof col.rowspan === "function");
     return colsWithRowspan.length ? ({ itemIndex }) => {
       let maxSpan = 1;
@@ -6756,11 +7202,11 @@ function useListRendering(param) {
   const hasHorizontalScrollbar = computedUnpinnedColumnsWidth > bodySize.width - computedPinnedStartColumnsWidth - computedPinnedEndColumnsWidth;
   const reservedContentHeight = verticalVirtualBrain.getTotalSize() + (hasHorizontalScrollbar ? getScrollbarWidth() : 0);
   const hasVerticalScrollbar = bodySize.height > 0 && bodySize.height < reservedContentHeight;
-  const scrollbars = (0, import_react42.useMemo)(() => ({
+  const scrollbars = (0, import_react41.useMemo)(() => ({
     vertical: hasVerticalScrollbar,
     horizontal: hasHorizontalScrollbar
   }), [hasVerticalScrollbar, hasHorizontalScrollbar]);
-  (0, import_react42.useEffect)(() => {
+  (0, import_react41.useEffect)(() => {
     if (!bodySize.height) {
       return;
     }
@@ -6773,7 +7219,6 @@ function useListRendering(param) {
         setColumnVisibility: (columnVisibility) => {
           componentActions.columnVisibility = columnVisibility;
         },
-        setColumnAggregations: (columnAggregations) => componentActions.columnAggregations = columnAggregations,
         getState,
         getDataSourceState
       };
@@ -6786,7 +7231,7 @@ function useListRendering(param) {
     reservedContentHeight
   });
   const { componentActions: dataSourceActions } = useDataSourceContextValue();
-  const toggleGroupRow = (0, import_react42.useCallback)((groupKeys) => {
+  const toggleGroupRow = (0, import_react41.useCallback)((groupKeys) => {
     const newState = new GroupRowsState(getDataSourceState().groupRowsState);
     newState.toggleGroupRow(groupKeys);
     dataSourceActions.groupRowsState = newState;
@@ -6821,7 +7266,7 @@ function useListRendering(param) {
     computedUnpinnedColumns
   });
   const [, rerender] = useRerender();
-  (0, import_react42.useEffect)(() => {
+  (0, import_react41.useEffect)(() => {
     rerender();
   }, [dataSourceState]);
   const { pinnedStartList, pinnedStartScrollbarPlaceholder } = usePinnedStartRendering(pinnedRenderingParams);
@@ -6844,8 +7289,8 @@ function useListRendering(param) {
 }
 
 // src/components/InfiniteTable/components/InfiniteTableLicenseFooter/index.tsx
-var React33 = __toModule(require("react"));
-var import_react43 = __toModule(require("react"));
+var React32 = __toModule(require("react"));
+var import_react42 = __toModule(require("react"));
 
 // src/components/utils/decamelize.ts
 function decamelize(str, options) {
@@ -6880,10 +7325,10 @@ var enforceStyle = (node, style) => {
     node.style.setProperty(decamelize(propertyName), propertyValue, "important");
   }
 };
-var InfiniteTableLicenseFooter = React33.forwardRef(function InfiniteTableLicenseFooter2(props, ref) {
+var InfiniteTableLicenseFooter = React32.forwardRef(function InfiniteTableLicenseFooter2(props, ref) {
   const { rootClassName: rootClassName12 } = useInternalProps();
-  const domRef = React33.useRef(null);
-  const domCallback = React33.useCallback((node) => {
+  const domRef = React32.useRef(null);
+  const domCallback = React32.useCallback((node) => {
     domRef.current = node;
     if (!ref) {
       return;
@@ -6894,7 +7339,7 @@ var InfiniteTableLicenseFooter = React33.forwardRef(function InfiniteTableLicens
       ref.current = node;
     }
   }, []);
-  (0, import_react43.useEffect)(() => {
+  (0, import_react42.useEffect)(() => {
     const forceStyle = () => {
       requestAnimationFrame(() => {
         var _a;
@@ -6908,12 +7353,12 @@ var InfiniteTableLicenseFooter = React33.forwardRef(function InfiniteTableLicens
       clearInterval(intervalId);
     };
   }, []);
-  return /* @__PURE__ */ React33.createElement("div", __spreadProps(__spreadValues({
+  return /* @__PURE__ */ React32.createElement("div", __spreadProps(__spreadValues({
     ref: domCallback
   }, props), {
     className: join(`${rootClassName12}-Footer`, FooterCls, props.className),
     style: defaultStyle2
-  }), "Powered by", " ", /* @__PURE__ */ React33.createElement("a", {
+  }), "Powered by", " ", /* @__PURE__ */ React32.createElement("a", {
     href: "https://infinite-table.com",
     rel: "noopener noreferrer",
     role: "link",
@@ -6922,7 +7367,7 @@ var InfiniteTableLicenseFooter = React33.forwardRef(function InfiniteTableLicens
 });
 
 // src/components/InfiniteTable/hooks/useLicense/useLicense.ts
-var import_react44 = __toModule(require("react"));
+var import_react43 = __toModule(require("react"));
 
 // src/components/InfiniteTable/hooks/useLicense/crc32.ts
 var DEFAULT_ReversedPolynomial = 3988292384;
@@ -7072,10 +7517,10 @@ var origin = typeof window !== "undefined" ? window.location.origin : "";
 var [_fullUrl, protocol, sandboxUrl] = Array.from(SANDBOX_REGEX.exec(origin) || []);
 var isInsideSandbox = protocol === "https" && sandboxUrl === "sandpack.codesandbox.io";
 var useLicense = (licenseKey = "") => {
-  const valid = (0, import_react44.useMemo)(() => {
+  const valid = (0, import_react43.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.0.10"
+      version: "0.1.3"
     });
     if (!licenseKey && !valid2 && isInsideSandbox) {
       return true;
@@ -7086,8 +7531,8 @@ var useLicense = (licenseKey = "") => {
 };
 
 // src/components/CSSVariableWatch.tsx
-var React34 = __toModule(require("react"));
-var import_react45 = __toModule(require("react"));
+var React33 = __toModule(require("react"));
+var import_react44 = __toModule(require("react"));
 var error = err("CSSVariableWatch");
 var debug5 = dbg("CSSVariableWatch");
 var WRAPPER_STYLE = {
@@ -7100,15 +7545,15 @@ var WRAPPER_STYLE = {
   overflow: "hidden"
 };
 var useCSSVariableWatch = (params) => {
-  const lastValueRef = (0, import_react45.useRef)(0);
-  const onResize = React34.useCallback(({ height }) => {
+  const lastValueRef = (0, import_react44.useRef)(0);
+  const onResize = React33.useCallback(({ height }) => {
     if (height && height !== lastValueRef.current) {
       lastValueRef.current = height;
       params.onChange(height);
     }
   }, [params.onChange]);
   useResizeObserver(params.ref, onResize, { earlyAttach: true });
-  React34.useLayoutEffect(() => {
+  React33.useLayoutEffect(() => {
     const value = params.ref.current.getBoundingClientRect().height;
     if (value) {
       lastValueRef.current = value;
@@ -7120,15 +7565,15 @@ var useCSSVariableWatch = (params) => {
   }, []);
 };
 var CSSVariableWatch = (props) => {
-  const domRef = (0, import_react45.useRef)(null);
+  const domRef = (0, import_react44.useRef)(null);
   useCSSVariableWatch(__spreadProps(__spreadValues({}, props), {
     ref: domRef
   }));
-  return /* @__PURE__ */ React34.createElement("div", {
+  return /* @__PURE__ */ React33.createElement("div", {
     "data-name": "css-variable-watcher",
     "data-var": props.varName,
     style: WRAPPER_STYLE
-  }, /* @__PURE__ */ React34.createElement("div", {
+  }, /* @__PURE__ */ React33.createElement("div", {
     ref: domRef,
     style: {
       height: props.varName.startsWith("var(") ? props.varName : `var(${props.varName})`
@@ -7221,7 +7666,7 @@ function useDOMProps(initialDOMProps) {
 }
 
 // src/components/InfiniteTable/components/LoadMask.tsx
-var React35 = __toModule(require("react"));
+var React34 = __toModule(require("react"));
 
 // src/components/InfiniteTable/components/LoadMask.css.ts
 var LoadMaskCls = { visible: "qy58ya1 qy58ya0 _16lm1iw2 _16lm1iwr _16lm1iwt _16lm1iwx _16lm1iwv", hidden: "qy58ya2 qy58ya0 _16lm1iw2 _16lm1iwr _16lm1iwt _16lm1iwx _16lm1iwv" };
@@ -7233,15 +7678,15 @@ var { rootClassName: rootClassName11 } = internalProps;
 var baseCls2 = `${rootClassName11}-LoadMask`;
 function LoadMaskFn(props) {
   const { visible, children = "Loading" } = props;
-  return /* @__PURE__ */ React35.createElement("div", {
+  return /* @__PURE__ */ React34.createElement("div", {
     className: `${LoadMaskCls[visible ? "visible" : "hidden"]} ${baseCls2}`
-  }, /* @__PURE__ */ React35.createElement("div", {
+  }, /* @__PURE__ */ React34.createElement("div", {
     className: `${LoadMaskOverlayCls} ${baseCls2}-Overlay`
-  }), /* @__PURE__ */ React35.createElement("div", {
+  }), /* @__PURE__ */ React34.createElement("div", {
     className: `${LoadMaskTextCls} ${baseCls2}-Text`
   }, children));
 }
-var LoadMask = React35.memo(LoadMaskFn);
+var LoadMask = React34.memo(LoadMaskFn);
 
 // src/components/InfiniteTable/index.tsx
 var InfiniteTableClassName = internalProps.rootClassName;
@@ -7260,7 +7705,7 @@ var InfiniteTableRoot = getComponentStateRoot({
   getParentState: () => useDataSource(),
   debugName: "InfiniteTable"
 });
-var InfiniteTableComponent = React36.memo(function InfiniteTableComponent2() {
+var InfiniteTableComponent = React35.memo(function InfiniteTableComponent2() {
   var _a;
   const {
     componentState,
@@ -7307,7 +7752,7 @@ var InfiniteTableComponent = React36.memo(function InfiniteTableComponent2() {
   const licenseValid = useLicense(licenseKey);
   const domProps = useDOMProps(componentState.domProps);
   const LoadMaskCmp = (_a = components == null ? void 0 : components.LoadMask) != null ? _a : LoadMask;
-  React36.useLayoutEffect(() => {
+  React35.useLayoutEffect(() => {
     const dataSourceState = getDataSourceState();
     const { onScrollbarsChange } = getInfiniteTableState();
     const { notifyScrollbarsChange } = dataSourceState;
@@ -7316,31 +7761,31 @@ var InfiniteTableComponent = React36.memo(function InfiniteTableComponent2() {
     }
     notifyScrollbarsChange(scrollbars);
   }, [scrollbars]);
-  return /* @__PURE__ */ React36.createElement("div", __spreadValues({
+  return /* @__PURE__ */ React35.createElement("div", __spreadValues({
     ref: domRef
-  }, domProps), header ? /* @__PURE__ */ React36.createElement(TableHeaderWrapper, {
+  }, domProps), header ? /* @__PURE__ */ React35.createElement(TableHeaderWrapper, {
     brain: horizontalVirtualBrain,
     repaintId,
     scrollbars
-  }) : null, /* @__PURE__ */ React36.createElement(InfiniteTableBody, null, /* @__PURE__ */ React36.createElement(VirtualScrollContainer, {
+  }) : null, /* @__PURE__ */ React35.createElement(InfiniteTableBody, null, /* @__PURE__ */ React35.createElement(VirtualScrollContainer, {
     ref: scrollerDOMRef,
     onContainerScroll: applyScrollVertical,
     scrollable: ONLY_VERTICAL_SCROLLBAR
-  }, /* @__PURE__ */ React36.createElement("div", {
+  }, /* @__PURE__ */ React35.createElement("div", {
     className: display.flex
-  }, pinnedStartList, centerList, pinnedEndList), /* @__PURE__ */ React36.createElement(SpacePlaceholder, {
+  }, pinnedStartList, centerList, pinnedEndList), /* @__PURE__ */ React35.createElement(SpacePlaceholder, {
     count: dataArray.length,
     width: 0,
     height: reservedContentHeight
-  })), pinnedStartScrollbarPlaceholder, pinnedEndScrollbarPlaceholder, /* @__PURE__ */ React36.createElement(LoadMaskCmp, {
+  })), pinnedStartScrollbarPlaceholder, pinnedEndScrollbarPlaceholder, /* @__PURE__ */ React35.createElement(LoadMaskCmp, {
     visible: loading
-  }, loadingText)), licenseValid ? null : /* @__PURE__ */ React36.createElement(InfiniteTableLicenseFooter, null), /* @__PURE__ */ React36.createElement("div", {
+  }, loadingText)), licenseValid ? null : /* @__PURE__ */ React35.createElement(InfiniteTableLicenseFooter, null), /* @__PURE__ */ React35.createElement("div", {
     ref: portalDOMRef,
     className: join(`${rootClassName}Portal`, zIndex[1e3], position.absolute, top[0], left[0])
-  }), rowHeightCSSVar ? /* @__PURE__ */ React36.createElement(CSSVariableWatch, {
+  }), rowHeightCSSVar ? /* @__PURE__ */ React35.createElement(CSSVariableWatch, {
     varName: rowHeightCSSVar,
     onChange: onRowHeightCSSVarChange
-  }) : null, headerHeightCSSVar ? /* @__PURE__ */ React36.createElement(CSSVariableWatch, {
+  }) : null, headerHeightCSSVar ? /* @__PURE__ */ React35.createElement(CSSVariableWatch, {
     varName: headerHeightCSSVar,
     onChange: onHeaderHeightCSSVarChange
   }) : null);
@@ -7376,25 +7821,25 @@ function InfiniteTableContextProvider() {
     }
     componentActions.bodySize = bodySize;
   }, { earlyAttach: true });
-  React36.useEffect(() => {
+  React35.useEffect(() => {
     return () => {
       componentState.onRowHeightCSSVarChange.destroy();
       componentState.onHeaderHeightCSSVarChange.destroy();
     };
   }, []);
-  React36.useEffect(() => {
+  React35.useEffect(() => {
     if (scrollerDOMRef.current) {
       scrollerDOMRef.current.scrollTop = 0;
     }
   }, [scrollTopId, scrollerDOMRef]);
   const TableContext2 = getInfiniteTableContext();
-  return /* @__PURE__ */ React36.createElement(TableContext2.Provider, {
+  return /* @__PURE__ */ React35.createElement(TableContext2.Provider, {
     value: contextValue
-  }, /* @__PURE__ */ React36.createElement(InfiniteTableComponent, null));
+  }, /* @__PURE__ */ React35.createElement(InfiniteTableComponent, null));
 }
 function InfiniteTable(props) {
-  const table = /* @__PURE__ */ React36.createElement(InfiniteTableRoot, __spreadValues({}, props), /* @__PURE__ */ React36.createElement(InfiniteTableContextProvider, null));
-  return /* @__PURE__ */ React36.createElement(React36.StrictMode, null, table);
+  const table = /* @__PURE__ */ React35.createElement(InfiniteTableRoot, __spreadValues({}, props), /* @__PURE__ */ React35.createElement(InfiniteTableContextProvider, null));
+  return /* @__PURE__ */ React35.createElement(React35.StrictMode, null, table);
 }
 InfiniteTable.defaultProps = {
   rowHeight: 40,