fix: RWD not working

wellyshen · May 30, 2021 · 97882ac · 97882ac
1 parent f993b88
commit 97882ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.changeset/fresh-lamps-study.md b/.changeset/fresh-lamps-study.md
@@ -0,0 +1,5 @@
+---
+"react-cool-virtual": patch
+---
+
+fix: RWD not working
diff --git a/src/useVirtual.ts b/src/useVirtual.ts
@@ -127,14 +127,13 @@ export default <
 
   const measureItems = useCallback(
     (useCache = true) => {
-      for (let i = 0; i < itemCount; i += 1) {
+      for (let i = 0; i < itemCount; i += 1)
         msDataRef.current[i] = getMeasure(
           i,
           useCache && msDataRef.current[i]
             ? msDataRef.current[i].size
             : getItemSize(i)
         );
-      }
     },
     [getItemSize, getMeasure, itemCount]
   );
@@ -442,19 +441,17 @@ export default <
     outerRef,
     (rect) => {
       const isSameWidth = outerRectRef.current.width === rect.width;
-      const { current: prevMsData } = msDataRef;
+      const prevTotalSize =
+        msDataRef.current[msDataRef.current.length - 1]?.end || 0;
 
       outerRectRef.current = rect;
       measureItems(false);
       handleScroll(scrollOffsetRef.current);
 
       if (onResizeRef.current) onResizeRef.current(rect);
 
-      const { current: msData } = msDataRef;
-      const ratio =
-        !isSameWidth &&
-        prevMsData.length &&
-        msData[msData.length - 1].end / prevMsData[prevMsData.length - 1].end;
+      const totalSize = msDataRef.current[msDataRef.current.length - 1].end;
+      const ratio = !isSameWidth && totalSize / prevTotalSize;
 
       if (ratio) scrollTo(scrollOffsetRef.current * ratio);
     },