Refactor

inokawa · Jul 27, 2023 · a368d28 · a368d28
1 parent c26d845
commit a368d28
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/core/scroller.ts b/src/core/scroller.ts
@@ -7,6 +7,7 @@ import {
   SCROLL_IDLE,
   ACTION_SCROLL_END,
   UPDATE_SIZE,
+  ACTION_MANUAL_SCROLL_END,
 } from "./store";
 import { debounce, throttle, max, min, timeout } from "./utils";
 
@@ -131,7 +132,7 @@ export const createScroller = (
 
     // Scroll with the updated value
     rootElement[scrollToKey] = normalizeOffset(getOffset());
-    store._update(ACTION_SCROLL_END, true);
+    store._update(ACTION_MANUAL_SCROLL_END);
   };
 
   return {
@@ -145,7 +146,7 @@ export const createScroller = (
       const onScrollStopped = debounce(() => {
         // Check scroll position once just after scrolling stopped
         syncViewportToScrollPosition();
-        store._update(ACTION_SCROLL_END, false);
+        store._update(ACTION_SCROLL_END);
       }, 150);
 
       const onScroll = () => {
@@ -220,7 +221,7 @@ export const createWindowScroller = (
       const onScrollStopped = debounce(() => {
         // Check scroll position once just after scrolling stopped
         syncViewportToScrollPosition();
-        store._update(ACTION_SCROLL_END, false);
+        store._update(ACTION_SCROLL_END);
       }, 150);
 
       const onScroll = () => {

diff --git a/src/core/store.ts b/src/core/store.ts
@@ -45,13 +45,15 @@ export const ACTION_WINDOW_RESIZE = 2;
 export const ACTION_SCROLL = 3;
 export const ACTION_MANUAL_SCROLL = 4;
 export const ACTION_SCROLL_END = 5;
+export const ACTION_MANUAL_SCROLL_END = 6;
 
 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_END, isManual: boolean];
+  | [type: typeof ACTION_SCROLL_END, dummy?: void]
+  | [type: typeof ACTION_MANUAL_SCROLL_END, dummy?: void];
 
 type Subscriber = (sync?: boolean) => void;
 
@@ -310,9 +312,11 @@ export const createVirtualStore = (
           break;
         }
         case ACTION_SCROLL_END: {
-          updatedScrollState = updateScrollDirection(
-            payload ? SCROLL_MANUAL : SCROLL_IDLE
-          );
+          updatedScrollState = updateScrollDirection(SCROLL_IDLE);
+          break;
+        }
+        case ACTION_MANUAL_SCROLL_END: {
+          updatedScrollState = updateScrollDirection(SCROLL_MANUAL);
           break;
         }
       }