[Refactor] Extract useFocusTrap hook from DrawerLayout and AgentSelector#190
Merged
[Refactor] Extract useFocusTrap hook from DrawerLayout and AgentSelector#190
Conversation
Contributor
|
Hi @samzong, DetailsInstructions for interacting with me using comments are available here. |
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.
Summary
Extract duplicated focus-trap logic from
DrawerLayoutandAgentSelectorinto a singleuseFocusTraphook. Eliminates ~40 lines of duplicated keyboard/focus management code and fixes an inconsistency whereDrawerLayoutdid not properly save/restore previous focus.Type of change
[Refactor]internal cleanupWhy is this needed?
Both
DrawerLayoutandAgentSelectorcontained nearly identical inline focus-trap implementations: Tab wrapping, Escape handling, save/restore of previous focus, and initial focus targeting. The duplication violated DRY and the two implementations had subtle inconsistencies —DrawerLayoutrelied on a hardcodedmenuButtonReffor focus restoration instead of savingdocument.activeElementon open, which meant edge-swipe opens could lose focus context.What changed?
packages/pwa/src/hooks/useFocusTrap.ts— reusable hook with signatureuseFocusTrap(containerRef, open, onClose, initialFocusSelector?)DrawerLayout.tsx— removed 38-line inline focus-trap useEffect, removedmenuButtonRef, simplifiedcloseDrawerto one line, replaced with singleuseFocusTrapcallAgentSelector.tsx— removedhandleKeyDownuseCallback (26 lines), focus-management useEffect (14 lines), andprevFocusRef; replaced with singleuseFocusTrapcall usinginitialFocusSelectorto skip the close buttonArchitecture impact
docs/architecture-invariants.md: noneLinked issues
Closes #
Validation
pnpm check(typecheck + lint + format + dead-code)pnpm buildCommands, screenshots, or notes:
Screenshots or recordings
No visual changes — behavior is identical.
Release note
NONE.Checklist
[Feat],[Fix],[UI],[Docs],[Refactor],[Build], or[Chore]