Skip to content

Commit d546d53

Browse files
committed
refactor(web): register the Diff side panel
1 parent 151c241 commit d546d53

10 files changed

Lines changed: 336 additions & 113 deletions

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ import { flushSync } from "react-dom";
155155
import { useLocation, useNavigate } from "@tanstack/react-router";
156156
import { assistantCitationFromLocation } from "../lib/assistantCitationNavigation";
157157
import { isMacPlatform } from "../lib/utils";
158+
import { RegisteredSidePanel } from "~/panels/bundledPanels";
158159
import type { AssistantCitationSourceAnchor } from "~/lib/assistantTextSelection";
159160
import { useShallow } from "zustand/react/shallow";
160161
import {
@@ -667,7 +668,6 @@ function useDraftHeroLayoutTransition(
667668
const PreviewPanel = lazy(() =>
668669
import("./preview/PreviewPanel").then((module) => ({ default: module.PreviewPanel })),
669670
);
670-
const DiffPanel = lazy(() => import("./DiffPanel"));
671671
const selectAutoShowFloatingPreview = (settings: { browserAutoShowFloatingPreview: boolean }) =>
672672
settings.browserAutoShowFloatingPreview;
673673
const DevicePanel = lazy(() =>
@@ -10252,9 +10252,9 @@ export default function ChatView(props: ChatViewProps) {
1025210252
/>
1025310253
) : renderedRightPanelSurface?.kind === "diff" ? (
1025410254
<Suspense fallback={null}>
10255-
<DiffPanel
10255+
<RegisteredSidePanel
1025610256
key={activeThreadKey}
10257-
mode="embedded"
10257+
id="diff"
1025810258
composerDraftTarget={composerDraftTarget}
1025910259
workspaceMutationId={workspaceMutationId}
1026010260
/>

‎apps/web/src/components/diffs/DiffFileLoadingBoundary.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { useEffect, useRef } from "react";
2-
import { DiffFileHeaderSkeleton } from "../DiffPanelShell";
2+
import { DiffFileHeaderSkeleton } from "./DiffLoadingState";
33

44
/** Load the next batch before the reader reaches the end of the current files. */
55
export function DiffFileLoadingBoundary({ load, count }: { load: () => void; count: number }) {

apps/web/src/components/DiffPanelShell.tsx renamed to apps/web/src/components/diffs/DiffLoadingState.tsx

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,4 @@
1-
import type { ReactNode } from "react";
2-
3-
import { isElectron } from "~/env";
4-
import { cn } from "~/lib/utils";
5-
6-
import { Skeleton } from "./ui/skeleton";
7-
8-
export type DiffPanelMode = "inline" | "sheet" | "sidebar" | "embedded";
9-
10-
function getDiffPanelHeaderRowClassName(mode: DiffPanelMode) {
11-
const shouldUseDragRegion = isElectron && mode !== "sheet" && mode !== "embedded";
12-
return cn(
13-
"flex items-center justify-between gap-2",
14-
mode === "embedded" ? "px-2" : "px-4",
15-
shouldUseDragRegion
16-
? "drag-region h-[var(--workspace-topbar-height)] border-b border-border wco:h-[env(titlebar-area-height)] wco:pr-(--workspace-native-controls-inset)"
17-
: "flex h-10 min-h-10 shrink-0 items-center border-b border-border/60 bg-background in-data-[preview-panel-mode=inline]:mb-3 in-data-[preview-panel-mode=inline]:h-7 in-data-[preview-panel-mode=inline]:min-h-7 in-data-[preview-panel-mode=inline]:border-b-transparent",
18-
);
19-
}
20-
21-
export function DiffPanelShell(props: {
22-
mode: DiffPanelMode;
23-
header: ReactNode;
24-
children: ReactNode;
25-
}) {
26-
const shouldUseDragRegion = isElectron && props.mode !== "sheet" && props.mode !== "embedded";
27-
28-
return (
29-
<div
30-
className={cn(
31-
"flex h-full min-w-0 flex-col bg-background",
32-
props.mode === "inline"
33-
? "w-[42vw] min-w-[360px] max-w-[560px] shrink-0 border-l border-border"
34-
: "w-full",
35-
)}
36-
>
37-
{shouldUseDragRegion ? (
38-
<div className={getDiffPanelHeaderRowClassName(props.mode)}>{props.header}</div>
39-
) : (
40-
<div className={getDiffPanelHeaderRowClassName(props.mode)} data-surface-subheader>
41-
{props.header}
42-
</div>
43-
)}
44-
{props.children}
45-
</div>
46-
);
47-
}
1+
import { Skeleton } from "../ui/skeleton";
482

493
export function DiffFileHeaderSkeleton({
504
titleWidth,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import { pullRequestEnvironment } from "~/state/pullRequests";
5757
import { useEnvironmentQuery } from "~/state/query";
5858
import { useAtomCommand } from "~/state/use-atom-command";
5959

60-
import { DiffPanelLoadingState } from "../DiffPanelShell";
60+
import { DiffPanelLoadingState } from "../diffs/DiffLoadingState";
6161
import { DiffCommentAnnotation } from "../diffs/DiffCommentAnnotation";
6262
import { DiffFileTree } from "../diffs/DiffFileTree";
6363
import { useCodeViewFileReveal } from "../diffs/useCodeViewFileReveal";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ import { MiddleTruncate } from "../ui/middle-truncate";
125125
import { PullRequestDetailGhost, PullRequestTimelineGhost } from "./PullRequestGhosts";
126126
import { PullRequestCopyableCode } from "./PullRequestCopyableCode";
127127
import { PullRequestActivityUnavailableState } from "./PullRequestActivityUnavailableState";
128-
import { DiffPanelLoadingState } from "../DiffPanelShell";
128+
import { DiffPanelLoadingState } from "../diffs/DiffLoadingState";
129129
import { PullRequestsUnavailableState } from "./PullRequestsUnavailableState";
130130
import type { PullRequestAgentSelectionInput } from "./PullRequestCodeTab";
131131
import { openOnHostLabel, showPullRequestLinkContextMenu } from "./pullRequestLinkContextMenu";
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import type { ScopedThreadRef } from "@t3tools/contracts";
2+
import type { DraftId } from "~/composerDraftStore";
3+
4+
import { createPanelRegistry } from "./panelRegistry";
5+
6+
export interface SidePanelProps {
7+
composerDraftTarget: ScopedThreadRef | DraftId;
8+
workspaceMutationId: string | null;
9+
}
10+
11+
export const bundledPanels = createPanelRegistry<SidePanelProps, "diff">([
12+
{
13+
id: "diff",
14+
title: "Diff",
15+
placement: "side-panel",
16+
load: () => import("./diff/DiffSidePanel"),
17+
},
18+
]);
19+
20+
export function RegisteredSidePanel({
21+
id,
22+
...props
23+
}: SidePanelProps & { id: Parameters<typeof bundledPanels.get>[0] }) {
24+
const panel = bundledPanels.get(id);
25+
if (!panel) throw new Error(`Unknown panel id: ${id}`);
26+
const Component = panel.Component;
27+
return <Component {...props} />;
28+
}

apps/web/src/components/DiffPanel.tsx renamed to apps/web/src/panels/diff/DiffSidePanel.tsx

Lines changed: 74 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { RefreshIcon } from "~/components/ui/refresh-icon";
21
import { useAtomValue } from "@effect/atom-react";
32
import type { FileDiffContentsLoader, FileDiffMetadata } from "@pierre/diffs";
43
import { useParams } from "@tanstack/react-router";
@@ -7,7 +6,7 @@ import {
76
squashAtomCommandFailure,
87
} from "@t3tools/client-runtime/state/runtime";
98
import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors";
10-
import type { ScopedThreadRef, RunId } from "@t3tools/contracts";
9+
import type { RunId } from "@t3tools/contracts";
1110
import {
1211
ArrowRightIcon,
1312
CheckIcon,
@@ -23,43 +22,21 @@ import {
2322
} from "lucide-react";
2423
import * as Schema from "effect/Schema";
2524
import * as DateTime from "effect/DateTime";
26-
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
27-
import { useCodeViewFileReveal } from "./diffs/useCodeViewFileReveal";
28-
import { useOpenInPreferredEditor } from "../editorPreferences";
29-
import { useFileContextMenuHandler } from "../fileContextMenu";
30-
import { type DraftId } from "../composerDraftStore";
31-
import { openDiffFilePrimaryAction } from "../diffFileActions";
32-
import { useCheckpointDiff } from "~/lib/checkpointDiffState";
33-
import { cn } from "~/lib/utils";
34-
import { selectThreadDiffPanelSelection, useDiffPanelStore } from "../diffPanelStore";
35-
import { useLocalStorage } from "../hooks/useLocalStorage";
36-
import { useTheme } from "../hooks/useTheme";
25+
import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
26+
27+
import { RefreshIcon } from "~/components/ui/refresh-icon";
28+
import { useCodeViewFileReveal } from "~/components/diffs/useCodeViewFileReveal";
29+
import { DiffFilePathCopyButton } from "~/components/DiffFilePathCopyButton";
30+
import { DiffStatLabel } from "~/components/chat/DiffStatLabel";
3731
import {
38-
buildFileDiffContentVersion,
39-
buildFileDiffIdentityKey,
40-
getDiffCollapseIconClassName,
41-
getDiffLineStat,
42-
getRenderablePatch,
43-
resolveDiffThemeName,
44-
resolveFileDiffPath,
45-
} from "../lib/diffRendering";
46-
import { PREFERRED_HIGHLIGHTER } from "../lib/syntaxHighlighting";
47-
import { areAllDiffFilesCollapsed, toggleAllDiffFiles } from "../lib/diffCollapse";
48-
import { useTurnDiffSummaries } from "../hooks/useTurnDiffSummaries";
49-
import { useWorkspaceMutationRefresh } from "../hooks/useWorkspaceMutationRefresh";
50-
import { useProject, useThreadProjection, useThreadShell } from "../state/entities";
51-
import { resolveThreadRouteRef } from "../threadRoutes";
52-
import { useClientSettings, useUpdateClientSettings } from "../hooks/useSettings";
53-
import { formatShortTimestamp } from "../timestampFormat";
54-
import { DiffFilePathCopyButton } from "./DiffFilePathCopyButton";
55-
import { DiffPanelLoadingState, DiffPanelShell, type DiffPanelMode } from "./DiffPanelShell";
56-
import { DiffStatLabel } from "./chat/DiffStatLabel";
57-
import { AnnotatableCodeView, type AnnotatableCodeViewHandle } from "./diffs/AnnotatableCodeView";
58-
import { DiffFileTree } from "./diffs/DiffFileTree";
59-
import { diffFileTreeEntries } from "./diffs/diffFileTree.logic";
60-
import { Button } from "./ui/button";
61-
import { ToggleGroup, Toggle } from "./ui/toggle-group";
62-
import { Switch } from "./ui/switch";
32+
AnnotatableCodeView,
33+
type AnnotatableCodeViewHandle,
34+
} from "~/components/diffs/AnnotatableCodeView";
35+
import { DiffFileTree } from "~/components/diffs/DiffFileTree";
36+
import { diffFileTreeEntries } from "~/components/diffs/diffFileTree.logic";
37+
import { Button } from "~/components/ui/button";
38+
import { ToggleGroup, Toggle } from "~/components/ui/toggle-group";
39+
import { Switch } from "~/components/ui/switch";
6340
import {
6441
Combobox,
6542
ComboboxEmpty,
@@ -68,7 +45,7 @@ import {
6845
ComboboxList,
6946
ComboboxPopup,
7047
ComboboxTrigger,
71-
} from "./ui/combobox";
48+
} from "~/components/ui/combobox";
7249
import {
7350
DropdownMenu,
7451
DropdownMenuContent,
@@ -78,19 +55,48 @@ import {
7855
DropdownMenuSubContent,
7956
DropdownMenuSubTrigger,
8057
DropdownMenuTrigger,
81-
} from "./ui/menu";
82-
import { Tooltip, TooltipPopup, TooltipTrigger } from "./ui/tooltip";
83-
import { useEnvironmentQuery } from "../state/query";
84-
import { useAtomCommand } from "../state/use-atom-command";
85-
import { serverEnvironment } from "../state/server";
86-
import { reviewEnvironment } from "../state/review";
87-
import { vcsEnvironment } from "../state/vcs";
88-
import { buildBaseRefChoices, filterBaseRefChoices } from "../lib/baseRefChoices";
89-
import { createGitDiffFileContentsLoader } from "../lib/diffFileContents";
58+
} from "~/components/ui/menu";
59+
import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
60+
import { useReviewFilePatches } from "~/components/diffs/useReviewFilePatches";
61+
import { DiffFileLoadingBoundary } from "~/components/diffs/DiffFileLoadingBoundary";
62+
import { DiffFileStatus } from "~/components/diffs/DiffFileStatus";
63+
import { DiffPanelLoadingState } from "~/components/diffs/DiffLoadingState";
9064

91-
import { useReviewFilePatches } from "./diffs/useReviewFilePatches";
92-
import { DiffFileLoadingBoundary } from "./diffs/DiffFileLoadingBoundary";
93-
import { DiffFileStatus } from "./diffs/DiffFileStatus";
65+
import type { SidePanelProps } from "../bundledPanels";
66+
67+
import { useOpenInPreferredEditor } from "~/editorPreferences";
68+
import { useFileContextMenuHandler } from "~/fileContextMenu";
69+
import { openDiffFilePrimaryAction } from "~/diffFileActions";
70+
import { useCheckpointDiff } from "~/lib/checkpointDiffState";
71+
import { cn } from "~/lib/utils";
72+
import { selectThreadDiffPanelSelection, useDiffPanelStore } from "~/diffPanelStore";
73+
import { useLocalStorage } from "~/hooks/useLocalStorage";
74+
import { useTheme } from "~/hooks/useTheme";
75+
import {
76+
buildFileDiffContentVersion,
77+
buildFileDiffIdentityKey,
78+
getDiffCollapseIconClassName,
79+
getDiffLineStat,
80+
getRenderablePatch,
81+
resolveDiffThemeName,
82+
resolveFileDiffPath,
83+
} from "~/lib/diffRendering";
84+
import { PREFERRED_HIGHLIGHTER } from "~/lib/syntaxHighlighting";
85+
import { areAllDiffFilesCollapsed, toggleAllDiffFiles } from "~/lib/diffCollapse";
86+
import { useTurnDiffSummaries } from "~/hooks/useTurnDiffSummaries";
87+
import { useWorkspaceMutationRefresh } from "~/hooks/useWorkspaceMutationRefresh";
88+
import { useProject, useThreadProjection, useThreadShell } from "~/state/entities";
89+
import { resolveThreadRouteRef } from "~/threadRoutes";
90+
import { useClientSettings, useUpdateClientSettings } from "~/hooks/useSettings";
91+
import { formatShortTimestamp } from "~/timestampFormat";
92+
93+
import { useEnvironmentQuery } from "~/state/query";
94+
import { useAtomCommand } from "~/state/use-atom-command";
95+
import { serverEnvironment } from "~/state/server";
96+
import { reviewEnvironment } from "~/state/review";
97+
import { vcsEnvironment } from "~/state/vcs";
98+
import { buildBaseRefChoices, filterBaseRefChoices } from "~/lib/baseRefChoices";
99+
import { createGitDiffFileContentsLoader } from "~/lib/diffFileContents";
94100

95101
type DiffThemeType = "light" | "dark";
96102
const AUTOMATIC_BASE_REF = "__automatic_base_ref__";
@@ -119,17 +125,25 @@ interface CollapsedDiffFilesState {
119125

120126
const EMPTY_COLLAPSED_DIFF_FILE_KEYS: ReadonlySet<string> = new Set();
121127

122-
interface DiffPanelProps {
123-
mode?: DiffPanelMode;
124-
composerDraftTarget: ScopedThreadRef | DraftId;
125-
workspaceMutationId: string | null;
128+
// RightPanelTabs owns placement and desktop chrome; Diff keeps its embedded toolbar.
129+
function DiffSidePanelFrame({ header, children }: { header: ReactNode; children: ReactNode }) {
130+
return (
131+
<div className="flex h-full min-w-0 flex-col bg-background w-full">
132+
<div
133+
className="flex items-center justify-between gap-2 px-2 h-10 min-h-10 shrink-0 border-b border-border/60 bg-background in-data-[preview-panel-mode=inline]:mb-3 in-data-[preview-panel-mode=inline]:h-7 in-data-[preview-panel-mode=inline]:min-h-7 in-data-[preview-panel-mode=inline]:border-b-transparent"
134+
data-surface-subheader
135+
>
136+
{header}
137+
</div>
138+
{children}
139+
</div>
140+
);
126141
}
127142

128-
export default function DiffPanel({
129-
mode = "inline",
143+
export default function DiffSidePanel({
130144
composerDraftTarget,
131145
workspaceMutationId,
132-
}: DiffPanelProps) {
146+
}: SidePanelProps) {
133147
const { resolvedTheme } = useTheme();
134148
const settings = useClientSettings();
135149
const diffLayout = settings.diffLayout;
@@ -970,7 +984,7 @@ export default function DiffPanel({
970984
);
971985

972986
return (
973-
<DiffPanelShell mode={mode} header={headerRow}>
987+
<DiffSidePanelFrame header={headerRow}>
974988
{!activeThread ? (
975989
<div className="flex flex-1 items-center justify-center px-5 text-center text-xs text-muted-foreground/70">
976990
Select a thread to inspect turn diffs.
@@ -1195,6 +1209,6 @@ export default function DiffPanel({
11951209
</div>
11961210
</>
11971211
)}
1198-
</DiffPanelShell>
1212+
</DiffSidePanelFrame>
11991213
);
12001214
}

0 commit comments

Comments
 (0)