Skip to content

fix: wrong focus behavior when configuring menu selectability #818

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

fix: wrong focus behavior when configuring menu selectability #818

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
935b711
fix: wrong focus behavior when configuring menu selectability
Oct 17, 2025
27b456e
fix: focus the first selected item if an item is already selected
Oct 17, 2025
5a55a01
test: add unit tests for focus scenarios with and without selection s…
Oct 17, 2025
8e64124
test: update unit tests
Oct 17, 2025
759581f
feat: optimize code
Oct 23, 2025
62360b5
feat: verify whether the selected item is focusable
Oct 23, 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
23 changes: 17 additions & 6 deletions src/Menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,14 +394,22 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
const keys = getKeys();
const { elements, key2element, element2key } = refreshElements(keys, uuid);
const focusableElements = getFocusableElements(containerRef.current, elements);

const defaultFocusKey = focusableElements[0]
? element2key.get(focusableElements[0])
: childList.find(node => !node.props.disabled)?.key;
let shouldFocusKey: string;
if (mergedActiveKey && keys.includes(mergedActiveKey)) {
shouldFocusKey = mergedActiveKey;
// find the item to focus on based on whether it is selectable.
if (selectable) {
// if there is already a selected item, do not apply the focus.
if (!getMergedSelectKeys()?.length) {
if (mergedActiveKey && keys.includes(mergedActiveKey)) {
shouldFocusKey = mergedActiveKey;
} else {
shouldFocusKey = defaultFocusKey;
}
}
} else {
shouldFocusKey = focusableElements[0]
? element2key.get(focusableElements[0])
: childList.find(node => !node.props.disabled)?.key;
shouldFocusKey = defaultFocusKey;
}
const elementToFocus = key2element.get(shouldFocusKey);

Expand Down Expand Up @@ -434,6 +442,9 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {

return [internalSelectKeys];
}, [internalSelectKeys]);
function getMergedSelectKeys() {
return mergedSelectKeys;
}

// >>>>> Trigger select
const triggerSelection = (info: MenuInfo) => {
Expand Down