From 3ff2a138ccc1507bad3ec515c069e2fdc89dfc45 Mon Sep 17 00:00:00 2001 From: Marco Beretta <81851188+berry-13@users.noreply.github.com> Date: Fri, 9 Oct 2026 17:35:53 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AD=20fix:=20Bring=20Submenus=20Closer?= =?UTF-8?q?=20to=20Their=20Parent=20Menu=20(#16930)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: Bring Submenus Closer to Their Parent Menu * fix: Scale Submenu Gutter With the UI Scale --- .../components/DropdownPopup.gutter.spec.tsx | 62 +++++++++++++++++++ .../client/src/components/DropdownPopup.tsx | 6 +- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 packages/client/src/components/DropdownPopup.gutter.spec.tsx diff --git a/packages/client/src/components/DropdownPopup.gutter.spec.tsx b/packages/client/src/components/DropdownPopup.gutter.spec.tsx new file mode 100644 index 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(); +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) => { + 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( + trigger} + 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.tsx index 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<{