fix(ui): preserve popover arrows around scrollable content

Keep the anchored surface overflow-visible so the arrow is not clipped. Move height-constrained scrolling into an inner viewport and expose viewportClassName for content-specific styling.
This commit is contained in:
Maofeng
2026-08-08 21:13:43 +08:00
parent 94506aa349
commit bc84912e48
+27 -1
View File
@@ -41,6 +41,11 @@ type PopoverContentProps = PopoverPrimitive.Popup.Props &
* with the `render` prop when both are provided. * with the `render` prop when both are provided.
*/ */
showArrow?: boolean | Omit<AnchoredSurfaceProps, "children" | "render"> showArrow?: boolean | Omit<AnchoredSurfaceProps, "children" | "render">
/**
* Styles the scrollable content viewport when `showArrow` is enabled.
* The outer surface stays overflow-visible so its tail is not clipped.
*/
viewportClassName?: string
} }
function PopoverContent({ function PopoverContent({
@@ -55,6 +60,7 @@ function PopoverContent({
showArrow = false, showArrow = false,
side = "bottom", side = "bottom",
sideOffset, sideOffset,
viewportClassName,
...props ...props
}: PopoverContentProps) { }: PopoverContentProps) {
const usesAnchoredSurface = Boolean(showArrow) const usesAnchoredSurface = Boolean(showArrow)
@@ -77,6 +83,10 @@ function PopoverContent({
) : ( ) : (
<AnchoredSurface {...anchoredSurfaceProps} render={render} /> <AnchoredSurface {...anchoredSurfaceProps} render={render} />
) )
const anchoredSurfaceBorderWidth = Math.max(
0,
anchoredSurfaceProps?.borderWidth ?? 1
)
return ( return (
<PopoverPrimitive.Portal> <PopoverPrimitive.Portal>
@@ -94,7 +104,8 @@ function PopoverContent({
data-slot="popover-content" data-slot="popover-content"
className={cn( className={cn(
"z-50 flex w-72 origin-(--transform-origin) flex-col gap-4 rounded-md bg-popover p-4 text-sm text-popover-foreground shadow-md ring-1 ring-foreground/10 outline-hidden duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-start-2 data-[side=inline-start]:slide-in-from-end-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 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95", "z-50 flex w-72 origin-(--transform-origin) flex-col gap-4 rounded-md bg-popover p-4 text-sm text-popover-foreground shadow-md ring-1 ring-foreground/10 outline-hidden duration-100 data-[side=bottom]:slide-in-from-top-2 data-[side=inline-end]:slide-in-from-start-2 data-[side=inline-start]:slide-in-from-end-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 data-open:animate-in data-open:fade-in-0 data-open:zoom-in-95 data-closed:animate-out data-closed:fade-out-0 data-closed:zoom-out-95",
usesAnchoredSurface && "bg-transparent shadow-none ring-0", usesAnchoredSurface &&
"!overflow-visible bg-transparent shadow-none ring-0",
className className
)} )}
render={resolvedRender} render={resolvedRender}
@@ -103,7 +114,22 @@ function PopoverContent({
{usesAnchoredSurface && ( {usesAnchoredSurface && (
<PopoverPrimitive.Arrow render={<AnchoredSurfaceArrow />} /> <PopoverPrimitive.Arrow render={<AnchoredSurfaceArrow />} />
)} )}
{usesAnchoredSurface ? (
<div
data-slot="popover-viewport"
className={cn(
"flex min-h-0 flex-1 flex-col gap-4 overflow-x-hidden overflow-y-auto rounded-[inherit]",
viewportClassName
)}
style={{
maxHeight: `calc(var(--available-height) - ${anchoredSurfaceBorderWidth * 2}px)`,
}}
>
{children} {children}
</div>
) : (
children
)}
</PopoverPrimitive.Popup> </PopoverPrimitive.Popup>
</PopoverPrimitive.Positioner> </PopoverPrimitive.Positioner>
</PopoverPrimitive.Portal> </PopoverPrimitive.Portal>