@economic/taco 2.64.0 → 2.64.1-table-flickering.0

package/dist/taco.cjs

@@ -88413,19 +88413,16 @@ 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;
@@ -88471,6 +88468,7 @@ function useTableDataLoader2(fetchPage, fetchAll, options = { pageSize: DEFAULT_
         delete _pendingPageRequests.current[pageIndex];
       });
     } catch {
+      delete _pendingPageRequests.current[pageIndex];
     }
   }
   const loadAll = async (sorting, filters, hiddenColumns, search) => {
@@ -88580,12 +88578,14 @@ function getCurrentPage(currentPages) {
   return currentPages[middle];
 }
 function getDirection(pageIndex, currentPages) {
-  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";
-    }
+  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";
   }
   return void 0;
 }