Skip to content

fix: Menu trigger should be focused when menu is closed with keyboard #25165

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
ling1726 merged 2 commits into from
Oct 11, 2022
Merged

fix: Menu trigger should be focused when menu is closed with keyboard #25165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f6fa5a
fix: Menu trigger should be focused when menu is closed with keyboard
ling1726 Oct 11, 2022
f199475
changefile
ling1726 Oct 11, 2022
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
7 changes: 7 additions & 0 deletions change/@fluentui-react-menu-5b06dfa2-a4e0-4c1c-8a7b-0784fe888b03.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Menu trigger should be focused when menu is closed with keyboard",
"packageName": "@fluentui/react-menu",
"email": "[email protected]",
"dependentChangeType": "patch"
}
9 changes: 8 additions & 1 deletion packages/react-components/react-menu/e2e/Menu.e2e.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,14 @@ describe('Menu', () => {
</MenuPopover>
</Menu>,
);
cy.get(menuTriggerSelector).click().focused().type('{esc}').get(menuSelector).should('not.exist');
cy.get(menuTriggerSelector)
.click()
.focused()
.type('{esc}')
.get(menuSelector)
.should('not.exist')
.get(menuTriggerSelector)
Copy link
Contributor Author

@ling1726 ling1726 Oct 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These situations should now be caught with tests

.should('be.focused');
});

it('should be dismissed on outside click', () => {
Expand Down
8 changes: 5 additions & 3 deletions packages/react-components/react-menu/src/components/Menu/useMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,12 @@ const useMenuOpenState = (
state.setContextTarget(undefined);
}

if (e.type === 'keydown' && (e as React.KeyboardEvent<HTMLElement>).key === Tab) {
if (e.type === 'keydown') {
shouldHandleKeyboardRef.current = true;
shouldHandleTabRef.current = true;
pressedShiftRef.current = (e as React.KeyboardEvent<HTMLElement>).shiftKey;
if ((e as React.KeyboardEvent<HTMLElement>).key === Tab) {
shouldHandleTabRef.current = true;
pressedShiftRef.current = (e as React.KeyboardEvent<HTMLElement>).shiftKey;
}
}

if (data.bubble) {
Expand Down