fix: use null as default value for ScrollObserverKey

empathyco · May 2, 2024 · 55a023d · 55a023d
1 parent aa02c76
commit 55a023d
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/packages/x-components/src/x-modules/scroll/components/main-scroll-item.vue b/packages/x-components/src/x-modules/scroll/components/main-scroll-item.vue
@@ -83,9 +83,10 @@
        *
        * @internal
        */
-      const firstVisibleItemObserver: Ref<ScrollVisibilityObserver> = inject<
-        Ref<ScrollVisibilityObserver>
-      >(ScrollObserverKey as string) as Ref<ScrollVisibilityObserver>;
+      const firstVisibleItemObserver = inject<Ref<ScrollVisibilityObserver> | null>(
+        ScrollObserverKey as string,
+        null
+      );
       /**
        * Checks if a given value is an `ElementRef` object.
        *
@@ -148,7 +149,9 @@
       onMounted(() => {
         nextTick(() => {
           // Mounted does not guarantee that child components are mounted too
-          watch(firstVisibleItemObserver, observeItem, { immediate: true });
+          if (firstVisibleItemObserver) {
+            watch(firstVisibleItemObserver, observeItem, { immediate: true });
+          }
         });
       });