Skip to content

fix: fix focus when active element is removed #791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 29, 2025
Merged

fix: fix focus when active element is removed #791

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f83e9f2
fixes issue with keyboard not working after focused menu item is removed
jon-cullison Jul 28, 2025
ae911bc
removes nested ternary expression
jon-cullison Jul 29, 2025
c3d3c38
adds test
jon-cullison Aug 28, 2025
dc04152
address code rabbit feedback
jon-cullison Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,10 +400,11 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
const focusableElements = getFocusableElements(containerRef.current, elements);

const shouldFocusKey =
mergedActiveKey ??
(focusableElements[0]
? element2key.get(focusableElements[0])
: childList.find(node => !node.props.disabled)?.key);
mergedActiveKey && keys.includes(mergedActiveKey)
? mergedActiveKey
: focusableElements[0]
? element2key.get(focusableElements[0])
: childList.find(node => !node.props.disabled)?.key;

const elementToFocus = key2element.get(shouldFocusKey);

Expand Down
Loading