Skip to content

Commit 081cf3f

Browse files
committed
fix(ui): keep dropdown menus open on window blur
1 parent 2be9e1e commit 081cf3f

1 file changed

Lines changed: 20 additions & 4 deletions

File tree

‎apps/dokploy/components/ui/dropdown-menu.tsx‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,37 @@
11
import { CheckIcon, ChevronRightIcon } from "lucide-react";
22
import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
3-
import type * as React from "react";
3+
import * as React from "react";
44
import { markNestedPopupClosed } from "@/components/ui/nested-popup-context";
55
import { cn } from "@/lib/utils";
66

77
function DropdownMenu({
8+
open,
9+
defaultOpen,
810
onOpenChange,
911
...props
1012
}: React.ComponentProps<typeof DropdownMenuPrimitive.Root>) {
13+
const [uncontrolledOpen, setUncontrolledOpen] = React.useState(
14+
defaultOpen ?? false,
15+
);
16+
const isControlled = open !== undefined;
17+
const isOpen = isControlled ? open : uncontrolledOpen;
18+
1119
return (
1220
<DropdownMenuPrimitive.Root
1321
data-slot="dropdown-menu"
14-
onOpenChange={(open) => {
15-
if (!open) {
22+
open={isOpen}
23+
onOpenChange={(nextOpen) => {
24+
// Radix closes menus on window blur, unmounting any dialog rendered inside
25+
if (!nextOpen && !document.hasFocus()) {
26+
return;
27+
}
28+
if (!isControlled) {
29+
setUncontrolledOpen(nextOpen);
30+
}
31+
if (!nextOpen) {
1632
markNestedPopupClosed();
1733
}
18-
onOpenChange?.(open);
34+
onOpenChange?.(nextOpen);
1935
}}
2036
{...props}
2137
/>

0 commit comments

Comments
 (0)