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(material/datepicker): focus restoration not working inside shadow dom #21796

Merged
merged 1 commit into from
Feb 9, 2021

Conversation

crisbeto
Copy link
Member

@crisbeto crisbeto commented Feb 3, 2021

Our focus restoration works by checking document.activeElement before the panel is opened and restoring to that element on close. The problem is that activeElement will return the shadow root, if the focused element is inside one.

These changes add some extra logic to account for it.

Fixes #21785.

… dom

Our focus restoration works by checking `document.activeElement` before the
panel is opened and restoring to that element on close. The problem is that
`activeElement` will return the shadow root, if the focused element is inside one.

These changes add some extra logic to account for it.

Fixes angular#21785.
@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 Feb 3, 2021
@google-cla google-cla bot added the cla: yes PR author has agreed to Google's Contributor License Agreement label Feb 3, 2021
crisbeto added a commit to crisbeto/material2 that referenced this pull request Feb 4, 2021
Related to angular#21796. The dialog focus restoration works by grabbing
`document.activeElement` before the dialog is opened and restoring focus to
the element on destroy.  This won't work if the element is inside the shadow DOM,
because the browser will return the shadow root. These changes add a workaround.
Copy link
Contributor

@mmalerba mmalerba left a comment

Choose a reason for hiding this comment

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

LGTM

@mmalerba mmalerba added the action: merge The PR is ready for merge by the caretaker label Feb 4, 2021
@annieyw annieyw added target: minor This PR is targeted for the next minor release and removed target: patch This PR is targeted for the next patch release labels Feb 9, 2021
@annieyw annieyw merged commit 85d8de9 into angular:master Feb 9, 2021
crisbeto added a commit to crisbeto/material2 that referenced this pull request Feb 21, 2021
…ow dom

Related to angular#21796. The bottom sheet focus restoration works by grabbing `document.activeElement`
before the sheet is opened and restoring focus to the element on destroy. This won't work if the
element is inside the shadow DOM, because the browser will return the shadow root.
These changes add a workaround.
andrewseguin pushed a commit that referenced this pull request Feb 23, 2021
…ow dom (#21975)

Related to #21796. The bottom sheet focus restoration works by grabbing `document.activeElement`
before the sheet is opened and restoring focus to the element on destroy. This won't work if the
element is inside the shadow DOM, because the browser will return the shadow root.
These changes add a workaround.
andrewseguin pushed a commit that referenced this pull request Feb 23, 2021
…ow dom (#21975)

Related to #21796. The bottom sheet focus restoration works by grabbing `document.activeElement`
before the sheet is opened and restoring focus to the element on destroy. This won't work if the
element is inside the shadow DOM, because the browser will return the shadow root.
These changes add a workaround.

(cherry picked from commit 7044153)
annieyw pushed a commit that referenced this pull request Mar 5, 2021
…#21811)

Related to #21796. The dialog focus restoration works by grabbing
`document.activeElement` before the dialog is opened and restoring focus to
the element on destroy.  This won't work if the element is inside the shadow DOM,
because the browser will return the shadow root. These changes add a workaround.
annieyw pushed a commit that referenced this pull request Mar 5, 2021
…#21811)

Related to #21796. The dialog focus restoration works by grabbing
`document.activeElement` before the dialog is opened and restoring focus to
the element on destroy.  This won't work if the element is inside the shadow DOM,
because the browser will return the shadow root. These changes add a workaround.

(cherry picked from commit be508da)
@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 Mar 12, 2021
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: minor This PR is targeted for the next minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bug(DatePicker): Focus Handling does not work with Shadow DOM
3 participants