Refactor

inokawa · Jan 6, 2024 · 1e7d7e1 · 1e7d7e1
1 parent af730db
commit 1e7d7e1
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/src/core/store.ts b/src/core/store.ts
@@ -82,7 +82,7 @@ type ItemsRange = Readonly<[startIndex: number, endIndex: number]>;
 /**
  * @internal
  */
-export const clampStartIndex = (
+export const overscanStartIndex = (
  startIndex: number,
  overscan: number,
  scrollDirection: ScrollDirection
@@ -96,7 +96,7 @@ export const clampStartIndex = (
 /**
  * @internal
  */
-export const clampEndIndex = (
+export const overscanEndIndex = (
  endIndex: number,
  overscan: number,
  scrollDirection: ScrollDirection,

diff --git a/src/react/VGrid.tsx b/src/react/VGrid.tsx
@@ -12,8 +12,8 @@ import {
  ACTION_ITEMS_LENGTH_CHANGE,
  UPDATE_SCROLL_STATE,
  UPDATE_SIZE_STATE,
- clampEndIndex,
- clampStartIndex,
+ overscanEndIndex,
+ overscanStartIndex,
  createVirtualStore,
  SCROLL_IDLE,
 } from "../core/store";
@@ -359,23 +359,23 @@ export const VGrid = forwardRef<VGridHandle, VGridProps>(
  };
  }, [children]);
 
- const overscanedStartRowIndex = clampStartIndex(
+ const overscanedStartRowIndex = overscanStartIndex(
  startRowIndex,
  overscan,
  vScrollDirection
  );
- const overscanedEndRowIndex = clampEndIndex(
+ const overscanedEndRowIndex = overscanEndIndex(
  endRowIndex,
  overscan,
  vScrollDirection,
  rowCount
  );
- const overscanedStartColIndex = clampStartIndex(
+ const overscanedStartColIndex = overscanStartIndex(
  startColIndex,
  overscan,
  hScrollDirection
  );
- const overscanedEndColIndex = clampEndIndex(
+ const overscanedEndColIndex = overscanEndIndex(
  endColIndex,
  overscan,
  hScrollDirection,

diff --git a/src/react/VList.tsx b/src/react/VList.tsx
@@ -10,8 +10,8 @@ import {
 import {
  UPDATE_SCROLL_EVENT,
  ACTION_ITEMS_LENGTH_CHANGE,
- clampEndIndex,
- clampStartIndex,
+ overscanEndIndex,
+ overscanStartIndex,
  createVirtualStore,
  UPDATE_SIZE_STATE,
  UPDATE_SCROLL_STATE,
@@ -305,12 +305,12 @@ export const VList = forwardRef<VListHandle, VListProps>(
  []
  );
 
- const overscanedStartIndex = clampStartIndex(
+ const overscanedStartIndex = overscanStartIndex(
  startIndex,
  overscan,
  scrollDirection
  );
- const overscanedEndIndex = clampEndIndex(
+ const overscanedEndIndex = overscanEndIndex(
  endIndex,
  overscan,
  scrollDirection,

diff --git a/src/react/WVList.tsx b/src/react/WVList.tsx
@@ -11,8 +11,8 @@ import {
  ACTION_ITEMS_LENGTH_CHANGE,
  UPDATE_SCROLL_STATE,
  UPDATE_SIZE_STATE,
- clampEndIndex,
- clampStartIndex,
+ overscanEndIndex,
+ overscanStartIndex,
  createVirtualStore,
  SCROLL_IDLE,
  UPDATE_SCROLL_STOP_EVENT,
@@ -250,12 +250,12 @@ export const WVList = forwardRef<WVListHandle, WVListProps>(
  []
  );
 
- const overscanedStartIndex = clampStartIndex(
+ const overscanedStartIndex = overscanStartIndex(
  startIndex,
  overscan,
  scrollDirection
  );
- const overscanedEndIndex = clampEndIndex(
+ const overscanedEndIndex = overscanEndIndex(
  endIndex,
  overscan,
  scrollDirection,

diff --git a/src/vue/VList.tsx b/src/vue/VList.tsx
@@ -17,8 +17,8 @@ import {
  UPDATE_SCROLL_EVENT,
  UPDATE_SCROLL_STOP_EVENT,
  UPDATE_SIZE_STATE,
- clampEndIndex,
- clampStartIndex,
+ overscanEndIndex,
+ overscanStartIndex,
  createVirtualStore,
  ACTION_ITEMS_LENGTH_CHANGE,
 } from "../core/store";
@@ -190,12 +190,12 @@ export const VList = /*#__PURE__*/ defineComponent({
  const scrollDirection = store._getScrollDirection();
  const scrollSize = store._getScrollSize();
 
- const overscanedStartIndex = clampStartIndex(
+ const overscanedStartIndex = overscanStartIndex(
  startIndex,
  props.overscan,
  scrollDirection
  );
- const overscanedEndIndex = clampEndIndex(
+ const overscanedEndIndex = overscanEndIndex(
  endIndex,
  props.overscan,
  scrollDirection,