Refactor

inokawa · Jul 28, 2023 · 460e7a1 · 460e7a1
1 parent f732e62
commit 460e7a1
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/react/VList.tsx b/src/react/VList.tsx
@@ -184,10 +184,6 @@ export const VList = forwardRef<VListHandle, VListProps>(
         mode === "reverse",
         cache
       );
-      _store._subscribe(UPDATE_SCROLL_WITH_EVENT, () => {
-        onScroll[refKey] && onScroll[refKey](store._getScrollOffset());
-      });
-
       return [
         _store,
         createResizer(_store, _isHorizontal),
@@ -209,9 +205,13 @@ export const VList = forwardRef<VListHandle, VListProps>(
       const root = rootRef[refKey]!;
       const unobserve = resizer._observeRoot(root);
       const cleanup = scroller._initRoot(root);
+      const cleanupOnScroll = store._subscribe(UPDATE_SCROLL_WITH_EVENT, () => {
+        onScroll[refKey] && onScroll[refKey](store._getScrollOffset());
+      });
       return () => {
         unobserve();
         cleanup();
+        cleanupOnScroll();
       };
     }, []);