Skip to content

feat(material/menu): allow focus origin to be optional input in focus method #20907

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
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
4 changes: 2 additions & 2 deletions src/material/menu/menu-item.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ export class MatMenuItem extends _MatMenuItemMixinBase
}

/** Focuses the menu item. */
focus(origin: FocusOrigin = 'program', options?: FocusOptions): void {
if (this._focusMonitor) {
focus(origin?: FocusOrigin, options?: FocusOptions): void {
if (this._focusMonitor && origin) {
this._focusMonitor.focusVia(this._getHostElement(), origin, options);
} else {
this._getHostElement().focus(options);
Expand Down
4 changes: 2 additions & 2 deletions src/material/menu/menu-trigger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy {
* Focuses the menu trigger.
* @param origin Source of the menu trigger's focus.
*/
focus(origin: FocusOrigin = 'program', options?: FocusOptions) {
if (this._focusMonitor) {
focus(origin?: FocusOrigin, options?: FocusOptions) {
if (this._focusMonitor && origin) {
this._focusMonitor.focusVia(this._element, origin, options);
} else {
this._element.nativeElement.focus(options);
Expand Down
37 changes: 37 additions & 0 deletions src/material/menu/menu.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,25 @@ describe('MatMenu', () => {
expect(items.every(item => item.getAttribute('role') === 'menuitemcheckbox')).toBe(true);
});

it('should not change focus origin if origin not specified for menu items', () => {
const fixture = createComponent(MenuWithCheckboxItems);
fixture.detectChanges();
fixture.componentInstance.trigger.openMenu();
fixture.detectChanges();

let [firstMenuItemDebugEl, secondMenuItemDebugEl] =
fixture.debugElement.queryAll(By.css('.mat-menu-item'))!;

const firstMenuItemInstance = firstMenuItemDebugEl.componentInstance as MatMenuItem;
const secondMenuItemInstance = secondMenuItemDebugEl.componentInstance as MatMenuItem;

firstMenuItemInstance.focus('mouse');
secondMenuItemInstance.focus();

expect(secondMenuItemDebugEl.nativeElement.classList).toContain('cdk-focused');
expect(secondMenuItemDebugEl.nativeElement.classList).toContain('cdk-mouse-focused');
});

it('should not throw an error on destroy', () => {
const fixture = createComponent(SimpleMenu, [], [FakeIcon]);
expect(fixture.destroy.bind(fixture)).not.toThrow();
Expand Down Expand Up @@ -2006,6 +2025,24 @@ describe('MatMenu', () => {
.toContain('mat-elevation-z4', 'Expected menu to have the proper updated elevation.');
}));

it('should not change focus origin if origin not specified for menu trigger',
fakeAsync(() => {
compileTestComponent();

instance.levelOneTrigger.openMenu();
instance.levelOneTrigger.focus('mouse');
fixture.detectChanges();

instance.levelTwoTrigger.focus();
fixture.detectChanges();
tick(500);

const levelTwoTrigger = overlay.querySelector('#level-two-trigger')! as HTMLElement;

expect(levelTwoTrigger.classList).toContain('cdk-focused');
expect(levelTwoTrigger.classList).toContain('cdk-mouse-focused');
}));

it('should not increase the elevation if the user specified a custom one', () => {
const elevationFixture = createComponent(NestedMenuCustomElevation);

Expand Down