Skip to content
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

fix(dialog): don't move focus if it was moved during close animation #17300

Merged
merged 1 commit into from Oct 18, 2019

Conversation

crisbeto
Copy link
Member

@crisbeto crisbeto commented Oct 5, 2019

Currently we restore focus to the previously-focused element once the dialog's exit animation has completed, however this can override any focus management the consumer might have done while the animation was running. These changes add extra check so that we only move focus if it was inside the dialog at the end of the animation.

Fixes #17296.

@crisbeto crisbeto added P3 An issue that is relevant to core functions, but does not impede progress. Important, but not urgent target: patch This PR is targeted for the next patch release labels Oct 5, 2019
@googlebot googlebot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Oct 5, 2019
@crisbeto crisbeto force-pushed the 17296/dialog-focus-restore branch 2 times, most recently from 81aa654 to 49c4979 Compare October 5, 2019 11:37
Currently we restore focus to the previously-focused element once the dialog's exit animation has completed, however this can override any focus management the consumer might have done while the animation was running. These changes add extra check so that we only move focus if it was inside the dialog at the end of the animation.

Fixes angular#17296.
Copy link
Member

@jelbourn jelbourn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jelbourn jelbourn added pr: lgtm action: merge The PR is ready for merge by the caretaker labels Oct 7, 2019
crisbeto added a commit to crisbeto/material2 that referenced this pull request Oct 7, 2019
…uring close animation

Along the same lines as angular#17300. Restores focus only if focus is inside the dialog at the time the exit animation has finished. This avoids overriding focus that was moved while the dialog is animating away.
crisbeto added a commit to crisbeto/material2 that referenced this pull request Oct 7, 2019
… close animation

Along the same lines as angular#17300. Restores focus only if focus is inside the dialog at the time the exit animation has finished. This avoids overriding focus that was moved while the dialog is animating away.
mmalerba pushed a commit that referenced this pull request Oct 8, 2019
… close animation (#17320)

Along the same lines as #17300. Restores focus only if focus is inside the dialog at the time the exit animation has finished. This avoids overriding focus that was moved while the dialog is animating away.
@mmalerba mmalerba merged commit 3476f51 into angular:master Oct 18, 2019
crisbeto added a commit to crisbeto/material2 that referenced this pull request Nov 15, 2019
…ation

Currently we restore focus to the previously-focused element once the bottom sheet's exit animation has completed, however this can override any focus management the consumer might have done while the animation was running. These changes add extra check so that we only move focus if it was inside the bottom sheet at the end of the animation.

Along the same lines as angular#17300.
@angular-automatic-lock-bot
Copy link

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot bot locked and limited conversation to collaborators Nov 18, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
action: merge The PR is ready for merge by the caretaker cla: yes PR author has agreed to Google's Contributor License Agreement P3 An issue that is relevant to core functions, but does not impede progress. Important, but not urgent target: patch This PR is targeted for the next patch release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Dialog should not restore focus when it doesn't have the focus anymore
4 participants