@infinite-table/infinite-react 9.1.2 → 9.1.3

package/index.dev.js

@@ -22434,6 +22434,23 @@ function computeFilterValueForRemote(filterValue, {
     }
   );
 }
+function createRemoteFilterValueMemo() {
+  let prev;
+  return (filterValue, filterTypes, filterMode) => {
+    if (prev && prev.filterValue === filterValue && prev.filterTypes === filterTypes && prev.filterMode === filterMode) {
+      return prev.result;
+    }
+    let result = computeFilterValueForRemote(filterValue, {
+      filterTypes,
+      filterMode
+    });
+    if (prev && prev.filterValue === filterValue && JSON.stringify(prev.result) === JSON.stringify(result)) {
+      result = prev.result;
+    }
+    prev = { filterValue, filterTypes, filterMode, result };
+    return result;
+  };
+}
 var getRafPromise = () => new Promise((resolve) => {
   raf(resolve);
 });
@@ -22446,6 +22463,10 @@ function getDetailReady(masterContext, getDataSourceState) {
     isDetailReady
   };
 }
+function isFirstLazyBatchRequested(componentState) {
+  const { lazyLoad, lazyLoadBatchSize, lazyLoadCacheOfLoadedBatches } = componentState;
+  return !!lazyLoad && !!lazyLoadBatchSize && lazyLoadBatchSize > 0 && lazyLoadCacheOfLoadedBatches.has([0]);
+}
 function lazyLoadRange(options, cache) {
   const {
     startIndex,
@@ -25042,12 +25063,15 @@ function useLoadData(options) {
       }
     }
   }, [scrollbars.vertical]);
-  const computedFilterValue = (0, import_react41.useMemo)(() => {
-    return computeFilterValueForRemote(filterValue, {
-      filterTypes,
-      filterMode
-    });
-  }, [filterValue, filterMode, filterTypes]);
+  const getRemoteFilterValue = (0, import_react41.useMemo)(
+    () => createRemoteFilterValueMemo(),
+    []
+  );
+  const computedFilterValue = getRemoteFilterValue(
+    filterValue,
+    filterTypes,
+    filterMode
+  );
   const depsObject = {
     // #sortMode_vs_shouldReloadData.sortInfo
     sortInfo: shouldReloadData.sortInfo ? sortInfo : null,
@@ -25058,14 +25082,19 @@ function useLoadData(options) {
     cursorId: livePagination ? stateCursorId : null
   };
   const initialRef = (0, import_react41.useRef)(true);
-  useLazyLoadRange(options, {
-    sortInfo,
-    groupBy,
-    pivotBy,
-    filterValue,
-    refetchKey,
-    cursorId: livePagination ? stateCursorId : null
-  });
+  const lazyRangeReloadedRef = (0, import_react41.useRef)(false);
+  useLazyLoadRange(
+    options,
+    {
+      sortInfo,
+      groupBy,
+      pivotBy,
+      filterValue,
+      refetchKey,
+      cursorId: livePagination ? stateCursorId : null
+    },
+    lazyRangeReloadedRef
+  );
   const getMasterContext = useGetMasterDetailContext();
   const dataChangeTimestampsRef = (0, import_react41.useRef)([]);
   useEffectWithChanges(
@@ -25129,6 +25158,9 @@ function useLoadData(options) {
       }
       const componentState = getDataSourceState();
       if (typeof componentState.data === "function") {
+        if (lazyRangeReloadedRef.current && !appendWhenLivePagination && isFirstLazyBatchRequested(componentState)) {
+          return;
+        }
         let marker;
         if (componentState.debugId) {
           marker = getMarker(
@@ -25150,6 +25182,9 @@ function useLoadData(options) {
     },
     { ...depsObject, data }
   );
+  (0, import_react41.useEffect)(() => {
+    lazyRangeReloadedRef.current = false;
+  });
   useEffectWithChanges(() => {
     const componentState = getDataSourceState();
     if (initialRef.current) {
@@ -25163,7 +25198,7 @@ function useLoadData(options) {
     }
   }, depsObject);
 }
-function useLazyLoadRange(options, dependencies) {
+function useLazyLoadRange(options, dependencies, reloadedRef) {
   const { getDataSourceState, dataSourceActions, dataSourceState } = options;
   (0, import_react41.useEffect)(() => {
     dataSourceActions.lazyLoadCacheOfLoadedBatches = new DeepMap();
@@ -25219,6 +25254,7 @@ function useLazyLoadRange(options, dependencies) {
           loadRange(notifyRenderRangeChange.get(), {
             dismissLoadedRows: true
           });
+          reloadedRef.current = true;
         } else {
           if (changes.originalLazyGroupDataChangeDetect || changes.groupRowsState) {
             loadRange(notifyRenderRangeChange.get());
@@ -27857,7 +27893,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "9.1.2"
+      version: "9.1.3"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;

package/index.dev.mjs

@@ -22368,6 +22368,23 @@ function computeFilterValueForRemote(filterValue, {
     }
   );
 }
+function createRemoteFilterValueMemo() {
+  let prev;
+  return (filterValue, filterTypes, filterMode) => {
+    if (prev && prev.filterValue === filterValue && prev.filterTypes === filterTypes && prev.filterMode === filterMode) {
+      return prev.result;
+    }
+    let result = computeFilterValueForRemote(filterValue, {
+      filterTypes,
+      filterMode
+    });
+    if (prev && prev.filterValue === filterValue && JSON.stringify(prev.result) === JSON.stringify(result)) {
+      result = prev.result;
+    }
+    prev = { filterValue, filterTypes, filterMode, result };
+    return result;
+  };
+}
 var getRafPromise = () => new Promise((resolve) => {
   raf(resolve);
 });
@@ -22380,6 +22397,10 @@ function getDetailReady(masterContext, getDataSourceState) {
     isDetailReady
   };
 }
+function isFirstLazyBatchRequested(componentState) {
+  const { lazyLoad, lazyLoadBatchSize, lazyLoadCacheOfLoadedBatches } = componentState;
+  return !!lazyLoad && !!lazyLoadBatchSize && lazyLoadBatchSize > 0 && lazyLoadCacheOfLoadedBatches.has([0]);
+}
 function lazyLoadRange(options, cache) {
   const {
     startIndex,
@@ -24981,12 +25002,15 @@ function useLoadData(options) {
       }
     }
   }, [scrollbars.vertical]);
-  const computedFilterValue = useMemo11(() => {
-    return computeFilterValueForRemote(filterValue, {
-      filterTypes,
-      filterMode
-    });
-  }, [filterValue, filterMode, filterTypes]);
+  const getRemoteFilterValue = useMemo11(
+    () => createRemoteFilterValueMemo(),
+    []
+  );
+  const computedFilterValue = getRemoteFilterValue(
+    filterValue,
+    filterTypes,
+    filterMode
+  );
   const depsObject = {
     // #sortMode_vs_shouldReloadData.sortInfo
     sortInfo: shouldReloadData.sortInfo ? sortInfo : null,
@@ -24997,14 +25021,19 @@ function useLoadData(options) {
     cursorId: livePagination ? stateCursorId : null
   };
   const initialRef = useRef25(true);
-  useLazyLoadRange(options, {
-    sortInfo,
-    groupBy,
-    pivotBy,
-    filterValue,
-    refetchKey,
-    cursorId: livePagination ? stateCursorId : null
-  });
+  const lazyRangeReloadedRef = useRef25(false);
+  useLazyLoadRange(
+    options,
+    {
+      sortInfo,
+      groupBy,
+      pivotBy,
+      filterValue,
+      refetchKey,
+      cursorId: livePagination ? stateCursorId : null
+    },
+    lazyRangeReloadedRef
+  );
   const getMasterContext = useGetMasterDetailContext();
   const dataChangeTimestampsRef = useRef25([]);
   useEffectWithChanges(
@@ -25068,6 +25097,9 @@ function useLoadData(options) {
       }
       const componentState = getDataSourceState();
       if (typeof componentState.data === "function") {
+        if (lazyRangeReloadedRef.current && !appendWhenLivePagination && isFirstLazyBatchRequested(componentState)) {
+          return;
+        }
         let marker;
         if (componentState.debugId) {
           marker = getMarker(
@@ -25089,6 +25121,9 @@ function useLoadData(options) {
     },
     { ...depsObject, data }
   );
+  useEffect21(() => {
+    lazyRangeReloadedRef.current = false;
+  });
   useEffectWithChanges(() => {
     const componentState = getDataSourceState();
     if (initialRef.current) {
@@ -25102,7 +25137,7 @@ function useLoadData(options) {
     }
   }, depsObject);
 }
-function useLazyLoadRange(options, dependencies) {
+function useLazyLoadRange(options, dependencies, reloadedRef) {
   const { getDataSourceState, dataSourceActions, dataSourceState } = options;
   useEffect21(() => {
     dataSourceActions.lazyLoadCacheOfLoadedBatches = new DeepMap();
@@ -25158,6 +25193,7 @@ function useLazyLoadRange(options, dependencies) {
           loadRange(notifyRenderRangeChange.get(), {
             dismissLoadedRows: true
           });
+          reloadedRef.current = true;
         } else {
           if (changes.originalLazyGroupDataChangeDetect || changes.groupRowsState) {
             loadRange(notifyRenderRangeChange.get());
@@ -27796,7 +27832,7 @@ var useLicense = (licenseKey = "") => {
     }
     let valid2 = isValidLicense(licenseKey, {
       publishedAt: 1624970570587,
-      version: "9.1.2"
+      version: "9.1.3"
     });
     if (!licenseKey && !valid2 && isInsidePlayground) {
       return true;