Refactor

inokawa · Aug 2, 2023 · a509cd9 · a509cd9
1 parent df07513
commit a509cd9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/core/cache.ts b/src/core/cache.ts
@@ -98,7 +98,7 @@ export const findIndex = (
     }
   }
 
-  return min(max(i, 0), cache._length - 1);
+  return min(cache._length - 1, max(0, i));
 };
 
 export const findStartIndexWithOffset = (

diff --git a/src/core/scroller.ts b/src/core/scroller.ts
@@ -171,7 +171,7 @@ export const createScroller = (
       scrollManually(store._getItemIndexForScrollTo(offset), () => offset);
     },
     _scrollToIndex(index) {
-      index = max(min(index, store._getItemLength() - 1), 0);
+      index = min(store._getItemLength() - 1, max(0, index));
 
       scrollManually(index, () => store._getItemOffset(index));
     },

diff --git a/src/core/store.ts b/src/core/store.ts
@@ -299,7 +299,7 @@ export const createVirtualStore = (
           }
 
           // Scroll offset may exceed min or max especially in Safari's elastic scrolling.
-          scrollOffset = max(0, min(getScrollOffsetMax(), payload));
+          scrollOffset = min(getScrollOffsetMax(), max(0, payload));
           mutated += UPDATE_SCROLL;
           break;
         }