fix: refactor reset method

empathyco · May 15, 2024 · 30234a2 · 30234a2
1 parent 5ccab1c
commit 30234a2
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/packages/x-components/src/composables/use-scroll.ts b/packages/x-components/src/composables/use-scroll.ts
@@ -1,4 +1,5 @@
 import { computed, nextTick, onMounted, Ref, ref, watch } from 'vue';
+import { isArray } from '@empathyco/x-utils';
 import { XEvent } from '../wiring/events.types';
 import { ScrollDirection } from '../components/scroll/scroll.types';
 import { throttle } from '../utils/throttle';
@@ -294,13 +295,25 @@ export function useScroll(
    * @internal
    */
   const $x = use$x();
-  $x.on(props.resetOn as XEvent, true).subscribe(() => {
-    nextTick().then(() => {
-      if (props.resetOnChange) {
-        scrollEl.value?.scrollTo({ top: 0 });
-      }
+  if (isArray(props.resetOn)) {
+    props.resetOn.forEach(event =>
+      $x.on(event, true).subscribe(() => {
+        nextTick().then(() => {
+          if (props.resetOnChange) {
+            scrollEl.value?.scrollTo({ top: 0 });
+          }
+        });
+      })
+    );
+  } else {
+    $x.on(props.resetOn, true).subscribe(() => {
+      nextTick().then(() => {
+        if (props.resetOnChange) {
+          scrollEl.value?.scrollTo({ top: 0 });
+        }
+      });
     });
-  });
+  }
 
   return { throttledStoreScrollData };
 }