fix: Focus lock uses correct direction when initial focus is outside the lock#4518
Merged
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #4518 +/- ##
=======================================
Coverage 97.42% 97.42%
=======================================
Files 936 936
Lines 29616 29619 +3
Branches 10761 10762 +1
=======================================
+ Hits 28852 28857 +5
- Misses 716 755 +39
+ Partials 48 7 -41 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
cansuaa
approved these changes
May 15, 2026
This file contains hidden or 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
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.
Description
The focus lock is commonly used with auto-focus (via autoFocus prop or manual). Thus, the focus is always inside the lock, and the tab traps behaviour is correct: upon reaching the last tab trap - the focus must move to the 1st focusable element, and vice-versa.
However, this use case (cloudscape-design/chart-components#217) requires the tooltip wrapped with focus lock to not automatically move focus inside when it appears. Should the user move focus by pressing Tab - it would hit the 1st tab trap, which distributes focus to the last element of the lock content.
See before:
Focusing with Tab navigates to "3" button first. Focusing with Shift+Tab navigates to "1" button first.
Screen.Recording.2026-05-15.at.11.21.31.mov
After:
Screen.Recording.2026-05-15.at.11.22.41.mov
How has this been tested?
Review checklist
The following items are to be evaluated by the author(s) and the reviewer(s).
Correctness
CONTRIBUTING.md.CONTRIBUTING.md.Security
checkSafeUrlfunction.Testing
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.