@infinite-table/infinite-react 0.2.6 → 0.2.9

package/index.esm.js

@@ -193,11 +193,11 @@ var require_common = __commonJS({
         let enableOverride = null;
         let namespacesCache;
         let enabledCache;
-        function debug6(...args) {
-          if (!debug6.enabled) {
+        function debug7(...args) {
+          if (!debug7.enabled) {
             return;
           }
-          const self = debug6;
+          const self = debug7;
           const curr = Number(new Date());
           const ms = curr - (prevTime || curr);
           self.diff = ms;
@@ -227,12 +227,12 @@ var require_common = __commonJS({
           const logFn = self.log || createDebug.log;
           logFn.apply(self, args);
         }
-        debug6.namespace = namespace;
-        debug6.useColors = createDebug.useColors();
-        debug6.color = createDebug.selectColor(namespace);
-        debug6.extend = extend;
-        debug6.destroy = createDebug.destroy;
-        Object.defineProperty(debug6, "enabled", {
+        debug7.namespace = namespace;
+        debug7.useColors = createDebug.useColors();
+        debug7.color = createDebug.selectColor(namespace);
+        debug7.extend = extend;
+        debug7.destroy = createDebug.destroy;
+        Object.defineProperty(debug7, "enabled", {
           enumerable: true,
           configurable: false,
           get: () => {
@@ -250,9 +250,9 @@ var require_common = __commonJS({
           }
         });
         if (typeof createDebug.init === "function") {
-          createDebug.init(debug6);
+          createDebug.init(debug7);
         }
-        return debug6;
+        return debug7;
       }
       function extend(namespace, delimiter) {
         const newDebug = createDebug(this.namespace + (typeof delimiter === "undefined" ? ":" : delimiter) + namespace);
@@ -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);
@@ -2930,7 +2936,7 @@ function enhancedFlatten(param) {
         if (!pivot) {
           const startIndex = result.length;
           result.push(...items.map((item, index) => {
-            return {
+            const rowInfo = {
               id: item ? toPrimaryKey(item) : `${groupKeys}-${index}`,
               data: item,
               isGroupRow: false,
@@ -2944,6 +2950,10 @@ function enhancedFlatten(param) {
               groupNesting,
               groupCount: enhancedGroupData.groupCount
             };
+            parents.forEach((parent) => {
+              parent.flatRowInfoList.push(rowInfo);
+            });
+            return rowInfo;
           }));
         }
       } else {
@@ -4222,13 +4232,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 +4281,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 +4307,10 @@ function useHideColumns(groupByMap) {
   }, [
     getDataSourceState,
     groupRenderStrategy,
-    generatedColumns,
     originalLazyGroupDataChangeDetect,
     groupBy,
+    groupByMap,
+    computedColumns,
     hideEmptyGroupColumns ? dataArray : null,
     hideEmptyGroupColumns ? groupRowsState : null,
     hideEmptyGroupColumns
@@ -4448,6 +4490,31 @@ 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,
+          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 +4541,7 @@ function useComputed() {
   const computedPinnedStartOverflow = computedPinnedStartWidth ? computedPinnedStartColumnsWidth > computedPinnedStartWidth : false;
   const computedPinnedEndOverflow = computedPinnedEndWidth ? computedPinnedEndColumnsWidth > computedPinnedEndWidth : false;
   return {
+    rowSpan,
     toggleGroupRow,
     computedPinnedStartOverflow,
     computedPinnedEndOverflow,
@@ -4665,7 +4733,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 +4780,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 +5118,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 +5434,7 @@ function createRenderer(brain) {
 function useVirtualRenderer({
   brain
 }) {
-  return useMemo7(() => {
+  return useMemo8(() => {
     return createRenderer(brain);
   }, [brain]);
 }
@@ -5458,7 +5526,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 +5740,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 +5977,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 {
@@ -6141,7 +6209,6 @@ function InfiniteTableColumnCellFn(props) {
       dataArray: getData(),
       column,
       rowInfo,
-      groupRowInfo,
       rowIndex,
       data: rowInfo.data
     });
@@ -6192,7 +6259,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 +6280,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 +6467,7 @@ function useUnpinnedRendering(params) {
     computedPinnedStartWidth,
     computedPinnedEndWidth,
     computedUnpinnedColumns,
+    rowSpan,
     getState
   } = params;
   const { virtualizeColumns } = getState();
@@ -6412,6 +6481,7 @@ function useUnpinnedRendering(params) {
       showZebraRows,
       showHoverRows,
       getData,
+      rowSpan,
       toggleGroupRow,
       virtualizeColumns: shouldVirtualizeColumns,
       brain: null,
@@ -6428,6 +6498,7 @@ function useUnpinnedRendering(params) {
   }, [
     repaintId,
     rowHeight,
+    rowSpan,
     computedUnpinnedColumns,
     computedUnpinnedColumnsWidth,
     shouldVirtualizeColumns,
@@ -6593,7 +6664,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 +6770,7 @@ function PinnedRowsContainer(props) {
     brain,
     renderRow
   } = props;
-  const style = useMemo9(() => {
+  const style = useMemo10(() => {
     const result = pinning === "end" ? {
       width: rowWidth,
       height,
@@ -6755,7 +6826,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 +6840,7 @@ function useRenderPinnedRow(params) {
       virtualizeColumns: false,
       verticalBrain,
       brain: null,
+      rowSpan,
       rowWidth: columnsWidth,
       columns
     }, rowParams);
@@ -6793,6 +6865,7 @@ function usePinnedRenderingForSide(side, params) {
     computedPinnedStartOverflow,
     pinnedStartScrollListener,
     pinnedEndScrollListener,
+    rowSpan,
     repaintId,
     toggleGroupRow,
     scrollbars: {
@@ -6811,6 +6884,7 @@ function usePinnedRenderingForSide(side, params) {
     getData,
     getState,
     toggleGroupRow,
+    rowSpan,
     verticalBrain: verticalVirtualBrain,
     columns,
     columnsWidth
@@ -6873,9 +6947,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 +7248,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,11 +7392,12 @@ var VirtualBrain = class extends Logger {
 
 // src/components/InfiniteTable/hooks/useColumnSizeFn.ts
 import { useCallback as useCallback16 } from "react";
+var debug5 = dbg("useColumnSizeFn");
 function useColumnSizeFn(computedUnpinnedColumns) {
   const columnSize = useCallback16((index) => {
     const column = computedUnpinnedColumns[index];
     if (!column) {
-      console.log("cannot find column at index", index, computedUnpinnedColumns);
+      debug5("cannot find column at index", index, computedUnpinnedColumns);
     }
     return column ? column.computedWidth : 0;
   }, [computedUnpinnedColumns]);
@@ -7366,6 +7441,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 +7476,7 @@ function useListRendering(param) {
     computedUnpinnedColumnsWidth,
     computedPinnedStartOverflow,
     computedPinnedEndOverflow,
-    computedVisibleColumns,
+    rowSpan,
     toggleGroupRow
   } = computed;
   const { componentState: dataSourceState, getState: getDataSourceState } = useDataSourceContextValue();
@@ -7416,32 +7495,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 +7507,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 +7555,8 @@ function useListRendering(param) {
     rowHeight,
     verticalVirtualBrain,
     pinnedStartScrollListener,
-    pinnedEndScrollListener
+    pinnedEndScrollListener,
+    rowSpan
   };
   const centerRenderingParams = __spreadProps(__spreadValues({}, pinnedRenderingParams), {
     columnShifts,
@@ -7618,7 +7672,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;
@@ -7763,17 +7817,25 @@ var decode = (licenseKey) => {
 };
 
 // src/components/InfiniteTable/hooks/useLicense/useLicense.ts
-var SANDBOX_REGEX = /(https):\/\/\d+\-\d+\-\d\-(sandpack\.codesandbox\.io)/g;
+var SANDPACK_REGEX = /(https):\/\/\d+\-\d+\-\d+\-(sandpack\.codesandbox\.io)/g;
+var SANDBOX_REGEX = /(https):\/\/\S+(\.csb\.app)/g;
 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 isInsideSandpack = () => {
+  const [_fullUrl, protocol, sandpackUrl] = Array.from(SANDPACK_REGEX.exec(origin) || []);
+  return protocol === "https" && sandpackUrl === "sandpack.codesandbox.io";
+};
+var isInsideSandbox = () => {
+  const [_fullUrl, protocol, sandboxUrl] = Array.from(SANDBOX_REGEX.exec(origin) || []);
+  return protocol === "https" && sandboxUrl === ".csb.app";
+};
+var isInsidePlayground = isInsideSandbox() || isInsideSandpack();
 var useLicense = (licenseKey = "") => {
-  const valid = useMemo12(() => {
+  const valid = useMemo13(() => {
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "0.2.6"
+      version: "0.2.9"
     });
-    if (!licenseKey && !valid2 && isInsideSandbox) {
+    if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;
     }
     return valid2;
@@ -7789,7 +7851,7 @@ import {
 } from "react";
 import { useRef as useRef19 } from "react";
 var error = err("CSSVariableWatch");
-var debug5 = dbg("CSSVariableWatch");
+var debug6 = dbg("CSSVariableWatch");
 var WRAPPER_STYLE = {
   position: "absolute",
   pointerEvents: "none",
@@ -7812,7 +7874,7 @@ var useCSSVariableWatch = (params) => {
     const value = params.ref.current.getBoundingClientRect().height;
     if (value) {
       lastValueRef.current = value;
-      debug5(`Variable ${params.varName} found and equals ${value}.`);
+      debug6(`Variable ${params.varName} found and equals ${value}.`);
       params.onChange(value);
     } else {
       error(`Specified variable ${params.varName} not found or does not have a numeric value.`);