From b1d068cd975d92916b81788309038aa3efaa2969 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E4=B8=AB=E8=AE=B2=E6=A2=B5?= Date: Fri, 2 Oct 2026 09:21:47 +0800 Subject: [PATCH] fix(dialog): keep stacked dialogs dismissible --- .../components/ssh/SshHostKeyPromptDialog.vue | 2 +- .../__tests__/SshHostKeyPromptDialog.spec.ts | 8 +- .../src/components/ui/LightDropdown.vue | 2 +- .../src/components/ui/LightDropdownMenu.vue | 2 +- .../src/components/ui/LightTooltip.vue | 2 +- .../ui/context-menu/ContextMenuContent.vue | 5 +- .../ui/context-menu/ContextMenuSubContent.vue | 5 +- .../components/ui/dialog/DialogContent.vue | 9 +- .../ui/dialog/DialogScrollContent.vue | 9 +- .../dialog/__tests__/dialogLayerOrder.spec.ts | 159 ++++++++++++++++-- .../ui/dialog/useDialogLayerOrder.ts | 115 ++++++++++--- .../ui/dropdown-menu/DropdownMenuContent.vue | 5 +- .../dropdown-menu/DropdownMenuSubContent.vue | 5 +- .../components/ui/popover/PopoverContent.vue | 5 +- .../components/ui/select/SelectContent.vue | 5 +- .../components/ui/tooltip/TooltipContent.vue | 5 +- .../__tests__/legacyWebviewFallback.spec.ts | 1 + apps/desktop/src/styles/globals.css | 10 +- 18 files changed, 286 insertions(+), 68 deletions(-) diff --git a/apps/desktop/src/components/ssh/SshHostKeyPromptDialog.vue b/apps/desktop/src/components/ssh/SshHostKeyPromptDialog.vue index 341246a3aa..ca99b31713 100644 --- a/apps/desktop/src/components/ssh/SshHostKeyPromptDialog.vue +++ b/apps/desktop/src/components/ssh/SshHostKeyPromptDialog.vue @@ -319,7 +319,7 @@ watch( is a blocking prompt, so keep it above every other layer in the app (the tallest today are the image preview at 80/81 and the sidebar overlays at 100). --> - + {{ dialogTitle }} diff --git a/apps/desktop/src/components/ssh/__tests__/SshHostKeyPromptDialog.spec.ts b/apps/desktop/src/components/ssh/__tests__/SshHostKeyPromptDialog.spec.ts index 57f66dee4e..329ebdcdbb 100644 --- a/apps/desktop/src/components/ssh/__tests__/SshHostKeyPromptDialog.spec.ts +++ b/apps/desktop/src/components/ssh/__tests__/SshHostKeyPromptDialog.spec.ts @@ -159,13 +159,13 @@ describe("SshHostKeyPromptDialog web bridge", () => { connectionPositioner.textContent = "New connection"; document.body.append(connectionPositioner); - const promptPositioner = document.body.querySelector(".dialog-positioner.z-\\[200\\]"); - const promptOverlay = document.body.querySelector(".dialog-overlay.z-\\[200\\]"); + const promptPositioner = document.body.querySelector(".dialog-positioner.\\!z-\\[200\\]"); + const promptOverlay = document.body.querySelector(".dialog-overlay.\\!z-\\[200\\]"); expect(promptPositioner).not.toBeNull(); expect(promptOverlay).not.toBeNull(); expect(connectionPositioner.classList.contains("z-50")).toBe(true); - expect(promptPositioner?.classList.contains("z-[200]")).toBe(true); - expect(promptOverlay?.classList.contains("z-[200]")).toBe(true); + expect(promptPositioner?.classList.contains("!z-[200]")).toBe(true); + expect(promptOverlay?.classList.contains("!z-[200]")).toBe(true); expect(document.body.textContent).toContain("layered.example.test:22"); const buttons = document.body.querySelectorAll("button"); diff --git a/apps/desktop/src/components/ui/LightDropdown.vue b/apps/desktop/src/components/ui/LightDropdown.vue index 3d2227231d..ba00f17dfe 100644 --- a/apps/desktop/src/components/ui/LightDropdown.vue +++ b/apps/desktop/src/components/ui/LightDropdown.vue @@ -187,7 +187,7 @@ onBeforeUnmount(close); -