Skip to content

fix(material/menu): aria-expanded not updating in an OnPush component #26279

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
crisbeto merged 1 commit into from
Jan 3, 2023
Merged

fix(material/menu): aria-expanded not updating in an OnPush component #26279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions src/material/menu/menu-trigger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ import {
import {TemplatePortal} from '@angular/cdk/portal';
import {
AfterContentInit,
ChangeDetectorRef,
Directive,
ElementRef,
EventEmitter,
inject,
Inject,
InjectionToken,
Input,
Expand Down Expand Up @@ -93,6 +95,7 @@ export abstract class _MatMenuTriggerBase implements AfterContentInit, OnDestroy
private _hoverSubscription = Subscription.EMPTY;
private _menuCloseSubscription = Subscription.EMPTY;
private _scrollStrategy: () => ScrollStrategy;
private _changeDetectorRef = inject(ChangeDetectorRef);

/**
* We're specifically looking for a `MatMenu` here since the generic `MatMenuPanel`
Expand Down Expand Up @@ -436,11 +439,15 @@ export abstract class _MatMenuTriggerBase implements AfterContentInit, OnDestroy

// set state rather than toggle to support triggers sharing a menu
private _setIsMenuOpen(isOpen: boolean): void {
this._menuOpen = isOpen;
this._menuOpen ? this.menuOpened.emit() : this.menuClosed.emit();
if (isOpen !== this._menuOpen) {
this._menuOpen = isOpen;
this._menuOpen ? this.menuOpened.emit() : this.menuClosed.emit();

if (this.triggersSubmenu()) {
this._menuItemInstance._setHighlighted(isOpen);
if (this.triggersSubmenu()) {
this._menuItemInstance._setHighlighted(isOpen);
}

this._changeDetectorRef.markForCheck();
}
}

Expand Down
79 changes: 51 additions & 28 deletions src/material/menu/menu.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,6 +897,26 @@ describe('MDC-based MatMenu', () => {
expect(triggerEl.getAttribute('aria-expanded')).toBe('false');
}));

it('should toggle aria-expanded on the trigger in an OnPush component', fakeAsync(() => {
const fixture = createComponent(SimpleMenuOnPush, [], [FakeIcon]);
fixture.detectChanges();
const triggerEl = fixture.componentInstance.triggerEl.nativeElement;

expect(triggerEl.getAttribute('aria-expanded')).toBe('false');

fixture.componentInstance.trigger.openMenu();
fixture.detectChanges();
tick(500);

expect(triggerEl.getAttribute('aria-expanded')).toBe('true');

fixture.componentInstance.trigger.closeMenu();
fixture.detectChanges();
tick(500);

expect(triggerEl.getAttribute('aria-expanded')).toBe('false');
}));

it('should throw if assigning a menu that contains the trigger', fakeAsync(() => {
expect(() => {
const fixture = createComponent(InvalidRecursiveMenu, [], [FakeIcon]);
Expand Down Expand Up @@ -2737,34 +2757,34 @@ describe('MatMenu default overrides', () => {
}));
});

@Component({
template: `
<button
[matMenuTriggerFor]="menu"
[matMenuTriggerRestoreFocus]="restoreFocus"
#triggerEl>Toggle menu</button>
<mat-menu
#menu="matMenu"
[class]="panelClass"
(closed)="closeCallback($event)"
[backdropClass]="backdropClass"
[aria-label]="ariaLabel"
[aria-labelledby]="ariaLabelledby"
[aria-describedby]="ariaDescribedby">

<button mat-menu-item> Item </button>
<button mat-menu-item disabled> Disabled </button>
<button mat-menu-item disableRipple>
<mat-icon>unicorn</mat-icon>
Item with an icon
</button>
<button mat-menu-item>
<span>Item with text inside span</span>
</button>
<button *ngFor="let item of extraItems" mat-menu-item> {{item}} </button>
</mat-menu>
`,
})
const SIMPLE_MENU_TEMPLATE = `
<button
[matMenuTriggerFor]="menu"
[matMenuTriggerRestoreFocus]="restoreFocus"
#triggerEl>Toggle menu</button>
<mat-menu
#menu="matMenu"
[class]="panelClass"
(closed)="closeCallback($event)"
[backdropClass]="backdropClass"
[aria-label]="ariaLabel"
[aria-labelledby]="ariaLabelledby"
[aria-describedby]="ariaDescribedby">

<button mat-menu-item> Item </button>
<button mat-menu-item disabled> Disabled </button>
<button mat-menu-item disableRipple>
<mat-icon>unicorn</mat-icon>
Item with an icon
</button>
<button mat-menu-item>
<span>Item with text inside span</span>
</button>
<button *ngFor="let item of extraItems" mat-menu-item> {{item}} </button>
</mat-menu>
`;

@Component({template: SIMPLE_MENU_TEMPLATE})
class SimpleMenu {
@ViewChild(MatMenuTrigger) trigger: MatMenuTrigger;
@ViewChild('triggerEl') triggerEl: ElementRef<HTMLElement>;
Expand All @@ -2780,6 +2800,9 @@ class SimpleMenu {
ariaDescribedby: string;
}

@Component({template: SIMPLE_MENU_TEMPLATE, changeDetection: ChangeDetectionStrategy.OnPush})
class SimpleMenuOnPush extends SimpleMenu {}

@Component({
template: `
<button [matMenuTriggerFor]="menu" #triggerEl>Toggle menu</button>
Expand Down