Fix Tauri tab close confirm reentry

This commit is contained in:
Mohamed Boudra
2026-03-17 16:14:18 +07:00
parent 18533ef52b
commit 4897627943
3 changed files with 94 additions and 42 deletions
@@ -39,6 +39,10 @@ describe("confirmDialog", () => {
it("uses Tauri dialog.ask on web when available", async () => {
const askMock = vi.fn(async () => true);
const blurMock = vi.fn();
(globalThis as { document?: unknown }).document = {
activeElement: { blur: blurMock },
} as unknown as Document;
(globalThis as { __TAURI__?: unknown }).__TAURI__ = {
dialog: { ask: askMock },
};
@@ -54,6 +58,7 @@ describe("confirmDialog", () => {
expect(confirmed).toBe(true);
expect(alertMock).not.toHaveBeenCalled();
expect(blurMock).toHaveBeenCalledTimes(1);
expect(askMock).toHaveBeenCalledWith("This will restart the daemon.", {
title: "Restart host",
okLabel: "Restart",
@@ -64,6 +69,10 @@ describe("confirmDialog", () => {
it("falls back to browser confirm on web when Tauri APIs are unavailable", async () => {
const browserConfirm = vi.fn(() => true);
const blurMock = vi.fn();
(globalThis as { document?: unknown }).document = {
activeElement: { blur: blurMock },
} as unknown as Document;
(globalThis as { confirm?: unknown }).confirm = browserConfirm;
const { confirmDialog } = await loadModuleForPlatform("web");
@@ -73,6 +82,7 @@ describe("confirmDialog", () => {
});
expect(confirmed).toBe(true);
expect(blurMock).toHaveBeenCalledTimes(1);
expect(browserConfirm).toHaveBeenCalledWith(
"Restart host\n\nThis will restart the daemon."
);
+15
View File
@@ -66,12 +66,21 @@ function buildTauriAskOptions(input: ConfirmDialogInput): TauriDialogAskOptions
};
}
function blurActiveWebElement(): void {
if (Platform.OS !== "web") {
return;
}
const activeElement = (globalThis as { document?: Document }).document?.activeElement;
(activeElement as HTMLElement | null)?.blur?.();
}
async function showTauriConfirmDialog(input: ConfirmDialogInput): Promise<boolean | null> {
const tauriApi = getTauriApi();
if (!tauriApi) {
return null;
}
blurActiveWebElement();
const options = buildTauriAskOptions(input);
const tauriAsk = tauriApi.dialog?.ask;
@@ -105,6 +114,7 @@ function showWebConfirmDialog(input: ConfirmDialogInput): boolean {
throw new Error("[ConfirmDialog] No web confirmation backend is available.");
}
blurActiveWebElement();
const promptMessage = `${input.title}\n\n${input.message}`;
return browserConfirm(promptMessage);
}
@@ -121,3 +131,8 @@ export async function confirmDialog(input: ConfirmDialogInput): Promise<boolean>
return showWebConfirmDialog(input);
}
export const __private__ = {
blurActiveWebElement,
buildTauriAskOptions,
};