@infinite-table/infinite-react 0.2.3 → 0.2.7

package/index.esm.js

@@ -856,6 +856,7 @@ var mapPropsToState = (params) => {
   });
   const computedColumns = state.columnsWhenGrouping || state.columnsWhenInlineGroupRenderStrategy || state.columns;
   return {
+    controlledColumnVisibility: !!props.columnVisibility,
     groupRenderStrategy,
     groupBy,
     computedColumns,
@@ -1389,6 +1390,7 @@ var getComputedVisibleColumns = ({
     const result2 = __spreadProps(__spreadValues({
       align: colType.align,
       verticalAlign: colType.verticalAlign,
+      defaultHiddenWhenGroupedBy: colType.defaultHiddenWhenGroupedBy,
       valueGetter: colType.valueGetter,
       renderValue: colType.renderValue,
       render: colType.render
@@ -1647,7 +1649,7 @@ var useComputedVisibleColumns = ({
 var sortAscending = (a, b) => a - b;
 
 // src/components/InfiniteTable/hooks/useComputed.ts
-import { useCallback as useCallback5, useEffect as useEffect10, useState as useState5 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect10, useMemo as useMemo6, useState as useState5 } from "react";
 
 // src/components/hooks/useComponentState.tsx
 import {
@@ -2855,6 +2857,7 @@ function getEnhancedGroupData(options, deepMapValue) {
     id: `${groupKeys}`,
     collapsed,
     parents,
+    flatRowInfoList: [],
     collapsedChildrenCount: 0,
     collapsedGroupsCount: 0,
     indexInParentGroups: options.indexInParentGroups,
@@ -2917,9 +2920,14 @@ function enhancedFlatten(param) {
     }
     if (collapsed) {
       parents.forEach((parent) => {
+        parent.flatRowInfoList.push(enhancedGroupData);
         parent.collapsedChildrenCount += enhancedGroupData.groupCount;
         parent.collapsedGroupsCount += 1;
       });
+    } else {
+      parents.forEach((parent) => {
+        parent.flatRowInfoList.push(enhancedGroupData);
+      });
     }
     indexInParentGroups.push(indexInGroup);
     parents.push(enhancedGroupData);
@@ -3025,7 +3033,7 @@ function buildDataSourceDataParams(componentState, overrides) {
     dataSourceParams.livePaginationCursor = componentState.livePaginationCursor;
     dataSourceParams.cursorId = componentState.cursorId;
   }
-  if (componentState.fullLazyLoad) {
+  if (componentState.lazyLoad) {
     if (componentState.lazyLoadBatchSize != null && componentState.lazyLoadBatchSize > 0) {
       dataSourceParams.lazyLoadBatchSize = componentState.lazyLoadBatchSize;
       dataSourceParams.lazyLoadStartIndex = 0;
@@ -3050,9 +3058,9 @@ function buildDataSourceDataParams(componentState, overrides) {
 }
 function loadData(data, componentState, actions, overrides) {
   const dataParams = buildDataSourceDataParams(componentState, overrides);
-  if (componentState.fullLazyLoad && dataParams.groupKeys) {
+  if (componentState.lazyLoad) {
     const lazyGroupData = componentState.originalLazyGroupData;
-    const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys];
+    const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys || []];
     const existingGroupRowInfo = lazyGroupData.get(key);
     if (existingGroupRowInfo && existingGroupRowInfo.cache) {
       const items = existingGroupRowInfo.items;
@@ -3073,7 +3081,7 @@ function loadData(data, componentState, actions, overrides) {
     data = data(dataParams);
   }
   const dataIsPromise = typeof data === "object" && typeof data.then === "function";
-  if (dataIsPromise && !componentState.fullLazyLoad) {
+  if (dataIsPromise && !componentState.lazyLoad) {
     actions.loading = true;
   }
   return Promise.resolve(data).then((dataParam) => {
@@ -3089,9 +3097,9 @@ function loadData(data, componentState, actions, overrides) {
       if (remoteData.mappings) {
         actions.pivotMappings = remoteData.mappings;
       }
-      if (componentState.fullLazyLoad && dataParams.groupKeys) {
+      if (componentState.lazyLoad) {
         const lazyGroupData = componentState.originalLazyGroupData;
-        const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys];
+        const key = [LAZY_ROOT_KEY_FOR_GROUPS, ...dataParams.groupKeys || []];
         const newGroupRowInfo = {
           cache: !!remoteData.cache,
           totalCount: (_a = remoteData.totalCount) != null ? _a : dataArray.length,
@@ -3121,6 +3129,10 @@ function loadData(data, componentState, actions, overrides) {
         }
         skipAssign = true;
         actions.originalLazyGroupDataChangeDetect = getChangeDetect();
+        if (!dataParams.groupKeys || !dataParams.groupKeys.length) {
+          const topLevelItems = lazyGroupData.get([LAZY_ROOT_KEY_FOR_GROUPS]);
+          actions.originalDataArray = [...topLevelItems.items];
+        }
       }
     } else {
       dataArray = dataParam;
@@ -3128,7 +3140,7 @@ function loadData(data, componentState, actions, overrides) {
     if (!skipAssign) {
       actions.originalDataArray = dataArray;
     }
-    if (dataIsPromise && !componentState.fullLazyLoad) {
+    if (dataIsPromise && !componentState.lazyLoad) {
       actions.loading = false;
     }
   });
@@ -3286,27 +3298,27 @@ function lazyLoadRange(options, cache) {
     const cacheKeys = theGroupKeys.length ? theGroupKeys : rootGroupKeys;
     const indexInGroup = rowInfo.indexInGroup;
     if (!rowLoaded) {
-      let fnCalls = perGroupFnCalls.get(cacheKeys);
+      let cachedFnCalls = perGroupFnCalls.get(cacheKeys);
       const batchStartIndexInGroup = Math.floor(indexInGroup / lazyLoadBatchSize) * lazyLoadBatchSize;
       const offset = rowInfo.indexInGroup - batchStartIndexInGroup;
       const absoluteIndexOfBatchStart = dataArray[rowInfo.indexInAll - offset].indexInAll;
       const batchStartRowLoaded = isRowLoaded(absoluteIndexOfBatchStart);
       const batchStartRowId = dataArray[absoluteIndexOfBatchStart].id;
-      if (batchStartRowLoaded || (fnCalls == null ? void 0 : fnCalls[batchStartRowId])) {
+      if (batchStartRowLoaded || (cachedFnCalls == null ? void 0 : cachedFnCalls[batchStartRowId])) {
         continue;
       }
-      const shouldSetFnCalls = !fnCalls;
-      fnCalls = fnCalls || {};
+      const shouldSetFnCalls = !cachedFnCalls;
+      cachedFnCalls = cachedFnCalls || {};
       const currentFnCall = {
         lazyLoadStartIndex: batchStartIndexInGroup,
         lazyLoadBatchSize,
         groupKeys: theGroupKeys
       };
-      if (!fnCalls[batchStartRowId]) {
-        fnCalls[batchStartRowId] = currentFnCall;
+      if (!cachedFnCalls[batchStartRowId]) {
+        cachedFnCalls[batchStartRowId] = currentFnCall;
       }
       if (shouldSetFnCalls) {
-        perGroupFnCalls.set(cacheKeys, fnCalls);
+        perGroupFnCalls.set(cacheKeys, cachedFnCalls);
       }
     }
   }
@@ -3563,12 +3575,11 @@ function getCompareObjectForDataParams(dataParams) {
 var forwardProps3 = (setupState) => {
   return {
     onDataParamsChange: (fn) => fn ? discardCallsWithEqualArg(fn, 100, getCompareObjectForDataParams) : void 0,
-    fullLazyLoad: 1,
+    lazyLoad: (lazyLoad) => !!lazyLoad,
     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,
@@ -3595,7 +3606,8 @@ function mapPropsToState2(params) {
   const controlledSort = isControlledValue(props.sortInfo);
   const result = {
     controlledSort,
-    multiSort: Array.isArray(controlledSort ? props.sortInfo : props.defaultSortInfo)
+    multiSort: Array.isArray(controlledSort ? props.sortInfo : props.defaultSortInfo),
+    lazyLoadBatchSize: typeof props.lazyLoad === "object" ? props.lazyLoad.batchSize : void 0
   };
   if (props.livePagination) {
     const dataArrayChanged = !oldState || oldState.originalDataArray !== state.originalDataArray;
@@ -3608,7 +3620,7 @@ 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) {
+    if (props.lazyLoad) {
       debugFullLazyLoad(`"data" function prop has changed`);
     }
     if (props.collapseGroupRowsOnDataFunctionChange !== false) {
@@ -3875,17 +3887,29 @@ function concludeReducer(params) {
   var _a;
   const { state, previousState } = params;
   const sortInfo = state.sortInfo;
-  const shouldSort = !!(sortInfo == null ? void 0 : sortInfo.length) && !state.controlledSort;
-  const originalDataArrayChanged = haveDepsChanged(previousState, state, [
+  let shouldSort = !!(sortInfo == null ? void 0 : sortInfo.length) && !state.controlledSort;
+  if (state.lazyLoad || state.livePagination) {
+    shouldSort = false;
+  }
+  let originalDataArrayChanged = haveDepsChanged(previousState, state, [
     "originalDataArray"
   ]);
+  const dataSourceChange = previousState && state.data !== previousState.data;
+  let lazyLoadGroupDataChange = state.lazyLoad && previousState && (previousState.groupBy !== state.groupBy || previousState.sortInfo !== state.sortInfo);
+  if (dataSourceChange) {
+    lazyLoadGroupDataChange = true;
+  }
+  if (lazyLoadGroupDataChange) {
+    state.originalLazyGroupData = new DeepMap();
+    originalDataArrayChanged = true;
+  }
   const sortInfoChanged = haveDepsChanged(previousState, state, ["sortInfo"]);
   const sortDepsChanged = originalDataArrayChanged || sortInfoChanged;
   const shouldSortAgain = shouldSort && (sortDepsChanged || !state.lastSortDataArray);
   const groupBy = state.groupBy;
   const pivotBy = state.pivotBy;
   const shouldGroup = groupBy.length || pivotBy;
-  const groupsDepsChanged = haveDepsChanged(previousState, state, [
+  const groupsDepsChanged = originalDataArrayChanged || haveDepsChanged(previousState, state, [
     "generateGroupRows",
     "originalDataArray",
     "originalLazyGroupData",
@@ -3918,7 +3942,7 @@ function concludeReducer(params) {
   };
   if (shouldGroup) {
     if (shouldGroupAgain) {
-      const groupResult = state.fullLazyLoad ? lazyGroup({
+      const groupResult = state.lazyLoad ? lazyGroup({
         groupBy,
         pivot: pivotBy,
         mappings: state.pivotMappings,
@@ -3955,7 +3979,7 @@ function concludeReducer(params) {
     state.groupDeepMap = void 0;
     state.pivotColumns = void 0;
     const arrayDifferentAfterSortStep = previousState.postSortDataArray != state.postSortDataArray;
-    if (arrayDifferentAfterSortStep) {
+    if (arrayDifferentAfterSortStep || groupsDepsChanged) {
       rowInfoDataArray = dataArray.map((data, index) => toRowInfo(data, data ? toPrimaryKey(data) : index, index));
     }
   }
@@ -4027,7 +4051,7 @@ function useToggleGroupRow() {
     const newState = new GroupRowsState(state.groupRowsState);
     newState.toggleGroupRow(groupKeys);
     dataSourceActions.groupRowsState = newState;
-    if (state.fullLazyLoad && newState.isGroupRowExpanded(groupKeys)) {
+    if (state.lazyLoad && newState.isGroupRowExpanded(groupKeys)) {
       loadData(state.data, state, dataSourceActions, {
         groupKeys
       });
@@ -4066,7 +4090,7 @@ function useColumnsWhen() {
   }, [pivotTotalColumnPosition]);
   useColumnsWhenInlineGroupRenderStrategy(groupByMap);
   const { toggleGroupRow } = useColumnsWhenGrouping();
-  useHideEmptyGroupColumns();
+  useHideColumns(groupByMap);
   return { toggleGroupRow };
 }
 function useColumnsWhenInlineGroupRenderStrategy(groupByMap) {
@@ -4188,9 +4212,10 @@ function useColumnsWhenGrouping() {
   ]);
   return { toggleGroupRow };
 }
-function useHideEmptyGroupColumns() {
+function useHideColumns(groupByMap) {
   const {
     componentState: {
+      dataArray,
       groupBy,
       groupRowsState,
       originalLazyGroupDataChangeDetect
@@ -4201,18 +4226,49 @@ function useHideEmptyGroupColumns() {
     getComponentState,
     componentActions,
     componentState: {
-      columnsWhenGrouping: generatedColumns,
+      columnTypes,
+      computedColumns,
       hideEmptyGroupColumns,
       groupRenderStrategy
     }
   } = useComponentState();
+  const prevHideEmptyGroupColumns = usePrevious(hideEmptyGroupColumns);
   useEffect9(() => {
     if (groupRenderStrategy !== "multi-column") {
       return;
     }
+    const currentState = getComponentState();
+    const computedGroupColumns = new Map();
+    computedColumns.forEach((column, colId) => {
+      if (typeof column.groupByField !== "string") {
+        return;
+      }
+      const { groupByField } = column;
+      const field = groupByField;
+      const groupInfoForColumn = groupByMap.get(field);
+      if (!groupInfoForColumn) {
+        return;
+      }
+      computedGroupColumns.set(colId, column);
+    });
+    if (!hideEmptyGroupColumns) {
+      if (prevHideEmptyGroupColumns) {
+        let updated2 = false;
+        const columnVisibility2 = __spreadValues({}, currentState.columnVisibility);
+        computedGroupColumns.forEach((_column, colId) => {
+          if (columnVisibility2[colId] === false) {
+            updated2 = true;
+            delete columnVisibility2[colId];
+          }
+        });
+        if (updated2) {
+          componentActions.columnVisibility = columnVisibility2;
+        }
+      }
+      return;
+    }
     const groupsLength = groupBy.length;
     let expandedGroupsLevel = 0;
-    const { dataArray } = getDataSourceState();
     const len = dataArray.length;
     for (let i = 0; i < len; i++) {
       const data = dataArray[i];
@@ -4221,23 +4277,24 @@ function useHideEmptyGroupColumns() {
         break;
       }
     }
-    const currentState = getComponentState();
-    const { computedColumns } = currentState;
     let updated = false;
     const columnVisibility = __spreadValues({}, currentState.columnVisibility);
-    const cols = computedColumns;
-    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;
-      }
+    computedGroupColumns.forEach((column, colId) => {
+      const { groupByField } = column;
+      const field = groupByField;
+      const groupInfoForColumn = groupByMap.get(field);
+      const index = groupInfoForColumn.groupIndex;
       const shouldBeHidden = index > expandedGroupsLevel && hideEmptyGroupColumns;
-      updated = true;
       if (shouldBeHidden) {
-        columnVisibility[colId] = false;
+        if (columnVisibility[colId] !== false) {
+          updated = true;
+          columnVisibility[colId] = false;
+        }
       } else {
-        delete columnVisibility[colId];
+        if (columnVisibility.hasOwnProperty(colId)) {
+          updated = true;
+          delete columnVisibility[colId];
+        }
       }
     });
     if (updated) {
@@ -4246,12 +4303,41 @@ function useHideEmptyGroupColumns() {
   }, [
     getDataSourceState,
     groupRenderStrategy,
-    generatedColumns,
     originalLazyGroupDataChangeDetect,
     groupBy,
+    groupByMap,
+    computedColumns,
+    hideEmptyGroupColumns ? dataArray : null,
     hideEmptyGroupColumns ? groupRowsState : null,
     hideEmptyGroupColumns
   ]);
+  useEffect9(() => {
+    const isGrouped = groupBy.length > 0;
+    const currentState = getComponentState();
+    const { controlledColumnVisibility, columnVisibility } = currentState;
+    if (controlledColumnVisibility) {
+      return;
+    }
+    const newColumnVisibility = __spreadValues({}, columnVisibility);
+    let updated = false;
+    computedColumns.forEach((col, id) => {
+      if (col.defaultHiddenWhenGroupedBy) {
+        const nowHidden = columnVisibility[id] === false;
+        const shouldBeHidden = col.defaultHiddenWhenGroupedBy === "*" && isGrouped || typeof col.defaultHiddenWhenGroupedBy === "string" && groupByMap.get(col.defaultHiddenWhenGroupedBy) || typeof col.defaultHiddenWhenGroupedBy === "object" && Object.keys(col.defaultHiddenWhenGroupedBy).reduce((acc, field) => acc || groupByMap.has(field), false);
+        if (nowHidden !== shouldBeHidden) {
+          updated = true;
+          if (shouldBeHidden) {
+            newColumnVisibility[id] = false;
+          } else {
+            delete newColumnVisibility[id];
+          }
+        }
+      }
+    });
+    if (updated) {
+      componentActions.columnVisibility = newColumnVisibility;
+    }
+  }, [computedColumns, columnTypes, groupBy, groupByMap]);
 }
 function getColumnsWhenGrouping(params) {
   const {
@@ -4400,6 +4486,32 @@ function useComputed() {
     columnSizing,
     columnTypes
   });
+  const rowSpan = useMemo6(() => {
+    const colsWithRowspan = computedVisibleColumns.filter((col) => typeof col.rowspan === "function");
+    return colsWithRowspan.length ? ({ itemIndex }) => {
+      let maxSpan = 1;
+      const dataArray = getDataSourceState().dataArray;
+      const rowInfo = dataArray[itemIndex];
+      const data = rowInfo.data;
+      colsWithRowspan.forEach((column) => {
+        if (!column.rowspan) {
+          return;
+        }
+        const span = column.rowspan({
+          column,
+          data,
+          dataArray,
+          groupRowInfo: null,
+          rowInfo,
+          rowIndex: itemIndex
+        });
+        if (span > maxSpan) {
+          maxSpan = span;
+        }
+      });
+      return maxSpan;
+    } : void 0;
+  }, [computedVisibleColumns]);
   const unpinnedColumnWidths = computedUnpinnedColumns.map((c) => c.computedWidth);
   let sortedUnpinnedColumnWidths = [...unpinnedColumnWidths].sort(sortAscending);
   let unpinnedColumnRenderCount = 0;
@@ -4426,6 +4538,7 @@ function useComputed() {
   const computedPinnedStartOverflow = computedPinnedStartWidth ? computedPinnedStartColumnsWidth > computedPinnedStartWidth : false;
   const computedPinnedEndOverflow = computedPinnedEndWidth ? computedPinnedEndColumnsWidth > computedPinnedEndWidth : false;
   return {
+    rowSpan,
     toggleGroupRow,
     computedPinnedStartOverflow,
     computedPinnedEndOverflow,
@@ -4617,7 +4730,7 @@ var InfiniteTableCell = memo3(InfiniteTableCellFn);
 var import_binary_search = __toModule(require_binary_search());
 import {
   useCallback as useCallback6,
-  useMemo as useMemo6,
+  useMemo as useMemo7,
   useRef as useRef7,
   useState as useState6
 } from "react";
@@ -4664,8 +4777,8 @@ var useColumnPointerEvents = ({
   const dragging = draggingDiff != null;
   const { componentActions, computed } = useInfiniteTable();
   const { computedColumnOrder } = computed;
-  const column = useMemo6(() => columns.get(columnId), [columnId, columns]);
-  const { columnIndex, columnWidth, columnsArray } = useMemo6(() => {
+  const column = useMemo7(() => columns.get(columnId), [columnId, columns]);
+  const { columnIndex, columnWidth, columnsArray } = useMemo7(() => {
     const columnsArray2 = Array.from(columns.values());
     return {
       columnsArray: columnsArray2,
@@ -5002,7 +5115,7 @@ function AvoidReactDiffFn(props) {
 var AvoidReactDiff = memo4(AvoidReactDiffFn);
 
 // src/components/RawList/useVirtualRenderer.ts
-import { useMemo as useMemo7 } from "react";
+import { useMemo as useMemo8 } from "react";
 
 // src/components/RawList/ReactVirtualRenderer.tsx
 import {
@@ -5318,7 +5431,7 @@ function createRenderer(brain) {
 function useVirtualRenderer({
   brain
 }) {
-  return useMemo7(() => {
+  return useMemo8(() => {
     return createRenderer(brain);
   }, [brain]);
 }
@@ -5410,7 +5523,7 @@ var InfiniteTableHeader = memo6(InfiniteTableHeaderFn);
 import {
   createElement as createElement17,
   memo as memo7,
-  useMemo as useMemo8,
+  useMemo as useMemo9,
   useRef as useRef10
 } from "react";
 
@@ -5624,7 +5737,7 @@ function InfiniteTableHeaderUnvirtualizedFn(props) {
   } = useInfiniteTable();
   const domRef = useRef10(null);
   const hasColumnGroups = computedColumnGroups.size > 0;
-  const columnHeaderGroups = useMemo8(() => {
+  const columnHeaderGroups = useMemo9(() => {
     return hasColumnGroups ? renderColumnHeaderGroups({
       columnGroups: computedColumnGroups,
       columnGroupsDepthsMap,
@@ -5861,7 +5974,7 @@ function SpacePlaceholderFn(props) {
 var SpacePlaceholder = memo8(SpacePlaceholderFn);
 
 // src/components/InfiniteTable/hooks/useListRendering.tsx
-import { useEffect as useEffect22, useMemo as useMemo11, useRef as useRef17 } from "react";
+import { useEffect as useEffect22, useMemo as useMemo12, useRef as useRef17 } from "react";
 
 // src/components/InfiniteTable/hooks/useUnpinnedRendering.tsx
 import {
@@ -6144,7 +6257,8 @@ function useRowDOMProps(props, rowProps, rowStyle, rowClassName, groupRenderStra
     showHoverRows = false,
     rowIndex,
     domRef: domRefFromProps,
-    rowInfo
+    rowInfo,
+    rowSpan
   } = props;
   const domRef = useRef13(null);
   const rowDOMRef = useCallback10((node) => {
@@ -6164,7 +6278,7 @@ function useRowDOMProps(props, rowProps, rowStyle, rowClassName, groupRenderStra
   if (rowStyle) {
     style = typeof rowStyle === "function" ? __spreadValues(__spreadValues({}, style), rowStyle(rowPropsAndStyleArgs)) : __spreadValues(__spreadValues({}, style), rowStyle);
   }
-  if (inlineGroupRoot) {
+  if (inlineGroupRoot || rowSpan) {
     style = style || {};
     style.zIndex = 2e6 - rowInfo.indexInAll;
   }
@@ -6351,6 +6465,7 @@ function useUnpinnedRendering(params) {
     computedPinnedStartWidth,
     computedPinnedEndWidth,
     computedUnpinnedColumns,
+    rowSpan,
     getState
   } = params;
   const { virtualizeColumns } = getState();
@@ -6364,6 +6479,7 @@ function useUnpinnedRendering(params) {
       showZebraRows,
       showHoverRows,
       getData,
+      rowSpan,
       toggleGroupRow,
       virtualizeColumns: shouldVirtualizeColumns,
       brain: null,
@@ -6380,6 +6496,7 @@ function useUnpinnedRendering(params) {
   }, [
     repaintId,
     rowHeight,
+    rowSpan,
     computedUnpinnedColumns,
     computedUnpinnedColumnsWidth,
     shouldVirtualizeColumns,
@@ -6545,7 +6662,7 @@ var useOnContainerScroll = ({
 // src/components/InfiniteTable/hooks/usePinnedRendering.tsx
 import {
   createElement as createElement28,
-  useMemo as useMemo9
+  useMemo as useMemo10
 } from "react";
 import { useCallback as useCallback15 } from "react";
 
@@ -6651,7 +6768,7 @@ function PinnedRowsContainer(props) {
     brain,
     renderRow
   } = props;
-  const style = useMemo9(() => {
+  const style = useMemo10(() => {
     const result = pinning === "end" ? {
       width: rowWidth,
       height,
@@ -6707,7 +6824,7 @@ function PinnedRowsContainer(props) {
   return /* @__PURE__ */ createElement28(RowListWithExternalScrolling, __spreadValues({}, rowListProps));
 }
 function useRenderPinnedRow(params) {
-  const { getData, getState, columnsWidth, columns, verticalBrain } = params;
+  const { getData, getState, columnsWidth, columns, rowSpan, verticalBrain } = params;
   const renderPinnedRow = useCallback15((rowParams) => {
     const dataArray = getData();
     const rowInfo = dataArray[rowParams.rowIndex];
@@ -6721,6 +6838,7 @@ function useRenderPinnedRow(params) {
       virtualizeColumns: false,
       verticalBrain,
       brain: null,
+      rowSpan,
       rowWidth: columnsWidth,
       columns
     }, rowParams);
@@ -6745,6 +6863,7 @@ function usePinnedRenderingForSide(side, params) {
     computedPinnedStartOverflow,
     pinnedStartScrollListener,
     pinnedEndScrollListener,
+    rowSpan,
     repaintId,
     toggleGroupRow,
     scrollbars: {
@@ -6763,6 +6882,7 @@ function usePinnedRenderingForSide(side, params) {
     getData,
     getState,
     toggleGroupRow,
+    rowSpan,
     verticalBrain: verticalVirtualBrain,
     columns,
     columnsWidth
@@ -6825,9 +6945,9 @@ function usePinnedStartRendering(params) {
 import { useEffect as useEffect21 } from "react";
 
 // src/components/hooks/useOnce.ts
-import { useMemo as useMemo10 } from "react";
+import { useMemo as useMemo11 } from "react";
 function useOnce(fn) {
-  const onceFn = useMemo10(() => {
+  const onceFn = useMemo11(() => {
     return once(fn);
   }, []);
   return onceFn();
@@ -7126,7 +7246,7 @@ var VirtualBrain = class extends Logger {
         this.computeCacheFor(lastSizeIndex);
         _prev = lastOffset;
         lastOffset = this.itemOffsetCache[lastSizeIndex];
-        if (_prev === lastOffset) {
+        if (_prev === lastOffset && _prev != 0) {
           return count - 1;
         }
       }
@@ -7318,6 +7438,10 @@ function useYourBrain(param) {
   }, []);
   horizontalVirtualBrain.update(computedUnpinnedColumns.length, columnSize);
   verticalVirtualBrain.update(dataArray.length, rowHeight, rowSpan);
+  if (true) {
+    globalThis.verticalVirtualBrain = verticalVirtualBrain;
+    globalThis.horizontalVirtualBrain = horizontalVirtualBrain;
+  }
   useEffect21(() => {
     verticalVirtualBrain.setAvailableSize({
       height: bodySize.height,
@@ -7349,7 +7473,7 @@ function useListRendering(param) {
     computedUnpinnedColumnsWidth,
     computedPinnedStartOverflow,
     computedPinnedEndOverflow,
-    computedVisibleColumns,
+    rowSpan,
     toggleGroupRow
   } = computed;
   const { componentState: dataSourceState, getState: getDataSourceState } = useDataSourceContextValue();
@@ -7368,32 +7492,6 @@ function useListRendering(param) {
     repaintIdRef.current++;
   }
   const repaintId = repaintIdRef.current;
-  const rowSpan = useMemo11(() => {
-    const colsWithRowspan = computedVisibleColumns.filter((col) => typeof col.rowspan === "function");
-    return colsWithRowspan.length ? ({ itemIndex }) => {
-      let maxSpan = 1;
-      const dataArray2 = getData();
-      const rowInfo = dataArray2[itemIndex];
-      const data = rowInfo.data;
-      colsWithRowspan.forEach((column) => {
-        if (!column.rowspan) {
-          return;
-        }
-        const span = column.rowspan({
-          column,
-          data,
-          dataArray: dataArray2,
-          groupRowInfo: null,
-          rowInfo,
-          rowIndex: itemIndex
-        });
-        if (span > maxSpan) {
-          maxSpan = span;
-        }
-      });
-      return maxSpan;
-    } : void 0;
-  }, [computedVisibleColumns]);
   const { horizontalVirtualBrain, verticalVirtualBrain } = useYourBrain({
     computedPinnedStartWidth: computed.computedPinnedStartWidth,
     computedPinnedEndWidth: computed.computedPinnedEndWidth,
@@ -7406,7 +7504,7 @@ 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 = useMemo11(() => ({
+  const scrollbars = useMemo12(() => ({
     vertical: hasVerticalScrollbar,
     horizontal: hasHorizontalScrollbar
   }), [hasVerticalScrollbar, hasHorizontalScrollbar]);
@@ -7454,7 +7552,8 @@ function useListRendering(param) {
     rowHeight,
     verticalVirtualBrain,
     pinnedStartScrollListener,
-    pinnedEndScrollListener
+    pinnedEndScrollListener,
+    rowSpan
   };
   const centerRenderingParams = __spreadProps(__spreadValues({}, pinnedRenderingParams), {
     columnShifts,
@@ -7570,7 +7669,7 @@ var InfiniteTableLicenseFooter = forwardRef3(function InfiniteTableLicenseFooter
 });
 
 // src/components/InfiniteTable/hooks/useLicense/useLicense.ts
-import { useMemo as useMemo12 } from "react";
+import { useMemo as useMemo13 } from "react";
 
 // src/components/InfiniteTable/hooks/useLicense/crc32.ts
 var DEFAULT_ReversedPolynomial = 3988292384;
@@ -7720,10 +7819,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 = useMemo12(() => {
+  const valid = useMemo13(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.2.3"
+      version: "0.2.7"
     });
     if (!licenseKey && !valid2 && isInsideSandbox) {
       return true;