virtua 0.40.1 → 0.40.2

package/lib/solid/index.jsx

@@ -246,6 +246,7 @@ const isSmoothScrollSupported = /*#__PURE__*/ once(() => {
     return "scrollBehavior" in getDocumentElement().style;
 });
 
+const MAX_INT_32 = 0x7fffffff;
 const SCROLL_IDLE = 0;
 const SCROLL_DOWN = 1;
 const SCROLL_UP = 2;
@@ -293,11 +294,10 @@ const isInitialMeasurementDone = (store) => {
  */
 const createVirtualStore = (elementsCount, itemSize = 40, overscan = 4, ssrCount = 0, cacheSnapshot, shouldAutoEstimateItemSize = false) => {
     let isSSR = !!ssrCount;
-    let stateVersion = [];
+    let stateVersion = 1;
     let viewportSize = 0;
     let startSpacerSize = 0;
     let scrollOffset = 0;
-    let jumpCount = 0;
     let jump = 0;
     let pendingJump = 0;
     let _flushedJump = 0;
@@ -330,7 +330,6 @@ const createVirtualStore = (elementsCount, itemSize = 40, overscan = 4, ssrCount
             }
             else {
                 jump += j;
-                jumpCount++;
             }
         }
     };
@@ -380,7 +379,6 @@ const createVirtualStore = (elementsCount, itemSize = 40, overscan = 4, ssrCount
         $getViewportSize: () => viewportSize,
         $getStartSpacerSize: () => startSpacerSize,
         $getTotalSize: getTotalSize,
-        $getJumpCount: () => jumpCount,
         _flushJump: () => {
             _flushedJump = jump;
             jump = 0;
@@ -549,11 +547,10 @@ const createVirtualStore = (elementsCount, itemSize = 40, overscan = 4, ssrCount
                 }
             }
             if (mutated) {
-                stateVersion = [];
+                stateVersion = (stateVersion % MAX_INT_32) + 1;
                 if (shouldFlushPendingJump && pendingJump) {
                     jump += pendingJump;
                     pendingJump = 0;
-                    jumpCount++;
                 }
                 subscribers.forEach(([target, cb]) => {
                     // Early return to skip React's computation
@@ -1354,7 +1351,7 @@ const Virtualizer = (props) => {
     const store = createVirtualStore(props.data.length, itemSize, overscan, undefined, undefined, !itemSize);
     const resizer = createResizer(store, horizontal);
     const scroller = createScroller(store, horizontal);
-    const [rerender, setRerender] = createSignal(store.$getStateVersion());
+    const [stateVersion, setRerender] = createSignal(store.$getStateVersion());
     const unsubscribeStore = store.$subscribe(UPDATE_VIRTUAL_STATE, () => {
         setRerender(store.$getStateVersion());
     });
@@ -1367,16 +1364,15 @@ const Virtualizer = (props) => {
         (_a = props.onScrollEnd) === null || _a === void 0 ? void 0 : _a.call(props);
     });
     const range = createMemo((prev) => {
-        rerender();
+        stateVersion();
         const next = store.$getRange();
         if (prev && isSameRange(prev, next)) {
             return prev;
         }
         return next;
     });
-    const isScrolling = createMemo(() => rerender() && store.$isScrolling());
-    const totalSize = createMemo(() => rerender() && store.$getTotalSize());
-    const jumpCount = createMemo(() => rerender() && store.$getJumpCount());
+    const isScrolling = createMemo(() => stateVersion() && store.$isScrolling());
+    const totalSize = createMemo(() => stateVersion() && store.$getTotalSize());
     onMount(() => {
         if (props.ref) {
             props.ref({
@@ -1422,7 +1418,7 @@ const Virtualizer = (props) => {
             store.$update(ACTION_START_OFFSET_CHANGE, value);
         }
     }));
-    createEffect(on(jumpCount, () => {
+    createEffect(on(stateVersion, () => {
         scroller.$fixScrollJump();
     }));
     return (<Dynamic component={props.as} ref={containerRef} style={{
@@ -1437,11 +1433,11 @@ const Virtualizer = (props) => {
         }}>
       <RangedFor _each={props.data} _range={range()} _render={(data, index) => {
             const offset = createMemo(() => {
-                rerender();
+                stateVersion();
                 return store.$getItemOffset(index);
             });
             const hide = createMemo(() => {
-                rerender();
+                stateVersion();
                 return store.$isUnmeasuredItem(index);
             });
             return (<ListItem _as={props.item} _index={index} _resizer={resizer.$observeItem} _offset={offset()} _hide={hide()} _children={props.children(data(), index)} _isHorizontal={horizontal}/>);
@@ -1480,7 +1476,7 @@ const WindowVirtualizer = (props) => {
     const store = createVirtualStore(props.data.length, itemSize, overscan, undefined, undefined, !itemSize);
     const resizer = createWindowResizer(store, horizontal);
     const scroller = createWindowScroller(store, horizontal);
-    const [rerender, setRerender] = createSignal(store.$getStateVersion());
+    const [stateVersion, setRerender] = createSignal(store.$getStateVersion());
     const unsubscribeStore = store.$subscribe(UPDATE_VIRTUAL_STATE, () => {
         setRerender(store.$getStateVersion());
     });
@@ -1494,16 +1490,15 @@ const WindowVirtualizer = (props) => {
         (_a = props.onScrollEnd) === null || _a === void 0 ? void 0 : _a.call(props);
     });
     const range = createMemo((prev) => {
-        rerender();
+        stateVersion();
         const next = store.$getRange();
         if (prev && isSameRange(prev, next)) {
             return prev;
         }
         return next;
     });
-    const isScrolling = createMemo(() => rerender() && store.$isScrolling());
-    const totalSize = createMemo(() => rerender() && store.$getTotalSize());
-    const jumpCount = createMemo(() => rerender() && store.$getJumpCount());
+    const isScrolling = createMemo(() => stateVersion() && store.$isScrolling());
+    const totalSize = createMemo(() => stateVersion() && store.$getTotalSize());
     onMount(() => {
         if (props.ref) {
             props.ref({
@@ -1530,7 +1525,7 @@ const WindowVirtualizer = (props) => {
             store.$update(ACTION_ITEMS_LENGTH_CHANGE, [len, props.shift]);
         }
     }));
-    createEffect(on(jumpCount, () => {
+    createEffect(on(stateVersion, () => {
         scroller.$fixScrollJump();
     }));
     return (<div ref={containerRef} style={{
@@ -1545,11 +1540,11 @@ const WindowVirtualizer = (props) => {
         }}>
       <RangedFor _each={props.data} _range={range()} _render={(data, index) => {
             const offset = createMemo(() => {
-                rerender();
+                stateVersion();
                 return store.$getItemOffset(index);
             });
             const hide = createMemo(() => {
-                rerender();
+                stateVersion();
                 return store.$isUnmeasuredItem(index);
             });
             return (<ListItem _index={index} _resizer={resizer.$observeItem} _offset={offset()} _hide={hide()} _children={props.children(data(), index)} _isHorizontal={horizontal}/>);