refactor

oruga-ui · Jun 6, 2024 · ebcc09f · ebcc09f
1 parent c41d6c7
commit ebcc09f
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/packages/oruga/src/components/notification/NotificationNotice.vue b/packages/oruga/src/components/notification/NotificationNotice.vue
@@ -204,11 +204,7 @@ onBeforeMount(() => {
 });
 
 onMounted(() => {
-    if (shouldQueue.value) correctParent.value.innerHTML = "";
-    correctParent.value.insertAdjacentElement(
-        "afterbegin",
-        notificationRef.value.$el,
-    );
+    showNotice();
     setAutoClose();
 });
 
@@ -235,6 +231,14 @@ const shouldQueue = computed(() =>
         : false,
 );
 
+function showNotice(): void {
+    if (shouldQueue.value) correctParent.value.innerHTML = "";
+    correctParent.value.insertAdjacentElement(
+        "afterbegin",
+        notificationRef.value.$el,
+    );
+}
+
 /** Set timer to auto close message */
 function setAutoClose(): void {
     if (!props.infinite) {

diff --git a/packages/oruga/src/composables/useEventListener.ts b/packages/oruga/src/composables/useEventListener.ts
@@ -1,7 +1,8 @@
 import {
-    onBeforeUnmount,
     onMounted,
     watch,
+    getCurrentScope,
+    onScopeDispose,
     type MaybeRefOrGetter,
     type Ref,
     type Component,
@@ -49,18 +50,18 @@ export function useEventListener(
         });
     };
 
-    const stop = (): void => {
-        if (typeof cleanup === "function") cleanup();
-    };
-
-    let watchStop;
+    let stopWatch;
 
     if (typeof options?.trigger !== "undefined") {
-        watchStop = watch(options.trigger, (value) => {
-            // toggle listener
-            if (value) register();
-            else stop();
-        });
+        stopWatch = watch(
+            options.trigger,
+            (value) => {
+                // toggle listener
+                if (value) register();
+                else stop();
+            },
+            { flush: "post" },
+        );
     }
 
     if (options?.immediate) register();
@@ -75,11 +76,13 @@ export function useEventListener(
         });
     }
 
-    // remove listener before unmounting
-    onBeforeUnmount(() => {
-        stop();
-        if (typeof watchStop === "function") watchStop();
-    });
+    const stop = (): void => {
+        // remove listener before unmounting
+        if (typeof stopWatch === "function") stopWatch();
+        if (typeof cleanup === "function") cleanup();
+    };
+
+    if (getCurrentScope()) onScopeDispose(stop);
 
     return stop;
 }