fix(menu): set appropriate origin when restoring focus #9303
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
crisbeto
added
pr: needs review
Accessibility
googlebot
added
the
cla: yes
jelbourn
added
pr: lgtm
action: merge
crisbeto
force-pushed
the
9292/menu-focus-origin-restore
branch
from
30cced2 to
b9b329d
Compare
|
Included the |
jelbourn
reviewed
Jan 10, 2018
src/lib/menu/menu-trigger.ts
Outdated
| @@ -208,8 +211,12 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy { | |||
| } | |||
|
|
|||
| /** Focuses the menu trigger. */ | |||
| focus() { | |||
| this._element.nativeElement.focus(); | |||
| focus(origin: FocusOrigin = 'program') { | |||
src/lib/menu/menu-trigger.ts
Outdated
| @@ -274,8 +281,10 @@ export class MatMenuTrigger implements AfterContentInit, OnDestroy { | |||
| // We should reset focus if the user is navigating using a keyboard or | |||
| // if we have a top-level trigger which might cause focus to be lost | |||
| // when clicking on the backdrop. | |||
| if (!this._openedByMouse || !this.triggersSubmenu()) { | |||
| if (!this._openedByMouse) { | |||
| this.focus(); | |||
There was a problem hiding this comment.
Add a comment that focus style will show for both program and keyboard, so we don't have to specify which?
Sets the correct focus origin depending on the way a menu has been opened. Fixes angular#9292.
crisbeto
force-pushed
the
9292/menu-focus-origin-restore
branch
from
b9b329d to
612d98b
Compare
jelbourn
pushed a commit
to jelbourn/components
that referenced
this pull request
Jan 29, 2018
Sets the correct focus origin depending on the way a menu has been opened. Fixes angular#9292.
|
This issue has been automatically locked due to inactivity. Read more about our automatic conversation locking policy. This action has been performed automatically by a bot. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Sets the correct focus origin depending on the way a menu has been opened.
Fixes #9292.