virtua 0.46.2 → 0.46.4

package/lib/solid/index.jsx

@@ -76,7 +76,7 @@ const setItemSize = (cache, index, size) => {
 /**
  * @internal
  */
-const computeOffset = (cache, index) => {
+const getItemOffset = (cache, index) => {
     if (!cache._length)
         return 0;
     if (cache._computedOffsetIndex >= index) {
@@ -98,15 +98,6 @@ const computeOffset = (cache, index) => {
     cache._computedOffsetIndex = index;
     return top;
 };
-/**
- * @internal
- */
-const computeTotalSize = (cache) => {
-    if (!cache._length)
-        return 0;
-    return (computeOffset(cache, cache._length - 1) +
-        getItemSize(cache, cache._length - 1));
-};
 /**
  * Finds the index of an item in the cache whose computed offset is closest to the specified offset.
  *
@@ -116,9 +107,8 @@ const findIndex = (cache, offset, low = 0, high = cache._length - 1) => {
     // Find with binary search
     while (low <= high) {
         const mid = floor((low + high) / 2);
-        const itemOffset = computeOffset(cache, mid);
-        if (itemOffset <= offset) {
-            if (itemOffset + getItemSize(cache, mid) > offset) {
+        if (getItemOffset(cache, mid) <= offset) {
+            if (getItemOffset(cache, mid + 1) > offset) {
                 return mid;
             }
             low = mid + 1;
@@ -135,7 +125,7 @@ const findIndex = (cache, offset, low = 0, high = cache._length - 1) => {
 const computeRange = (cache, startOffset, endOffset, prevStartIndex) => {
     // Clamp because prevStartIndex may exceed the limit when children decreased a lot after scrolling
     prevStartIndex = min(prevStartIndex, cache._length - 1);
-    if (computeOffset(cache, prevStartIndex) <= startOffset) {
+    if (getItemOffset(cache, prevStartIndex) <= startOffset) {
         // search forward
         // start <= end, prevStartIndex <= start
         const end = findIndex(cache, endOffset, prevStartIndex);
@@ -187,7 +177,7 @@ const initCache = (length, itemSize, snapshot) => {
             : fill([], length),
         _length: length,
         _computedOffsetIndex: -1,
-        _offsets: fill([], length),
+        _offsets: fill([], length + 1),
     };
 };
 /**
@@ -323,9 +313,9 @@ const createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSna
     const getRange = (startOffset, endOffset) => {
         return computeRange(cache, startOffset, endOffset, _prevRange[0]);
     };
-    const getTotalSize = () => computeTotalSize(cache);
-    const getItemOffset = (index) => {
-        return computeOffset(cache, index) - pendingJump;
+    const getTotalSize = () => getItemOffset(cache, cache._length);
+    const getItemOffset$1 = (index) => {
+        return getItemOffset(cache, index) - pendingJump;
     };
     const getItemSize$1 = (index) => {
         return getItemSize(cache, index);
@@ -349,6 +339,9 @@ const createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSna
         }
     };
     return {
+        $dispose: () => {
+            subscribers.clear();
+        },
         $getStateVersion: () => stateVersion,
         $getCacheSnapshot: () => {
             return takeCacheSnapshot(cache);
@@ -368,11 +361,11 @@ const createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSna
                 [startIndex, endIndex] = _prevRange;
             }
             else {
-                bufferSize = max(0, bufferSize);
                 let startOffset = max(0, getVisibleOffset());
                 let endOffset = startOffset + viewportSize;
                 // For faster initial render pass, returns without buffer if measurement seems to be in progress.
                 if (!shouldAutoEstimateItemSize) {
+                    bufferSize = max(0, bufferSize);
                     if (_scrollDirection !== SCROLL_DOWN) {
                         startOffset -= bufferSize;
                     }
@@ -391,7 +384,7 @@ const createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSna
         $findStartIndex: () => findIndex(cache, getVisibleOffset()),
         $findEndIndex: () => findIndex(cache, getVisibleOffset() + viewportSize),
         $isUnmeasuredItem: isSizeEqual,
-        $getItemOffset: getItemOffset,
+        $getItemOffset: getItemOffset$1,
         $getItemSize: getItemSize$1,
         $getItemsLength: () => cache._length,
         $getScrollOffset: () => scrollOffset,
@@ -417,6 +410,10 @@ const createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSna
             let mutated = 0;
             switch (type) {
                 case ACTION_SCROLL: {
+                    if (payload === scrollOffset && _scrollMode === SCROLL_BY_NATIVE) {
+                        // Ignore scroll events from different direction
+                        break;
+                    }
                     const flushedJump = _flushedJump;
                     _flushedJump = 0;
                     const delta = payload - scrollOffset;
@@ -485,13 +482,12 @@ const createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSna
                                     // https://github.com/inokawa/virtua/issues/758
                                     index < _frozenRange[0]
                                 : // Otherwise we should maintain visible position
-                                    getItemOffset(index) +
+                                    getItemOffset$1(index +
                                         // https://github.com/inokawa/virtua/issues/385
                                         (_scrollDirection === SCROLL_IDLE &&
                                             _scrollMode === SCROLL_BY_NATIVE
-                                            ? getItemSize$1(index)
-                                            : 0) <
-                                        getRelativeScrollOffset())) {
+                                            ? 1
+                                            : 0)) < getRelativeScrollOffset())) {
                             acc += size - getItemSize$1(index);
                         }
                         return acc;
@@ -1313,14 +1309,14 @@ const Virtualizer = (props) => {
     const resizer = createResizer(store, horizontal);
     const scroller = createScroller(store, horizontal);
     const [stateVersion, setRerender] = createSignal(store.$getStateVersion());
-    const unsubscribeStore = store.$subscribe(UPDATE_VIRTUAL_STATE, () => {
+    store.$subscribe(UPDATE_VIRTUAL_STATE, () => {
         setRerender(store.$getStateVersion());
     });
-    const unsubscribeOnScroll = store.$subscribe(UPDATE_SCROLL_EVENT, () => {
+    store.$subscribe(UPDATE_SCROLL_EVENT, () => {
         var _a;
         (_a = props.onScroll) === null || _a === void 0 ? void 0 : _a.call(props, store.$getScrollOffset());
     });
-    const unsubscribeOnScrollEnd = store.$subscribe(UPDATE_SCROLL_END_EVENT, () => {
+    store.$subscribe(UPDATE_SCROLL_END_EVENT, () => {
         var _a;
         (_a = props.onScrollEnd) === null || _a === void 0 ? void 0 : _a.call(props);
     });
@@ -1365,9 +1361,7 @@ const Virtualizer = (props) => {
             if (props.ref) {
                 props.ref();
             }
-            unsubscribeStore();
-            unsubscribeOnScroll();
-            unsubscribeOnScrollEnd();
+            store.$dispose();
             resizer.$dispose();
             scroller.$dispose();
         });
@@ -1424,7 +1418,6 @@ const Virtualizer = (props) => {
     return (<Dynamic component={props.as} ref={containerRef} style={{
             contain: "size paint style", // https://github.com/inokawa/virtua/pull/775
             "overflow-anchor": "none", // opt out browser's scroll anchoring because it will conflict to scroll anchoring of virtualizer
-            overflow: "clip", // https://github.com/inokawa/virtua/pull/485 https://github.com/inokawa/virtua/issues/717
             flex: "none", // flex style can break layout
             position: "relative",
             width: horizontal ? totalSize() + "px" : "100%",
@@ -1490,15 +1483,15 @@ const WindowVirtualizer = (props) => {
     const resizer = createWindowResizer(store, horizontal);
     const scroller = createWindowScroller(store, horizontal);
     const [stateVersion, setRerender] = createSignal(store.$getStateVersion());
-    const unsubscribeStore = store.$subscribe(UPDATE_VIRTUAL_STATE, () => {
+    store.$subscribe(UPDATE_VIRTUAL_STATE, () => {
         setRerender(store.$getStateVersion());
     });
-    const unsubscribeOnScroll = store.$subscribe(UPDATE_SCROLL_EVENT, () => {
+    store.$subscribe(UPDATE_SCROLL_EVENT, () => {
         var _a;
         // https://github.com/inokawa/virtua/discussions/580
         (_a = props.onScroll) === null || _a === void 0 ? void 0 : _a.call(props);
     });
-    const unsubscribeOnScrollEnd = store.$subscribe(UPDATE_SCROLL_END_EVENT, () => {
+    store.$subscribe(UPDATE_SCROLL_END_EVENT, () => {
         var _a;
         (_a = props.onScrollEnd) === null || _a === void 0 ? void 0 : _a.call(props);
     });
@@ -1529,9 +1522,7 @@ const WindowVirtualizer = (props) => {
             if (props.ref) {
                 props.ref();
             }
-            unsubscribeStore();
-            unsubscribeOnScroll();
-            unsubscribeOnScrollEnd();
+            store.$dispose();
             resizer.$dispose();
             scroller.$dispose();
         });
@@ -1555,7 +1546,6 @@ const WindowVirtualizer = (props) => {
     return (<div ref={containerRef} style={{
             contain: "size paint style", // https://github.com/inokawa/virtua/pull/775
             "overflow-anchor": "none", // opt out browser's scroll anchoring because it will conflict to scroll anchoring of virtualizer
-            overflow: "clip", // https://github.com/inokawa/virtua/pull/485 https://github.com/inokawa/virtua/issues/717
             flex: "none", // flex style can break layout
             position: "relative",
             width: horizontal ? totalSize() + "px" : "100%",