Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🫧 fix: Raise Nested Popovers Above Dialog Layers (#15738)

Danny Avila5cd70ad61273
diff --git a/packages/client/src/components/Combobox.tsx b/packages/client/src/components/Combobox.tsx
index 41b8c46f09..dd744f061b 100644
--- a/packages/client/src/components/Combobox.tsx
+++ b/packages/client/src/components/Combobox.tsx
@@ -12,6 +12,7 @@ import {
} from '@ariakit/react';
import type { OptionWithIcon } from '~/common';
import { SelectTrigger, SelectValue, SelectScrollDownButton } from './Select';
+import { useNestedPopoverStyle } from './OriginalDialog';
import { useCombobox } from '~/hooks';
import { cn } from '~/utils';
@@ -47,6 +48,7 @@ export default function ComboboxComponent({
value: selectedValue,
options,
});
+ const nestedStyle = useNestedPopoverStyle();
return (
<RadixSelect.Root
@@ -104,6 +106,7 @@ export default function ComboboxComponent({
role="dialog"
aria-label={ariaLabel + 's'}
position="popper"
+ style={nestedStyle}
className={cn(
'relative z-40 max-h-[52vh] min-w-[8rem] overflow-hidden rounded-md border border-border-light bg-surface-secondary text-text-primary shadow-md 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',
'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
diff --git a/packages/client/src/components/HoverCard.tsx b/packages/client/src/components/HoverCard.tsx
index ba389711cd..76012fca08 100644
--- a/packages/client/src/components/HoverCard.tsx
+++ b/packages/client/src/components/HoverCard.tsx
@@ -1,5 +1,6 @@
import * as React from 'react';
import * as HoverCardPrimitive from '@radix-ui/react-hover-card';
+import { useNestedPopoverStyle } from './OriginalDialog';
import { cn } from '~/utils';
const HoverCard: React.FC<HoverCardPrimitive.HoverCardProps> = HoverCardPrimitive.Root;
@@ -18,24 +19,31 @@ const HoverCardContent: React.ForwardRefExoticComponent<
> = React.forwardRef<
React.ElementRef<typeof HoverCardPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content> & { disabled?: boolean }
->(({ className = '', align = 'center', sideOffset = 6, disabled = false, ...props }, ref) => {
- if (disabled) {
- return null;
- }
+>(
+ (
+ { className = '', align = 'center', sideOffset = 6, disabled = false, style, ...props },
+ ref,
+ ) => {
+ const nestedStyle = useNestedPopoverStyle();
+ if (disabled) {
+ return null;
+ }
- return (
- <HoverCardPrimitive.Content
- ref={ref}
- align={align}
- sideOffset={sideOffset}
- className={cn(
- 'z-50 w-64 origin-[--radix-hover-card-content-transform-origin] rounded-xl border border-border-light bg-surface-secondary p-4 text-text-primary shadow-md outline-none 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',
- className,
- )}
- {...props}
- />
- );
-});
+ return (
+ <HoverCardPrimitive.Content
+ ref={ref}
+ align={align}
+ sideOffset={sideOffset}
+ style={{ ...nestedStyle, ...style }}
+ className={cn(
+ 'z-50 w-64 origin-[--radix-hover-card-content-transform-origin] rounded-xl border border-border-light bg-surface-secondary p-4 text-text-primary shadow-md outline-none 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',
+ className,
+ )}
+ {...props}
+ />
+ );
+ },
+);
HoverCardContent.displayName = HoverCardPrimitive.Content.displayName;
export { HoverCard, HoverCardTrigger, HoverCardContent, HoverCardPortal };
diff --git a/packages/client/src/components/OriginalDialog.tsx b/packages/client/src/components/OriginalDialog.tsx
index 895a14b62b..b63d76891f 100644
--- a/packages/client/src/components/OriginalDialog.tsx
+++ b/packages/client/src/components/OriginalDialog.tsx
@@ -22,6 +22,28 @@ export const usePopoverZIndex = (): number => {
return contentZIndex + 10;
};
+/**
+ * What a body-portaled Radix popover needs to survive a modal dialog, or
+ * `undefined` outside one — so a popover's own CSS layer (and any consumer
+ * override of it) is left untouched everywhere else.
+ *
+ * Radix coordinates nested layers through module-level state, so it only
+ * coordinates layers from the *same copy* of `react-dismissable-layer`. This
+ * app has three: `react-dialog` is pinned at 1.0.2 (#11023) while `react-select`
+ * and `react-hover-card` resolve to their own newer copies. A popover therefore
+ * never learns that the dialog disabled body pointer events, and never lifts
+ * itself over the dialog — it opens behind an opaque overlay, inert.
+ *
+ * `pointer-events` mirrors what `DropdownPopup` already does for Ariakit menus
+ * in the same situation; a click inside still reaches the dialog's own
+ * "inside" check, because React portals bubble through the React tree.
+ */
+export const useNestedPopoverStyle = (): React.CSSProperties | undefined => {
+ const depth = useDialogDepth();
+ const zIndex = usePopoverZIndex();
+ return depth > 0 ? { zIndex, pointerEvents: 'auto' } : undefined;
+};
+
interface OGDialogProps extends DialogPrimitive.DialogProps {
triggerRef?: React.RefObject<HTMLButtonElement | HTMLInputElement | HTMLDivElement | null>;
triggerRefs?: React.RefObject<HTMLButtonElement | HTMLInputElement | HTMLDivElement | null>[];
diff --git a/packages/client/src/components/Select.tsx b/packages/client/src/components/Select.tsx
index 2bcbd16fd8..103f87848f 100644
--- a/packages/client/src/components/Select.tsx
+++ b/packages/client/src/components/Select.tsx
@@ -1,6 +1,7 @@
import * as React from 'react';
import * as SelectPrimitive from '@radix-ui/react-select';
import { CaretSortIcon, CheckIcon, ChevronDownIcon, ChevronUpIcon } from '@radix-ui/react-icons';
+import { useNestedPopoverStyle } from './OriginalDialog';
import { cn } from '~/utils';
// @ts-ignore - Radix UI type conflicts with React types
@@ -80,35 +81,39 @@ const SelectContent: React.ForwardRefExoticComponent<
> = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
->(({ className = '', children, position = 'popper', ...props }, ref) => (
- <SelectPrimitive.Portal>
- <SelectPrimitive.Content
- ref={ref}
- className={cn(
- 'relative z-40 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-border-light bg-surface-secondary text-text-primary shadow-md 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',
- position === 'popper'
- ? 'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1'
- : '',
- className,
- )}
- position={position}
- {...props}
- >
- <SelectScrollUpButton />
- <SelectPrimitive.Viewport
+>(({ className = '', children, position = 'popper', style, ...props }, ref) => {
+ const nestedStyle = useNestedPopoverStyle();
+ return (
+ <SelectPrimitive.Portal>
+ <SelectPrimitive.Content
+ ref={ref}
+ style={{ ...nestedStyle, ...style }}
className={cn(
- 'p-1',
+ 'relative z-40 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-border-light bg-surface-secondary text-text-primary shadow-md 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',
position === 'popper'
- ? 'h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]'
+ ? 'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1'
: '',
+ className,
)}
+ position={position}
+ {...props}
>
- {children}
- </SelectPrimitive.Viewport>
- <SelectScrollDownButton />
- </SelectPrimitive.Content>
- </SelectPrimitive.Portal>
-));
+ <SelectScrollUpButton />
+ <SelectPrimitive.Viewport
+ className={cn(
+ 'p-1',
+ position === 'popper'
+ ? 'h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]'
+ : '',
+ )}
+ >
+ {children}
+ </SelectPrimitive.Viewport>
+ <SelectScrollDownButton />
+ </SelectPrimitive.Content>
+ </SelectPrimitive.Portal>
+ );
+});
SelectContent.displayName = SelectPrimitive.Content.displayName;
const SelectLabel: React.ForwardRefExoticComponent<
diff --git a/packages/client/src/components/__tests__/popoverLayering.spec.tsx b/packages/client/src/components/__tests__/popoverLayering.spec.tsx
new file mode 100644
index 0000000000..674894cb5b
--- /dev/null
+++ b/packages/client/src/components/__tests__/popoverLayering.spec.tsx
@@ -0,0 +1,98 @@
+import '@testing-library/jest-dom';
+import { render, screen } from '@testing-library/react';
+import { HoverCard, HoverCardContent, HoverCardPortal, HoverCardTrigger } from '../HoverCard';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../Select';
+import { OGDialog, OGDialogContent } from '../OriginalDialog';
+
+/**
+ * A portaled popover lands beside the dialog in the DOM, not inside it, so its
+ * own z-index decides whether it is reachable. `OGDialogContent` sits at 140
+ * over an opaque overlay at 130: a popover left on the shadcn default (40, 50)
+ * opens *behind* both, invisible and unclickable, while the dialog around it
+ * still takes clicks — the shape of the Run Code settings being unusable once
+ * danny-avila/LibreChat#15722 moved them into a dialog.
+ *
+ * The modal dialog also parks `pointer-events: none` on the body, and Radix
+ * re-enables it only for layers registered in the same copy of
+ * `react-dismissable-layer` — which a popover from another copy is not.
+ */
+const DIALOG_CONTENT_Z_INDEX = 140;
+
+function zIndexOf(element: HTMLElement): number {
+ return Number(element.style.zIndex);
+}
+
+function EnvironmentSelect() {
+ return (
+ <Select open value="attached">
+ <SelectTrigger aria-label="Execution environment">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ <SelectItem value="attached">Attached VM</SelectItem>
+ </SelectContent>
+ </Select>
+ );
+}
+
+function HelpHoverCard() {
+ return (
+ <HoverCard open>
+ <HoverCardTrigger>help</HoverCardTrigger>
+ <HoverCardPortal>
+ <HoverCardContent>What stateful sessions do</HoverCardContent>
+ </HoverCardPortal>
+ </HoverCard>
+ );
+}
+
+describe('portaled popovers inside a dialog', () => {
+ it('opens a select above the dialog content it belongs to', () => {
+ render(
+ <OGDialog open>
+ <OGDialogContent>
+ <EnvironmentSelect />
+ </OGDialogContent>
+ </OGDialog>,
+ );
+
+ const listbox = screen.getByRole('listbox');
+ expect(zIndexOf(listbox)).toBeGreaterThan(DIALOG_CONTENT_Z_INDEX);
+ expect(listbox.style.pointerEvents).toBe('auto');
+ });
+
+ it('opens a hover card above the dialog content it belongs to', () => {
+ render(
+ <OGDialog open>
+ <OGDialogContent>
+ <HelpHoverCard />
+ </OGDialogContent>
+ </OGDialog>,
+ );
+
+ const card = screen.getByText('What stateful sessions do');
+ expect(zIndexOf(card)).toBeGreaterThan(DIALOG_CONTENT_Z_INDEX);
+ expect(card.style.pointerEvents).toBe('auto');
+ });
+
+ /** Outside a dialog the CSS layer still decides, so a consumer that raises it
+ * by class — `z-[999]` to clear the legacy `Dialog` — keeps that override.
+ * Radix still owns `pointer-events` there: a select disables outside pointer
+ * events for its own layer stack whether or not a dialog is involved. */
+ it('leaves the CSS layer alone outside any dialog', () => {
+ render(
+ <>
+ <EnvironmentSelect />
+ <HelpHoverCard />
+ </>,
+ );
+
+ const listbox = screen.getByRole('listbox');
+ const card = screen.getByText('What stateful sessions do');
+ expect(listbox.style.zIndex).toBe('');
+ expect(listbox).toHaveClass('z-40');
+ expect(card.style.zIndex).toBe('');
+ expect(card.style.pointerEvents).toBe('');
+ expect(card).toHaveClass('z-50');
+ });
+});