Skip to content

fix(bug-dock): preserve focus and remove yellow border flash on diagnostics completion (fixes #478) #544

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rchari1 merged 1 commit into from
Aug 24, 2026
Merged

fix(bug-dock): preserve focus and remove yellow border flash on diagnostics completion (fixes #478) #544

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions packages/app-bundle/overlay/packages/app/src/pages/session/composer/session-bug-dock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,22 @@ export function BugDockView(props: {
}) {
const [store, setStore] = createStore({ height: HEADER_HEIGHT + 120 })
let contentRef: HTMLDivElement | undefined
let textareaRef: HTMLTextAreaElement | undefined
let wasFocused = false
let blurTimer: number | undefined

// Preserve focus across background diagnostics completion (amicode#478):
// the bug session flips busy and agentText appears while the user may be
// mid-typing. A reactive border/text update must not steal focus. The blur
// timer keeps wasFocused true through the synchronous blur that fires during
// the DOM patch so the deferred effect still sees it.
const restoreFocusIfNeeded = () => {
if (wasFocused && textareaRef && document.activeElement !== textareaRef) {
requestAnimationFrame(() => textareaRef?.focus())
}
}
createEffect(on(() => props.busy, restoreFocusIfNeeded, { defer: true }))
createEffect(on(() => props.agentText, restoreFocusIfNeeded, { defer: true }))

// The dock family's animated max-height idiom (the todo dock's shape):
// measure the collapse-independent content, spring between full and header.
Expand Down Expand Up @@ -457,15 +473,22 @@ export function BugDockView(props: {
</span>
<div class="flex gap-2">
<textarea
ref={(el) => (textareaRef = el)}
value={props.answerText}
onInput={(e) => props.onAnswerChange(e.currentTarget.value)}
onFocus={() => {
if (blurTimer !== undefined) window.clearTimeout(blurTimer)
wasFocused = true
}}
onBlur={() => {
if (blurTimer !== undefined) window.clearTimeout(blurTimer)
blurTimer = window.setTimeout(() => {
if (document.activeElement !== textareaRef) wasFocused = false
}, 300)
}}
placeholder="Type your answer…"
disabled={props.answering}
classList={{
"flex-1 resize-none rounded-md border-[0.5px] bg-v2-background-bg-layer-02 px-3 py-1.5 text-[13px] leading-5 text-v2-text-text-base placeholder:text-v2-text-text-faint focus:outline-none": true,
"border-v2-state-fg-warning shadow-[0_0_0_1px_var(--v2-state-fg-warning)]": !props.busy,
"border-v2-border-border-base": props.busy,
}}
class="flex-1 resize-none rounded-md border-[0.5px] border-v2-border-border-base bg-v2-background-bg-layer-02 px-3 py-1.5 text-[13px] leading-5 text-v2-text-text-base placeholder:text-v2-text-text-faint focus:outline-none focus:border-v2-border-border-focus focus:shadow-[0_0_0_1px_var(--v2-border-border-focus)]"
rows={2}
onKeyDown={(e) => {
if (e.key === "Enter" && !e.shiftKey) {
Expand Down
Loading