Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(dialog): keep stacked dialogs dismissible

二丫讲梵b1d068cd975d
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). -->
- <DialogContent class="flex max-h-[min(36rem,calc(var(--dbx-viewport-height)-2rem))] w-full max-w-[32rem] flex-col gap-4 overflow-hidden" overlay-class="z-[200]" portal-class="z-[200]" :show-close-button="false" @interact-outside.prevent @escape-key-down.prevent>
+ <DialogContent class="flex max-h-[min(36rem,calc(var(--dbx-viewport-height)-2rem))] w-full max-w-[32rem] flex-col gap-4 overflow-hidden" overlay-class="!z-[200]" portal-class="!z-[200]" :show-close-button="false" @interact-outside.prevent @escape-key-down.prevent>
<DialogHeader class="shrink-0">
<DialogTitle>{{ dialogTitle }}</DialogTitle>
<DialogDescription class="text-muted-foreground">
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<HTMLElement>(".dialog-positioner.z-\\[200\\]");
- const promptOverlay = document.body.querySelector<HTMLElement>(".dialog-overlay.z-\\[200\\]");
+ const promptPositioner = document.body.querySelector<HTMLElement>(".dialog-positioner.\\!z-\\[200\\]");
+ const promptOverlay = document.body.querySelector<HTMLElement>(".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<HTMLButtonElement>("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);
<ChevronDown v-if="showChevron" class="h-3 w-3 opacity-50" />
</button>
<Teleport to="body">
- <div v-if="open" ref="menuRef" class="pointer-events-auto fixed z-50 min-w-32 overflow-x-hidden overflow-y-auto rounded-md p-1 cn-menu-translucent text-popover-foreground" :class="contentClass" :style="menuStyle" role="menu" @pointerdown.prevent>
+ <div v-if="open" ref="menuRef" class="pointer-events-auto fixed z-(--dbx-floating-layer-z-index) min-w-32 overflow-x-hidden overflow-y-auto rounded-md p-1 cn-menu-translucent text-popover-foreground" :class="contentClass" :style="menuStyle" role="menu" @pointerdown.prevent>
<div v-if="label" :class="labelClass">{{ label }}</div>
<div v-if="label" class="bg-border -mx-1 my-1 h-px" />
<template v-for="item in items" :key="item.value">
diff --git a/apps/desktop/src/components/ui/LightDropdownMenu.vue b/apps/desktop/src/components/ui/LightDropdownMenu.vue
index f069ea97c2..b8e4bb32cd 100644
--- a/apps/desktop/src/components/ui/LightDropdownMenu.vue
+++ b/apps/desktop/src/components/ui/LightDropdownMenu.vue
@@ -260,7 +260,7 @@ watch(
<div
v-if="isOpen"
ref="menuRef"
- class="ring-foreground/10 fixed z-50 max-h-(--reka-dropdown-menu-content-available-height) min-w-32 overflow-x-hidden overflow-y-auto rounded-md p-1 ring-1 cn-menu-translucent text-popover-foreground"
+ class="ring-foreground/10 fixed z-(--dbx-floating-layer-z-index) max-h-(--reka-dropdown-menu-content-available-height) min-w-32 overflow-x-hidden overflow-y-auto rounded-md p-1 ring-1 cn-menu-translucent text-popover-foreground"
:class="cn(matchTriggerWidth ? 'w-(--reka-dropdown-menu-trigger-width)' : '', contentClass)"
:style="menuStyle"
role="menu"
diff --git a/apps/desktop/src/components/ui/LightTooltip.vue b/apps/desktop/src/components/ui/LightTooltip.vue
index a8982a889e..4eded3844a 100644
--- a/apps/desktop/src/components/ui/LightTooltip.vue
+++ b/apps/desktop/src/components/ui/LightTooltip.vue
@@ -306,7 +306,7 @@ watch(
<div
v-if="show"
ref="tooltipRef"
- class="fixed z-50 rounded-md text-xs"
+ class="fixed z-(--dbx-floating-layer-z-index) rounded-md text-xs"
:class="cn([tooltipSurfaceClass, slots.content ? '' : ['inline-flex w-fit max-w-xs items-center gap-1.5 px-3 py-1.5', nowrap && !wrapNowrapContent ? 'whitespace-nowrap' : 'break-words'], tooltipTransformClass], contentClass)"
:style="{ left: `${x}px`, top: `${y}px` }"
role="tooltip"
diff --git a/apps/desktop/src/components/ui/context-menu/ContextMenuContent.vue b/apps/desktop/src/components/ui/context-menu/ContextMenuContent.vue
index ca37de1205..90b9250474 100644
--- a/apps/desktop/src/components/ui/context-menu/ContextMenuContent.vue
+++ b/apps/desktop/src/components/ui/context-menu/ContextMenuContent.vue
@@ -4,6 +4,7 @@ import type { HTMLAttributes } from "vue";
import { reactiveOmit } from "@vueuse/core";
import { ContextMenuContent, ContextMenuPortal, useForwardPropsEmits } from "reka-ui";
import { cn } from "@/lib/common/utils";
+import { useFloatingLayerOrder } from "@/components/ui/dialog/useDialogLayerOrder";
defineOptions({
inheritAttrs: false,
@@ -15,16 +16,18 @@ const emits = defineEmits<ContextMenuContentEmits>();
const delegatedProps = reactiveOmit(props, "class");
const forwarded = useForwardPropsEmits(delegatedProps, emits);
+const { forwardRef } = useFloatingLayerOrder();
</script>
<template>
<ContextMenuPortal>
<ContextMenuContent
+ :ref="forwardRef"
data-slot="context-menu-content"
v-bind="{ ...$attrs, ...forwarded }"
:class="
cn(
- 'data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 text-popover-foreground min-w-36 rounded-md p-1 duration-100 cn-menu-translucent z-50 max-h-(--reka-context-menu-content-available-height) origin-(--reka-context-menu-content-transform-origin) overflow-x-hidden overflow-y-auto',
+ 'data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 text-popover-foreground min-w-36 rounded-md p-1 duration-100 cn-menu-translucent z-(--dbx-floating-layer-z-index) max-h-(--reka-context-menu-content-available-height) origin-(--reka-context-menu-content-transform-origin) overflow-x-hidden overflow-y-auto',
props.class,
)
"
diff --git a/apps/desktop/src/components/ui/context-menu/ContextMenuSubContent.vue b/apps/desktop/src/components/ui/context-menu/ContextMenuSubContent.vue
index 8d23e8b2ed..75ff2861d0 100644
--- a/apps/desktop/src/components/ui/context-menu/ContextMenuSubContent.vue
+++ b/apps/desktop/src/components/ui/context-menu/ContextMenuSubContent.vue
@@ -4,6 +4,7 @@ import type { HTMLAttributes } from "vue";
import { reactiveOmit } from "@vueuse/core";
import { ContextMenuPortal, ContextMenuSubContent, useForwardPropsEmits } from "reka-ui";
import { cn } from "@/lib/common/utils";
+import { useFloatingLayerOrder } from "@/components/ui/dialog/useDialogLayerOrder";
const props = defineProps<DropdownMenuSubContentProps & { class?: HTMLAttributes["class"] }>();
const emits = defineEmits<DropdownMenuSubContentEmits>();
@@ -11,16 +12,18 @@ const emits = defineEmits<DropdownMenuSubContentEmits>();
const delegatedProps = reactiveOmit(props, "class");
const forwarded = useForwardPropsEmits(delegatedProps, emits);
+const { forwardRef } = useFloatingLayerOrder();
</script>
<template>
<ContextMenuPortal>
<ContextMenuSubContent
+ :ref="forwardRef"
data-slot="context-menu-sub-content"
v-bind="forwarded"
:class="
cn(
- 'data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 text-popover-foreground min-w-32 rounded-md ring-foreground/10 ring-1 p-1 duration-100 cn-menu-translucent z-50 origin-(--reka-context-menu-content-transform-origin) overflow-hidden',
+ 'data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 text-popover-foreground min-w-32 rounded-md ring-foreground/10 ring-1 p-1 duration-100 cn-menu-translucent z-(--dbx-floating-layer-z-index) origin-(--reka-context-menu-content-transform-origin) overflow-hidden',
props.class,
)
"
diff --git a/apps/desktop/src/components/ui/dialog/DialogContent.vue b/apps/desktop/src/components/ui/dialog/DialogContent.vue
index dd16e9f82f..6249c06131 100644
--- a/apps/desktop/src/components/ui/dialog/DialogContent.vue
+++ b/apps/desktop/src/components/ui/dialog/DialogContent.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { DialogContentEmits, DialogContentProps } from "reka-ui";
-import { ref, type HTMLAttributes } from "vue";
+import { type HTMLAttributes } from "vue";
import { reactiveOmit } from "@vueuse/core";
import { XIcon } from "@lucide/vue";
import { DialogClose, DialogContent, DialogDescription, DialogPortal, VisuallyHidden, useForwardPropsEmits } from "reka-ui";
@@ -33,14 +33,13 @@ const delegatedProps = reactiveOmit(props, "class", "overlayClass", "portalClass
const forwarded = useForwardPropsEmits(delegatedProps, emits);
-const positioner = ref<HTMLElement | null>(null);
-useDialogLayerOrder(positioner);
+const { layerStyle } = useDialogLayerOrder();
</script>
<template>
<DialogPortal>
- <DialogOverlay :class="props.overlayClass" />
- <div ref="positioner" data-slot="dialog-positioner" :class="cn('fixed inset-0 z-50 grid place-items-center p-4 pointer-events-none', props.portalClass)">
+ <DialogOverlay :class="props.overlayClass" :style="layerStyle" />
+ <div data-slot="dialog-positioner" :style="layerStyle" :class="cn('fixed inset-0 z-50 grid place-items-center p-4 pointer-events-none', props.portalClass)">
<DialogContent
data-slot="dialog-content"
v-bind="{ ...$attrs, ...forwarded }"
diff --git a/apps/desktop/src/components/ui/dialog/DialogScrollContent.vue b/apps/desktop/src/components/ui/dialog/DialogScrollContent.vue
index 7e74921d24..5cfc4c47ab 100644
--- a/apps/desktop/src/components/ui/dialog/DialogScrollContent.vue
+++ b/apps/desktop/src/components/ui/dialog/DialogScrollContent.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type { DialogContentEmits, DialogContentProps } from "reka-ui";
-import { ref, type HTMLAttributes } from "vue";
+import { type HTMLAttributes } from "vue";
import { reactiveOmit } from "@vueuse/core";
import { XIcon } from "@lucide/vue";
import { DialogClose, DialogContent, DialogDescription, DialogPortal, VisuallyHidden, useForwardPropsEmits } from "reka-ui";
@@ -23,14 +23,13 @@ const delegatedProps = reactiveOmit(props, "class", "showOverlay", "showCloseBut
const forwarded = useForwardPropsEmits(delegatedProps, emits);
-const positioner = ref<HTMLElement | null>(null);
-useDialogLayerOrder(positioner);
+const { layerStyle } = useDialogLayerOrder();
</script>
<template>
<DialogPortal>
- <DialogOverlay v-if="props.showOverlay" />
- <div ref="positioner" data-slot="dialog-positioner" class="fixed inset-0 z-50 grid place-items-center p-4 pointer-events-none">
+ <DialogOverlay v-if="props.showOverlay" :style="layerStyle" />
+ <div data-slot="dialog-positioner" :style="layerStyle" class="fixed inset-0 z-50 grid place-items-center p-4 pointer-events-none">
<DialogContent
data-slot="dialog-content"
:class="cn('relative z-50 grid max-h-[calc(var(--dbx-viewport-height)-6rem)] w-full max-w-lg my-8 gap-4 rounded-lg border border-border bg-popover text-popover-foreground p-4 shadow-lg duration-200 md:w-full pointer-events-auto', props.class)"
diff --git a/apps/desktop/src/components/ui/dialog/__tests__/dialogLayerOrder.spec.ts b/apps/desktop/src/components/ui/dialog/__tests__/dialogLayerOrder.spec.ts
index 327cfa99fc..894b9e5ba3 100644
--- a/apps/desktop/src/components/ui/dialog/__tests__/dialogLayerOrder.spec.ts
+++ b/apps/desktop/src/components/ui/dialog/__tests__/dialogLayerOrder.spec.ts
@@ -1,20 +1,40 @@
// @vitest-environment happy-dom
+import { readFileSync } from "node:fs";
+import { resolve } from "node:path";
import { createApp, defineComponent, h, nextTick, reactive, type Component } from "vue";
import { createI18n } from "vue-i18n";
import { afterEach, describe, expect, it } from "vitest";
import { Dialog, DialogContent, DialogScrollContent, DialogTitle } from "@/components/ui/dialog";
+import { useFloatingLayerOrder } from "@/components/ui/dialog/useDialogLayerOrder";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
const mountedApps: Array<{ unmount: () => void; host: HTMLElement }> = [];
+const mountedStyles: HTMLStyleElement[] = [];
+const floatingLayerRule = readFileSync(resolve(process.cwd(), "apps/desktop/src/styles/globals.css"), "utf8").match(/\[data-dbx-floating-layer\]\s*\{[^}]+\}/)?.[0];
+
+if (!floatingLayerRule) {
+ throw new Error("globals.css is missing the floating layer z-index rule");
+}
afterEach(() => {
for (const { unmount, host } of mountedApps.splice(0)) {
unmount();
host.remove();
}
+ for (const style of mountedStyles.splice(0)) {
+ style.remove();
+ }
document.body.innerHTML = "";
});
+function installFloatingLayerStyles() {
+ const style = document.createElement("style");
+ style.textContent = floatingLayerRule;
+ document.head.append(style);
+ mountedStyles.push(style);
+}
+
async function flush() {
for (let turn = 0; turn < 5; turn += 1) {
await nextTick();
@@ -23,15 +43,16 @@ async function flush() {
}
}
-type Layer = { index: number; slot: string; label: string; element: Element };
+type Layer = { index: number; slot: string; label: string; zIndex: number; element: Element };
-/** Dialog layers teleport into `body`, so paint order is their order among the body children. */
+/** Dialog layers teleport into `body`; their visual order is controlled by z-index. */
function dialogLayers(): Layer[] {
return Array.from(document.body.children)
.map((element, index) => ({
index,
element,
slot: element.getAttribute("data-slot") || "",
+ zIndex: Number.parseInt((element as HTMLElement).style.zIndex || "0", 10),
label: (element.textContent || "")
.replace(/\s+/g, " ")
.trim()
@@ -46,8 +67,8 @@ function layer(slot: string, label?: string): Layer {
return match!;
}
-function overlayBefore(target: Layer): Layer | undefined {
- return dialogLayers().find((candidate) => candidate.slot === "dialog-overlay" && candidate.index === target.index - 1);
+function layers(slot: string): Layer[] {
+ return dialogLayers().filter((candidate) => candidate.slot === slot);
}
function labeledDialog(options: { open: () => boolean; setOpen: (open: boolean) => void; label: string; content: Component }) {
@@ -115,19 +136,21 @@ describe("dialog layer order", () => {
state.confirmOpen = true;
await flush();
- // The transfer form and its confirmation paint in open order to begin with.
+ // The transfer form and its confirmation receive layers in open order to begin with.
const transfer = layer("dialog-positioner", "transfer form");
const confirm = layer("dialog-positioner", "confirm transfer");
- expect(confirm.index).toBeGreaterThan(transfer.index);
- expect(overlayBefore(confirm)).toBeDefined();
+ expect(confirm.zIndex).toBeGreaterThan(transfer.zIndex);
+ expect(
+ layers("dialog-overlay")
+ .map(({ zIndex }) => zIndex)
+ .sort(),
+ ).toEqual([transfer.zIndex, confirm.zIndex].sort());
- // A dialog that gets remounted (leaving the tracked-transfer dialog and returning to the form)
- // ends up after the dialog it is supposed to sit below; Reka UI then keeps handing pointer
- // events to the confirmation dialog while the form's backdrop covers it.
+ // Reparenting a portal node must not change which dialog is visually on top.
const transferOverlay = transfer.element.previousElementSibling!;
document.body.append(transferOverlay, transfer.element);
await flush();
- expect(layer("dialog-positioner", "transfer form").index).toBeGreaterThan(layer("dialog-positioner", "confirm transfer").index);
+ expect(layer("dialog-positioner", "confirm transfer").zIndex).toBeGreaterThan(layer("dialog-positioner", "transfer form").zIndex);
// Reopening the confirmation must bring its layer back above the form.
state.confirmOpen = false;
@@ -136,9 +159,7 @@ describe("dialog layer order", () => {
await flush();
const reopened = layer("dialog-positioner", "confirm transfer");
- expect(reopened.index).toBeGreaterThan(layer("dialog-positioner", "transfer form").index);
- expect(document.body.lastElementChild).toBe(reopened.element);
- expect(overlayBefore(reopened)).toBeDefined();
+ expect(reopened.zIndex).toBeGreaterThan(layer("dialog-positioner", "transfer form").zIndex);
});
it("paints a nested dialog above the dialog that opened it", async () => {
@@ -185,6 +206,114 @@ describe("dialog layer order", () => {
state.confirmOpen = true;
await flush();
- expect(layer("dialog-positioner", "confirm transfer").index).toBeGreaterThan(layer("dialog-positioner", "transfer form").index);
+ const transfer = layer("dialog-positioner", "transfer form");
+ const confirm = layer("dialog-positioner", "confirm transfer");
+ expect(transfer.zIndex).toBeGreaterThan(50);
+ expect(confirm.zIndex).toBeGreaterThan(transfer.zIndex);
+ });
+
+ it("resets the layer sequence after all dialogs close", async () => {
+ const state = mountSiblingDialogs();
+
+ state.transferOpen = true;
+ await flush();
+ expect(layer("dialog-positioner", "transfer form").zIndex).toBe(51);
+
+ state.transferOpen = false;
+ await flush();
+ expect(document.documentElement.style.getPropertyValue("--dbx-dialog-top-z-index")).toBe("50");
+ expect(document.documentElement.style.getPropertyValue("--dbx-floating-layer-z-index")).toBe("51");
+
+ state.transferOpen = true;
+ await flush();
+ expect(layer("dialog-positioner", "transfer form").zIndex).toBe(51);
+ });
+
+ it("exposes a floating layer above the open dialog", async () => {
+ installFloatingLayerStyles();
+ const host = document.createElement("div");
+ document.body.append(host);
+ const state = reactive({ dialogOpen: true, selectOpen: false });
+ const app = createApp(
+ defineComponent({
+ setup() {
+ return () =>
+ h("div", [
+ h(
+ Dialog,
+ { open: state.dialogOpen, "onUpdate:open": (open: boolean) => (state.dialogOpen = open) },
+ {
+ default: () =>
+ h(DialogContent, null, {
+ default: () => [
+ h(DialogTitle, null, { default: () => "settings" }),
+ h(
+ Select,
+ { open: state.selectOpen, "onUpdate:open": (open: boolean) => (state.selectOpen = open) },
+ {
+ default: () => [h(SelectTrigger, null, { default: () => h(SelectValue, { placeholder: "Choose" }) }), h(SelectContent, null, { default: () => h(SelectItem, { value: "one" }, { default: () => "One" }) })],
+ },
+ ),
+ ],
+ }),
+ },
+ ),
+ ]);
+ },
+ }),
+ );
+ app.use(createI18n({ legacy: false, locale: "en", messages: { en: {} }, missingWarn: false, fallbackWarn: false }));
+ app.mount(host);
+ mountedApps.push({ unmount: () => app.unmount(), host });
+ await flush();
+
+ const dialog = layer("dialog-positioner", "settings");
+ state.selectOpen = true;
+ await flush();
+
+ const selectContent = document.body.querySelector<HTMLElement>('[data-slot="select-content"]');
+ const popperWrapper = document.body.querySelector<HTMLElement>("[data-reka-popper-content-wrapper]");
+ expect(selectContent).not.toBeNull();
+ expect(popperWrapper?.hasAttribute("data-dbx-floating-layer")).toBe(true);
+ expect(selectContent?.className).toContain("z-(--dbx-floating-layer-z-index)");
+ expect(Number(document.documentElement.style.getPropertyValue("--dbx-floating-layer-z-index"))).toBe(dialog.zIndex + 1);
+ expect(getComputedStyle(popperWrapper!).zIndex).toContain(String(dialog.zIndex + 1));
+ });
+
+ it("preserves an explicit floating layer z-index", async () => {
+ installFloatingLayerStyles();
+ const host = document.createElement("div");
+ document.body.append(host);
+ const FloatingProbe = defineComponent({
+ setup() {
+ const { forwardRef } = useFloatingLayerOrder();
+ return () => h("div", { ref: forwardRef, "data-reka-popper-content-wrapper": "", style: { zIndex: "80" } }, h("div", { style: { zIndex: "80" } }));
+ },
+ });
+ const app = createApp(
+ defineComponent({
+ setup() {
+ return () =>
+ h(
+ Dialog,
+ { open: true },
+ {
+ default: () =>
+ h(DialogContent, null, {
+ default: () => [h(DialogTitle, null, { default: () => "settings" }), h(FloatingProbe)],
+ }),
+ },
+ );
+ },
+ }),
+ );
+ app.use(createI18n({ legacy: false, locale: "en", messages: { en: {} }, missingWarn: false, fallbackWarn: false }));
+ app.mount(host);
+ mountedApps.push({ unmount: () => app.unmount(), host });
+ await flush();
+
+ const popperWrapper = document.body.querySelector<HTMLElement>("[data-reka-popper-content-wrapper]");
+ expect(popperWrapper?.style.getPropertyValue("--dbx-floating-content-z-index")).toBe("80");
+ expect(getComputedStyle(popperWrapper!).zIndex).toContain("80");
});
});
diff --git a/apps/desktop/src/components/ui/dialog/useDialogLayerOrder.ts b/apps/desktop/src/components/ui/dialog/useDialogLayerOrder.ts
index f806a655e6..78d0b38a99 100644
--- a/apps/desktop/src/components/ui/dialog/useDialogLayerOrder.ts
+++ b/apps/desktop/src/components/ui/dialog/useDialogLayerOrder.ts
@@ -1,39 +1,100 @@
-import { injectDialogRootContext } from "reka-ui";
-import { watch, type Ref } from "vue";
+import { injectDialogRootContext, useForwardExpose } from "reka-ui";
+import { computed, onBeforeUnmount, onUpdated, ref, watch, watchPostEffect, type Ref } from "vue";
+
+const BASE_DIALOG_Z_INDEX = 50;
+const DIALOG_TOP_Z_INDEX_VAR = "--dbx-dialog-top-z-index";
+const FLOATING_LAYER_Z_INDEX_VAR = "--dbx-floating-layer-z-index";
+
+const activeDialogLayers = new Map<symbol, Ref<number>>();
+const topDialogZIndex = ref(BASE_DIALOG_Z_INDEX);
+
+function syncLayerVariables() {
+ if (typeof document === "undefined") return;
+
+ const root = document.documentElement;
+ root.style.setProperty(DIALOG_TOP_Z_INDEX_VAR, String(topDialogZIndex.value));
+ root.style.setProperty(FLOATING_LAYER_Z_INDEX_VAR, String(topDialogZIndex.value + 1));
+}
+
+function refreshTopDialogZIndex() {
+ let zIndex = BASE_DIALOG_Z_INDEX;
+ // Compact in insertion order even while a parent dialog remains open.
+ for (const layer of activeDialogLayers.values()) layer.value = ++zIndex;
+ topDialogZIndex.value = zIndex;
+ syncLayerVariables();
+}
+
+function registerDialogLayer(id: symbol, zIndex: Ref<number>) {
+ if (activeDialogLayers.has(id)) return;
+
+ activeDialogLayers.set(id, zIndex);
+ refreshTopDialogZIndex();
+}
+
+function unregisterDialogLayer(id: symbol) {
+ if (!activeDialogLayers.delete(id)) return;
+
+ refreshTopDialogZIndex();
+}
+
+/** Keep Reka's positioning wrapper in sync with the floating content's layer. */
+export function useFloatingLayerOrder() {
+ const { forwardRef, currentElement } = useForwardExpose();
+
+ function syncWrapper() {
+ const element = currentElement.value;
+ const wrapper = element?.hasAttribute("data-reka-popper-content-wrapper") ? element : element?.parentElement;
+ if (!wrapper || (!wrapper.hasAttribute("data-reka-popper-content-wrapper") && element.dataset.alignTrigger !== "true")) return;
+
+ // Reka copies the content's computed z-index to the positioning wrapper.
+ // Read that value before enabling the important override below, otherwise
+ // an existing z-[60]/z-[80] value would be replaced by the live default.
+ const contentElement = wrapper === element ? (element.firstElementChild ?? element) : element;
+ const contentZIndex = Number.parseInt(getComputedStyle(contentElement).zIndex, 10);
+ const wrapperZIndex = Number.parseInt(wrapper.style.zIndex, 10);
+ const preservedZIndex = Math.max(Number.isFinite(contentZIndex) ? contentZIndex : 0, Number.isFinite(wrapperZIndex) ? wrapperZIndex : 0);
+ wrapper.style.setProperty("--dbx-floating-content-z-index", String(preservedZIndex));
+ wrapper.dataset.dbxFloatingLayer = "";
+ }
+
+ watchPostEffect(() => {
+ void topDialogZIndex.value;
+ syncWrapper();
+ });
+ onUpdated(syncWrapper);
+
+ return { forwardRef };
+}
/**
- * Keeps a dialog layer painted above every dialog that was opened before it.
- *
- * `DialogPortal` only teleports its children, it does not gate them on the open state,
- * so the `fixed inset-0 z-50` wrapper lands in the target as soon as the dialog
- * *component* mounts. Because all dialog layers share the same z-index, the browser
- * paints them in mount order. A dialog mounted earlier therefore covered one that opens
- * later: Reka UI's dismissable-layer stack still handed pointer events to the later
- * dialog, so that dialog stayed invisible while the earlier one became unclickable.
+ * Keep the visual order of dialogs aligned with Reka UI's logical layer stack.
*
- * Re-appending the wrapper when its dialog opens makes paint order follow open order
- * instead of mount order. The element stays mounted on close, so enter/leave animations
- * are unchanged.
+ * Reparenting portal nodes changes only their DOM order. Reka UI keeps a
+ * separate insertion ordered layer set for pointer-events and outside-click
+ * handling, so reparenting can leave the visible top dialog unreachable. A
+ * z-index gives each open dialog a new visual layer while its logical layer
+ * remains where Reka UI registered it.
*/
-export function useDialogLayerOrder(positioner: Ref<HTMLElement | null>) {
+export function useDialogLayerOrder() {
const rootContext = injectDialogRootContext();
-
- function raiseLayer() {
- const element = positioner.value;
- const parent = element?.parentNode;
- if (!element || !parent || parent.lastElementChild === element) return;
- // The overlay is the sibling right in front of the wrapper; move both so a later
- // dialog's backdrop still covers the earlier dialog instead of slipping under it.
- const overlay = element.previousElementSibling;
- if (overlay?.getAttribute("data-slot") === "dialog-overlay") parent.appendChild(overlay);
- parent.appendChild(element);
- }
+ const layerId = Symbol("dialog-layer");
+ const zIndex = ref(BASE_DIALOG_Z_INDEX);
watch(
() => rootContext?.open.value ?? false,
(isOpen) => {
- if (isOpen) raiseLayer();
+ if (isOpen) {
+ registerDialogLayer(layerId, zIndex);
+ } else {
+ unregisterDialogLayer(layerId);
+ }
},
- { flush: "post" },
+ { flush: "post", immediate: true },
);
+
+ onBeforeUnmount(() => unregisterDialogLayer(layerId));
+
+ return {
+ layerStyle: computed(() => ({ zIndex: String(zIndex.value) })),
+ };
}
diff --git a/apps/desktop/src/components/ui/dropdown-menu/DropdownMenuContent.vue b/apps/desktop/src/components/ui/dropdown-menu/DropdownMenuContent.vue
index b02347368c..3564f3e6e3 100644
--- a/apps/desktop/src/components/ui/dropdown-menu/DropdownMenuContent.vue
+++ b/apps/desktop/src/components/ui/dropdown-menu/DropdownMenuContent.vue
@@ -4,6 +4,7 @@ import type { HTMLAttributes } from "vue";
import { reactiveOmit } from "@vueuse/core";
import { DropdownMenuContent, DropdownMenuPortal, useForwardPropsEmits } from "reka-ui";
import { cn } from "@/lib/common/utils";
+import { useFloatingLayerOrder } from "@/components/ui/dialog/useDialogLayerOrder";
defineOptions({
inheritAttrs: false,
@@ -18,16 +19,18 @@ const emits = defineEmits<DropdownMenuContentEmits>();
const delegatedProps = reactiveOmit(props, "class");
const forwarded = useForwardPropsEmits(delegatedProps, emits);
+const { forwardRef } = useFloatingLayerOrder();
</script>
<template>
<DropdownMenuPortal>
<DropdownMenuContent
+ :ref="forwardRef"
data-slot="dropdown-menu-content"
v-bind="{ ...$attrs, ...forwarded }"
:class="
cn(
- 'data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 text-popover-foreground min-w-32 rounded-md p-1 ring-1 duration-100 cn-menu-translucent z-50 max-h-(--reka-dropdown-menu-content-available-height) w-(--reka-dropdown-menu-trigger-width) origin-(--reka-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto data-[state=closed]:overflow-hidden',
+ 'data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 text-popover-foreground min-w-32 rounded-md p-1 ring-1 duration-100 cn-menu-translucent z-(--dbx-floating-layer-z-index) max-h-(--reka-dropdown-menu-content-available-height) w-(--reka-dropdown-menu-trigger-width) origin-(--reka-dropdown-menu-content-transform-origin) overflow-x-hidden overflow-y-auto data-[state=closed]:overflow-hidden',
props.class,
)
"
diff --git a/apps/desktop/src/components/ui/dropdown-menu/DropdownMenuSubContent.vue b/apps/desktop/src/components/ui/dropdown-menu/DropdownMenuSubContent.vue
index e3f9246a4d..336db09f6d 100644
--- a/apps/desktop/src/components/ui/dropdown-menu/DropdownMenuSubContent.vue
+++ b/apps/desktop/src/components/ui/dropdown-menu/DropdownMenuSubContent.vue
@@ -4,6 +4,7 @@ import type { HTMLAttributes } from "vue";
import { reactiveOmit } from "@vueuse/core";
import { DropdownMenuSubContent, useForwardPropsEmits } from "reka-ui";
import { cn } from "@/lib/common/utils";
+import { useFloatingLayerOrder } from "@/components/ui/dialog/useDialogLayerOrder";
const props = defineProps<DropdownMenuSubContentProps & { class?: HTMLAttributes["class"] }>();
const emits = defineEmits<DropdownMenuSubContentEmits>();
@@ -11,15 +12,17 @@ const emits = defineEmits<DropdownMenuSubContentEmits>();
const delegatedProps = reactiveOmit(props, "class");
const forwarded = useForwardPropsEmits(delegatedProps, emits);
+const { forwardRef } = useFloatingLayerOrder();
</script>
<template>
<DropdownMenuSubContent
+ :ref="forwardRef"
data-slot="dropdown-menu-sub-content"
v-bind="forwarded"
:class="
cn(
- 'data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 text-popover-foreground min-w-[96px] rounded-md p-1 ring-1 duration-100 cn-menu-translucent z-50 origin-(--reka-dropdown-menu-content-transform-origin) overflow-hidden',
+ 'data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 text-popover-foreground min-w-[96px] rounded-md p-1 ring-1 duration-100 cn-menu-translucent z-(--dbx-floating-layer-z-index) origin-(--reka-dropdown-menu-content-transform-origin) overflow-hidden',
props.class,
)
"
diff --git a/apps/desktop/src/components/ui/popover/PopoverContent.vue b/apps/desktop/src/components/ui/popover/PopoverContent.vue
index 353794f326..1ed7bc2dd3 100644
--- a/apps/desktop/src/components/ui/popover/PopoverContent.vue
+++ b/apps/desktop/src/components/ui/popover/PopoverContent.vue
@@ -4,6 +4,7 @@ import type { HTMLAttributes } from "vue";
import { reactiveOmit } from "@vueuse/core";
import { PopoverContent, PopoverPortal, useForwardPropsEmits } from "reka-ui";
import { cn } from "@/lib/common/utils";
+import { useFloatingLayerOrder } from "@/components/ui/dialog/useDialogLayerOrder";
defineOptions({
inheritAttrs: false,
@@ -18,16 +19,18 @@ const emits = defineEmits<PopoverContentEmits>();
const delegatedProps = reactiveOmit(props, "class");
const forwarded = useForwardPropsEmits(delegatedProps, emits);
+const { forwardRef } = useFloatingLayerOrder();
</script>
<template>
<PopoverPortal>
<PopoverContent
+ :ref="forwardRef"
data-slot="popover-content"
v-bind="{ ...$attrs, ...forwarded }"
:class="
cn(
- 'bg-popover text-popover-foreground data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 flex flex-col gap-2.5 rounded-md p-2.5 text-sm shadow-md ring-1 duration-100 z-50 w-72 origin-(--reka-popover-content-transform-origin) outline-hidden',
+ 'bg-popover text-popover-foreground data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 flex flex-col gap-2.5 rounded-md p-2.5 text-sm shadow-md ring-1 duration-100 z-(--dbx-floating-layer-z-index) w-72 origin-(--reka-popover-content-transform-origin) outline-hidden',
props.class,
)
"
diff --git a/apps/desktop/src/components/ui/select/SelectContent.vue b/apps/desktop/src/components/ui/select/SelectContent.vue
index 59198b6da2..f92331e3d2 100644
--- a/apps/desktop/src/components/ui/select/SelectContent.vue
+++ b/apps/desktop/src/components/ui/select/SelectContent.vue
@@ -5,6 +5,7 @@ import { useSlots } from "vue";
import { reactiveOmit } from "@vueuse/core";
import { SelectContent, SelectPortal, SelectViewport, useForwardPropsEmits } from "reka-ui";
import { cn } from "@/lib/common/utils";
+import { useFloatingLayerOrder } from "@/components/ui/dialog/useDialogLayerOrder";
import { SelectScrollDownButton, SelectScrollUpButton } from ".";
defineOptions({
@@ -33,17 +34,19 @@ const slots = useSlots();
const delegatedProps = reactiveOmit(props, "class", "disablePortal", "hideScrollButtons");
const forwarded = useForwardPropsEmits(delegatedProps, emits);
+const { forwardRef } = useFloatingLayerOrder();
</script>
<template>
<SelectPortal :disabled="disablePortal">
<SelectContent
+ :ref="forwardRef"
data-slot="select-content"
:data-align-trigger="position === 'item-aligned'"
v-bind="{ ...$attrs, ...forwarded }"
:class="
cn(
- 'text-popover-foreground data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 min-w-36 rounded-md ring-1 duration-100 data-[side=inline-start]:slide-in-from-right-2 data-[side=inline-end]:slide-in-from-left-2 cn-menu-translucent relative z-50 max-h-(--reka-select-content-available-height) origin-(--reka-select-content-transform-origin) overflow-x-hidden data-[align-trigger=true]:animate-none',
+ 'text-popover-foreground data-open:animate-in data-closed:animate-out data-closed:fade-out-0 data-open:fade-in-0 data-closed:zoom-out-95 data-open:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 ring-foreground/10 min-w-36 rounded-md ring-1 duration-100 data-[side=inline-start]:slide-in-from-right-2 data-[side=inline-end]:slide-in-from-left-2 cn-menu-translucent relative z-(--dbx-floating-layer-z-index) max-h-(--reka-select-content-available-height) origin-(--reka-select-content-transform-origin) overflow-x-hidden data-[align-trigger=true]:animate-none',
slots.header || slots.footer ? 'flex flex-col overflow-y-hidden' : 'overflow-y-auto',
position === 'popper' && 'w-fit min-w-[var(--reka-select-trigger-width)] data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
props.class,
diff --git a/apps/desktop/src/components/ui/tooltip/TooltipContent.vue b/apps/desktop/src/components/ui/tooltip/TooltipContent.vue
index a23ad32f40..e20acab26c 100644
--- a/apps/desktop/src/components/ui/tooltip/TooltipContent.vue
+++ b/apps/desktop/src/components/ui/tooltip/TooltipContent.vue
@@ -4,6 +4,7 @@ import type { HTMLAttributes } from "vue";
import { reactiveOmit } from "@vueuse/core";
import { TooltipArrow, TooltipContent, TooltipPortal, useForwardPropsEmits } from "reka-ui";
import { cn } from "@/lib/common/utils";
+import { useFloatingLayerOrder } from "@/components/ui/dialog/useDialogLayerOrder";
defineOptions({
inheritAttrs: false,
@@ -17,16 +18,18 @@ const emits = defineEmits<TooltipContentEmits>();
const delegatedProps = reactiveOmit(props, "class");
const forwarded = useForwardPropsEmits(delegatedProps, emits);
+const { forwardRef } = useFloatingLayerOrder();
</script>
<template>
<TooltipPortal>
<TooltipContent
+ :ref="forwardRef"
data-slot="tooltip-content"
v-bind="{ ...forwarded, ...$attrs }"
:class="
cn(
- 'data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-[state=delayed-open]:animate-in data-[state=delayed-open]:fade-in-0 data-[state=delayed-open]:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs has-data-[slot=kbd]:pr-1.5 **:data-[slot=kbd]:relative **:data-[slot=kbd]:isolate **:data-[slot=kbd]:z-50 **:data-[slot=kbd]:rounded-sm bg-foreground text-background-solid z-50 w-fit max-w-xs origin-(--reka-tooltip-content-transform-origin)',
+ 'data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-[state=delayed-open]:animate-in data-[state=delayed-open]:fade-in-0 data-[state=delayed-open]:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 inline-flex items-center gap-1.5 rounded-md px-3 py-1.5 text-xs has-data-[slot=kbd]:pr-1.5 **:data-[slot=kbd]:relative **:data-[slot=kbd]:isolate **:data-[slot=kbd]:z-50 **:data-[slot=kbd]:rounded-sm bg-foreground text-background-solid z-(--dbx-floating-layer-z-index) w-fit max-w-xs origin-(--reka-tooltip-content-transform-origin)',
props.class,
)
"
diff --git a/apps/desktop/src/styles/__tests__/legacyWebviewFallback.spec.ts b/apps/desktop/src/styles/__tests__/legacyWebviewFallback.spec.ts
index 8912120e53..05749d142e 100644
--- a/apps/desktop/src/styles/__tests__/legacyWebviewFallback.spec.ts
+++ b/apps/desktop/src/styles/__tests__/legacyWebviewFallback.spec.ts
@@ -87,6 +87,7 @@ describe("legacy WebView CSS fallbacks", () => {
expect(dialogContentSource).toContain('data-slot="dialog-positioner"');
expect(dialogScrollContentSource).toContain('data-slot="dialog-positioner"');
expect(fallback).toContain('[data-slot="dialog-positioner"]');
+ expect(fallback).toContain("z-index: var(--dbx-dialog-top-z-index, 50);");
expect(fallback).toContain("display: flex !important;");
expect(fallback).toContain("align-items: center !important;");
expect(fallback).toContain("justify-content: center !important;");
diff --git a/apps/desktop/src/styles/globals.css b/apps/desktop/src/styles/globals.css
index a00855c440..4cf968792d 100644
--- a/apps/desktop/src/styles/globals.css
+++ b/apps/desktop/src/styles/globals.css
@@ -77,6 +77,8 @@
@import "./tokens.css";
:root {
+ --dbx-dialog-top-z-index: 50;
+ --dbx-floating-layer-z-index: 51;
--data-grid-type-integer-fg: #1d4ed8;
--data-grid-type-numeric-fg: #0e7490;
--data-grid-type-string-fg: #166534;
@@ -100,6 +102,12 @@
--data-grid-type-spatial-fg: #6ee7b7;
}
+/* Reka caches the content's computed z-index on its positioning wrapper.
+ * Keep it above the live dialog stack through positioning and stack updates. */
+[data-dbx-floating-layer] {
+ z-index: max(var(--dbx-floating-layer-z-index, 51), var(--dbx-floating-content-z-index, 0)) !important;
+}
+
/* The column-info tooltip re-derives its type hues from these softer 400-level
* values: the 300-level grid-cell palette above is tuned for the data surface
* and glares on the dark popover. Light mode keeps the 700-level base. */
@@ -1826,7 +1834,7 @@ html.dbx-legacy-webview [data-slot="dialog-positioner"] {
right: 0 !important;
bottom: 0 !important;
left: 0 !important;
- z-index: 50 !important;
+ z-index: var(--dbx-dialog-top-z-index, 50);
display: flex !important;
align-items: center !important;
justify-content: center !important;