@homebound/beam 2.415.1 → 2.415.3

package/dist/index.cjs

@@ -13878,7 +13878,7 @@ function useColumnResizeHandlers(columns, columnSizes, tableWidth, setResizedWid
 // src/components/Table/hooks/useScrollStorage.ts
 var import_react72 = require("react");
 function useScrollStorage(tableId, enabled = true) {
-  const storageKey = `scrollPosition_${window.location.pathname}_${tableId}`;
+  const storageKey = `scrollPosition_${window.location.pathname}${window.location.search}_${tableId}`;
   return (0, import_react72.useMemo)(
     () => ({
       getScrollIndex: () => {
@@ -14260,7 +14260,7 @@ function renderTable(style, id, columns, visibleDataRows, keptSelectedRows, firs
     }
   );
 }
-function renderVirtual(style, id, columns, visibleDataRows, keptSelectedRows, firstRowMessage, stickyHeader, xss, virtuosoRef, virtuosoRangeRef, tableHeadRows, _stickyOffset, infiniteScroll, _tableContainerRef, persistScrollPosition = true) {
+function renderVirtual(style, id, columns, visibleDataRows, keptSelectedRows, firstRowMessage, stickyHeader, xss, virtuosoRef, virtuosoRangeRef, tableHeadRows, _stickyOffset, infiniteScroll, _tableContainerRef, persistScrollPosition = infiniteScroll === void 0) {
   const { footerStyle, listStyle } = (0, import_react74.useMemo)(() => {
     const { paddingBottom, ...otherRootStyles } = style.rootCss ?? {};
     return { footerStyle: { paddingBottom }, listStyle: { ...style, rootCss: otherRootStyles } };
@@ -14268,14 +14268,15 @@ function renderVirtual(style, id, columns, visibleDataRows, keptSelectedRows, fi
   const [fetchMoreInProgress, setFetchMoreInProgress] = (0, import_react74.useState)(false);
   const { getScrollIndex, setScrollIndex } = useScrollStorage(id, persistScrollPosition);
   const savedScrollIndex = getScrollIndex();
-  const initialScrollIndex = !!savedScrollIndex && visibleDataRows.length > 0 && savedScrollIndex < visibleDataRows.length ? savedScrollIndex : void 0;
   const topItemCount = stickyHeader ? tableHeadRows.length : 0;
+  const validatedScrollIndex = savedScrollIndex !== void 0 && savedScrollIndex < visibleDataRows.length ? savedScrollIndex : void 0;
+  const virtuosoKey = !!validatedScrollIndex && visibleDataRows.length > 0 ? "with-data" : "virtuoso";
   return /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(
     import_react_virtuoso2.Virtuoso,
     {
       overscan: 5,
       ref: virtuosoRef,
-      ...initialScrollIndex !== void 0 ? { initialTopMostItemIndex: initialScrollIndex + topItemCount } : {},
+      ...validatedScrollIndex !== void 0 ? { initialTopMostItemIndex: validatedScrollIndex } : {},
       components: {
         // Applying a zIndex: 2 to ensure it stays on top of sticky columns
         TopItemList: import_react74.default.forwardRef((props, ref) => /* @__PURE__ */ (0, import_jsx_runtime81.jsx)(
@@ -14314,8 +14315,8 @@ function renderVirtual(style, id, columns, visibleDataRows, keptSelectedRows, fi
       },
       rangeChanged: (newRange) => {
         virtuosoRangeRef.current = newRange;
-        if (!infiniteScroll) {
-          setScrollIndex(newRange.startIndex + tableHeadRows.length);
+        if (!infiniteScroll && visibleDataRows.length > 0) {
+          setScrollIndex(newRange.startIndex);
         }
       },
       totalCount: tableHeadRows.length + (firstRowMessage ? 1 : 0) + visibleDataRows.length + keptSelectedRows.length,
@@ -14336,7 +14337,8 @@ function renderVirtual(style, id, columns, visibleDataRows, keptSelectedRows, fi
           }
         }
       } : {}
-    }
+    },
+    virtuosoKey
   );
 }
 var VirtualRoot = (0, import_memoize_one.default)(