Skip to content

fix: stabilize worktree branch selector popovers#8386

Merged
kirillk merged 3 commits into
mainfrom
noiseless-professor
Apr 6, 2026
Merged

fix: stabilize worktree branch selector popovers#8386
kirillk merged 3 commits into
mainfrom
noiseless-professor

Conversation

@kirillk

@kirillk kirillk commented Apr 5, 2026

Copy link
Copy Markdown
Contributor

Summary

  • render the worktree branch selector popovers inline so the dialog focus trap no longer blocks the search input
  • autofocus the branch filter field when the popover opens and move branch selector inputs to shared data-autofocus behavior
  • keep the branch selector popovers anchored above the trigger without flipping as filtered results change size

Demo

Before

Arrow keys don't work, typing doesn't work

Screen.Recording.2026-04-05.at.2.39.09.PM.mp4

After

Screen.Recording.2026-04-05.at.2.40.39.PM.mp4

kirillk added 2 commits April 5, 2026 14:42
Render the worktree branch dropdowns inline so the dialog focus trap can keep the filter input keyboard-accessible. Autofocus the search field on open and disable placement flipping so filtering does not make the popup jump.
Keep nested popovers from dismissing their parent dialog when users press Escape. This preserves the branch picker close behavior in the new worktree flow without closing the whole modal.
Comment thread packages/ui/src/components/popover.tsx
@kilo-code-bot

kilo-code-bot Bot commented Apr 5, 2026

Copy link
Copy Markdown
Contributor

Code Review Summary

Status: 1 Issue Found | Recommendation: Address before merge

Overview

Severity Count
CRITICAL 0
WARNING 1
SUGGESTION 0
Issue Details (click to expand)

WARNING

File Line Issue
packages/ui/src/components/popover.tsx 175 Preventing onOpenAutoFocus unconditionally breaks popovers that rely on Kobalte's default focus behavior, including the model selector search field.

Fix these issues in Kilo Cloud

Files Reviewed (4 files)
  • packages/kilo-vscode/webview-ui/agent-manager/BranchSelect.tsx - 0 issues
  • packages/kilo-vscode/webview-ui/agent-manager/NewWorktreeDialog.tsx - 0 issues
  • packages/ui/src/components/popover.tsx - 1 issue
  • packages/ui/src/context/dialog.tsx - 0 issues

Reviewed by gpt-5.4-2026-03-05 · 842,227 tokens

@kirillk kirillk enabled auto-merge April 6, 2026 12:57
@kirillk kirillk merged commit 78bde07 into main Apr 6, 2026
13 checks passed
@kirillk kirillk deleted the noiseless-professor branch April 6, 2026 15:33
jliounis pushed a commit to jliounis/kilocode that referenced this pull request May 18, 2026
fix: stabilize worktree branch selector popovers
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants