Skip to content

Commit

Permalink
bugfix: disable menu opening if contextmenu event is prevented (#28718)
Browse files Browse the repository at this point in the history
  • Loading branch information
bsunderhus committed Aug 3, 2023
1 parent a5aa130 commit 44b1282
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "bugfix: disable menu opening if contextmenu event is prevented",
"packageName": "@fluentui/react-menu",
"email": "bernardo.sunderhus@gmail.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,14 @@ describe('Context menu', () => {
cy.get(menuTriggerSelector).rightclick().get(menuSelector).should('exist');
});

it('should not open if event is prevented', () => {
mount(<ContextMenuExample />);
cy.get(menuTriggerSelector).then(([trigger]) => {
trigger.addEventListener('contextmenu', e => e.preventDefault(), { capture: true, once: true });
});
cy.get(menuTriggerSelector).rightclick().get(menuSelector).should('not.exist');
});

it('should close when the trigger is clicked', () => {
mount(<ContextMenuExample />);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const useMenuTrigger_unstable = (props: MenuTriggerProps): MenuTriggerSta
const child = getTriggerChild(children);

const onContextMenu = (event: React.MouseEvent<HTMLButtonElement & HTMLAnchorElement & HTMLDivElement>) => {
if (isTargetDisabled(event)) {
if (isTargetDisabled(event) || event.isDefaultPrevented()) {
return;
}

Expand Down

0 comments on commit 44b1282

Please sign in to comment.