Merge pull request #88 from wellyshen/fix/ssr-items-size

Fix: fallback tp default item size for SSR items
wellyshen · Jun 2, 2021 · 7c61cf3 · 7c61cf3
2 parents 0acdc4f + b5d483d
commit 7c61cf3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/.changeset/young-waves-approve.md b/.changeset/young-waves-approve.md
@@ -0,0 +1,5 @@
+---
+"react-cool-virtual": patch
+---
+
+fix: fallback tp default item size for SSR items
diff --git a/src/useVirtual.ts b/src/useVirtual.ts
@@ -42,7 +42,7 @@ const getInitItems = (itemSize: ItemSize, ssrItemCount?: SsrItemCount) => {
       index: i,
       start: 0,
       width: 0,
-      size: isNumber(itemSize) ? itemSize : itemSize(i, 0),
+      size: isNumber(itemSize) ? itemSize : itemSize(i, 0) ?? DEFAULT_ITEM_SIZE,
       measureRef: () => null,
     };
 
@@ -97,10 +97,10 @@ export default <
 
   const getItemSize = useCallback(
     (idx: number) => {
-      let { current: size } = itemSizeRef;
-      size = isNumber(size) ? size : size(idx, outerRectRef.current.width);
-
-      return size ?? DEFAULT_ITEM_SIZE;
+      const { current: size } = itemSizeRef;
+      return isNumber(size)
+        ? size
+        : size(idx, outerRectRef.current.width) ?? DEFAULT_ITEM_SIZE;
     },
     [itemSizeRef]
   );