Skip to content

Commit 536aecb

Browse files
committed
refactor(web): keep popup retention inside the dialog component
1 parent 139e198 commit 536aecb

4 files changed

Lines changed: 25 additions & 26 deletions

File tree

‎apps/web/src/components/ui/alert-dialog.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
DIALOG_MOBILE_SHEET_CLASS,
99
DIALOG_POPUP_CLASS,
1010
} from "~/components/ui/dialog-styles";
11-
import { ControlledOpenContext, renderRetainedPopup } from "~/components/ui/retained-popup";
11+
import { ControlledOpenContext, renderRetainedPopup } from "~/components/ui/dialog";
1212

1313
function AlertDialog<Payload>(props: AlertDialogPrimitive.Root.Props<Payload>) {
1414
return (

‎apps/web/src/components/ui/dialog.tsx‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import { Dialog as DialogPrimitive } from "@base-ui/react/dialog";
44
import { XIcon } from "lucide-react";
5+
import { type ComponentProps, createContext, type ReactNode, use, useState } from "react";
56
import { cn } from "~/lib/utils";
67
import { Button } from "~/components/ui/button";
78
import {
@@ -12,7 +13,26 @@ import {
1213
DIALOG_POPUP_CLASS,
1314
} from "~/components/ui/dialog-styles";
1415
import { ScrollArea } from "~/components/ui/scroll-area";
15-
import { ControlledOpenContext, renderRetainedPopup } from "~/components/ui/retained-popup";
16+
17+
const ControlledOpenContext = createContext<boolean | undefined>(undefined);
18+
19+
function RetainedWhileClosed({ open, children }: { open: boolean; children: ReactNode }) {
20+
const controlledOpen = use(ControlledOpenContext);
21+
const isOpen = open && controlledOpen !== false;
22+
const [retained, setRetained] = useState(children);
23+
if (isOpen && retained !== children) {
24+
setRetained(children);
25+
}
26+
return isOpen ? children : retained;
27+
}
28+
29+
function renderRetainedPopup(props: ComponentProps<"div">, state: { open: boolean }) {
30+
return (
31+
<div {...props}>
32+
<RetainedWhileClosed open={state.open}>{props.children}</RetainedWhileClosed>
33+
</div>
34+
);
35+
}
1636

1737
function Dialog<Payload>(props: DialogPrimitive.Root.Props<Payload>) {
1838
return (
@@ -188,6 +208,8 @@ function DialogPanel({
188208
}
189209

190210
export {
211+
ControlledOpenContext,
212+
renderRetainedPopup,
191213
Dialog,
192214
DialogTrigger,
193215
DialogPortal,

‎apps/web/src/components/ui/retained-popup.tsx‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎apps/web/src/components/ui/sheet.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { XIcon } from "lucide-react";
55
import type { CSSProperties } from "react";
66
import { cn } from "~/lib/utils";
77
import { Button } from "~/components/ui/button";
8-
import { ControlledOpenContext, renderRetainedPopup } from "~/components/ui/retained-popup";
8+
import { ControlledOpenContext, renderRetainedPopup } from "~/components/ui/dialog";
99

1010
function Sheet<Payload>(props: SheetPrimitive.Root.Props<Payload>) {
1111
return (

0 commit comments

Comments
 (0)