fix: tests

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

Hide file tree

Showing 2 changed files with 28 additions and 41 deletions.
diff --git a/packages/oruga/src/components/dropdown/Dropdown.vue b/packages/oruga/src/components/dropdown/Dropdown.vue
@@ -314,39 +314,45 @@ const triggerRef = ref<HTMLElement>();
 const eventCleanups = [];
 let timer: NodeJS.Timeout;
 
+const cancelOptions = computed(() =>
+    typeof props.closeable === "boolean"
+        ? props.closeable
+            ? ["escape", "outside", "content"]
+            : []
+        : props.closeable,
+);
+
 watch(
     isActive,
     (value) => {
         // on active set event handler
         if (value && isClient) {
-            setTimeout(() => {
-                if (cancelOptions.value.indexOf("outside") >= 0) {
-                    // set outside handler
-                    eventCleanups.push(
-                        useClickOutside(contentRef, onClickedOutside, {
-                            ignore: [triggerRef],
-                            immediate: true,
-                            passive: true,
-                        }),
-                    );
-                }
-
-                if (cancelOptions.value.indexOf("escape") >= 0) {
-                    // set keyup handler
-                    eventCleanups.push(
-                        useEventListener("keyup", onKeyPress, document, {
-                            immediate: true,
-                        }),
-                    );
-                }
-            });
+            if (cancelOptions.value.indexOf("outside") >= 0) {
+                // set outside handler
+                eventCleanups.push(
+                    useClickOutside(contentRef, onClickedOutside, {
+                        ignore: [triggerRef],
+                        immediate: true,
+                        passive: true,
+                    }),
+                );
+            }
+
+            if (cancelOptions.value.indexOf("escape") >= 0) {
+                // set keyup handler
+                eventCleanups.push(
+                    useEventListener("keyup", onKeyPress, document, {
+                        immediate: true,
+                    }),
+                );
+            }
         } else if (!value) {
             // on close cleanup event handler
             eventCleanups.forEach((fn) => fn());
             eventCleanups.length = 0;
         }
     },
-    { immediate: true },
+    { immediate: true, flush: "post" },
 );
 
 onUnmounted(() => {
@@ -355,14 +361,6 @@ onUnmounted(() => {
     eventCleanups.length = 0;
 });
 
-const cancelOptions = computed(() =>
-    typeof props.closeable === "boolean"
-        ? props.closeable
-            ? ["escape", "outside", "content"]
-            : []
-        : props.closeable,
-);
-
 /** Close dropdown if clicked outside. */
 function onClickedOutside(): void {
     if (!isActive.value || props.inline) return;

diff --git a/packages/oruga/src/components/menu/tests/__snapshots__/menu.test.ts.snap b/packages/oruga/src/components/menu/tests/__snapshots__/menu.test.ts.snap
@@ -1,16 +1,5 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`OMenu > render correctly 1`] = `
-"<div data-oruga="menu" class="o-menu">
-  <!--v-if-->
-  <ul class="o-menu__list" role="menu">
-    <!--
-                @slot Place menu items here 
-            -->
-  </ul>
-</div>"
-`;
-
 exports[`OMenu tests > render correctly 1`] = `
 "<div data-oruga="menu" class="o-menu">
   <!--v-if-->