🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
fix(ui): keep dropdown lists scrollable inside dialogs and drawers (#16115)
Nikita Kabardinf6b80d98db3c
diff --git a/web/src/components/ui/hover-card.tsx b/web/src/components/ui/hover-card.tsxindex 5204645f38..50bfbea21f 100644--- a/web/src/components/ui/hover-card.tsx+++ b/web/src/components/ui/hover-card.tsx@@ -5,7 +5,10 @@ import * as React from "react";import * as HoverCardPrimitive from "@radix-ui/react-hover-card";import { cn } from "@/src/utils/tailwind";-import { useLayerContainer } from "@/src/components/ui/layer";+import {+ stopScrollPropagation,+ useLayerContainer,+} from "@/src/components/ui/layer";const HoverCard = HoverCardPrimitive.Root;@@ -25,25 +28,41 @@ HoverCardPortal.displayName = "HoverCardPortal";const HoverCardContent = React.forwardRef<React.ComponentRef<typeof HoverCardPrimitive.Content>,React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content>->(({ className, align = "center", sideOffset = 4, ...props }, ref) => {- // Route into the `popover` overlay layer. null until mounted → falls back to- // <body>, SSR-parity. Layer order, not z-index, stacks it.- const container = useLayerContainer("popover");- return (- <HoverCardPrimitive.Portal container={container}>- <HoverCardPrimitive.Content- ref={ref}- align={align}- sideOffset={sideOffset}- className={cn(- "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=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 w-64 rounded-md border p-3 shadow-md outline-hidden",- className,- )}- {...props}- />- </HoverCardPrimitive.Portal>- );-});+>(+ (+ {+ className,+ align = "center",+ sideOffset = 4,+ onWheel,+ onTouchMove,+ ...props+ },+ ref,+ ) => {+ // Route into the `popover` overlay layer. null until mounted → falls back to+ // <body>, SSR-parity. Layer order, not z-index, stacks it.+ const container = useLayerContainer("popover");+ return (+ <HoverCardPrimitive.Portal container={container}>+ <HoverCardPrimitive.Content+ ref={ref}+ align={align}+ sideOffset={sideOffset}+ // Keeps scrollable content in a hover card scrollable when it is+ // opened from a scroll-locked overlay (see `stopScrollPropagation`).+ onWheel={stopScrollPropagation(onWheel)}+ onTouchMove={stopScrollPropagation(onTouchMove)}+ className={cn(+ "bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=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 w-64 rounded-md border p-3 shadow-md outline-hidden",+ className,+ )}+ {...props}+ />+ </HoverCardPrimitive.Portal>+ );+ },+);HoverCardContent.displayName = HoverCardPrimitive.Content.displayName;const HoverCardTitle = React.forwardRef<diff --git a/web/src/components/ui/layer.tsx b/web/src/components/ui/layer.tsxindex 82e7fbfcaa..deea55d76f 100644--- a/web/src/components/ui/layer.tsx+++ b/web/src/components/ui/layer.tsx@@ -76,6 +76,27 @@ export function useLayerContainer(name: LayerName): HTMLElement | null {return container;}+/**+ * Wraps a wheel/touch-move handler so the event stops at the overlay it happened+ * in, for overlay content that does NOT own the page scroll lock.+ *+ * A Dialog/Sheet/Drawer locks page scrolling with `react-remove-scroll`, whose+ * document-level listener cancels wheel/touch-move events that occur outside the+ * locked subtree. Content in a layer container is always outside it, so a+ * scrollable list inside a Popover or HoverCard opened from a dialog would be+ * frozen for wheel and touch (keyboard still works). Keeping the event local+ * exempts the overlay. Primitives that bring their own lock — Select, modal+ * DropdownMenu — need none of this.+ */+export function stopScrollPropagation<E extends React.SyntheticEvent>(+ handler?: (event: E) => void,+) {+ return (event: E) => {+ event.stopPropagation();+ handler?.(event);+ };+}+/*** Renders its children into the named overlay layer (see {@link LAYER_ORDER}),* escaping ancestor `overflow` clipping and stacking contexts. Renders nothingdiff --git a/web/src/components/ui/overlay-scroll.clienttest.tsx b/web/src/components/ui/overlay-scroll.clienttest.tsxnew file mode 100644index 0000000000..e288944ced--- /dev/null+++ b/web/src/components/ui/overlay-scroll.clienttest.tsx@@ -0,0 +1,89 @@+/**+ * A Dialog/Sheet/Drawer locks page scrolling with `react-remove-scroll`, whose+ * document-level listener cancels wheel and touch-move events that reach it from+ * outside the locked subtree. Popover and hover-card content portals into an+ * overlay layer, i.e. always outside it, so these events must stay inside the+ * overlay — otherwise a scrollable list in a picker opened from a dialog freezes+ * for wheel and touch while keyboard navigation still works.+ */+import { fireEvent, render, screen } from "@testing-library/react";+import {+ Popover,+ PopoverContent,+ PopoverTrigger,+} from "@/src/components/ui/popover";+import {+ HoverCard,+ HoverCardContent,+ HoverCardTrigger,+} from "@/src/components/ui/hover-card";++describe("overlay content keeps scroll events local", () => {+ beforeAll(() => {+ vi.stubGlobal(+ "ResizeObserver",+ class {+ observe() {}+ unobserve() {}+ disconnect() {}+ },+ );+ });++ const atDocument: string[] = [];+ const record = (event: Event) => atDocument.push(event.type);++ beforeEach(() => {+ atDocument.length = 0;+ document.addEventListener("wheel", record);+ document.addEventListener("touchmove", record);+ });++ afterEach(() => {+ document.removeEventListener("wheel", record);+ document.removeEventListener("touchmove", record);+ });++ const scroll = (element: HTMLElement) => {+ fireEvent.wheel(element);+ fireEvent.touchMove(element);+ };++ it("popover: neither event reaches the document", () => {+ render(+ <Popover open>+ <PopoverTrigger>open</PopoverTrigger>+ <PopoverContent>+ <button>option</button>+ </PopoverContent>+ </Popover>,+ );++ scroll(screen.getByRole("button", { name: "option" }));++ expect(atDocument).toEqual([]);+ });++ it("hover card: neither event reaches the document", () => {+ render(+ <HoverCard open>+ <HoverCardTrigger>hover</HoverCardTrigger>+ <HoverCardContent>+ <pre>preview</pre>+ </HoverCardContent>+ </HoverCard>,+ );++ scroll(screen.getByText("preview"));++ expect(atDocument).toEqual([]);+ });++ it("page content is untouched: both events reach the document", () => {+ render(<button>in the page</button>);++ scroll(screen.getByRole("button", { name: "in the page" }));++ expect(atDocument).toEqual(["wheel", "touchmove"]);+ });+});diff --git a/web/src/components/ui/popover.tsx b/web/src/components/ui/popover.tsxindex c5ef01154a..60bbdc5be5 100644--- a/web/src/components/ui/popover.tsx+++ b/web/src/components/ui/popover.tsx@@ -5,7 +5,10 @@ import * as React from "react";import * as PopoverPrimitive from "@radix-ui/react-popover";import { cn } from "@/src/utils/tailwind";-import { useLayerContainer } from "@/src/components/ui/layer";+import {+ stopScrollPropagation,+ useLayerContainer,+} from "@/src/components/ui/layer";const Popover = PopoverPrimitive.Root;@@ -16,7 +19,15 @@ const PopoverContent = React.forwardRef<React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>>((- { className, align = "center", sideOffset = 4, forceMount, ...props },+ {+ className,+ align = "center",+ sideOffset = 4,+ forceMount,+ onWheel,+ onTouchMove,+ ...props+ },ref,) => {// Route into the `popover` overlay layer (above `modal`, so popovers opened@@ -35,6 +46,10 @@ const PopoverContent = React.forwardRef<align={align}sideOffset={sideOffset}forceMount={forceMount}+ // Keeps lists inside a popover scrollable when it is opened from a+ // scroll-locked overlay (see `stopScrollPropagation`).+ onWheel={stopScrollPropagation(onWheel)}+ onTouchMove={stopScrollPropagation(onTouchMove)}className={cn("bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=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 max-h-[calc(var(--radix-popover-content-available-height)-1rem)] max-w-[max(var(--radix-popover-trigger-width),fit-content)] min-w-72 overflow-y-auto rounded-md border p-3 shadow-md outline-hidden",className,diff --git a/web/src/features/batch-actions/components/RunEvaluationDialog/EvaluatorPromptPreview.tsx b/web/src/features/batch-actions/components/RunEvaluationDialog/EvaluatorPromptPreview.tsxindex 357570bf76..21d3a4b466 100644--- a/web/src/features/batch-actions/components/RunEvaluationDialog/EvaluatorPromptPreview.tsx+++ b/web/src/features/batch-actions/components/RunEvaluationDialog/EvaluatorPromptPreview.tsx@@ -15,18 +15,11 @@ export function EvaluatorPromptPreview(props: EvaluatorPromptPreviewProps) {return (<HoverCard openDelay={150} closeDelay={150}><HoverCardTrigger asChild>{trigger}</HoverCardTrigger>- <HoverCardContent- className="w-[520px] max-w-[85vw]"- align="end"- onWheel={(event) => event.stopPropagation()}- >+ <HoverCardContent className="w-[520px] max-w-[85vw]" align="end"><p className="text-muted-foreground mb-2 text-xs">Prompt preview with the first selected observation</p>- <pre- className="bg-muted/20 max-h-[320px] overflow-y-auto rounded-md border p-2 text-xs wrap-break-word whitespace-pre-wrap"- onWheel={(event) => event.stopPropagation()}- >+ <pre className="bg-muted/20 max-h-[320px] overflow-y-auto rounded-md border p-2 text-xs wrap-break-word whitespace-pre-wrap">{previewContent}</pre></HoverCardContent>diff --git a/web/src/features/evals/components/template-selector.tsx b/web/src/features/evals/components/template-selector.tsxindex b3ede4053f..5748bf27c5 100644--- a/web/src/features/evals/components/template-selector.tsx+++ b/web/src/features/evals/components/template-selector.tsx@@ -187,10 +187,6 @@ export const TemplateSelector = ({tabIndex={0}className="overflow-y-auto focus:outline-hidden"style={{ maxHeight: "300px" }}- onWheel={(e) => {- // Prevent the wheel event from being captured by parent elements- e.stopPropagation();- }}><InputCommandList className="max-h-full overflow-visible overflow-x-hidden">{!hasResults && (diff --git a/web/src/features/filters/components/filter-builder.tsx b/web/src/features/filters/components/filter-builder.tsxindex 257ac32c7a..f27241d5a8 100644--- a/web/src/features/filters/components/filter-builder.tsx+++ b/web/src/features/filters/components/filter-builder.tsx@@ -677,16 +677,7 @@ function FilterBuilderForm({<ChevronDown className="h-4 w-4 shrink-0 opacity-50" /></Button></PopoverTrigger>- <PopoverContent- align="start"- className="max-w-fit p-0"- onWheel={(e) => {- e.stopPropagation();- }}- onTouchMove={(e) => {- e.stopPropagation();- }}- >+ <PopoverContent align="start" className="max-w-fit p-0"><InputCommand><InputCommandInputplaceholder="Search for column"