Skip to content

Commit d73efd9

Browse files
authored
fix: block interactions with disabled submenus (#902)
* fix: block interactions with disabled submenus * test: guard open keys when a submenu becomes disabled
1 parent 180d068 commit d73efd9

3 files changed

Lines changed: 65 additions & 2 deletions

File tree

‎src/SubMenu/index.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ const InternalSubMenu = React.forwardRef<HTMLLIElement, SubMenuProps>((props, re
382382
<MenuContextProvider
383383
classNames={menuClassNames}
384384
styles={styles}
385+
disabled={mergedDisabled}
385386
onItemClick={onMergedItemClick}
386387
mode={mode === 'horizontal' ? 'vertical' : mode}
387388
itemIcon={mergedItemIcon}

‎src/hooks/useAccessibility.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,12 @@ export function useAccessibility<T extends HTMLElement>(
282282
tryFocus(targetElement);
283283

284284
// ======================= InlineTrigger =======================
285+
} else if (
286+
(offsetObj.inlineTrigger || offsetObj.offset > 0) &&
287+
focusMenuElement.getAttribute('aria-disabled') === 'true'
288+
) {
289+
originOnKeyDown?.(e);
290+
return;
285291
} else if (offsetObj.inlineTrigger) {
286292
// Inline trigger no need switch to sub menu item
287293
triggerAccessibilityOpen(focusMenuKey);

‎tests/DisabledKeyboard.spec.tsx‎

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { fireEvent, render } from '@testing-library/react';
1+
import { act, fireEvent, render } from '@testing-library/react';
22
import { KeyCode } from '@rc-component/util';
33
import React from 'react';
4-
import Menu, { MenuItem } from '../src';
4+
import Menu, { MenuItem, SubMenu } from '../src';
55

66
describe('Disabled menu keyboard selection', () => {
77
it('ignores Enter after a focused item becomes disabled', () => {
@@ -25,3 +25,59 @@ describe('Disabled menu keyboard selection', () => {
2525
expect(onSelect).toHaveBeenCalledTimes(1);
2626
});
2727
});
28+
29+
describe('Disabled submenus', () => {
30+
it.each(['inline', 'vertical'] as const)(
31+
'ignores keyboard opening after a focused %s submenu becomes disabled',
32+
mode => {
33+
const onOpenChange = jest.fn();
34+
const menu = (disabled: boolean) => (
35+
<Menu mode={mode} disabled={disabled} onOpenChange={onOpenChange}>
36+
<SubMenu key="parent" title="Parent">
37+
<MenuItem key="child">Child</MenuItem>
38+
</SubMenu>
39+
</Menu>
40+
);
41+
const { getByRole, rerender } = render(menu(false));
42+
const submenu = getByRole('menuitem', { name: 'Parent' });
43+
act(() => submenu.focus());
44+
rerender(menu(true));
45+
46+
const key = mode === 'inline' ? KeyCode.ENTER : KeyCode.RIGHT;
47+
fireEvent.keyDown(submenu, { which: key, keyCode: key });
48+
expect(onOpenChange).not.toHaveBeenCalled();
49+
50+
rerender(menu(false));
51+
fireEvent.keyDown(submenu, { which: key, keyCode: key });
52+
expect(onOpenChange).toHaveBeenCalledWith(['parent']);
53+
},
54+
);
55+
56+
it.each(['inline', 'vertical'] as const)(
57+
'blocks selection in an open %s submenu while it is disabled',
58+
async mode => {
59+
const onSelect = jest.fn();
60+
const onOpenChange = jest.fn();
61+
const menu = (disabled: boolean) => (
62+
<Menu mode={mode} openKeys={['parent']} onSelect={onSelect} onOpenChange={onOpenChange}>
63+
<SubMenu key="parent" title="Parent" disabled={disabled}>
64+
<MenuItem key="child">Child</MenuItem>
65+
</SubMenu>
66+
</Menu>
67+
);
68+
const { findByRole, rerender } = render(menu(false));
69+
const item = await findByRole('menuitem', { name: 'Child' });
70+
act(() => item.focus());
71+
rerender(menu(true));
72+
73+
fireEvent.click(item);
74+
fireEvent.keyDown(item, { which: KeyCode.ENTER, keyCode: KeyCode.ENTER });
75+
expect(onSelect).not.toHaveBeenCalled();
76+
expect(onOpenChange).not.toHaveBeenCalled();
77+
78+
rerender(menu(false));
79+
fireEvent.click(item);
80+
expect(onSelect).toHaveBeenCalledTimes(1);
81+
},
82+
);
83+
});

0 commit comments

Comments
 (0)