@shwfed/nuxt 0.11.18 → 0.11.20

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@shwfed/nuxt",
   "configKey": "shwfed",
-  "version": "0.11.18",
+  "version": "0.11.20",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/components/modal.d.vue.ts

@@ -9,34 +9,36 @@ declare function close(): void;
 declare var __VLS_14: {
     close: typeof close;
     isDesktop: boolean;
-}, __VLS_34: {
+}, __VLS_36: {
     close: typeof close;
     isDesktop: boolean;
-}, __VLS_42: {
+}, __VLS_44: {
     close: typeof close;
     isDesktop: boolean;
-}, __VLS_44: {
+}, __VLS_46: {
     close: typeof close;
     isDesktop: boolean;
-}, __VLS_52: {
+}, __VLS_54: {
     close: typeof close;
     isDesktop: boolean;
 };
 type __VLS_Slots = {} & {
     trigger?: (props: typeof __VLS_14) => any;
 } & {
-    title?: (props: typeof __VLS_34) => any;
+    title?: (props: typeof __VLS_36) => any;
 } & {
-    description?: (props: typeof __VLS_42) => any;
+    description?: (props: typeof __VLS_44) => any;
 } & {
-    default?: (props: typeof __VLS_44) => any;
+    default?: (props: typeof __VLS_46) => any;
 } & {
-    footer?: (props: typeof __VLS_52) => any;
+    footer?: (props: typeof __VLS_54) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:open": (open: boolean) => any;
+    "after-close": () => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     "onUpdate:open"?: ((open: boolean) => any) | undefined;
+    "onAfter-close"?: (() => any) | undefined;
 }>, {
     showCloseButton: boolean;
     breakpoint: string;

package/dist/runtime/components/modal.vue

@@ -31,7 +31,7 @@ const props = defineProps({
   showCloseButton: { type: Boolean, required: false, default: true },
   dismissible: { type: Boolean, required: false, default: true }
 });
-const emit = defineEmits(["update:open"]);
+const emit = defineEmits(["update:open", "after-close"]);
 const attrs = useAttrs();
 const slots = useSlots();
 const uncontrolledOpen = ref(props.defaultOpen);
@@ -99,6 +99,7 @@ function close() {
       :is="modalComponents.Content"
       v-bind="attrs"
       :show-close-button="props.showCloseButton"
+      @after-close="emit('after-close')"
     >
       <component
         :is="modalComponents.Header"

package/dist/runtime/components/modal.vue.d.ts

@@ -9,34 +9,36 @@ declare function close(): void;
 declare var __VLS_14: {
     close: typeof close;
     isDesktop: boolean;
-}, __VLS_34: {
+}, __VLS_36: {
     close: typeof close;
     isDesktop: boolean;
-}, __VLS_42: {
+}, __VLS_44: {
     close: typeof close;
     isDesktop: boolean;
-}, __VLS_44: {
+}, __VLS_46: {
     close: typeof close;
     isDesktop: boolean;
-}, __VLS_52: {
+}, __VLS_54: {
     close: typeof close;
     isDesktop: boolean;
 };
 type __VLS_Slots = {} & {
     trigger?: (props: typeof __VLS_14) => any;
 } & {
-    title?: (props: typeof __VLS_34) => any;
+    title?: (props: typeof __VLS_36) => any;
 } & {
-    description?: (props: typeof __VLS_42) => any;
+    description?: (props: typeof __VLS_44) => any;
 } & {
-    default?: (props: typeof __VLS_44) => any;
+    default?: (props: typeof __VLS_46) => any;
 } & {
-    footer?: (props: typeof __VLS_52) => any;
+    footer?: (props: typeof __VLS_54) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:open": (open: boolean) => any;
+    "after-close": () => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     "onUpdate:open"?: ((open: boolean) => any) | undefined;
+    "onAfter-close"?: (() => any) | undefined;
 }>, {
     showCloseButton: boolean;
     breakpoint: string;

package/dist/runtime/components/ui/app/OverlayHost.vue

@@ -25,6 +25,12 @@ function handleOpenUpdate(sessionId, open) {
   }
   overlay.closeSync(sessionId);
 }
+function handleAfterClose(sessionId) {
+  const finalizeCloseSync = Reflect.get(overlay, "finalizeCloseSync");
+  if (typeof finalizeCloseSync === "function") {
+    finalizeCloseSync(sessionId);
+  }
+}
 const renderedSessions = computed(() => {
   const nextSessions = [];
   for (const session of overlay.sessions) {
@@ -35,6 +41,7 @@ const renderedSessions = computed(() => {
     nextSessions.push({
       sessionId: session.sessionId,
       definitionId: session.definitionId,
+      open: session.open,
       shell: {
         title: session.shell.title,
         description: session.shell.description,
@@ -57,11 +64,12 @@ const renderedSessions = computed(() => {
     :key="session.sessionId"
   >
     <ShwfedModal
-      :open="true"
+      :open="session.open"
       :breakpoint="session.shell.breakpoint"
       :show-close-button="session.shell.showCloseButton"
       :dismissible="session.shell.dismissible"
       @update:open="handleOpenUpdate(session.sessionId, $event)"
+      @after-close="handleAfterClose(session.sessionId)"
     >
       <template
         v-if="session.shell.title"

package/dist/runtime/components/ui/dialog/DialogContent.d.vue.ts

@@ -4,9 +4,9 @@ type __VLS_Props = DialogContentProps & {
     class?: HTMLAttributes['class'];
     showCloseButton?: boolean;
 };
-declare var __VLS_19: {};
+declare var __VLS_22: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_19) => any;
+    default?: (props: typeof __VLS_22) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     escapeKeyDown: (event: KeyboardEvent) => any;
@@ -15,6 +15,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {},
     interactOutside: (event: import("reka-ui").PointerDownOutsideEvent | import("reka-ui").FocusOutsideEvent) => any;
     openAutoFocus: (event: Event) => any;
     closeAutoFocus: (event: Event) => any;
+    "after-close": () => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     onEscapeKeyDown?: ((event: KeyboardEvent) => any) | undefined;
     onPointerDownOutside?: ((event: import("reka-ui").PointerDownOutsideEvent) => any) | undefined;
@@ -22,6 +23,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {},
     onInteractOutside?: ((event: import("reka-ui").PointerDownOutsideEvent | import("reka-ui").FocusOutsideEvent) => any) | undefined;
     onOpenAutoFocus?: ((event: Event) => any) | undefined;
     onCloseAutoFocus?: ((event: Event) => any) | undefined;
+    "onAfter-close"?: (() => any) | undefined;
 }>, {
     showCloseButton: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/dist/runtime/components/ui/dialog/DialogContent.vue

@@ -9,6 +9,7 @@ import {
 import { cn } from "../../../utils/cn";
 import DialogOverlay from "./DialogOverlay.vue";
 import { Icon } from "@iconify/vue";
+import { onBeforeUnmount, shallowRef, watchEffect } from "vue";
 defineOptions({
   inheritAttrs: false
 });
@@ -20,15 +21,123 @@ const props = defineProps({
   class: { type: null, required: false },
   showCloseButton: { type: Boolean, required: false, default: true }
 });
-const emits = defineEmits(["escapeKeyDown", "pointerDownOutside", "focusOutside", "interactOutside", "openAutoFocus", "closeAutoFocus"]);
+const emit = defineEmits(["escapeKeyDown", "pointerDownOutside", "focusOutside", "interactOutside", "openAutoFocus", "closeAutoFocus", "after-close"]);
 const delegatedProps = reactiveOmit(props, "class");
-const forwarded = useForwardPropsEmits(delegatedProps, emits);
+const forwarded = useForwardPropsEmits(delegatedProps, emit);
+const contentElement = shallowRef(null);
+let closeFallbackTimer;
+let hasEmittedAfterClose = false;
+function isClosedContentTarget(target) {
+  return target instanceof HTMLElement && target.dataset.state === "closed";
+}
+function clearCloseFallbackTimer() {
+  if (closeFallbackTimer === void 0) {
+    return;
+  }
+  window.clearTimeout(closeFallbackTimer);
+  closeFallbackTimer = void 0;
+}
+function emitAfterClose() {
+  if (hasEmittedAfterClose) {
+    return;
+  }
+  hasEmittedAfterClose = true;
+  clearCloseFallbackTimer();
+  emit("after-close");
+}
+function parseDurationMs(value) {
+  const normalizedValue = value.trim();
+  if (normalizedValue.endsWith("ms")) {
+    const duration = Number.parseFloat(normalizedValue.slice(0, -2));
+    return Number.isFinite(duration) ? duration : 0;
+  }
+  if (normalizedValue.endsWith("s")) {
+    const duration = Number.parseFloat(normalizedValue.slice(0, -1));
+    return Number.isFinite(duration) ? duration * 1e3 : 0;
+  }
+  return 0;
+}
+function getLongestMotionMs(element) {
+  const style = window.getComputedStyle(element);
+  const animationDurations = style.animationDuration.split(",");
+  const animationDelays = style.animationDelay.split(",");
+  const transitionDurations = style.transitionDuration.split(",");
+  const transitionDelays = style.transitionDelay.split(",");
+  let longestMotionMs = 0;
+  for (const [index, durationValue] of animationDurations.entries()) {
+    const durationMs = parseDurationMs(durationValue);
+    const delayMs = parseDurationMs(animationDelays[index] ?? animationDelays[0] ?? "0s");
+    longestMotionMs = Math.max(longestMotionMs, durationMs + delayMs);
+  }
+  for (const [index, durationValue] of transitionDurations.entries()) {
+    const durationMs = parseDurationMs(durationValue);
+    const delayMs = parseDurationMs(transitionDelays[index] ?? transitionDelays[0] ?? "0s");
+    longestMotionMs = Math.max(longestMotionMs, durationMs + delayMs);
+  }
+  return longestMotionMs;
+}
+function syncCloseFallback() {
+  const element = contentElement.value;
+  clearCloseFallbackTimer();
+  if (!element) {
+    return;
+  }
+  if (element.dataset.state !== "closed") {
+    hasEmittedAfterClose = false;
+    return;
+  }
+  const motionMs = getLongestMotionMs(element);
+  closeFallbackTimer = window.setTimeout(() => {
+    emitAfterClose();
+  }, motionMs > 0 ? motionMs : 0);
+}
+function handleCloseMotionEnd(event) {
+  if (hasEmittedAfterClose || event.target !== event.currentTarget || !isClosedContentTarget(event.currentTarget)) {
+    return;
+  }
+  emitAfterClose();
+}
+function setContentElement(target) {
+  if (target instanceof HTMLElement) {
+    contentElement.value = target;
+    syncCloseFallback();
+    return;
+  }
+  if (target && "$el" in target && target.$el instanceof HTMLElement) {
+    contentElement.value = target.$el;
+    syncCloseFallback();
+    return;
+  }
+  contentElement.value = null;
+  clearCloseFallbackTimer();
+}
+watchEffect((onCleanup) => {
+  const element = contentElement.value;
+  if (!element) {
+    return;
+  }
+  const observer = new MutationObserver(() => {
+    syncCloseFallback();
+  });
+  observer.observe(element, {
+    attributes: true,
+    attributeFilter: ["data-state"]
+  });
+  syncCloseFallback();
+  onCleanup(() => {
+    observer.disconnect();
+  });
+});
+onBeforeUnmount(() => {
+  clearCloseFallbackTimer();
+});
 </script>
 
 <template>
   <DialogPortal>
     <DialogOverlay />
     <DialogContent
+      :ref="setContentElement"
       data-slot="dialog-content"
       v-bind="{ ...$attrs, ...forwarded }"
       :class="
@@ -37,6 +146,8 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
     props.class
   )
 "
+      @animationend="handleCloseMotionEnd"
+      @transitionend="handleCloseMotionEnd"
     >
       <slot />
 

package/dist/runtime/components/ui/dialog/DialogContent.vue.d.ts

@@ -4,9 +4,9 @@ type __VLS_Props = DialogContentProps & {
     class?: HTMLAttributes['class'];
     showCloseButton?: boolean;
 };
-declare var __VLS_19: {};
+declare var __VLS_22: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_19) => any;
+    default?: (props: typeof __VLS_22) => any;
 };
 declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     escapeKeyDown: (event: KeyboardEvent) => any;
@@ -15,6 +15,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {},
     interactOutside: (event: import("reka-ui").PointerDownOutsideEvent | import("reka-ui").FocusOutsideEvent) => any;
     openAutoFocus: (event: Event) => any;
     closeAutoFocus: (event: Event) => any;
+    "after-close": () => any;
 }, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
     onEscapeKeyDown?: ((event: KeyboardEvent) => any) | undefined;
     onPointerDownOutside?: ((event: import("reka-ui").PointerDownOutsideEvent) => any) | undefined;
@@ -22,6 +23,7 @@ declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {},
     onInteractOutside?: ((event: import("reka-ui").PointerDownOutsideEvent | import("reka-ui").FocusOutsideEvent) => any) | undefined;
     onOpenAutoFocus?: ((event: Event) => any) | undefined;
     onCloseAutoFocus?: ((event: Event) => any) | undefined;
+    "onAfter-close"?: (() => any) | undefined;
 }>, {
     showCloseButton: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;

package/dist/runtime/components/ui/drawer/DrawerContent.d.vue.ts

@@ -3,11 +3,15 @@ type __VLS_Props = {
     class?: HTMLAttributes['class'];
     showCloseButton?: boolean;
 };
-declare var __VLS_19: {};
+declare var __VLS_22: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_19) => any;
+    default?: (props: typeof __VLS_22) => any;
 };
-declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
+declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    "after-close": () => any;
+}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
+    "onAfter-close"?: (() => any) | undefined;
+}>, {
     showCloseButton: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/runtime/components/ui/drawer/DrawerContent.vue

@@ -2,6 +2,7 @@
 import { reactiveOmit } from "@vueuse/core";
 import { Icon } from "@iconify/vue";
 import { useForwardProps } from "reka-ui";
+import { onBeforeUnmount, shallowRef, watchEffect } from "vue";
 import {
   DrawerClose,
   DrawerContent,
@@ -16,14 +17,123 @@ const props = defineProps({
   class: { type: null, required: false },
   showCloseButton: { type: Boolean, required: false, default: true }
 });
+const emit = defineEmits(["after-close"]);
 const delegatedProps = reactiveOmit(props, "class", "showCloseButton");
 const forwardedProps = useForwardProps(delegatedProps);
+const contentElement = shallowRef(null);
+let closeFallbackTimer;
+let hasEmittedAfterClose = false;
+function isClosedContentTarget(target) {
+  return target instanceof HTMLElement && target.dataset.state === "closed";
+}
+function clearCloseFallbackTimer() {
+  if (closeFallbackTimer === void 0) {
+    return;
+  }
+  window.clearTimeout(closeFallbackTimer);
+  closeFallbackTimer = void 0;
+}
+function emitAfterClose() {
+  if (hasEmittedAfterClose) {
+    return;
+  }
+  hasEmittedAfterClose = true;
+  clearCloseFallbackTimer();
+  emit("after-close");
+}
+function parseDurationMs(value) {
+  const normalizedValue = value.trim();
+  if (normalizedValue.endsWith("ms")) {
+    const duration = Number.parseFloat(normalizedValue.slice(0, -2));
+    return Number.isFinite(duration) ? duration : 0;
+  }
+  if (normalizedValue.endsWith("s")) {
+    const duration = Number.parseFloat(normalizedValue.slice(0, -1));
+    return Number.isFinite(duration) ? duration * 1e3 : 0;
+  }
+  return 0;
+}
+function getLongestMotionMs(element) {
+  const style = window.getComputedStyle(element);
+  const animationDurations = style.animationDuration.split(",");
+  const animationDelays = style.animationDelay.split(",");
+  const transitionDurations = style.transitionDuration.split(",");
+  const transitionDelays = style.transitionDelay.split(",");
+  let longestMotionMs = 0;
+  for (const [index, durationValue] of animationDurations.entries()) {
+    const durationMs = parseDurationMs(durationValue);
+    const delayMs = parseDurationMs(animationDelays[index] ?? animationDelays[0] ?? "0s");
+    longestMotionMs = Math.max(longestMotionMs, durationMs + delayMs);
+  }
+  for (const [index, durationValue] of transitionDurations.entries()) {
+    const durationMs = parseDurationMs(durationValue);
+    const delayMs = parseDurationMs(transitionDelays[index] ?? transitionDelays[0] ?? "0s");
+    longestMotionMs = Math.max(longestMotionMs, durationMs + delayMs);
+  }
+  return longestMotionMs;
+}
+function syncCloseFallback() {
+  const element = contentElement.value;
+  clearCloseFallbackTimer();
+  if (!element) {
+    return;
+  }
+  if (element.dataset.state !== "closed") {
+    hasEmittedAfterClose = false;
+    return;
+  }
+  const motionMs = getLongestMotionMs(element);
+  closeFallbackTimer = window.setTimeout(() => {
+    emitAfterClose();
+  }, motionMs > 0 ? motionMs : 0);
+}
+function handleCloseMotionEnd(event) {
+  if (hasEmittedAfterClose || event.target !== event.currentTarget || !isClosedContentTarget(event.currentTarget)) {
+    return;
+  }
+  emitAfterClose();
+}
+function setContentElement(target) {
+  if (target instanceof HTMLElement) {
+    contentElement.value = target;
+    syncCloseFallback();
+    return;
+  }
+  if (target && "$el" in target && target.$el instanceof HTMLElement) {
+    contentElement.value = target.$el;
+    syncCloseFallback();
+    return;
+  }
+  contentElement.value = null;
+  clearCloseFallbackTimer();
+}
+watchEffect((onCleanup) => {
+  const element = contentElement.value;
+  if (!element) {
+    return;
+  }
+  const observer = new MutationObserver(() => {
+    syncCloseFallback();
+  });
+  observer.observe(element, {
+    attributes: true,
+    attributeFilter: ["data-state"]
+  });
+  syncCloseFallback();
+  onCleanup(() => {
+    observer.disconnect();
+  });
+});
+onBeforeUnmount(() => {
+  clearCloseFallbackTimer();
+});
 </script>
 
 <template>
   <DrawerPortal>
     <DrawerOverlay />
     <DrawerContent
+      :ref="setContentElement"
       data-slot="drawer-content"
       v-bind="{ ...$attrs, ...forwardedProps }"
       :class="
@@ -32,6 +142,8 @@ const forwardedProps = useForwardProps(delegatedProps);
     props.class
   )
 "
+      @animationend="handleCloseMotionEnd"
+      @transitionend="handleCloseMotionEnd"
     >
       <div class="mx-auto -mt-2 h-2 w-16 rounded-full bg-zinc-200" />
 

package/dist/runtime/components/ui/drawer/DrawerContent.vue.d.ts

@@ -3,11 +3,15 @@ type __VLS_Props = {
     class?: HTMLAttributes['class'];
     showCloseButton?: boolean;
 };
-declare var __VLS_19: {};
+declare var __VLS_22: {};
 type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_19) => any;
+    default?: (props: typeof __VLS_22) => any;
 };
-declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {
+declare const __VLS_base: import("vue").DefineComponent<__VLS_Props, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    "after-close": () => any;
+}, string, import("vue").PublicProps, Readonly<__VLS_Props> & Readonly<{
+    "onAfter-close"?: (() => any) | undefined;
+}>, {
     showCloseButton: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;

package/dist/runtime/composables/useOverlay.d.ts

@@ -38,9 +38,11 @@ type OverlayShellState = OverlayShellProps & {
 type OverlaySession = {
     sessionId: string;
     definitionId: string;
+    open: boolean;
     shell: OverlayShellState;
     props: Record<string, unknown>;
     deferred: Deferred.Deferred<OverlayResult, never>;
+    pendingResult?: OverlayResult;
 };
 export type OverlayHandle<T = Record<string, unknown>> = Readonly<{
     sessionId: string;

package/dist/runtime/composables/useOverlay.js

@@ -50,19 +50,25 @@ function createOverlayRuntime() {
     const [session] = sessions.value.splice(index, 1);
     return session;
   }
-  function closeInternal(sessionId, result) {
-    return Effect.gen(function* () {
-      const session = removeSession(sessionId);
-      if (!session) {
-        return;
-      }
-      yield* Deferred.succeed(session.deferred, result);
-    });
+  function finalizeCloseSync(sessionId, result) {
+    const session = removeSession(sessionId);
+    if (!session) {
+      return;
+    }
+    Effect.runSync(Deferred.succeed(session.deferred, session.pendingResult ?? result ?? Option.none()));
+  }
+  function requestCloseSync(sessionId, result) {
+    const session = getSession(sessionId);
+    if (!session || !session.open) {
+      return;
+    }
+    session.open = false;
+    session.pendingResult = result;
   }
   function closeDefinitionSessions(definitionId) {
     const targetSessions = sessions.value.filter((session) => session.definitionId === definitionId).map((session) => session.sessionId);
     for (const sessionId of targetSessions) {
-      void Effect.runPromise(closeInternal(sessionId, Option.none()));
+      finalizeCloseSync(sessionId, Option.none());
     }
   }
   function registerDefinition(definition) {
@@ -111,19 +117,19 @@ function createOverlayRuntime() {
     }
   }
   function closeSync(sessionId, ...args) {
-    void Effect.runPromise(closeInternal(sessionId, createResult(...args)));
+    requestCloseSync(sessionId, createResult(...args));
   }
   function closeTopSync() {
     const topSession = sessions.value.at(-1);
     if (!topSession) {
       return;
     }
-    void Effect.runPromise(closeInternal(topSession.sessionId, Option.none()));
+    requestCloseSync(topSession.sessionId, Option.none());
   }
   function closeAllSync() {
     const sessionIds = sessions.value.map((session) => session.sessionId);
     for (const sessionId of sessionIds) {
-      void Effect.runPromise(closeInternal(sessionId, Option.none()));
+      requestCloseSync(sessionId, Option.none());
     }
   }
   function createHandle(session) {
@@ -132,7 +138,9 @@ function createOverlayRuntime() {
       patch: (patch) => Effect.sync(() => {
         patchSync(session.sessionId, patch);
       }),
-      close: (...args) => closeInternal(session.sessionId, createResult(...args)),
+      close: (...args) => Effect.sync(() => {
+        requestCloseSync(session.sessionId, createResult(...args));
+      }),
       result: Deferred.await(session.deferred)
     };
   }
@@ -160,6 +168,7 @@ function createOverlayRuntime() {
         const session = {
           sessionId: crypto.randomUUID(),
           definitionId,
+          open: true,
           shell: {
             title: explicitTitle ?? buttonTitle ?? definitionTitle,
             description: explicitDescription ?? buttonDescription ?? definitionDescription ?? getDefaultOverlayDescription(buttonAction?.locale ?? "zh"),
@@ -176,7 +185,9 @@ function createOverlayRuntime() {
         sessions.value.push(session);
         return createHandle(session);
       }),
-      (handle) => closeInternal(handle.sessionId, Option.none())
+      (handle) => Effect.sync(() => {
+        finalizeCloseSync(handle.sessionId, Option.none());
+      })
     );
   }
   const runtime = {
@@ -192,7 +203,7 @@ function createOverlayRuntime() {
     registerDefinition,
     unregisterDefinition,
     syncDefinitions,
-    isOpen: (sessionId) => findSessionIndex(sessionId) >= 0,
+    isOpen: (sessionId) => getSession(sessionId)?.open === true,
     patchSync,
     closeSync,
     closeTopSync,
@@ -201,13 +212,16 @@ function createOverlayRuntime() {
     patch: (sessionId, patch) => Effect.sync(() => {
       patchSync(sessionId, patch);
     }),
-    close: (sessionId, ...args) => closeInternal(sessionId, createResult(...args)),
+    close: (sessionId, ...args) => Effect.sync(() => {
+      requestCloseSync(sessionId, createResult(...args));
+    }),
     closeTop: () => Effect.sync(() => {
       closeTopSync();
     }),
     closeAll: () => Effect.sync(() => {
       closeAllSync();
-    })
+    }),
+    finalizeCloseSync
   };
   return runtime;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shwfed/nuxt",
-  "version": "0.11.18",
+  "version": "0.11.20",
   "description": "",
   "license": "MIT",
   "type": "module",