Skip to content

Commit

Permalink
fix(material/menu): clicks on disabled item closing the menu
Browse files Browse the repository at this point in the history
We have some logic to prevent clicks on disabled items from closing the menu. The
problem is that browsers swallow clicks and don't fire their event listeners for disabled
`button` nodes, but not any non-disabled child nodes. In #16696 we made it
consistent so clicks don't land on any of the button's elements, but these changes
fix the underlying issue by binding the event both on the root `button`, and a wrapper
 `span` that's around the content. This way we're guaranteed to hit at least one of the listeners.

These changes also move the event outside the `NgZone` since it doesn't trigger any
changes in the view.

Fixes #19173.
  • Loading branch information
crisbeto committed Apr 24, 2021
1 parent 7cc42f5 commit 828fe76
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 35 deletions.
2 changes: 1 addition & 1 deletion src/material-experimental/mdc-menu/menu-item.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ng-content></ng-content>
<span class="mat-mdc-menu-item-content" #content><ng-content></ng-content></span>
<div class="mat-mdc-menu-ripple" matRipple
[matRippleDisabled]="disableRipple || disabled"
[matRippleTrigger]="_getHostElement()">
Expand Down
11 changes: 5 additions & 6 deletions src/material-experimental/mdc-menu/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@ mat-menu {
text-decoration: none;

&[disabled] {
// Usually every click inside the menu closes it, however some browsers will stop events
// when the user clicks on a disabled item, **except** when the user clicks on a non-disabled
// child node of the disabled button. This is inconsistent because some regions of a disabled
// button will still cause the menu to close and some won't (see #16694). We make the behavior
// more consistent by disabling pointer events and allowing the user to click through.
pointer-events: none;
cursor: default;
}

Expand Down Expand Up @@ -98,6 +92,11 @@ mat-menu {
}
}

.mat-mdc-menu-item-content {
display: flex;
align-items: center;
}

// Renders out a chevron on menu items that trigger a sub-menu.
.mat-mdc-menu-item-submenu-trigger {
@include menu-common.item-submenu-trigger(mdc-list.$deprecated-side-padding);
Expand Down
17 changes: 17 additions & 0 deletions src/material-experimental/mdc-menu/menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -590,6 +590,23 @@ describe('MDC-based MatMenu', () => {
expect(items.every(item => item.getAttribute('role') === 'menuitem')).toBe(true);
});

it('should prevent the default action when clicking on a disabled item', () => {
const fixture = createComponent(SimpleMenu, [], [FakeIcon]);
fixture.detectChanges();
fixture.componentInstance.trigger.openMenu();
fixture.detectChanges();

const item = overlayContainerElement.querySelector('.mat-mdc-menu-item[disabled]')!;
const itemEvent = dispatchFakeEvent(item, 'click');
fixture.detectChanges();
expect(itemEvent.defaultPrevented).toBe(true);

const contentWrapper = item.querySelector('span')!;
const wrapperEvent = dispatchFakeEvent(contentWrapper, 'click');
fixture.detectChanges();
expect(wrapperEvent.defaultPrevented).toBe(true);
});

it('should be able to set an alternate role on the menu items', () => {
const fixture = createComponent(MenuWithCheckboxItems);
fixture.detectChanges();
Expand Down
2 changes: 1 addition & 1 deletion src/material/menu/menu-item.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ng-content></ng-content>
<span #content><ng-content></ng-content></span>
<div class="mat-menu-ripple" matRipple
[matRippleDisabled]="disableRipple || disabled"
[matRippleTrigger]="_getHostElement()">
Expand Down
55 changes: 40 additions & 15 deletions src/material/menu/menu-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ import {
Optional,
Input,
HostListener,
NgZone,
AfterViewInit,
ViewChild,
} from '@angular/core';
import {
CanDisable, CanDisableCtor,
Expand Down Expand Up @@ -63,6 +65,9 @@ export class MatMenuItem extends _MatMenuItemMixinBase
/** ARIA role for the menu item. */
@Input() role: 'menuitem' | 'menuitemradio' | 'menuitemcheckbox' = 'menuitem';

/** Reference to the element wrapping the projected content. */
@ViewChild('content') _content: ElementRef<HTMLElement> | undefined;

/** Stream that emits when the menu item is hovered. */
readonly _hovered: Subject<MatMenuItem> = new Subject<MatMenuItem>();

Expand All @@ -83,9 +88,11 @@ export class MatMenuItem extends _MatMenuItemMixinBase
*/
@Inject(DOCUMENT) _document?: any,
private _focusMonitor?: FocusMonitor,
@Inject(MAT_MENU_PANEL) @Optional() public _parentMenu?: MatMenuPanel<MatMenuItem>) {
@Inject(MAT_MENU_PANEL) @Optional() public _parentMenu?: MatMenuPanel<MatMenuItem>,
private _ngZone?: NgZone) {

// @breaking-change 8.0.0 make `_focusMonitor` and `document` required params.
// @breaking-change 11.0.0 make `_ngZone` a required parameter.
super();

if (_parentMenu && _parentMenu.addItem) {
Expand All @@ -111,6 +118,13 @@ export class MatMenuItem extends _MatMenuItemMixinBase
// mouse or touch interaction.
this._focusMonitor.monitor(this._elementRef, false);
}

// @breaking-change 11.0.0 Remove null check for `_ngZone`.
if (this._ngZone) {
this._ngZone.runOutsideAngular(() => this._bindDisabledClickEvents());
} else {
this._bindDisabledClickEvents();
}
}

ngOnDestroy() {
Expand All @@ -122,6 +136,11 @@ export class MatMenuItem extends _MatMenuItemMixinBase
this._parentMenu.removeItem(this);
}

this._elementRef.nativeElement.removeEventListener('click', this._preventDisabledClicks);
if (this._content) {
this._content.nativeElement.removeEventListener('click', this._preventDisabledClicks);
}

this._hovered.complete();
this._focused.complete();
}
Expand All @@ -136,20 +155,6 @@ export class MatMenuItem extends _MatMenuItemMixinBase
return this._elementRef.nativeElement;
}

/** Prevents the default element actions if it is disabled. */
// We have to use a `HostListener` here in order to support both Ivy and ViewEngine.
// In Ivy the `host` bindings will be merged when this class is extended, whereas in
// ViewEngine they're overwritten.
// TODO(crisbeto): we move this back into `host` once Ivy is turned on by default.
// tslint:disable-next-line:no-host-decorator-in-concrete
@HostListener('click', ['$event'])
_checkDisabled(event: Event): void {
if (this.disabled) {
event.preventDefault();
event.stopPropagation();
}
}

/** Emits to the hover stream. */
// We have to use a `HostListener` here in order to support both Ivy and ViewEngine.
// In Ivy the `host` bindings will be merged when this class is extended, whereas in
Expand All @@ -175,6 +180,26 @@ export class MatMenuItem extends _MatMenuItemMixinBase
return clone.textContent?.trim() || '';
}

/** Binds the click events that prevent the default actions while disabled. */
private _bindDisabledClickEvents() {
// We need to bind this event both on the root node and the content wrapper, because browsers
// won't dispatch events on disabled `button` nodes, but they'll still be dispatched if the
// user interacts with a non-disabled child of the button. This means that can get regions
// inside a disabled menu item where clicks land and others where they don't.
this._elementRef.nativeElement.addEventListener('click', this._preventDisabledClicks);
if (this._content) {
this._content.nativeElement.addEventListener('click', this._preventDisabledClicks);
}
}

/** Prevents the default click action if the menu item is disabled. */
private _preventDisabledClicks = (event: Event) => {
if (this.disabled) {
event.preventDefault();
event.stopPropagation();
}
}

static ngAcceptInputType_disabled: BooleanInput;
static ngAcceptInputType_disableRipple: BooleanInput;
}
9 changes: 0 additions & 9 deletions src/material/menu/menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,6 @@ mat-menu {
@include menu-common.item-base();
position: relative;

&[disabled] {
// Usually every click inside the menu closes it, however some browsers will stop events
// when the user clicks on a disabled item, **except** when the user clicks on a non-disabled
// child node of the disabled button. This is inconsistent because some regions of a disabled
// button will still cause the menu to close and some won't (see #16694). We make the behavior
// more consistent by disabling pointer events and allowing the user to click through.
pointer-events: none;
}

@include a11y.high-contrast(active, off) {
$outline-width: 1px;

Expand Down
17 changes: 17 additions & 0 deletions src/material/menu/menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,23 @@ describe('MatMenu', () => {
expect(items.every(item => item.getAttribute('role') === 'menuitem')).toBe(true);
});

it('should prevent the default action when clicking on a disabled item', () => {
const fixture = createComponent(SimpleMenu, [], [FakeIcon]);
fixture.detectChanges();
fixture.componentInstance.trigger.openMenu();
fixture.detectChanges();

const item = overlayContainerElement.querySelector('.mat-menu-item[disabled]')!;
const itemEvent = dispatchFakeEvent(item, 'click');
fixture.detectChanges();
expect(itemEvent.defaultPrevented).toBe(true);

const contentWrapper = item.querySelector('span')!;
const wrapperEvent = dispatchFakeEvent(contentWrapper, 'click');
fixture.detectChanges();
expect(wrapperEvent.defaultPrevented).toBe(true);
});

it('should be able to set an alternate role on the menu items', () => {
const fixture = createComponent(MenuWithCheckboxItems);
fixture.detectChanges();
Expand Down
6 changes: 3 additions & 3 deletions tools/public_api_guard/material/menu.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ export interface MatMenuDefaultOptions {
}

export declare class MatMenuItem extends _MatMenuItemMixinBase implements FocusableOption, CanDisable, CanDisableRipple, AfterViewInit, OnDestroy {
_content: ElementRef<HTMLElement> | undefined;
readonly _focused: Subject<MatMenuItem>;
_highlighted: boolean;
readonly _hovered: Subject<MatMenuItem>;
_parentMenu?: MatMenuPanel<MatMenuItem> | undefined;
_triggersSubmenu: boolean;
role: 'menuitem' | 'menuitemradio' | 'menuitemcheckbox';
constructor(_elementRef: ElementRef<HTMLElement>,
_document?: any, _focusMonitor?: FocusMonitor | undefined, _parentMenu?: MatMenuPanel<MatMenuItem> | undefined);
_checkDisabled(event: Event): void;
_document?: any, _focusMonitor?: FocusMonitor | undefined, _parentMenu?: MatMenuPanel<MatMenuItem> | undefined, _ngZone?: NgZone | undefined);
_getHostElement(): HTMLElement;
_getTabIndex(): string;
_handleMouseEnter(): void;
Expand All @@ -118,7 +118,7 @@ export declare class MatMenuItem extends _MatMenuItemMixinBase implements Focusa
static ngAcceptInputType_disableRipple: BooleanInput;
static ngAcceptInputType_disabled: BooleanInput;
static ɵcmp: i0.ɵɵComponentDeclaration<MatMenuItem, "[mat-menu-item]", ["matMenuItem"], { "disabled": "disabled"; "disableRipple": "disableRipple"; "role": "role"; }, {}, never, ["*"]>;
static ɵfac: i0.ɵɵFactoryDeclaration<MatMenuItem, [null, null, null, { optional: true; }]>;
static ɵfac: i0.ɵɵFactoryDeclaration<MatMenuItem, [null, null, null, { optional: true; }, null]>;
}

export declare class MatMenuModule {
Expand Down

0 comments on commit 828fe76

Please sign in to comment.