fix(Popover): fix autoFocus on target focus #6991
Open
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
Generate changelog in
|
bvandercar-vt
changed the title
bvandercar-vt
changed the title
bvandercar-vt
changed the title
bvandercar-vt
force-pushed
the
bvandercar/fix-overlay-autoFocus
branch
from
acbe513 to
cd0115d
Compare
bvandercar-vt
changed the title
bvandercar-vt
force-pushed
the
bvandercar/fix-overlay-autoFocus
branch
from
2e257b0 to
5f358d2
Compare
bvandercar-vt
force-pushed
the
bvandercar/fix-overlay-autoFocus
branch
from
5f358d2 to
613911f
Compare
bvandercar-vt
commented
Jan 27, 2025
| @@ -215,18 +215,11 @@ export class Overlay extends AbstractPureComponent<OverlayProps, OverlayState> { | |||
| } | |||
|
|
|||
| // decorate the child with a few injected props | |||
| const tabIndex = this.props.enforceFocus || this.props.autoFocus ? 0 : undefined; | |||
There was a problem hiding this comment.
This tabIndex={0} doesn't do anything because it's not on an interactive element. And autoFocus brings focus to startFocusTrapElement, not this element.
| @@ -290,7 +283,7 @@ export class Overlay extends AbstractPureComponent<OverlayProps, OverlayState> { | |||
| * the `startFocusTrapElement`), depending on whether the element losing focus is inside the | |||
| * Overlay. | |||
| */ | |||
| private handleStartFocusTrapElementFocus = (e: React.FocusEvent<HTMLDivElement>) => { | |||
There was a problem hiding this comment.
can cast relatedTarget type using the 2nd param
| @@ -408,7 +408,6 @@ export const Overlay2 = React.forwardRef<OverlayInstance, Overlay2Props>((props, | |||
| // IMPORTANT: only inject our ref if the user didn't specify childRef or childRefs already. Otherwise, | |||
| // we risk clobbering the user's ref (which we cannot inspect here while cloning/decorating the child). | |||
| ref: userChildRef === undefined ? localChildRef : undefined, | |||
| tabIndex: enforceFocus || autoFocus ? 0 : undefined, | |||
There was a problem hiding this comment.
This tabIndex={0} doesn't do anything because it's not on an interactive element. And autoFocus brings focus to startFocusTrapElement, not this element.
| // popover open. | ||
| if ( | ||
| e.relatedTarget !== this.popoverElement && | ||
| !this.isElementInPopover(e.relatedTarget as HTMLElement) |
There was a problem hiding this comment.
This is the main fix in this PR. Overlay2 brings focus to its startFocusTrapElement upon autoFocus, and this element is not within the popover element. It is just outside the popover element, within the overlay element. So, use isElementInOverlay instead of isElementInPopover
|
@ggdouglas Made some updates to this PR after finding another bug with this issue. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes autofocus to the
Overlay.