Skip to content

fix(material/menu): update submenu indication when menu is assigned #25608

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.

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
merged 1 commit into from
Sep 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions src/material/legacy-menu/menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2304,6 +2304,12 @@ describe('MatMenu', () => {
expect(menuItems[0].querySelector('.mat-menu-submenu-icon')).toBeTruthy();
expect(menuItems[1].classList).not.toContain('mat-menu-item-submenu-trigger');
expect(menuItems[1].querySelector('.mat-menu-submenu-icon')).toBeFalsy();

instance.levelOneTrigger.menu = null;
fixture.detectChanges();

expect(menuItems[0].classList).not.toContain('mat-menu-item-submenu-trigger');
expect(menuItems[0].querySelector('.mat-menu-submenu-icon')).toBeFalsy();
}));

it('should increase the sub-menu elevation based on its depth', fakeAsync(() => {
Expand Down
6 changes: 6 additions & 0 deletions src/material/menu/menu-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,12 @@ export class MatMenuItem
this._changeDetectorRef?.markForCheck();
}

_setTriggersSubmenu(triggersSubmenu: boolean) {
// @breaking-change 12.0.0 Remove null check for `_changeDetectorRef`.
this._triggersSubmenu = triggersSubmenu;
this._changeDetectorRef?.markForCheck();
}

_hasFocus(): boolean {
return this._document && this._document.activeElement === this._getHostElement();
}
Expand Down
8 changes: 3 additions & 5 deletions src/material/menu/menu-trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ export abstract class _MatMenuTriggerBase implements AfterContentInit, OnDestroy
}
});
}

this._menuItemInstance?._setTriggersSubmenu(this.triggersSubmenu());
}
private _menu: MatMenuPanel | null;

Expand Down Expand Up @@ -257,10 +259,6 @@ export abstract class _MatMenuTriggerBase implements AfterContentInit, OnDestroy
this._handleTouchStart,
passiveEventListenerOptions,
);

if (_menuItemInstance) {
_menuItemInstance._triggersSubmenu = this.triggersSubmenu();
}
}

ngAfterContentInit() {
Expand Down Expand Up @@ -296,7 +294,7 @@ export abstract class _MatMenuTriggerBase implements AfterContentInit, OnDestroy

/** Whether the menu triggers a sub-menu or a top-level one. */
triggersSubmenu(): boolean {
return !!(this._menuItemInstance && this._parentMaterialMenu);
return !!(this._menuItemInstance && this._parentMaterialMenu && this.menu);
}

/** Toggles the menu between the open and closed states. */
Expand Down
6 changes: 6 additions & 0 deletions src/material/menu/menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2315,6 +2315,12 @@ describe('MDC-based MatMenu', () => {
expect(menuItems[0].querySelector('.mat-mdc-menu-submenu-icon')).toBeTruthy();
expect(menuItems[1].classList).not.toContain('mat-mdc-menu-item-submenu-trigger');
expect(menuItems[1].querySelector('.mat-mdc-menu-submenu-icon')).toBeFalsy();

instance.levelOneTrigger.menu = null;
fixture.detectChanges();

expect(menuItems[0].classList).not.toContain('mat-mdc-menu-item-submenu-trigger');
expect(menuItems[0].querySelector('.mat-mdc-menu-submenu-icon')).toBeFalsy();
}));

it('should increase the sub-menu elevation based on its depth', fakeAsync(() => {
Expand Down
2 changes: 2 additions & 0 deletions tools/public_api_guard/material/menu.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,8 @@ export class MatMenuItem extends _MatMenuItemBase implements FocusableOption, Ca
role: 'menuitem' | 'menuitemradio' | 'menuitemcheckbox';
// (undocumented)
_setHighlighted(isHighlighted: boolean): void;
// (undocumented)
_setTriggersSubmenu(triggersSubmenu: boolean): void;
_triggersSubmenu: boolean;
// (undocumented)
static ɵcmp: i0.ɵɵComponentDeclaration<MatMenuItem, "[mat-menu-item]", ["matMenuItem"], { "disabled": "disabled"; "disableRipple": "disableRipple"; "role": "role"; }, {}, never, ["mat-icon", "*"], false>;
Expand Down