Skip to content

Commit c838fd6

Browse files
t3dotggclaude
andcommitted
refactor(web): workspace focus is an app service, not React effects
F6 registers with the shell's shortcut dispatcher, and the focus controller starts with the app like the other start* services. A store subscription moves focus into a panel the user opens, and a route subscription moves it into Pull Requests. One focusout safety net replaces the per-component recovery hooks: focus that drops to the body returns to the same control when React remounted it, else to its area, else to the main content. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent dd8fa44 commit c838fd6

19 files changed

Lines changed: 221 additions & 256 deletions

‎apps/web/src/appInit.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import { appAtomRegistry } from "./rpc/atomRegistry";
4848
import { primaryServerConfigAtom } from "./state/server";
4949
import { environmentShell } from "./state/shell";
5050
import { installChatRouteCommands } from "./shortcuts/chatRouteCommands";
51+
import { startWorkspaceFocus } from "./lib/workspaceFocus";
5152
import { installCommandPaletteCommands } from "./shortcuts/commandPaletteCommands";
5253
import { registerOpenFavoriteEditorCommand } from "./components/chat/OpenInPickerShortcut";
5354
import { environmentThreadShells } from "./state/threads";
@@ -191,6 +192,7 @@ export function startAppServices(): AppRouter {
191192
shellStateAtom: environmentShell.stateAtom,
192193
});
193194
startMainAppLocationTracking(router);
195+
startWorkspaceFocus(router);
194196
startBackgroundThreadAnnouncements(appAtomRegistry, router);
195197
startThreadVisitedMigration(appAtomRegistry);
196198
startSshPasswordPromptQueue();

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

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
} from "react";
1010
import { useLocation, useRouter, type AnyRouter } from "@tanstack/react-router";
1111

12-
import { WorkspaceNavigation, workspaceAreaProps } from "./WorkspaceNavigation";
12+
import { moveWorkspaceFocus, workspaceAreaProps } from "../lib/workspaceFocus";
1313
import { isCommandPaletteOpen } from "../commandPaletteBus";
1414
import { isElectron } from "../env";
1515
import {
@@ -171,6 +171,33 @@ export function registerNavigationHistoryCommands(router: AnyRouter): () => void
171171
);
172172
}
173173

174+
// Capture phase, so F6 also leaves widgets that swallow keys, such as the terminal.
175+
function registerWorkspaceFocusCommands(router: AnyRouter): () => void {
176+
const move = (direction: 1 | -1) => (event: KeyboardEvent) => {
177+
if (event.isComposing) return false;
178+
// Inside a dialog the move is refused, but the key is still consumed.
179+
event.preventDefault();
180+
event.stopPropagation();
181+
moveWorkspaceFocus(direction);
182+
};
183+
const disposers = [
184+
registerCommands(
185+
{ "workspace.focusNext": move(1), "workspace.focusPrevious": move(-1) },
186+
{
187+
capture: true,
188+
when: (event) => !isKeybindingCaptureTarget(event),
189+
context: () => readRoutePanelsOpen(router),
190+
},
191+
),
192+
// A focused desktop browser forwards the keys; its renderer focus is stale.
193+
registerMenuAction("workspace.focusNext", () => moveWorkspaceFocus(1, "panel")),
194+
registerMenuAction("workspace.focusPrevious", () => moveWorkspaceFocus(-1, "panel")),
195+
];
196+
return () => {
197+
for (const dispose of disposers) dispose();
198+
};
199+
}
200+
174201
// Escape leaves the pull requests page when no scope (a selection, a dialog,
175202
// a drag) claimed it, so it observes after every other scope.
176203
function registerPullRequestsEscapeCommand(router: AnyRouter): () => void {
@@ -273,6 +300,7 @@ function registerAppShellCommands(router: AnyRouter, shellElement: Element): ()
273300
const disposers = [
274301
registerThreadUndoCommands(router, readSidebarVisible),
275302
registerNavigationHistoryCommands(router),
303+
registerWorkspaceFocusCommands(router),
276304
registerPullRequestsEscapeCommand(router),
277305
registerMenuAction("open-settings", () => {
278306
if (!/^\/settings(\/|$)/.test(router.state.location.pathname))
@@ -374,7 +402,6 @@ function SidebarControl() {
374402
}
375403

376404
export function AppSidebarLayout({ children }: { children: ReactNode }) {
377-
const router = useRouter();
378405
const sidebarArea = workspaceAreaProps("sidebar", 0, "Threads");
379406
const legacySidebarEnabled = useLegacySidebarEnabled();
380407
const [sidebarRouteReveal] = useState<SidebarRouteReveal>(() => ({
@@ -453,7 +480,6 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {
453480
{children}
454481
<BackgroundThreadAnnouncer />
455482
<SidebarControl />
456-
<WorkspaceNavigation readPanelContext={() => readRoutePanelsOpen(router)} />
457483
</SidebarProvider>
458484
</PanelAnimationSuppressionProvider>
459485
);

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { workspaceAreaProps } from "./WorkspaceNavigation";
2-
import { useWorkspacePanelFocus } from "../hooks/useWorkspacePanelFocus";
3-
import { useWorkspaceFocusRecovery } from "../hooks/useWorkspaceFocusRecovery";
1+
import { workspaceAreaProps } from "../lib/workspaceFocus";
42
import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
53
import { queuedRunEditBlockedReason } from "@t3tools/client-runtime/queued-run-edit";
64
import { ScrollToEndButton, WorkspaceFileDropOverlay } from "./chat/TimelineOverlays";
@@ -1018,7 +1016,6 @@ export default function ChatView(props: ChatViewProps) {
10181016
const canReuseTerminal = activeThreadKnownSessionsRaw !== null;
10191017
const previewPanelOpen = activeRightPanelKind === "preview" && browserAvailable;
10201018
const rightPanelOpen = rightPanelState.isOpen;
1021-
useWorkspacePanelFocus(activeThreadRef);
10221019
const { active: panelAnimationsActive, durationMs: panelAnimationDurationMs } =
10231020
usePanelAnimationSettings();
10241021
const rightPanelPresenceValue = {
@@ -1045,7 +1042,6 @@ export default function ChatView(props: ChatViewProps) {
10451042
const canMaximizeRightPanel = rightPanelOpen;
10461043
const rightPanelMaximized = canMaximizeRightPanel && rightPanelState.maximized === true;
10471044
const inlineRightPanelOwnsTitleBar = rightPanelOpen && !shouldUsePlanSidebarSheet;
1048-
useWorkspaceFocusRecovery("[data-chat-column-maximized-away]", rightPanelMaximized, "panel");
10491045
const [threadPanelPopoverHandle] = useState(PopoverCreateHandle);
10501046
const [chatCanvasStore] = useState(createChatCanvasStore);
10511047

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ import { writeTextToClipboard } from "../hooks/useCopyToClipboard";
9393
import {
9494
queueWorkspaceFocusFromPalette,
9595
restoreWorkspaceFocusFromPalette,
96-
requestWorkspaceFocus,
9796
} from "../lib/workspaceFocus";
9897
import {
9998
composerPromptLink,
@@ -1519,7 +1518,6 @@ function OpenCommandPaletteDialog(props: {
15191518
icon: <PullRequestGlyph.pullRequest className={ITEM_ICON_CLASS} />,
15201519
run: async () => {
15211520
await navigate({ to: "/pull-requests", search: readPullRequestListPreferences() });
1522-
requestWorkspaceFocus({ area: "pull-requests" });
15231521
},
15241522
});
15251523
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { workspaceAreaProps, useWorkspacePageFocus } from "./WorkspaceNavigation";
1+
import { workspaceAreaProps } from "../lib/workspaceFocus";
22
import { MessageSquareDashedIcon, PlusIcon } from "lucide-react";
33

44
import { openCommandPalette } from "../commandPaletteBus";
@@ -12,7 +12,6 @@ import { WorkspacePageHeader } from "./WorkspacePageHeader";
1212

1313
export function NoProjectsHero() {
1414
const contentArea = workspaceAreaProps("home", 1, "Home");
15-
useWorkspacePageFocus("home");
1615
const primaryEnvironmentId = usePrimaryEnvironmentId();
1716
const { scratchEnvironmentId, startScratchThread } = useScratchProject();
1817
const scratchTargetEnvironmentId = scratchEnvironmentId(primaryEnvironmentId);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { workspaceAreaProps } from "./WorkspaceNavigation";
1+
import { workspaceAreaProps } from "../lib/workspaceFocus";
22
import { useAtomMount, useAtomValue } from "@effect/atom-react";
33
import {
44
isAtomCommandInterrupted,

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

Lines changed: 0 additions & 140 deletions
This file was deleted.

‎apps/web/src/components/chat/ThreadDetailsCard.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { workspaceAreaProps } from "../WorkspaceNavigation";
1+
import { workspaceAreaProps } from "../../lib/workspaceFocus";
22
import { useLayoutEffect, useState, type ReactNode, type RefObject } from "react";
33
import type { ScopedThreadRef } from "@t3tools/contracts";
44
import { ScrollArea } from "../ui/scroll-area";
@@ -11,7 +11,6 @@ import {
1111
resolveThreadDetailsCardDensity,
1212
} from "./threadDetailsCardLayout";
1313
import { observeResize } from "../../lib/observeResize";
14-
import { useWorkspaceFocusRecovery } from "../../hooks/useWorkspaceFocusRecovery";
1514
import { requestWorkspaceFocus } from "../../lib/workspaceFocus";
1615

1716
export function ThreadDetailsCard({
@@ -37,7 +36,6 @@ export function ThreadDetailsCard({
3736
const popoverOpen = useRightPanelStore((state) =>
3837
selectThreadPanelOpen(state.threadPanelVisibilityByThreadKey, threadRef, "popover"),
3938
);
40-
useWorkspaceFocusRecovery('[data-thread-details-panel="inline"]', `${mode}:${inlineOpen}`);
4139
const measurementKey = `${threadRef.environmentId}:${threadRef.threadId}:${preferredPlacement?.width ?? "popup"}`;
4240
const [measurements, setMeasurements] = useState({
4341
key: measurementKey,

‎apps/web/src/components/preview/PreviewPanelShell.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
usePreviewPanelInlineSize,
55
} from "~/hooks/usePreviewPanelInlineSize";
66
import { RESIZABLE_WIDTH_PROPERTY } from "~/hooks/useResizableWidth";
7-
import { workspaceAreaProps } from "../WorkspaceNavigation";
7+
import { workspaceAreaProps } from "../../lib/workspaceFocus";
88
import { cn } from "~/lib/utils";
99

1010
import { RightPanelResizeHandle } from "./RightPanelResizeHandle";

‎apps/web/src/components/pullRequest/PullRequestsColumn.tsx‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ import {
1313
} from "../WorkspaceBreadcrumb";
1414
import { WorkspacePageContainer } from "../WorkspacePageContainer";
1515
import { WorkspacePageHeader } from "../WorkspacePageHeader";
16-
import { workspaceAreaProps, useWorkspacePageFocus } from "../WorkspaceNavigation";
17-
import { useWorkspaceFocusRecovery } from "~/hooks/useWorkspaceFocusRecovery";
16+
import { workspaceAreaProps } from "../../lib/workspaceFocus";
1817
import { PullRequestCompactFilterMenu } from "./PullRequestCompactFilterMenu";
1918
import type { PullRequestFilterOption } from "./PullRequestListFilters";
2019
import { INVOLVEMENT_TABS, STATE_TABS } from "./pullRequestListOptions";
@@ -111,8 +110,6 @@ export function PullRequestsColumn({
111110
scrollRef: RefObject<HTMLDivElement | null>;
112111
}) {
113112
const contentArea = workspaceAreaProps("pull-requests", 1, "Pull requests");
114-
useWorkspacePageFocus("pull-requests");
115-
useWorkspaceFocusRecovery('[data-workspace-area="pull-requests"]', maximizedAway, "panel");
116113
const markerRef = useRef<HTMLDivElement | null>(null);
117114
const [condensed, setCondensed] = useState(false);
118115
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- IntersectionObserver on the scroll marker condenses the topbar

0 commit comments

Comments
 (0)