Refactor

inokawa · Mar 10, 2024 · c7b6658 · c7b6658
1 parent 2b64b26
commit c7b6658
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/core/store.ts b/src/core/store.ts
@@ -173,11 +173,9 @@ export const createVirtualStore = (
     return computeRange(cache, offset, _prevRange[0], viewportSize);
   };
   const getTotalSize = (): number => computeTotalSize(cache);
-  const getScrollableSize = (): number =>
-    getTotalSize() + startSpacerSize + endSpacerSize;
   const getMaxScrollOffset = (): number =>
     // total size can become smaller than viewport size
-    max(0, getScrollableSize() - viewportSize);
+    max(0, getTotalSize() + startSpacerSize + endSpacerSize - viewportSize);
   const getItemOffset = (index: number): number => {
     return computeStartOffset(cache, index) - pendingJump;
   };
@@ -259,7 +257,7 @@ export const createVirtualStore = (
       const flushedIsJumpByShift = isJumpByShift;
       jump = 0;
       isJumpByShift = false;
-      if (viewportSize > getScrollableSize()) {
+      if (viewportSize > getTotalSize() + startSpacerSize + endSpacerSize) {
         // In this case applying jump will not cause scroll.
         // Current logic expects scroll event occurs after applying jump so discard it.
         return [0, false];