virtua 0.46.7 → 0.47.1

package/lib/solid/index.jsx

@@ -105,19 +105,18 @@ const getItemOffset = (cache, index) => {
  */
 const findIndex = (cache, offset, low = 0, high = cache._length - 1) => {
     // Find with binary search
+    let found = low;
     while (low <= high) {
         const mid = floor((low + high) / 2);
         if (getItemOffset(cache, mid) <= offset) {
-            if (getItemOffset(cache, mid + 1) > offset) {
-                return mid;
-            }
+            found = mid;
             low = mid + 1;
         }
         else {
             high = mid - 1;
         }
     }
-    return clamp(low, 0, cache._length - 1);
+    return clamp(found, 0, cache._length - 1);
 };
 /**
  * @internal
@@ -168,12 +167,12 @@ const estimateDefaultItemSize = (cache, startIndex) => {
 /**
  * @internal
  */
-const initCache = (length, itemSize, snapshot) => {
+const initCache = (length, itemSize, sizes) => {
     return {
-        _defaultItemSize: snapshot ? snapshot[1] : itemSize,
-        _sizes: snapshot && snapshot[0]
+        _defaultItemSize: itemSize,
+        _sizes: sizes
             ? // https://github.com/inokawa/virtua/issues/441
-                fill(snapshot[0].slice(0, min(length, snapshot[0].length)), max(0, length - snapshot[0].length))
+                fill(sizes.slice(0, min(length, sizes.length)), max(0, length - sizes.length))
             : fill([], length),
         _length: length,
         _computedOffsetIndex: -1,
@@ -306,7 +305,10 @@ const createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSna
     let _frozenRange = NULL;
     let _prevRange = [0, isSSR ? max(ssrCount - 1, 0) : -1];
     let _totalMeasuredSize = 0;
-    const cache = initCache(elementsCount, itemSize, cacheSnapshot);
+    let _isViewportMeasured = false;
+    const cache = initCache(elementsCount, cacheSnapshot
+        ? cacheSnapshot[1]
+        : itemSize, cacheSnapshot && cacheSnapshot[0]);
     const subscribers = new Set();
     const getRelativeScrollOffset = () => scrollOffset - startSpacerSize;
     const getVisibleOffset = () => getRelativeScrollOffset() + pendingJump + jump;
@@ -347,10 +349,10 @@ const createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSna
             return takeCacheSnapshot(cache);
         },
         $getRange: (bufferSize = 200) => {
-            if (!viewportSize || isSSR) {
-                // Empty viewportSize means the first render.
-                // We return range for SSR here, or return [0, -1] to render nothing, until the scroll offset and viewport size are determined.
+            if (!_isViewportMeasured || isSSR) {
+                // Return range for SSR, or return [0, -1] to render nothing, until the scroll offset and viewport size are determined.
                 // https://github.com/inokawa/virtua/issues/415
+                // https://github.com/inokawa/virtua/pull/818
                 return _prevRange;
             }
             let startIndex;
@@ -381,8 +383,7 @@ const createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSna
             }
             return [max(startIndex, 0), min(endIndex, cache._length - 1)];
         },
-        $findStartIndex: () => findIndex(cache, getVisibleOffset()),
-        $findEndIndex: () => findIndex(cache, getVisibleOffset() + viewportSize),
+        $findItemIndex: (offset) => findIndex(cache, offset - startSpacerSize),
         $isUnmeasuredItem: isSizeEqual,
         $getItemOffset: getItemOffset$1,
         $getItemSize: getItemSize$1,
@@ -523,7 +524,7 @@ const createVirtualStore = (elementsCount, itemSize = 40, ssrCount = 0, cacheSna
                 case ACTION_VIEWPORT_RESIZE: {
                     if (viewportSize !== payload) {
                         if (!viewportSize) {
-                            shouldSync = true;
+                            _isViewportMeasured = shouldSync = true;
                         }
                         viewportSize = payload;
                         mutated = UPDATE_VIRTUAL_STATE + UPDATE_SIZE_EVENT;
@@ -994,32 +995,44 @@ const createWindowScroller = (store, isHorizontal) => {
  * @internal
  */
 const createGridScroller = (rowStore, colStore) => {
-    const vScroller = createScroller(rowStore, false);
-    const hScroller = createScroller(colStore, true);
+    const rowScroller = createScroller(rowStore, false);
+    const colScroller = createScroller(colStore, true);
     return {
         $observe(viewportElement) {
-            vScroller.$observe(viewportElement);
-            hScroller.$observe(viewportElement);
+            rowScroller.$observe(viewportElement);
+            colScroller.$observe(viewportElement);
         },
         $dispose() {
-            vScroller.$dispose();
-            hScroller.$dispose();
+            rowScroller.$dispose();
+            colScroller.$dispose();
         },
-        $scrollTo(offsetX, offsetY) {
-            vScroller.$scrollTo(offsetY);
-            hScroller.$scrollTo(offsetX);
+        $scrollTo(row, col) {
+            if (row != null) {
+                rowScroller.$scrollTo(row);
+            }
+            if (col != null) {
+                colScroller.$scrollTo(col);
+            }
         },
-        $scrollBy(offsetX, offsetY) {
-            vScroller.$scrollBy(offsetY);
-            hScroller.$scrollBy(offsetX);
+        $scrollBy(row, col) {
+            if (row != null) {
+                rowScroller.$scrollBy(row);
+            }
+            if (col != null) {
+                colScroller.$scrollBy(col);
+            }
         },
-        $scrollToIndex(indexX, indexY) {
-            vScroller.$scrollToIndex(indexY);
-            hScroller.$scrollToIndex(indexX);
+        $scrollToIndex(row, col) {
+            if (row != null) {
+                rowScroller.$scrollToIndex(row);
+            }
+            if (col != null) {
+                colScroller.$scrollToIndex(col);
+            }
         },
         $fixScrollJump() {
-            vScroller.$fixScrollJump();
-            hScroller.$fixScrollJump();
+            rowScroller.$fixScrollJump();
+            colScroller.$fixScrollJump();
         },
     };
 };
@@ -1345,8 +1358,7 @@ const Virtualizer = (props) => {
                 get viewportSize() {
                     return store.$getViewportSize();
                 },
-                findStartIndex: store.$findStartIndex,
-                findEndIndex: store.$findEndIndex,
+                findItemIndex: store.$findItemIndex,
                 getItemOffset: store.$getItemOffset,
                 getItemSize: store.$getItemSize,
                 scrollToIndex: scroller.$scrollToIndex,
@@ -1511,8 +1523,15 @@ const WindowVirtualizer = (props) => {
                 get cache() {
                     return store.$getCacheSnapshot();
                 },
-                findStartIndex: store.$findStartIndex,
-                findEndIndex: store.$findEndIndex,
+                get scrollOffset() {
+                    return store.$getScrollOffset();
+                },
+                get viewportSize() {
+                    return store.$getViewportSize();
+                },
+                findItemIndex: store.$findItemIndex,
+                getItemOffset: store.$getItemOffset,
+                getItemSize: store.$getItemSize,
                 scrollToIndex: scroller.$scrollToIndex,
             });
         }