Skip to content

fix(desktop): autofocus new terminal #262

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
AviPeltz merged 2 commits into from
Dec 5, 2025
Merged

fix(desktop): autofocus new terminal #262

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48e766f
autofocus new terminal
AviPeltz Dec 5, 2025
5c420be
should fix focus behavior
AviPeltz Dec 5, 2025
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
16 changes: 16 additions & 0 deletions ...derer/screens/main/components/WorkspaceView/ContentView/TabsContent/Terminal/Terminal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
? focusedPaneIds[pane.windowId] === paneId
: false;

// Ref to track focus state for use in terminal creation effect
const isFocusedRef = useRef(isFocused);
isFocusedRef.current = isFocused;

// Required for resolving relative file paths in terminal commands
const { data: workspaceCwd } =
trpc.terminal.getWorkspaceCwd.useQuery(workspaceId);
Expand Down Expand Up @@ -108,6 +112,13 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
}
}, [isFocused]);

// Autofocus terminal when it becomes the focused pane (e.g., after split)
useEffect(() => {
if (isFocused && xtermRef.current) {
xtermRef.current.focus();
}
}, [isFocused]);

// Toggle search with Cmd+F (only for the focused terminal)
useHotkeys(
HOTKEYS.FIND_IN_TERMINAL.keys,
Expand All @@ -133,6 +144,11 @@ export const Terminal = ({ tabId, workspaceId }: TerminalProps) => {
fitAddonRef.current = fitAddon;
isExitedRef.current = false;

// Autofocus on initial render if this terminal is the focused pane
if (isFocusedRef.current) {
xterm.focus();
}

// Load search addon for Cmd+F functionality
import("@xterm/addon-search").then(({ SearchAddon }) => {
if (isUnmounted) return;
Expand Down