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
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🏃 feat: Keep Modals Open on Escape in Dropdown Menus (#10975)
Dustin Healyd8b788aecc10
diff --git a/packages/client/src/components/OriginalDialog.tsx b/packages/client/src/components/OriginalDialog.tsxindex 74e67c60fd..706732f19a 100644--- a/packages/client/src/components/OriginalDialog.tsx+++ b/packages/client/src/components/OriginalDialog.tsx@@ -78,29 +78,39 @@ const DialogContent = React.forwardRef<},ref,) => {- /* Handle Escape key to prevent closing dialog if a tooltip is open+ const contentRef = React.useRef<HTMLDivElement>(null);++ React.useImperativeHandle(ref, () => contentRef.current as HTMLDivElement, []);++ /* Handle Escape key to prevent closing dialog if a tooltip or dropdown is open(this is a workaround in order to achieve WCAG compliance which requiresthat our tooltips be dismissable with Escape key) */const handleEscapeKeyDown = React.useCallback((event: KeyboardEvent) => {- const tooltips = document.querySelectorAll('.tooltip');-- for (const tooltip of Array.from(tooltips)) {- const computedStyle = window.getComputedStyle(tooltip);- const opacity = parseFloat(computedStyle.opacity);-- if (- tooltip.parentElement &&- computedStyle.display !== 'none' &&- computedStyle.visibility !== 'hidden' &&- opacity > 0- ) {+ if (!contentRef.current) {+ propsOnEscapeKeyDown?.(event);+ return;+ }++ const tooltips = contentRef.current.querySelectorAll('.tooltip');+ const dropdownMenus = contentRef.current.querySelectorAll('[role="menu"]');++ for (const tooltip of tooltips) {+ const style = window.getComputedStyle(tooltip);+ if (style.display !== 'none') {+ event.preventDefault();+ return;+ }+ }++ for (const dropdownMenu of dropdownMenus) {+ const style = window.getComputedStyle(dropdownMenu);+ if (style.display !== 'none') {event.preventDefault();return;}}- // Call the original handler if it existspropsOnEscapeKeyDown?.(event);},[propsOnEscapeKeyDown],@@ -110,7 +120,7 @@ const DialogContent = React.forwardRef<<DialogPortal><DialogOverlay className={overlayClassName} /><DialogPrimitive.Content- ref={ref}+ ref={contentRef}onEscapeKeyDown={handleEscapeKeyDown}className={cn('max-w-11/12 fixed left-[50%] top-[50%] z-50 grid max-h-[90vh] w-full translate-x-[-50%] translate-y-[-50%] gap-4 overflow-y-auto rounded-2xl bg-background p-6 text-text-primary shadow-lg duration-200 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-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%]',