Skip to content

Keep chat composer focused after toolbar and mode interactions #49

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
juliusmarminge merged 3 commits into from
Feb 16, 2026
Merged

Keep chat composer focused after toolbar and mode interactions #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c604768
Keep composer focused after toolbar and mode changes
juliusmarminge Feb 15, 2026
4d2f16b
Simplify env mode change handler in ChatView
juliusmarminge Feb 16, 2026
c9fae23
Memoize ChatView selection handlers with useCallback
juliusmarminge Feb 16, 2026
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
12 changes: 11 additions & 1 deletion apps/web/src/components/BranchToolbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,15 @@ interface BranchToolbarProps {
envMode: "local" | "worktree";
onEnvModeChange: (mode: "local" | "worktree") => void;
envLocked: boolean;
onComposerFocusRequest?: () => void;
}

export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: BranchToolbarProps) {
export default function BranchToolbar({
envMode,
onEnvModeChange,
envLocked,
onComposerFocusRequest,
}: BranchToolbarProps) {
const { state, dispatch } = useStore();
const api = useNativeApi();
const queryClient = useQueryClient();
Expand Down Expand Up @@ -123,6 +129,7 @@ export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: B
setThreadError(null);
setThreadBranch(branch.name, null);
setIsBranchMenuOpen(false);
onComposerFocusRequest?.();
return;
}

Expand All @@ -135,6 +142,7 @@ export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: B
// Secondary worktree → point the thread at that worktree path.
setThreadBranch(branch.name, isMainWorktree ? null : branch.worktreePath);
setIsBranchMenuOpen(false);
onComposerFocusRequest?.();
return;
}

Expand All @@ -143,6 +151,7 @@ export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: B
setThreadError(null);
setThreadBranch(branch.name, activeWorktreePath);
setIsBranchMenuOpen(false);
onComposerFocusRequest?.();
},
});
};
Expand All @@ -156,6 +165,7 @@ export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: B
setThreadBranch(name, activeWorktreePath);
setBranchQuery("");
setIsBranchMenuOpen(false);
onComposerFocusRequest?.();
},
});
};
Expand Down
49 changes: 39 additions & 10 deletions apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,11 @@ export default function ChatView() {
const cursor = textarea.value.length;
textarea.setSelectionRange(cursor, cursor);
}, []);
const scheduleComposerFocus = useCallback(() => {
window.requestAnimationFrame(() => {
focusComposer();
});
}, [focusComposer]);
const toggleTerminalVisibility = useCallback(() => {
if (!activeThreadId) return;
dispatch({
Expand Down Expand Up @@ -344,6 +349,7 @@ export default function ChatView() {
const handleRuntimeModeChange = async (mode: "approval-required" | "full-access") => {
if (mode === state.runtimeMode) return;
dispatch({ type: "SET_RUNTIME_MODE", mode });
scheduleComposerFocus();
if (!api) return;

const sessionIds = state.threads
Expand Down Expand Up @@ -806,14 +812,32 @@ export default function ChatView() {
}
};

const onModelSelect = (model: ModelSlug) => {
if (!activeThread) return;
dispatch({
type: "SET_THREAD_MODEL",
threadId: activeThread.id,
model: resolveModelSlug(model),
});
};
const onModelSelect = useCallback(
(model: ModelSlug) => {
if (!activeThread) return;
dispatch({
type: "SET_THREAD_MODEL",
threadId: activeThread.id,
model: resolveModelSlug(model),
});
scheduleComposerFocus();
},
[activeThread, dispatch, scheduleComposerFocus],
);
const onEffortSelect = useCallback(
(effort: ReasoningEffort) => {
setSelectedEffort(effort);
scheduleComposerFocus();
},
[scheduleComposerFocus],
);
const onEnvModeChange = useCallback(
(mode: "local" | "worktree") => {
setEnvMode(mode);
scheduleComposerFocus();
},
[scheduleComposerFocus],
);

const onKeyDown = (e: KeyboardEvent<HTMLTextAreaElement>) => {
if (e.key === "Enter" && !e.shiftKey) {
Expand Down Expand Up @@ -1213,7 +1237,7 @@ export default function ChatView() {
<Separator orientation="vertical" className="mx-0.5 h-4" />

{/* Reasoning effort */}
<ReasoningEffortPicker effort={selectedEffort} onEffortChange={setSelectedEffort} />
<ReasoningEffortPicker effort={selectedEffort} onEffortChange={onEffortSelect} />

{/* Divider */}
<Separator orientation="vertical" className="mx-0.5 h-4" />
Expand Down Expand Up @@ -1316,7 +1340,12 @@ export default function ChatView() {
</div>

{isGitRepo && (
<BranchToolbar envMode={envMode} onEnvModeChange={setEnvMode} envLocked={envLocked} />
<BranchToolbar
envMode={envMode}
onEnvModeChange={onEnvModeChange}
envLocked={envLocked}
onComposerFocusRequest={scheduleComposerFocus}
/>
)}

{activeThread.terminalOpen && api && activeProject && (
Expand Down