Refactor

inokawa · Jul 1, 2023 · 57416e5 · 57416e5
1 parent 05b7e56
commit 57416e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/core/scroller.ts b/src/core/scroller.ts
@@ -5,8 +5,7 @@ import {
   ScrollJump,
   VirtualStore,
   SCROLL_STOP,
-  ACTION_SCROLL_DIRECTION_CHANGE,
-  SCROLL_MANUAL,
+  ACTION_SCROLL_END,
 } from "./store";
 import { debounce, throttle, max, min } from "./utils";
 
@@ -87,7 +86,7 @@ export const createScroller = (
 
     // Scroll with the updated value
     scrollTo(getOffset());
-    store._update(ACTION_SCROLL_DIRECTION_CHANGE, SCROLL_MANUAL);
+    store._update(ACTION_SCROLL_END, true);
   };
 
   return {
@@ -105,7 +104,7 @@ export const createScroller = (
       const onScrollStopped = debounce(() => {
         // Check scroll position once just after scrolling stopped
         syncViewportToScrollPosition();
-        store._update(ACTION_SCROLL_DIRECTION_CHANGE, SCROLL_STOP);
+        store._update(ACTION_SCROLL_END, false);
       }, 150);
 
       const onScroll = () => {

diff --git a/src/core/store.ts b/src/core/store.ts
@@ -41,14 +41,14 @@ export const ACTION_ITEM_RESIZE = 1;
 export const ACTION_WINDOW_RESIZE = 2;
 export const ACTION_SCROLL = 3;
 export const ACTION_MANUAL_SCROLL = 4;
-export const ACTION_SCROLL_DIRECTION_CHANGE = 5;
+export const ACTION_SCROLL_END = 5;
 
 type Actions =
   | [type: typeof ACTION_ITEM_RESIZE, entries: ItemResize[]]
   | [type: typeof ACTION_WINDOW_RESIZE, size: number]
   | [type: typeof ACTION_SCROLL, offset: number]
   | [type: typeof ACTION_MANUAL_SCROLL, offset: number]
-  | [type: typeof ACTION_SCROLL_DIRECTION_CHANGE, direction: ScrollDirection];
+  | [type: typeof ACTION_SCROLL_END, isManual: boolean];
 
 type Subscriber = (sync?: boolean) => void;
 
@@ -194,7 +194,7 @@ export const createVirtualStore = (
         };
         _scrollToQueue = [resolveQueue, reject];
 
-        // In some specific situation with VGrid, the promise never resolved so we cancel it if timed out. 
+        // In some specific situation with VGrid, the promise never resolved so we cancel it if timed out.
         timeout(resolveQueue, 250);
       });
     },
@@ -305,8 +305,10 @@ export const createVirtualStore = (
           mutated = true;
           break;
         }
-        case ACTION_SCROLL_DIRECTION_CHANGE: {
-          updatedScrollState = updateScrollDirection(payload);
+        case ACTION_SCROLL_END: {
+          updatedScrollState = updateScrollDirection(
+            payload ? SCROLL_MANUAL : SCROLL_STOP
+          );
           break;
         }
       }