Skip to content
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

Jump to bottom

fix(menu): focus first item when opened #13277

Merged
merged 2 commits into from
Mar 9, 2023
Merged

fix(menu): focus first item when opened #13277

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b41d3bb
fix(menu): focus first item when opened
janhassel Mar 2, 2023
36e275c
Merge branch 'main' into 13265
kodiakhq[bot] Mar 9, 2023
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
58 changes: 35 additions & 23 deletions packages/react/src/components/Menu/Menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const Menu = React.forwardRef(function Menu(

const [position, setPosition] = useState([-1, -1]);
const focusableItems = childContext.state.items.filter(
(item) => !item.disabled
(item) => !item.disabled && item.ref.current
);

function returnFocus() {
Expand All @@ -80,7 +80,6 @@ const Menu = React.forwardRef(function Menu(
if (menu.current) {
focusReturn.current = document.activeElement;
setPosition(calculatePosition());
menu.current.focus();
}
}

Expand All @@ -101,11 +100,6 @@ const Menu = React.forwardRef(function Menu(
function handleKeyDown(e) {
e.stopPropagation();

const currentItem = focusableItems.findIndex((item) =>
item.ref.current.contains(document.activeElement)
);
let indexToFocus = currentItem;

// if the user presses escape or this is a submenu
// and the user presses ArrowLeft, close it
if (
Expand All @@ -114,28 +108,39 @@ const Menu = React.forwardRef(function Menu(
) {
handleClose(e);
} else {
// if currentItem is -1, the menu itself is focused.
// in this case, the arrow keys define the first item
// to be focused.
focusItem(e);
}
}

function focusItem(e) {
const currentItem = focusableItems.findIndex((item) =>
item.ref.current.contains(document.activeElement)
);
let indexToFocus = currentItem;

// if currentItem is -1, no menu item is focused yet.
// in this case, the first item should receive focus.
if (currentItem === -1) {
indexToFocus = 0;
} else if (e) {
if (match(e, keys.ArrowUp)) {
indexToFocus =
currentItem === -1 ? focusableItems.length - 1 : indexToFocus - 1;
indexToFocus = indexToFocus - 1;
}
if (match(e, keys.ArrowDown)) {
indexToFocus = currentItem === -1 ? 0 : indexToFocus + 1;
indexToFocus = indexToFocus + 1;
}
}

if (indexToFocus < 0) {
indexToFocus = 0;
}
if (indexToFocus >= focusableItems.length) {
indexToFocus = focusableItems.length - 1;
}
if (indexToFocus < 0) {
indexToFocus = focusableItems.length - 1;
}
if (indexToFocus >= focusableItems.length) {
indexToFocus = 0;
}

if (indexToFocus !== currentItem) {
const nodeToFocus = focusableItems[indexToFocus];
nodeToFocus.ref.current.focus();
}
if (indexToFocus !== currentItem) {
const nodeToFocus = focusableItems[indexToFocus];
nodeToFocus.ref.current.focus();
}
}

Expand Down Expand Up @@ -198,6 +203,13 @@ const Menu = React.forwardRef(function Menu(
return [-1, -1];
}

useEffect(() => {
if (open && focusableItems.length > 0) {
focusItem();
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [open, focusableItems]);

useEffect(() => {
if (open) {
handleOpen();
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/components/Menu/MenuItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ const MenuItem = React.forwardRef(function MenuItem(
function handleKeyDown(e) {
if (hasChildren && match(e, keys.ArrowRight)) {
openSubmenu();
e.stopPropagation();
}

if (match(e, keys.Enter) || match(e, keys.Space)) {
Expand Down