Skip to content

Commit 489d08a

Browse files
perf(web): router updates no longer re-render thread route consumers (#20837)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent 74ca17b commit 489d08a

9 files changed

Lines changed: 53 additions & 59 deletions

File tree

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
type CSSProperties,
88
type ReactNode,
99
} from "react";
10-
import { useLocation, useNavigate, useParams } from "@tanstack/react-router";
10+
import { useLocation, useNavigate } from "@tanstack/react-router";
1111

1212
import { isElectron } from "../env";
1313
import { getLocalStorageItem, removeLocalStorageItem } from "../hooks/useLocalStorage";
@@ -22,7 +22,6 @@ import { isTerminalFocused } from "../lib/terminalFocus";
2222
import { isModelPickerOpen } from "../modelPickerVisibility";
2323
import { selectActiveRightPanel, useRightPanelStore } from "../rightPanelStore";
2424
import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../terminalUiStateStore";
25-
import { resolveThreadRouteRef } from "../threadRoutes";
2625
import { cn, isMacPlatform } from "../lib/utils";
2726
import { primaryServerKeybindingsAtom } from "../state/server";
2827
import { useEnvironmentIdentificationMode, useLegacySidebarEnabled } from "../hooks/useSettings";
@@ -56,6 +55,7 @@ import {
5655
useSidebarVisibility,
5756
} from "./ui/sidebar";
5857
import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
58+
import { useThreadRouteRef } from "../hooks/useThreadRouteTarget";
5959

6060
const MACOS_TRAFFIC_LIGHTS_LEFT_INSET = "var(--desktop-window-controls-inset, 90px)";
6161

@@ -201,10 +201,7 @@ function SidebarControl() {
201201

202202
function NavigationHistoryShortcuts() {
203203
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
204-
const routeThreadRef = useParams({
205-
strict: false,
206-
select: (params) => resolveThreadRouteRef(params),
207-
});
204+
const routeThreadRef = useThreadRouteRef();
208205

209206
useEffect(() => {
210207
const onKeyDown = (event: KeyboardEvent) => {

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import {
5555
PRIMARY_LOCAL_ENVIRONMENT_ID,
5656
resolveEnvironmentMachineKind,
5757
} from "@t3tools/contracts";
58-
import { useLocation, useNavigate, useParams } from "@tanstack/react-router";
58+
import { useLocation, useNavigate } from "@tanstack/react-router";
5959
import {
6060
ArrowLeftIcon,
6161
ChartNoAxesColumnIcon,
@@ -161,7 +161,7 @@ import {
161161
newProjectId,
162162
} from "../lib/utils";
163163
import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../terminalUiStateStore";
164-
import { buildThreadRouteParams, resolveThreadRouteTarget } from "../threadRoutes";
164+
import { buildThreadRouteParams } from "../threadRoutes";
165165
import { useAvailableSettingsSearchItems } from "./settings/useAvailableSettingsSearchItems";
166166
import {
167167
applyWslEnvironmentConfiguration,
@@ -245,6 +245,7 @@ import {
245245
import type { Project } from "../types";
246246
import { PullRequestGlyph } from "~/components/pullRequest/pullRequestIcons";
247247
import { readPullRequestListPreferences } from "~/components/pullRequest/pullRequestListPreferences";
248+
import { useThreadRouteTarget } from "../hooks/useThreadRouteTarget";
248249

249250
const EMPTY_BROWSE_ENTRIES: FilesystemBrowseResult["entries"] = [];
250251

@@ -494,10 +495,7 @@ export function CommandPalette({ children }: { children: ReactNode }) {
494495
const keybindings = useAtomValue(primaryServerKeybindingsAtom);
495496
const { theme, themeHalves, resolvedTheme, appearanceMode, setAppearanceMode } = useTheme();
496497
const composerHandleRef = useRef<ChatComposerHandle | null>(null);
497-
const routeTarget = useParams({
498-
strict: false,
499-
select: (params) => resolveThreadRouteTarget(params),
500-
});
498+
const routeTarget = useThreadRouteTarget();
501499
const routeThreadRef = routeTarget?.kind === "server" ? routeTarget.threadRef : null;
502500
const terminalOpen = useTerminalUiStateStore((state) =>
503501
routeThreadRef
@@ -745,10 +743,7 @@ function OpenCommandPaletteDialog(props: {
745743
const availableSettingsSearchItems = useAvailableSettingsSearchItems();
746744
const { activeDraftThread, activeThread, defaultProjectRef, handleNewThread } =
747745
useHandleNewThread();
748-
const paletteRouteTarget = useParams({
749-
strict: false,
750-
select: (params) => resolveThreadRouteTarget(params),
751-
});
746+
const paletteRouteTarget = useThreadRouteTarget();
752747
const projects = useProjects();
753748
const referenceThreadRef =
754749
pathname === "/pull-requests"

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { RefreshIcon } from "~/components/ui/refresh-icon";
22
import { useAtomValue } from "@effect/atom-react";
33
import type { FileDiffContentsLoader, FileDiffMetadata } from "@pierre/diffs";
4-
import { useParams } from "@tanstack/react-router";
54
import {
65
isAtomCommandInterrupted,
76
squashAtomCommandFailure,
@@ -47,7 +46,6 @@ import { PREFERRED_HIGHLIGHTER } from "../lib/syntaxHighlighting";
4746
import { areAllDiffFilesCollapsed, toggleAllDiffFiles } from "../lib/diffCollapse";
4847
import { useWorkspaceMutationRefresh } from "../hooks/useWorkspaceMutationRefresh";
4948
import { useProject, useThreadCheckpointSummaries, useThreadShell } from "../state/entities";
50-
import { resolveThreadRouteRef } from "../threadRoutes";
5149
import { useClientSettings, useUpdateClientSettings } from "../hooks/useSettings";
5250
import { formatShortTimestamp } from "../timestampFormat";
5351
import { DiffFilePathCopyButton } from "./DiffFilePathCopyButton";
@@ -91,6 +89,7 @@ import { createGitDiffFileContentsLoader } from "../lib/diffFileContents";
9189
import { useReviewFilePatches } from "./diffs/useReviewFilePatches";
9290
import { DiffFileLoadingBoundary } from "./diffs/DiffFileLoadingBoundary";
9391
import { DiffFileStatus } from "./diffs/DiffFileStatus";
92+
import { useThreadRouteRef } from "../hooks/useThreadRouteTarget";
9493

9594
type DiffThemeType = "light" | "dark";
9695
const AUTOMATIC_BASE_REF = "__automatic_base_ref__";
@@ -215,10 +214,7 @@ export default function DiffPanel({
215214
const [codeViewRevision, setCodeViewRevision] = useState(0);
216215
const [codeView, setCodeView] = useState<AnnotatableCodeViewHandle | null>(null);
217216

218-
const routeThreadRef = useParams({
219-
strict: false,
220-
select: (params) => resolveThreadRouteRef(params),
221-
});
217+
const routeThreadRef = useThreadRouteRef();
222218
const activeThreadId = routeThreadRef?.threadId ?? null;
223219
const activeThread = useThreadShell(routeThreadRef);
224220
const fileAccess = useFilesystemReadAccess(activeThread?.environmentId ?? null);

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import {
6868
squashAtomCommandFailure,
6969
} from "@t3tools/client-runtime/state/runtime";
7070
import { threadRuntimeCanArchive } from "@t3tools/client-runtime/state/models";
71-
import { useNavigate, useParams, useRouter } from "@tanstack/react-router";
71+
import { useNavigate, useRouter } from "@tanstack/react-router";
7272
import {
7373
MAX_SIDEBAR_THREAD_PREVIEW_COUNT,
7474
MIN_SIDEBAR_THREAD_PREVIEW_COUNT,
@@ -129,11 +129,7 @@ import { useThreadActions } from "../hooks/useThreadActions";
129129
import { projectEnvironment } from "../state/projects";
130130
import { threadEnvironment, useEnvironmentThread } from "../state/threads";
131131
import { useEnvironment, useEnvironments, usePrimaryEnvironmentId } from "../state/environments";
132-
import {
133-
buildThreadRouteParams,
134-
resolveActiveThreadRouteRef,
135-
resolveThreadRouteTarget,
136-
} from "../threadRoutes";
132+
import { buildThreadRouteParams, resolveActiveThreadRouteRef } from "../threadRoutes";
137133
import { stackedThreadToast, toastManager } from "./ui/toast";
138134
import { formatRelativeTimeLabel } from "../timestampFormat";
139135
import { Kbd } from "./ui/kbd";
@@ -225,6 +221,7 @@ import {
225221
type SidebarProjectSnapshot,
226222
} from "../sidebarProjectGrouping";
227223
import { PullRequestGlyph } from "~/components/pullRequest/pullRequestIcons";
224+
import { useThreadRouteTarget } from "../hooks/useThreadRouteTarget";
228225
const SIDEBAR_SORT_LABELS: Record<SidebarProjectSortOrder, string> = {
229226
updated_at: "Last user message",
230227
created_at: "Created at",
@@ -3253,10 +3250,7 @@ export default function LegacySidebar() {
32533250
const handleNewThread = useNewThreadHandler();
32543251
const { archiveThread, deleteThread, markThreadUnread } = useThreadActions();
32553252
const { isMobile, setOpenMobile } = useSidebar();
3256-
const routeTarget = useParams({
3257-
strict: false,
3258-
select: (params) => resolveThreadRouteTarget(params),
3259-
});
3253+
const routeTarget = useThreadRouteTarget();
32603254
const routeDraftThread = useComposerDraftStore((store) =>
32613255
routeTarget?.kind === "draft" ? store.getDraftSession(routeTarget.draftId) : null,
32623256
);

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ import {
9797
type PointerEvent as ReactPointerEvent,
9898
type ReactNode,
9999
} from "react";
100-
import { useParams, useRouter } from "@tanstack/react-router";
100+
import { useRouter } from "@tanstack/react-router";
101101

102102
import { useRightPanelStore } from "../rightPanelStore";
103103
import {
@@ -166,11 +166,7 @@ import { useEnvironmentQuery } from "../state/query";
166166
import { useThreadSearch } from "../state/queries";
167167
import { useOrchestrationCommand } from "../state/use-orchestration-command";
168168
import { readEnvironmentScope, useEnvironmentScope } from "../state/session";
169-
import {
170-
buildThreadRouteParams,
171-
resolveActiveThreadRouteRef,
172-
resolveThreadRouteTarget,
173-
} from "../threadRoutes";
169+
import { buildThreadRouteParams, resolveActiveThreadRouteRef } from "../threadRoutes";
174170
import { formatRelativeTimeLabel, parseTimestampDate } from "../timestampFormat";
175171
import type { SidebarThreadSummary } from "../types";
176172
import { isScratchProject } from "@t3tools/client-runtime/state/projects";
@@ -286,6 +282,7 @@ import {
286282
type ComposerThreadDraftState,
287283
type DraftSessionState,
288284
} from "../composerDraftStore";
285+
import { useThreadRouteTarget } from "../hooks/useThreadRouteTarget";
289286

290287
const EMPTY_PROVIDER_ENTRIES: ReadonlyMap<string, ProviderInstanceEntry> = new Map();
291288
// Collapsed shelves share one empty list so a route change alone does not
@@ -2680,10 +2677,7 @@ export default function Sidebar() {
26802677
const toggleThreadSelection = useThreadSelectionStore((s) => s.toggleThread);
26812678
const rangeSelectTo = useThreadSelectionStore((s) => s.rangeSelectTo);
26822679
const acknowledgeWoke = useAcknowledgeThreadWoke();
2683-
const routeTarget = useParams({
2684-
strict: false,
2685-
select: (params) => resolveThreadRouteTarget(params),
2686-
});
2680+
const routeTarget = useThreadRouteTarget();
26872681
const routeDraftThread = useComposerDraftStore((store) =>
26882682
routeTarget?.kind === "draft" ? store.getDraftSession(routeTarget.draftId) : null,
26892683
);

‎apps/web/src/components/ui/toast.tsx‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
type KeyboardEvent,
1212
type ReactNode,
1313
} from "react";
14-
import { useParams } from "@tanstack/react-router";
1514
import { type ScopedThreadRef, type ThreadId } from "@t3tools/contracts";
1615
import { CircleAlertIcon, CircleCheckIcon, InfoIcon, TriangleAlertIcon, XIcon } from "lucide-react";
1716
import { Check, ChevronDown, ChevronUp, Copy } from "lucide";
@@ -21,14 +20,14 @@ import { Button, buttonVariants } from "~/components/ui/button";
2120
import { MorphIcon } from "~/components/MorphIcon";
2221
import { useComposerDraftStore } from "~/composerDraftStore";
2322
import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
24-
import { resolveThreadRouteTarget } from "~/threadRoutes";
2523
import {
2624
buildVisibleToastLayout,
2725
hasVisibleToastAction,
2826
shouldHideCollapsedToastContent,
2927
shouldRenderThreadScopedToast,
3028
} from "./toast.logic";
3129
import { Tooltip, TooltipPopup, TooltipTrigger } from "./tooltip";
30+
import { useThreadRouteTarget } from "~/hooks/useThreadRouteTarget";
3231

3332
export type ThreadToastData = {
3433
threadRef?: ScopedThreadRef | null;
@@ -411,10 +410,7 @@ interface ToastProviderProps extends Toast.Provider.Props {
411410
}
412411

413412
function useActiveThreadRefFromRoute(): ScopedThreadRef | null {
414-
const routeTarget = useParams({
415-
strict: false,
416-
select: (params) => resolveThreadRouteTarget(params),
417-
});
413+
const routeTarget = useThreadRouteTarget();
418414
const activeDraftSession = useComposerDraftStore((store) =>
419415
routeTarget?.kind === "draft" ? store.getDraftSession(routeTarget.draftId) : null,
420416
);

‎apps/web/src/hooks/useHandleNewThread.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
scopeThreadRef,
55
} from "@t3tools/client-runtime/environment";
66
import { DEFAULT_SERVER_SETTINGS, type ScopedProjectRef, type ThreadId } from "@t3tools/contracts";
7-
import { useParams, useRouter } from "@tanstack/react-router";
7+
import { useRouter } from "@tanstack/react-router";
88
import {
99
composerDraftHasUserContent,
1010
markPromotedDraftThreadByRef,
@@ -40,6 +40,7 @@ import { environmentServerConfigsAtom } from "../state/server";
4040
import { resolveThreadRouteTarget } from "../threadRoutes";
4141
import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore";
4242
import { useClientSettings } from "./useSettings";
43+
import { useThreadRouteTarget } from "./useThreadRouteTarget";
4344

4445
interface NewThreadWorkspaceOptions {
4546
branch?: string | null;
@@ -384,10 +385,7 @@ export function useNewThreadHandler() {
384385

385386
export function useHandleNewThread() {
386387
const projectOrder = useUiStateStore((store) => store.projectOrder);
387-
const routeTarget = useParams({
388-
strict: false,
389-
select: (params) => resolveThreadRouteTarget(params),
390-
});
388+
const routeTarget = useThreadRouteTarget();
391389
const routeThreadRef = routeTarget?.kind === "server" ? routeTarget.threadRef : null;
392390
const routeDraftId = routeTarget?.kind === "draft" ? routeTarget.draftId : null;
393391
const activeThread = useThreadShell(routeThreadRef);
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import type { ScopedThreadRef } from "@t3tools/contracts";
2+
import { useParams } from "@tanstack/react-router";
3+
4+
import {
5+
resolveThreadRouteRef,
6+
resolveThreadRouteTarget,
7+
type ThreadRouteTarget,
8+
} from "../threadRoutes";
9+
10+
// The router re-runs selectors on every store update (preloads, location state,
11+
// same-route navigations) and compares with ===. Selecting the string params keeps
12+
// those updates from reaching consumers; the target is then built once per id change.
13+
function useThreadRouteIds() {
14+
const environmentId = useParams({ strict: false, select: (params) => params.environmentId });
15+
const threadId = useParams({ strict: false, select: (params) => params.threadId });
16+
return { environmentId, threadId };
17+
}
18+
19+
export function useThreadRouteTarget(): ThreadRouteTarget | null {
20+
const { environmentId, threadId } = useThreadRouteIds();
21+
const draftId = useParams({ strict: false, select: (params) => params.draftId });
22+
return resolveThreadRouteTarget({ environmentId, threadId, draftId });
23+
}
24+
25+
export function useThreadRouteRef(): ScopedThreadRef | null {
26+
return resolveThreadRouteRef(useThreadRouteIds());
27+
}

‎apps/web/src/routes/_chat.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import { AuthPreviewOperateScope } from "@t3tools/contracts";
2-
import { Outlet, createFileRoute, redirect, useParams } from "@tanstack/react-router";
2+
import { Outlet, createFileRoute, redirect } from "@tanstack/react-router";
33
import { useAtomValue } from "@effect/atom-react";
44
import { useEffect } from "react";
55

66
import { isCommandPaletteOpen } from "../commandPaletteBus";
77
import { ThreadRouteView } from "../components/ThreadRouteView";
88
import { ThreadLinkPrompt } from "../components/promptLinks/ThreadLinkPrompt";
9-
import { resolveThreadRouteTarget } from "../threadRoutes";
109
import { useClientSettings, useLegacySidebarEnabled } from "../hooks/useSettings";
1110
import { openCommandPalette } from "../commandPaletteBus";
1211
import { useProjects } from "../state/entities";
@@ -30,6 +29,7 @@ import { selectActiveRightPanel, useRightPanelStore } from "../rightPanelStore";
3029
import { useThreadSelectionStore } from "../threadSelectionStore";
3130
import { stackedThreadToast, toastManager } from "~/components/ui/toast";
3231
import { primaryServerKeybindingsAtom } from "~/state/server";
32+
import { useThreadRouteTarget } from "../hooks/useThreadRouteTarget";
3333

3434
function ChatRouteGlobalShortcuts() {
3535
const clearSelection = useThreadSelectionStore((state) => state.clearSelection);
@@ -208,10 +208,7 @@ function ChatRouteGlobalShortcuts() {
208208
function ChatRouteLayout() {
209209
// Both thread routes render here, not in their own leaf components, so the
210210
// draft-to-thread promotion keeps one ChatView mounted across the swap.
211-
const threadTarget = useParams({
212-
strict: false,
213-
select: (params) => resolveThreadRouteTarget(params),
214-
});
211+
const threadTarget = useThreadRouteTarget();
215212
return (
216213
<>
217214
<ChatRouteGlobalShortcuts />

0 commit comments

Comments
 (0)