Refactor

src/core/store.ts

@@ -83,17 +83,13 @@ export type VirtualStore = {
 
 export const createVirtualStore = (
   elementsCount: number,
-  itemSize: number | undefined,
+  itemSize: number = 40,
   initialItemCount: number = 0,
-  isReverse: boolean,
-  cacheSnapshot?: CacheSnapshot
+  cache: Cache = initCache(elementsCount, itemSize),
+  isReverse?: boolean,
+  shouldAutoEstimateItemSize?: boolean
 ): VirtualStore => {
-  const shouldAutoEstimateItemSize = !itemSize;
-  const initialItemSize = itemSize || 40;
-  const cache =
-    (cacheSnapshot as unknown as Cache | undefined) ||
-    initCache(elementsCount, initialItemSize);
-  let viewportSize = initialItemSize * max(initialItemCount - 1, 0);
+  let viewportSize = itemSize * max(initialItemCount - 1, 0);
   let scrollOffset = 0;
   let jumpCount = 0;
   let jump: ScrollJump = 0;

src/react/VGrid.tsx

@@ -273,18 +273,8 @@ export const VGrid = forwardRef<VGridHandle, VGridProps>(
     const [vStore, hStore, resizer, vScroller, hScroller, isRtl] = useStatic(
       () => {
         const _isRtl = !!rtlProp;
-        const _vs = createVirtualStore(
-          rowCount,
-          cellHeight,
-          initialRowCount,
-          false
-        );
-        const _hs = createVirtualStore(
-          colCount,
-          cellWidth,
-          initialColCount,
-          false
-        );
+        const _vs = createVirtualStore(rowCount, cellHeight, initialRowCount);
+        const _hs = createVirtualStore(colCount, cellWidth, initialColCount);
         return [
           _vs,
           _hs,

src/react/VList.tsx

@@ -30,6 +30,7 @@ import {
 } from "./Viewport";
 import { CustomItemComponent, ListItem } from "./ListItem";
 import { CacheSnapshot } from "../core/types";
+import { Cache } from "../core/cache";
 
 export type ScrollMode = "reverse" | "rtl";
 
@@ -193,8 +194,9 @@ export const VList = forwardRef<VListHandle, VListProps>(
         count,
         initialItemSize,
         initialItemCount,
+        cache as unknown as Cache | undefined,
         mode === "reverse",
-        cache
+        !initialItemSize
       );
       return [
         _store,

src/react/WVList.tsx

@@ -29,6 +29,7 @@ import {
   Viewport as DefaultViewport,
 } from "./Viewport";
 import { CustomItemComponent, ListItem } from "./ListItem";
+import { Cache } from "../core/cache";
 
 type CustomItemComponentOrElement =
   | keyof JSX.IntrinsicElements
@@ -147,8 +148,9 @@ export const WVList = forwardRef<WVListHandle, WVListProps>(
         count,
         initialItemSize,
         initialItemCount,
+        cache as unknown as Cache | undefined,
         false,
-        cache
+        !initialItemSize
       );
 
       return [