Skip to content

Commit c604768

Browse files
Keep composer focused after toolbar and mode changes
- Add a shared composer-focus scheduler in `ChatView` - Refocus composer after runtime mode, model, effort, and env mode selections - Let `BranchToolbar` request composer focus after branch/worktree actions
1 parent 98c4b7c commit c604768

2 files changed

Lines changed: 36 additions & 3 deletions

File tree

‎apps/web/src/components/BranchToolbar.tsx‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,15 @@ interface BranchToolbarProps {
2525
envMode: "local" | "worktree";
2626
onEnvModeChange: (mode: "local" | "worktree") => void;
2727
envLocked: boolean;
28+
onComposerFocusRequest?: () => void;
2829
}
2930

30-
export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: BranchToolbarProps) {
31+
export default function BranchToolbar({
32+
envMode,
33+
onEnvModeChange,
34+
envLocked,
35+
onComposerFocusRequest,
36+
}: BranchToolbarProps) {
3137
const { state, dispatch } = useStore();
3238
const api = useNativeApi();
3339
const queryClient = useQueryClient();
@@ -123,6 +129,7 @@ export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: B
123129
setThreadError(null);
124130
setThreadBranch(branch.name, null);
125131
setIsBranchMenuOpen(false);
132+
onComposerFocusRequest?.();
126133
return;
127134
}
128135

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

@@ -143,6 +151,7 @@ export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: B
143151
setThreadError(null);
144152
setThreadBranch(branch.name, activeWorktreePath);
145153
setIsBranchMenuOpen(false);
154+
onComposerFocusRequest?.();
146155
},
147156
});
148157
};
@@ -156,6 +165,7 @@ export default function BranchToolbar({ envMode, onEnvModeChange, envLocked }: B
156165
setThreadBranch(name, activeWorktreePath);
157166
setBranchQuery("");
158167
setIsBranchMenuOpen(false);
168+
onComposerFocusRequest?.();
159169
},
160170
});
161171
};

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,11 @@ export default function ChatView() {
273273
const cursor = textarea.value.length;
274274
textarea.setSelectionRange(cursor, cursor);
275275
}, []);
276+
const scheduleComposerFocus = useCallback(() => {
277+
window.requestAnimationFrame(() => {
278+
focusComposer();
279+
});
280+
}, [focusComposer]);
276281
const toggleTerminalVisibility = useCallback(() => {
277282
if (!activeThreadId) return;
278283
dispatch({
@@ -344,6 +349,7 @@ export default function ChatView() {
344349
const handleRuntimeModeChange = async (mode: "approval-required" | "full-access") => {
345350
if (mode === state.runtimeMode) return;
346351
dispatch({ type: "SET_RUNTIME_MODE", mode });
352+
scheduleComposerFocus();
347353
if (!api) return;
348354

349355
const sessionIds = state.threads
@@ -813,7 +819,19 @@ export default function ChatView() {
813819
threadId: activeThread.id,
814820
model: resolveModelSlug(model),
815821
});
822+
scheduleComposerFocus();
823+
};
824+
const onEffortSelect = (effort: ReasoningEffort) => {
825+
setSelectedEffort(effort);
826+
scheduleComposerFocus();
816827
};
828+
const onEnvModeChange = useCallback(
829+
(mode: "local" | "worktree") => {
830+
setEnvMode(mode);
831+
scheduleComposerFocus();
832+
},
833+
[scheduleComposerFocus],
834+
);
817835

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

12151233
{/* Reasoning effort */}
1216-
<ReasoningEffortPicker effort={selectedEffort} onEffortChange={setSelectedEffort} />
1234+
<ReasoningEffortPicker effort={selectedEffort} onEffortChange={onEffortSelect} />
12171235

12181236
{/* Divider */}
12191237
<Separator orientation="vertical" className="mx-0.5 h-4" />
@@ -1316,7 +1334,12 @@ export default function ChatView() {
13161334
</div>
13171335

13181336
{isGitRepo && (
1319-
<BranchToolbar envMode={envMode} onEnvModeChange={setEnvMode} envLocked={envLocked} />
1337+
<BranchToolbar
1338+
envMode={envMode}
1339+
onEnvModeChange={onEnvModeChange}
1340+
envLocked={envLocked}
1341+
onComposerFocusRequest={scheduleComposerFocus}
1342+
/>
13201343
)}
13211344

13221345
{activeThread.terminalOpen && api && activeProject && (

0 commit comments

Comments
 (0)