@economic/taco 2.64.1-table-flickering.0 → 2.64.1-test-1.0

package/dist/taco.cjs

@@ -37836,6 +37836,15 @@ function useTableRenderer(renderers, table, tableRef, length, defaultRowActiveIn
       virtualiser.measure();
     }
   }, [expandedState]);
+  React.useEffect(() => {
+    const totalSize2 = virtualiser.getTotalSize();
+    console.log("before measuring totalSize", totalSize2);
+    virtualiser.measure();
+    setTimeout(() => {
+      const totalSize3 = virtualiser.getTotalSize();
+      console.log("after measuring totalSize", totalSize3);
+    }, 1e3);
+  }, [tableMeta.fontSize.size, tableMeta.rowHeight.height, JSON.stringify(table.getState().sorting), rows.length]);
   const totalSize = virtualiser.getTotalSize();
   const virtualItems = virtualiser.getVirtualItems();
   const scrollToIndex = React.useCallback(
@@ -38446,6 +38455,21 @@ function Cell$2(props) {
   }
   return /* @__PURE__ */ React.createElement(CellRenderer, { ...cellProps });
 }
+const useResizeObserver$1 = (ref, enabled = true) => {
+  const [size2, setSize] = React.useState();
+  React.useEffect(() => {
+    if (!ref.current || !enabled) {
+      return () => void 0;
+    }
+    const observer = new ResizeObserver((entries) => {
+      const entry = entries[0];
+      setSize({ height: entry.contentRect.height, width: entry.contentRect.width });
+    });
+    observer.observe(ref.current);
+    return () => observer.disconnect();
+  }, [enabled]);
+  return size2;
+};
 const DisplayRow = React.memo(function DisplayRow2(props) {
   var _a, _b, _c;
   const { children, cellRenderer: CellRenderer, index: index2, measureRow, row, table, ...otherAttributes } = props;
@@ -38540,12 +38564,14 @@ const DisplayRow = React.memo(function DisplayRow2(props) {
   }
   const ref = React.useRef(null);
   const expansionRef = React.useRef(null);
+  const rowSize = useResizeObserver$1(ref, true);
+  const expandedRowSize = useResizeObserver$1(expansionRef, !!expandedRow);
   React.useEffect(() => {
     var _a2, _b2;
     const rowHeight = ((_a2 = ref.current) == null ? void 0 : _a2.getBoundingClientRect().height) ?? 0;
     const expansionHeight = ((_b2 = expansionRef.current) == null ? void 0 : _b2.getBoundingClientRect().height) ?? 0;
     measureRow(rowHeight + expansionHeight);
-  }, [expansionRef.current]);
+  }, [rowSize, expandedRowSize, measureRow]);
   const className = clsx("group/row", otherAttributes.className, {
     "hover:cursor-grab": tableMeta.rowDrag.isEnabled && typeof attributes.onClick !== "function",
     "hover:cursor-pointer": typeof attributes.onClick === "function"
@@ -88413,16 +88439,19 @@ function useTableDataLoader2(fetchPage, fetchAll, options = { pageSize: DEFAULT_
   const _lastUsedSearch = React.useRef();
   async function loadPage(pageIndex, sorting, filters, hiddenColumns, search) {
     const hasDataChanged = JSON.stringify(sorting) !== JSON.stringify(_lastUsedSorting.current) || JSON.stringify(filters) !== JSON.stringify(_lastUsedFilters.current) || JSON.stringify(hiddenColumns) !== JSON.stringify(_lastUsedHiddenColumns.current) || search !== _lastUsedSearch.current;
-    const isAlreadyLoadedOrLoading = _pendingPageRequests.current[pageIndex] || data.cache[pageIndex] && data.cache[pageIndex][0];
-    if (!hasDataChanged && isAlreadyLoadedOrLoading) {
-      return;
-    }
     if (hasDataChanged) {
       _lastUsedSorting.current = sorting;
       _lastUsedFilters.current = filters;
       _lastUsedSearch.current = search;
       _lastUsedHiddenColumns.current = hiddenColumns;
       _pendingPageRequests.current = {};
+    } else {
+      if (_pendingPageRequests.current[pageIndex]) {
+        return;
+      }
+      if (data.cache[pageIndex] && data.cache[pageIndex][0]) {
+        return;
+      }
     }
     const dataKey = getDataKey(sorting, filters, hiddenColumns, search);
     _pendingPageRequests.current[pageIndex] = dataKey;
@@ -88468,7 +88497,6 @@ function useTableDataLoader2(fetchPage, fetchAll, options = { pageSize: DEFAULT_
         delete _pendingPageRequests.current[pageIndex];
       });
     } catch {
-      delete _pendingPageRequests.current[pageIndex];
     }
   }
   const loadAll = async (sorting, filters, hiddenColumns, search) => {
@@ -88578,14 +88606,12 @@ function getCurrentPage(currentPages) {
   return currentPages[middle];
 }
 function getDirection(pageIndex, currentPages) {
-  if (!currentPages.length) {
-    return void 0;
-  }
-  if (pageIndex === currentPages[currentPages.length - 1] + 1) {
-    return "forward";
-  }
-  if (pageIndex === currentPages[0] - 1 || currentPages.length === 2 && currentPages[0] !== 0 && pageIndex === currentPages[0]) {
-    return "backward";
+  if (currentPages.length) {
+    if (pageIndex === currentPages[currentPages.length - 1] + 1) {
+      return "forward";
+    } else if (pageIndex === currentPages[0] - 1 || currentPages.length === 2 && currentPages[0] !== 0 && pageIndex === currentPages[0]) {
+      return "backward";
+    }
   }
   return void 0;
 }