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
🧭 fix: Bring Submenus Closer to Their Parent Menu (#16930)
Marco Beretta3ff2a138ccc1
diff --git a/packages/client/src/components/DropdownPopup.gutter.spec.tsx b/packages/client/src/components/DropdownPopup.gutter.spec.tsxnew file mode 100644index 0000000000..468dc7c65e--- /dev/null+++ b/packages/client/src/components/DropdownPopup.gutter.spec.tsx@@ -0,0 +1,62 @@+import React from 'react';+import * as Ariakit from '@ariakit/react';+import userEvent from '@testing-library/user-event';+import { act, render, screen } from '@testing-library/react';+import DropdownPopup from './DropdownPopup';++let mockRemScale = 1;+jest.mock('~/hooks/useRemScale', () => ({+ __esModule: true,+ default: () => mockRemScale,+}));++/** jsdom has no layout, so the offset Ariakit computes cannot be measured: the gutter each menu+ * receives is recorded instead. */+const mockGutters = new Map<string, number | undefined>();+jest.mock('@ariakit/react', () => {+ const actual = jest.requireActual('@ariakit/react');+ const ReactActual = jest.requireActual('react');+ const Menu = ReactActual.forwardRef(+ (props: { id?: string; gutter?: number }, ref: React.Ref<HTMLDivElement>) => {+ if (props.id != null) {+ mockGutters.set(props.id, props.gutter);+ }+ return ReactActual.createElement(actual.Menu, { ...props, ref });+ },+ );+ return { ...actual, Menu };+});++beforeEach(() => {+ mockRemScale = 1;+ mockGutters.clear();+});++const renderWithSubmenu = async () => {+ const user = userEvent.setup();+ render(+ <DropdownPopup+ menuId="gutter-test"+ isOpen={true}+ setIsOpen={jest.fn()}+ trigger={<Ariakit.MenuButton>trigger</Ariakit.MenuButton>}+ items={[{ label: 'Move', subItems: [{ label: 'Alpha', onClick: jest.fn() }] }]}+ />,+ );+ await act(async () => {+ await user.click(screen.getByRole('menuitem', { name: 'Move' }));+ });+};++describe('DropdownPopup submenu gutter', () => {+ it('keeps the submenu gutter at 14px at the default UI scale', async () => {+ await renderWithSubmenu();+ expect(mockGutters.get('gutter-test-0')).toBe(14);+ });++ it('scales the submenu gutter with the UI scale so the parent padding cannot outgrow it', async () => {+ mockRemScale = 1.5;+ await renderWithSubmenu();+ expect(mockGutters.get('gutter-test-0')).toBe(21);+ });+});diff --git a/packages/client/src/components/DropdownPopup.tsx b/packages/client/src/components/DropdownPopup.tsxindex 2580b29dbf..947a72e169 100644--- a/packages/client/src/components/DropdownPopup.tsx+++ b/packages/client/src/components/DropdownPopup.tsx@@ -3,6 +3,7 @@ import * as Ariakit from '@ariakit/react';import type * as t from '~/common';import { usePopoverZIndex } from './OriginalDialog';import { cn, disabledInkClasses } from '~/utils';+import useRemScale from '~/hooks/useRemScale';import './Dropdown.css';interface DropdownProps {@@ -217,6 +218,9 @@ const SubMenuItem: React.FC<{itemClassName?: string;}> = ({ item, subItems, menuId, hideAll, iconClassName, itemClassName }) => {const store = Ariakit.useMenuStore();+ /** Ariakit takes the gutter in pixels while the parent menu's padding is in rem: scaling it keeps+ * the submenu clear of the parent menu at every UI scale. */+ const remScale = useRemScale();/** The parent's `hideAll` closes only its own store: a submenu that stays mounted would be left* open in its portal, so this store is closed with it. */const hideSubmenuAndParents = () => {@@ -254,7 +258,7 @@ const SubMenuItem: React.FC<{<Menuitems={subItems}menuId={menuId}- gutter={20}+ gutter={14 * remScale}portal={true}hideAll={hideSubmenuAndParents}style={{ maxHeight: 'min(24rem, var(--popover-available-height, 24rem))' }}