Skip to content

fix: Context menu close should restore focus #29290

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 4 commits into from
Sep 26, 2023
Merged

fix: Context menu close should restore focus #29290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53bfdae
fix: Context menu close should restore focus
ling1726 Sep 26, 2023
83be859
changefile
ling1726 Sep 26, 2023
f7391d6
revert
ling1726 Sep 26, 2023
b92fd5d
revert
ling1726 Sep 26, 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
7 changes: 7 additions & 0 deletions change/@fluentui-react-menu-afb66643-49cf-4a58-a947-2645694572a3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Context menu close should restore focus",
"packageName": "@fluentui/react-menu",
"email": "[email protected]",
"dependentChangeType": "patch"
}
21 changes: 19 additions & 2 deletions packages/react-components/react-menu/src/components/Menu/Menu.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,9 @@ describe('Context menu', () => {
.get(menuTriggerSelector)
.click()
.get(menuSelector)
.should('not.exist');
.should('not.exist')
.get(menuTriggerSelector)
.should('have.focus');
});

it('should close on scroll outside', () => {
Expand All @@ -1081,6 +1083,21 @@ describe('Context menu', () => {
.get('body')
.trigger('wheel')
.get(menuSelector)
.should('not.exist');
.should('not.exist')
.get(menuTriggerSelector)
.should('have.focus');
});

it('should restore focus on escape', () => {
mount(<ContextMenuExample />);
cy.get(menuTriggerSelector)
.rightclick()
.get(menuSelector)
.should('exist')
.focused()
.type('{esc}')
.should('not.exist')
.get(menuTriggerSelector)
.should('have.focus');
});
});
2 changes: 1 addition & 1 deletion packages/react-components/react-menu/src/components/MenuTrigger/useMenuTrigger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ export const useMenuTrigger_unstable = (props: MenuTriggerProps): MenuTriggerSta
id: triggerId,
...child?.props,
ref: useMergedRefs(triggerRef, child?.ref),
...restoreFocusTargetAttribute,
onMouseEnter: useEventCallback(mergeCallbacks(child?.props.onMouseEnter, onMouseEnter)),
onMouseLeave: useEventCallback(mergeCallbacks(child?.props.onMouseLeave, onMouseLeave)),
onContextMenu: useEventCallback(mergeCallbacks(child?.props.onContextMenu, onContextMenu)),
Expand All @@ -136,7 +137,6 @@ export const useMenuTrigger_unstable = (props: MenuTriggerProps): MenuTriggerSta
const triggerChildProps = {
'aria-haspopup': 'menu',
'aria-expanded': !open && !isSubmenu ? undefined : open,
...restoreFocusTargetAttribute,
...contextMenuProps,
onClick: useEventCallback(mergeCallbacks(child?.props.onClick, onClick)),
onKeyDown: useEventCallback(mergeCallbacks(child?.props.onKeyDown, onKeyDown)),
Expand Down