fix(generation): stabilize model picker teardown - #1618
Merged
Merged
Conversation
wyuc
approved these changes
Sep 20, 2026
wyuc
left a comment
Contributor
There was a problem hiding this comment.
Approving — thanks @LeoParkerOu, and for picking this up so quickly. Two-line production change with the right mechanism: no modal focus trap to tear down, and the picker closes before the provider/model update so the nested control isn't unmounting mid-selection. The e2e coverage is what makes modal={false} safe here — outside-click dismissal, Escape, and focus restoration to the trigger are exactly the behaviours that change when the trap goes away, and repeating the interaction exercises the intermittent path.
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
Make the generation toolbar model picker non-modal and close it before applying a model change, avoiding the focus-trap teardown race with nested controls.
Related Issues
Fixes #1447
Changes
Popoverwithmodal={false}.Type of Change
Verification
Steps to reproduce / test
What you personally verified
tsc --noEmitpass for the changed code.Evidence
pnpm check && pnpm lint && npx tsc --noEmit)Checklist