Skip to content

fix: Make Menu openOnHover prop work again #24899

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
behowell merged 2 commits into from
Sep 23, 2022
Merged

fix: Make Menu openOnHover prop work again #24899

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
4617f57
fix: Make Menu openOnHover prop work again
behowell Sep 21, 2022
0baf43c
Add openOnHover cypress test
behowell Sep 22, 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-5eeb5c9b-a02e-4d75-aeee-9e9fd45a5aac.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: Make Menu openOnHover prop work again",
"packageName": "@fluentui/react-menu",
"email": "[email protected]",
"dependentChangeType": "patch"
}
22 changes: 22 additions & 0 deletions 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 @@ -51,6 +51,28 @@ describe('MenuTrigger', () => {
.should('be.focused');
});

it('should open menu on hover if openOnHover is set', () => {
mount(
<Menu openOnHover hoverDelay={1}>
<MenuTrigger>
<button>Menu</button>
</MenuTrigger>
<MenuPopover>
<MenuList>
<MenuItem>Item</MenuItem>
</MenuList>
</MenuPopover>
</Menu>,
);
cy.get(menuTriggerSelector)
.realHover()
.wait(1)
.get(menuSelector)
.should('be.visible')
.get(menuItemSelector)
.should('be.focused');
});

it('should close menu on escape when focus is on the trigger', () => {
mount(
<Menu>
Expand Down
5 changes: 3 additions & 2 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 @@ -25,6 +25,7 @@ import { Tab } from '@fluentui/keyboard-keys';
* @param props - props from this instance of Menu
*/
export const useMenu_unstable = (props: MenuProps): MenuState => {
const isSubmenu = useIsSubmenu();
const {
hoverDelay = 500,
inline = false,
Expand All @@ -33,10 +34,10 @@ export const useMenu_unstable = (props: MenuProps): MenuState => {
closeOnScroll = false,
openOnContext = false,
persistOnItemClick = false,
openOnHover = isSubmenu,
defaultCheckedValues,
} = props;
const triggerId = useId('menu');
const isSubmenu = useIsSubmenu();
const [contextTarget, setContextTarget] = usePositioningMouseTarget();

const positioningState = {
Expand Down Expand Up @@ -96,7 +97,7 @@ export const useMenu_unstable = (props: MenuProps): MenuState => {
hoverDelay,
triggerId,
isSubmenu,
openOnHover: isSubmenu,
openOnHover,
contextTarget,
setContextTarget,
hasCheckmarks,
Expand Down