fix(useVirtual): do not trigger onScroll and loadMore by internal…

…ly scroll-to method
wellyshen · Jun 19, 2021 · abc5880 · abc5880
1 parent c120667
commit abc5880
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/.changeset/gorgeous-avocados-develop.md b/.changeset/gorgeous-avocados-develop.md
@@ -0,0 +1,5 @@
+---
+"react-cool-virtual": patch
+---
+
+fix(useVirtual): do not trigger `onScroll` and `loadMore` by internally scroll-to method
diff --git a/src/useVirtual.ts b/src/useVirtual.ts
@@ -69,6 +69,7 @@ export default <
     getInitItems(itemSize, ssrItemCount)
   );
   const isMountedRef = useRef(false);
+  const isScrollingRef = useRef(true);
   const isScrollToItemRef = useRef(false);
   const hasDynamicSizeRef = useRef(false);
   const rosRef = useRef<Map<Element, ResizeObserver>>(new Map());
@@ -176,8 +177,11 @@ export default <
   );
 
   const scrollTo = useCallback(
-    (offset: number) => {
-      if (outerRef.current) outerRef.current[scrollKey] = offset;
+    (offset: number, isScrolling = true) => {
+      if (outerRef.current) {
+        isScrollingRef.current = isScrolling;
+        outerRef.current[scrollKey] = offset;
+      }
     },
     [scrollKey]
   );
@@ -363,7 +367,7 @@ export default <
               if (measuredSize !== size || start !== prevEnd) {
                 // To prevent dynamic size from jumping during backward scrolling
                 if (i < prevItemIdxRef.current && start < scrollOffset)
-                  scrollTo(scrollOffset + measuredSize - size);
+                  scrollTo(scrollOffset + measuredSize - size, false);
 
                 msDataRef.current[i] = getMeasure(i, measuredSize);
                 if (!isScrollToItemRef.current)
@@ -480,19 +484,21 @@ export default <
       measureItems(hasDynamicSizeRef.current);
       handleScroll(scrollOffsetRef.current);
 
-      if (resetScroll && itemCount !== prevItemCount) scrollTo(0);
+      if (resetScroll && itemCount !== prevItemCount) scrollTo(0, false);
+
+      if (!isMountedRef.current) {
+        isMountedRef.current = true;
+        return;
+      }
 
       if (!hasDynamicSizeRef.current && !isSameWidth) {
         const totalSize = msDataRef.current[msDataRef.current.length - 1]?.end;
         const ratio = totalSize / prevTotalSize || 1;
 
-        scrollTo(scrollOffsetRef.current * ratio);
+        scrollTo(scrollOffsetRef.current * ratio, false);
       }
 
-      if (isMountedRef.current && !isSameSize && onResizeRef.current)
-        onResizeRef.current(rect);
-
-      isMountedRef.current = true;
+      if (!isSameSize && onResizeRef.current) onResizeRef.current(rect);
     },
     [itemCount, resetScroll, handleScroll, measureItems, onResizeRef, scrollTo]
   );
@@ -513,7 +519,8 @@ export default <
           ? uxScrolling(Math.abs(scrollOffset - scrollOffsetRef.current))
           : uxScrolling;
 
-      handleScroll(scrollOffset, true, uxScrolling);
+      handleScroll(scrollOffset, isScrollingRef.current, uxScrolling);
+      isScrollingRef.current = true;
       scrollOffsetRef.current = scrollOffset;
     };