@infinite-table/infinite-react 0.2.6 → 0.2.7

package/index.d.ts

@@ -839,6 +839,7 @@ declare module "utils/groupAndPivot/index" {
         collapsedGroupsCount?: number;
         groupNesting?: number;
         groupKeys?: any[];
+        flatRowInfoList?: (InfiniteTableRowInfo<T> | InfiniteTableEnhancedGroupInfo<T>)[];
         parents?: InfiniteTableEnhancedGroupInfo<T>[];
         indexInParentGroups?: number[];
         indexInGroup: number;
@@ -852,6 +853,7 @@ declare module "utils/groupAndPivot/index" {
     export type InfiniteTableEnhancedGroupInfo<T> = InfiniteTableRowInfo<T> & {
         data: Partial<T> | null;
         groupData: T[];
+        flatRowInfoList: (InfiniteTableRowInfo<T> | InfiniteTableEnhancedGroupInfo<T>)[];
         value: any;
         isGroupRow: true;
         collapsedChildrenCount: number;
@@ -1448,9 +1450,11 @@ declare module "components/InfiniteTable/types/InfiniteTableAction" {
     };
 }
 declare module "components/InfiniteTable/types/InfiniteTableComputedValues" {
+    import type { VirtualBrainOptions } from "components/VirtualBrain/index";
     import type { InfiniteTableComputedColumn } from "components/InfiniteTable/types/InfiniteTableColumn";
     import type { InfiniteTablePropColumnOrderNormalized, InfiniteTablePropColumnVisibility } from "components/InfiniteTable/types/InfiniteTableProps";
     export interface InfiniteTableComputedValues<T> {
+        rowSpan?: VirtualBrainOptions['itemSpan'];
         computedPinnedStartOverflow: boolean;
         computedPinnedEndOverflow: boolean;
         computedPinnedStartColumns: InfiniteTableComputedColumn<T>[];
@@ -1489,11 +1493,11 @@ declare module "components/InfiniteTable/types/index" {
     import type { InfiniteTableAction } from "components/InfiniteTable/types/InfiniteTableAction";
     import type { InfiniteTableActionType } from "components/InfiniteTable/types/InfiniteTableActionType";
     import type { InfiniteTableProps, InfiniteTableImperativeApi, InfiniteTablePropColumnOrder, InfiniteTablePropColumnVisibility, InfiniteTablePropColumnPinning, InfiniteTableColumnAggregator, InfiniteTableColumnGroup, InfiniteTablePropGroupRenderStrategy, InfiniteTablePropColumnGroups, InfiniteTablePropRowStyle, InfiniteTableRowStyleFn, InfiniteTableRowClassNameFn, InfiniteTablePropRowClassName, InfiniteTablePropColumns, InfiniteTablePropColumnsMap, InfiniteTablePropComponents, InfiniteTableGroupColumnFunction, InfiniteTableGroupColumnGetterOptions, InfiniteTablePropColumnSizingMap, InfiniteTablePropColumnSizing, InfiniteTablePropColumnTypes, InfiniteTablePropColumnTypesMap, InfiniteTableColumnSizingOptions, Scrollbars, InfiniteTableGroupColumnBase, InfiniteTablePropGroupColumn } from "components/InfiniteTable/types/InfiniteTableProps";
-    import type { InfiniteTableColumn, InfiniteTableColumnComparer, InfiniteTableComputedColumn, InfiniteTableColumnRenderParam, InfiniteTableColumnRenderValueParam } from "components/InfiniteTable/types/InfiniteTableColumn";
+    import type { InfiniteTableColumn, InfiniteTableColumnComparer, InfiniteTableComputedColumn, InfiniteTableColumnRenderParam, InfiniteTableColumnRenderValueParam, InfiniteTableColumnRowspanFnParams } from "components/InfiniteTable/types/InfiniteTableColumn";
     import type { InfiniteTableComputedValues } from "components/InfiniteTable/types/InfiniteTableComputedValues";
     import type { InfiniteTableContextValue } from "components/InfiniteTable/types/InfiniteTableContextValue";
     import type { InfiniteTableRowInfo } from "utils/groupAndPivot/index";
-    export type { Scrollbars, InfiniteTableColumnAggregator, InfiniteTableComputedValues, InfiniteTablePropColumns, InfiniteTablePropGroupColumn, InfiniteTablePropColumnsMap, InfiniteTableRowInfo, InfiniteTableGroupColumnFunction, InfiniteTableGroupColumnBase, InfiniteTablePropColumnOrder, InfiniteTablePropComponents, InfiniteTablePropColumnVisibility as InfiniteTablePropColumnVisibility, InfiniteTablePropColumnPinning, InfiniteTableColumnGroup, InfiniteTableColumn, InfiniteTableColumnComparer, InfiniteTableComputedColumn, InfiniteTableColumnRenderParam, InfiniteTableColumnRenderValueParam, InfiniteTableContextValue, InfiniteTablePropGroupRenderStrategy, InfiniteTablePropColumnGroups, InfiniteTablePropColumnSizing, InfiniteTablePropColumnSizingMap, InfiniteTableColumnSizingOptions, InfiniteTableState, InfiniteTableAction, InfiniteTableProps, InfiniteTablePropColumnTypes, InfiniteTablePropColumnTypesMap, InfiniteTableImperativeApi, InfiniteTableActionType, InfiniteTablePropRowStyle, InfiniteTablePropRowClassName, InfiniteTableRowStyleFn, InfiniteTableRowClassNameFn, InfiniteTableGroupColumnGetterOptions, };
+    export type { Scrollbars, InfiniteTableColumnAggregator, InfiniteTableComputedValues, InfiniteTableColumnRowspanFnParams, InfiniteTablePropColumns, InfiniteTablePropGroupColumn, InfiniteTablePropColumnsMap, InfiniteTableRowInfo, InfiniteTableGroupColumnFunction, InfiniteTableGroupColumnBase, InfiniteTablePropColumnOrder, InfiniteTablePropComponents, InfiniteTablePropColumnVisibility as InfiniteTablePropColumnVisibility, InfiniteTablePropColumnPinning, InfiniteTableColumnGroup, InfiniteTableColumn, InfiniteTableColumnComparer, InfiniteTableComputedColumn, InfiniteTableColumnRenderParam, InfiniteTableColumnRenderValueParam, InfiniteTableContextValue, InfiniteTablePropGroupRenderStrategy, InfiniteTablePropColumnGroups, InfiniteTablePropColumnSizing, InfiniteTablePropColumnSizingMap, InfiniteTableColumnSizingOptions, InfiniteTableState, InfiniteTableAction, InfiniteTableProps, InfiniteTablePropColumnTypes, InfiniteTablePropColumnTypesMap, InfiniteTableImperativeApi, InfiniteTableActionType, InfiniteTablePropRowStyle, InfiniteTablePropRowClassName, InfiniteTableRowStyleFn, InfiniteTableRowClassNameFn, InfiniteTableGroupColumnGetterOptions, };
 }
 declare module "components/InfiniteTable/InfiniteTableContext" {
     import { InfiniteTableContextValue } from "components/InfiniteTable/types/InfiniteTableContextValue";
@@ -2532,7 +2536,7 @@ declare module "components/VirtualList/VirtualRowList" {
     export const VirtualRowList: (props: VirtualRowListProps & HTMLProps<HTMLDivElement>) => JSX.Element;
 }
 declare module "components/InfiniteTable/components/InfiniteTableRow/InfiniteTableRowTypes" {
-    import type { VirtualBrain } from "components/VirtualBrain/index";
+    import type { VirtualBrain, VirtualBrainOptions } from "components/VirtualBrain/index";
     import type { ScrollPosition } from "components/types/ScrollPosition";
     import type { InfiniteTableComputedColumn, InfiniteTableRowInfo } from "components/InfiniteTable/types/index";
     import { InfiniteTableToggleGroupRowFn } from "components/InfiniteTable/types/InfiniteTableColumn";
@@ -2547,6 +2551,7 @@ declare module "components/InfiniteTable/components/InfiniteTableRow/InfiniteTab
         getData: () => InfiniteTableRowInfo<T>[];
         toggleGroupRow: InfiniteTableToggleGroupRowFn;
         repaintId?: number | string;
+        rowSpan?: VirtualBrainOptions['itemSpan'];
         virtualizeColumns: boolean;
         showZebraRows?: boolean;
         showHoverRows?: boolean;
@@ -2606,7 +2611,7 @@ declare module "components/InfiniteTable/components/InfiniteTableRow/InfiniteTab
     export const TableRowUnvirtualized: typeof TableRowUnvirtualizedFn;
 }
 declare module "components/InfiniteTable/hooks/useUnpinnedRendering" {
-    import type { VirtualBrain } from "components/VirtualBrain/index";
+    import type { VirtualBrain, VirtualBrainOptions } from "components/VirtualBrain/index";
     import type { Size } from "components/types/Size";
     import type { InfiniteTableComputedColumn, InfiniteTableRowInfo } from "components/InfiniteTable/types/index";
     import { InfiniteTableState } from "components/InfiniteTable/types/InfiniteTableState";
@@ -2628,6 +2633,7 @@ declare module "components/InfiniteTable/hooks/useUnpinnedRendering" {
         computedUnpinnedColumnsWidth: number;
         computedPinnedStartWidth: number;
         computedPinnedEndWidth: number;
+        rowSpan?: VirtualBrainOptions['itemSpan'];
         getState: () => InfiniteTableState<T>;
     };
     export function useUnpinnedRendering<T>(params: UnpinnedRenderingParams<T>): JSX.Element | null;
@@ -2675,7 +2681,7 @@ declare module "components/VirtualList/RowListWithExternalScrolling" {
     export const RowListWithExternalScrolling: (props: RowListWithExternalScrollingListProps) => JSX.Element;
 }
 declare module "components/InfiniteTable/hooks/usePinnedRendering" {
-    import { VirtualBrain } from "components/VirtualBrain/index";
+    import { VirtualBrain, VirtualBrainOptions } from "components/VirtualBrain/index";
     import type { InfiniteTableComputedColumn, InfiniteTableRowInfo, Scrollbars } from "components/InfiniteTable/types/index";
     import type { Size } from "components/types/Size";
     import type { RenderRow } from "components/VirtualList/types";
@@ -2701,6 +2707,7 @@ declare module "components/InfiniteTable/hooks/usePinnedRendering" {
         toggleGroupRow: InfiniteTableToggleGroupRowFn;
         computedPinnedStartColumnsWidth: number;
         computedPinnedStartColumns: InfiniteTableComputedColumn<T>[];
+        rowSpan?: VirtualBrainOptions['itemSpan'];
     };
     export function usePinnedRenderingForSide<T>(side: 'start' | 'end', params: UsePinnedParams<T>): {
         renderRowPinned: RenderRow;

package/index.esm.js

@@ -1649,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 {
@@ -2857,6 +2857,7 @@ function getEnhancedGroupData(options, deepMapValue) {
     id: `${groupKeys}`,
     collapsed,
     parents,
+    flatRowInfoList: [],
     collapsedChildrenCount: 0,
     collapsedGroupsCount: 0,
     indexInParentGroups: options.indexInParentGroups,
@@ -2919,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);
@@ -4222,13 +4228,43 @@ function useHideColumns(groupByMap) {
     componentState: {
       columnTypes,
       computedColumns,
-      columnsWhenGrouping: generatedColumns,
       hideEmptyGroupColumns,
       groupRenderStrategy
     }
   } = useComponentState();
+  const prevHideEmptyGroupColumns = usePrevious(hideEmptyGroupColumns);
   useEffect9(() => {
-    if (groupRenderStrategy !== "multi-column" || !hideEmptyGroupColumns) {
+    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;
@@ -4241,23 +4277,24 @@ function useHideColumns(groupByMap) {
         break;
       }
     }
-    const currentState = getComponentState();
-    const { computedColumns: computedColumns2 } = currentState;
     let updated = false;
     const columnVisibility = __spreadValues({}, currentState.columnVisibility);
-    const cols = computedColumns2;
-    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) {
@@ -4266,9 +4303,10 @@ function useHideColumns(groupByMap) {
   }, [
     getDataSourceState,
     groupRenderStrategy,
-    generatedColumns,
     originalLazyGroupDataChangeDetect,
     groupBy,
+    groupByMap,
+    computedColumns,
     hideEmptyGroupColumns ? dataArray : null,
     hideEmptyGroupColumns ? groupRowsState : null,
     hideEmptyGroupColumns
@@ -4448,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;
@@ -4474,6 +4538,7 @@ function useComputed() {
   const computedPinnedStartOverflow = computedPinnedStartWidth ? computedPinnedStartColumnsWidth > computedPinnedStartWidth : false;
   const computedPinnedEndOverflow = computedPinnedEndWidth ? computedPinnedEndColumnsWidth > computedPinnedEndWidth : false;
   return {
+    rowSpan,
     toggleGroupRow,
     computedPinnedStartOverflow,
     computedPinnedEndOverflow,
@@ -4665,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";
@@ -4712,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,
@@ -5050,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 {
@@ -5366,7 +5431,7 @@ function createRenderer(brain) {
 function useVirtualRenderer({
   brain
 }) {
-  return useMemo7(() => {
+  return useMemo8(() => {
     return createRenderer(brain);
   }, [brain]);
 }
@@ -5458,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";
 
@@ -5672,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,
@@ -5909,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 {
@@ -6192,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) => {
@@ -6212,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;
   }
@@ -6399,6 +6465,7 @@ function useUnpinnedRendering(params) {
     computedPinnedStartWidth,
     computedPinnedEndWidth,
     computedUnpinnedColumns,
+    rowSpan,
     getState
   } = params;
   const { virtualizeColumns } = getState();
@@ -6412,6 +6479,7 @@ function useUnpinnedRendering(params) {
       showZebraRows,
       showHoverRows,
       getData,
+      rowSpan,
       toggleGroupRow,
       virtualizeColumns: shouldVirtualizeColumns,
       brain: null,
@@ -6428,6 +6496,7 @@ function useUnpinnedRendering(params) {
   }, [
     repaintId,
     rowHeight,
+    rowSpan,
     computedUnpinnedColumns,
     computedUnpinnedColumnsWidth,
     shouldVirtualizeColumns,
@@ -6593,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";
 
@@ -6699,7 +6768,7 @@ function PinnedRowsContainer(props) {
     brain,
     renderRow
   } = props;
-  const style = useMemo9(() => {
+  const style = useMemo10(() => {
     const result = pinning === "end" ? {
       width: rowWidth,
       height,
@@ -6755,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];
@@ -6769,6 +6838,7 @@ function useRenderPinnedRow(params) {
       virtualizeColumns: false,
       verticalBrain,
       brain: null,
+      rowSpan,
       rowWidth: columnsWidth,
       columns
     }, rowParams);
@@ -6793,6 +6863,7 @@ function usePinnedRenderingForSide(side, params) {
     computedPinnedStartOverflow,
     pinnedStartScrollListener,
     pinnedEndScrollListener,
+    rowSpan,
     repaintId,
     toggleGroupRow,
     scrollbars: {
@@ -6811,6 +6882,7 @@ function usePinnedRenderingForSide(side, params) {
     getData,
     getState,
     toggleGroupRow,
+    rowSpan,
     verticalBrain: verticalVirtualBrain,
     columns,
     columnsWidth
@@ -6873,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();
@@ -7174,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;
         }
       }
@@ -7366,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,
@@ -7397,7 +7473,7 @@ function useListRendering(param) {
     computedUnpinnedColumnsWidth,
     computedPinnedStartOverflow,
     computedPinnedEndOverflow,
-    computedVisibleColumns,
+    rowSpan,
     toggleGroupRow
   } = computed;
   const { componentState: dataSourceState, getState: getDataSourceState } = useDataSourceContextValue();
@@ -7416,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,
@@ -7454,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]);
@@ -7502,7 +7552,8 @@ function useListRendering(param) {
     rowHeight,
     verticalVirtualBrain,
     pinnedStartScrollListener,
-    pinnedEndScrollListener
+    pinnedEndScrollListener,
+    rowSpan
   };
   const centerRenderingParams = __spreadProps(__spreadValues({}, pinnedRenderingParams), {
     columnShifts,
@@ -7618,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;
@@ -7768,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.6"
+      version: "0.2.7"
     });
     if (!licenseKey && !valid2 && isInsideSandbox) {
       return true;

package/index.js

@@ -2843,6 +2843,7 @@ function getEnhancedGroupData(options, deepMapValue) {
     id: `${groupKeys}`,
     collapsed,
     parents,
+    flatRowInfoList: [],
     collapsedChildrenCount: 0,
     collapsedGroupsCount: 0,
     indexInParentGroups: options.indexInParentGroups,
@@ -2905,9 +2906,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);
@@ -4208,13 +4214,43 @@ function useHideColumns(groupByMap) {
     componentState: {
       columnTypes,
       computedColumns,
-      columnsWhenGrouping: generatedColumns,
       hideEmptyGroupColumns,
       groupRenderStrategy
     }
   } = useComponentState();
+  const prevHideEmptyGroupColumns = usePrevious(hideEmptyGroupColumns);
   (0, import_react17.useEffect)(() => {
-    if (groupRenderStrategy !== "multi-column" || !hideEmptyGroupColumns) {
+    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;
@@ -4227,23 +4263,24 @@ function useHideColumns(groupByMap) {
         break;
       }
     }
-    const currentState = getComponentState();
-    const { computedColumns: computedColumns2 } = currentState;
     let updated = false;
     const columnVisibility = __spreadValues({}, currentState.columnVisibility);
-    const cols = computedColumns2;
-    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) {
@@ -4252,9 +4289,10 @@ function useHideColumns(groupByMap) {
   }, [
     getDataSourceState,
     groupRenderStrategy,
-    generatedColumns,
     originalLazyGroupDataChangeDetect,
     groupBy,
+    groupByMap,
+    computedColumns,
     hideEmptyGroupColumns ? dataArray : null,
     hideEmptyGroupColumns ? groupRowsState : null,
     hideEmptyGroupColumns
@@ -4434,6 +4472,32 @@ function useComputed() {
     columnSizing,
     columnTypes
   });
+  const rowSpan = (0, import_react18.useMemo)(() => {
+    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;
@@ -4460,6 +4524,7 @@ function useComputed() {
   const computedPinnedStartOverflow = computedPinnedStartWidth ? computedPinnedStartColumnsWidth > computedPinnedStartWidth : false;
   const computedPinnedEndOverflow = computedPinnedEndWidth ? computedPinnedEndColumnsWidth > computedPinnedEndWidth : false;
   return {
+    rowSpan,
     toggleGroupRow,
     computedPinnedStartOverflow,
     computedPinnedEndOverflow,
@@ -6112,7 +6177,8 @@ function useRowDOMProps(props, rowProps, rowStyle, rowClassName, groupRenderStra
     showHoverRows = false,
     rowIndex,
     domRef: domRefFromProps,
-    rowInfo
+    rowInfo,
+    rowSpan
   } = props;
   const domRef = (0, import_react31.useRef)(null);
   const rowDOMRef = (0, import_react31.useCallback)((node) => {
@@ -6132,7 +6198,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;
   }
@@ -6316,6 +6382,7 @@ function useUnpinnedRendering(params) {
     computedPinnedStartWidth,
     computedPinnedEndWidth,
     computedUnpinnedColumns,
+    rowSpan,
     getState
   } = params;
   const { virtualizeColumns } = getState();
@@ -6329,6 +6396,7 @@ function useUnpinnedRendering(params) {
       showZebraRows,
       showHoverRows,
       getData,
+      rowSpan,
       toggleGroupRow,
       virtualizeColumns: shouldVirtualizeColumns,
       brain: null,
@@ -6345,6 +6413,7 @@ function useUnpinnedRendering(params) {
   }, [
     repaintId,
     rowHeight,
+    rowSpan,
     computedUnpinnedColumns,
     computedUnpinnedColumnsWidth,
     shouldVirtualizeColumns,
@@ -6667,7 +6736,7 @@ function PinnedRowsContainer(props) {
   return /* @__PURE__ */ React30.createElement(RowListWithExternalScrolling, __spreadValues({}, rowListProps));
 }
 function useRenderPinnedRow(params) {
-  const { getData, getState, columnsWidth, columns, verticalBrain } = params;
+  const { getData, getState, columnsWidth, columns, rowSpan, verticalBrain } = params;
   const renderPinnedRow = (0, import_react37.useCallback)((rowParams) => {
     const dataArray = getData();
     const rowInfo = dataArray[rowParams.rowIndex];
@@ -6681,6 +6750,7 @@ function useRenderPinnedRow(params) {
       virtualizeColumns: false,
       verticalBrain,
       brain: null,
+      rowSpan,
       rowWidth: columnsWidth,
       columns
     }, rowParams);
@@ -6705,6 +6775,7 @@ function usePinnedRenderingForSide(side, params) {
     computedPinnedStartOverflow,
     pinnedStartScrollListener,
     pinnedEndScrollListener,
+    rowSpan,
     repaintId,
     toggleGroupRow,
     scrollbars: {
@@ -6723,6 +6794,7 @@ function usePinnedRenderingForSide(side, params) {
     getData,
     getState,
     toggleGroupRow,
+    rowSpan,
     verticalBrain: verticalVirtualBrain,
     columns,
     columnsWidth
@@ -7086,7 +7158,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;
         }
       }
@@ -7278,6 +7350,10 @@ function useYourBrain(param) {
   }, []);
   horizontalVirtualBrain.update(computedUnpinnedColumns.length, columnSize);
   verticalVirtualBrain.update(dataArray.length, rowHeight, rowSpan);
+  if (true) {
+    globalThis.verticalVirtualBrain = verticalVirtualBrain;
+    globalThis.horizontalVirtualBrain = horizontalVirtualBrain;
+  }
   (0, import_react40.useEffect)(() => {
     verticalVirtualBrain.setAvailableSize({
       height: bodySize.height,
@@ -7309,7 +7385,7 @@ function useListRendering(param) {
     computedUnpinnedColumnsWidth,
     computedPinnedStartOverflow,
     computedPinnedEndOverflow,
-    computedVisibleColumns,
+    rowSpan,
     toggleGroupRow
   } = computed;
   const { componentState: dataSourceState, getState: getDataSourceState } = useDataSourceContextValue();
@@ -7328,32 +7404,6 @@ function useListRendering(param) {
     repaintIdRef.current++;
   }
   const repaintId = repaintIdRef.current;
-  const rowSpan = (0, import_react41.useMemo)(() => {
-    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,
@@ -7414,7 +7464,8 @@ function useListRendering(param) {
     rowHeight,
     verticalVirtualBrain,
     pinnedStartScrollListener,
-    pinnedEndScrollListener
+    pinnedEndScrollListener,
+    rowSpan
   };
   const centerRenderingParams = __spreadProps(__spreadValues({}, pinnedRenderingParams), {
     columnShifts,
@@ -7678,7 +7729,7 @@ var useLicense = (licenseKey = "") => {
   const valid = (0, import_react43.useMemo)(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.2.6"
+      version: "0.2.7"
     });
     if (!licenseKey && !valid2 && isInsideSandbox) {
       return true;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@infinite-table/infinite-react",
   "description": "Infinite Table for React",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "main": "index.js",
   "module": "index.esm.js",
   "typings": "index.d.ts",
@@ -14,5 +14,5 @@
   },
   "license": "Commercial & Open Source",
   "//": "will be updated at build time",
-  "publishedAt": 1644931690394
+  "publishedAt": 1645183793183
 }