Skip to content

Commit 09ac556

Browse files
authored
fix(web): popovers fade out in place instead of jumping after a pick (#26716)
1 parent 6eef681 commit 09ac556

3 files changed

Lines changed: 23 additions & 0 deletions

File tree

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import { useState, type ComponentProps, type CSSProperties } from "react";
2+
3+
const PLACEMENT_KEYS = ["position", "top", "right", "bottom", "left", "transform"] as const;
4+
5+
type Placement = Pick<CSSProperties, (typeof PLACEMENT_KEYS)[number]>;
6+
7+
function ClosingPositioner({ open, style, ...props }: ComponentProps<"div"> & { open: boolean }) {
8+
const [openPlacement, setOpenPlacement] = useState<Placement>({});
9+
if (open && style && PLACEMENT_KEYS.some((key) => style[key] !== openPlacement[key])) {
10+
const { position, top, right, bottom, left, transform } = style;
11+
setOpenPlacement({ position, top, right, bottom, left, transform });
12+
}
13+
return <div {...props} style={open ? style : { ...style, ...openPlacement }} />;
14+
}
15+
16+
export function renderClosingPositioner(props: ComponentProps<"div">, state: { open: boolean }) {
17+
return <ClosingPositioner {...props} open={state.open} />;
18+
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type * as React from "react";
44

55
import { cn } from "~/lib/utils";
66
import { buttonVariants } from "./button";
7+
import { renderClosingPositioner } from "./closing-positioner";
78
import { Input, type InputProps } from "./input";
89
import { Spinner } from "./spinner";
910

@@ -45,6 +46,7 @@ function MenuPopup({
4546
anchor={anchor}
4647
className="z-[130]"
4748
data-slot="menu-positioner"
49+
render={renderClosingPositioner}
4850
side={side}
4951
sideOffset={sideOffset}
5052
>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { Popover as PopoverPrimitive } from "@base-ui/react/popover";
22

33
import { cn } from "~/lib/utils";
44

5+
import { renderClosingPositioner } from "./closing-positioner";
6+
57
const PopoverCreateHandle = PopoverPrimitive.createHandle;
68

79
const Popover = PopoverPrimitive.Root;
@@ -82,6 +84,7 @@ function PopoverPopup({
8284
: "z-[130]",
8385
)}
8486
data-slot="popover-positioner"
87+
render={renderClosingPositioner}
8588
side={side}
8689
sideOffset={sideOffset}
8790
>

0 commit comments

Comments
 (0)