corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1841270 - refine focus handling in HidePopover. r=emilio

Browse Source 
Only run focusing steps for previouslyFocusedElement if focus is within the
popover hierarchy.

Differential Revision: https://phabricator.services.mozilla.com/D186439
This commit is contained in:
Ziran Sun
2023-08-21 07:06:13 +00:00
parent 5c27fb9fcf
commit d66cffcec1
2 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dom/html/nsGenericHTMLElement.cpp
View File

@@ -3447,10 +3447,13 @@ void nsGenericHTMLElement::FocusPreviousElementAfterHidingPopover() {
return;
}
// Run the focusing steps for previouslyFocusedElement
FocusOptions options;
options.mPreventScroll = true;
control->Focus(options, CallerType::NonSystem, IgnoreErrors());
// Run the focusing steps for previouslyFocusedElement if focus is within the
// popover hierarchy.
if (IsShadowIncludingInclusiveDescendantOf(control)) {
FocusOptions options;
options.mPreventScroll = true;
control->Focus(options, CallerType::NonSystem, IgnoreErrors());
}
}
// https://html.spec.whatwg.org/multipage/popover.html#dom-togglepopover