Skip to content

Commit 6861bcd

Browse files
perf(web): the changed files tree compiles without manual memoization
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent a702563 commit 6861bcd

1 file changed

Lines changed: 23 additions & 22 deletions

File tree

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

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { type RunId } from "@t3tools/contracts";
2-
import { type MouseEvent, memo, useCallback, useMemo, useState } from "react";
2+
import { type MouseEvent, memo, useState } from "react";
33
import { type TurnDiffFileChange } from "../../types";
44
import {
55
buildTurnDiffTree,
@@ -38,7 +38,7 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {
3838
onOpenTurnDiff,
3939
onFileContextMenu,
4040
} = props;
41-
const summaryStat = useMemo(() => summarizeTurnDiffStats(files), [files]);
41+
const summaryStat = summarizeTurnDiffStats(files);
4242
const hasDirectories = files.some((file) => /[/\\]/.test(file.path));
4343

4444
return (
@@ -122,6 +122,14 @@ export const ChangedFilesCard = memo(function ChangedFilesCard(props: {
122122
);
123123
});
124124

125+
// Building the tree walks every file, and the compiler would redo it each render
126+
// because the expansion state hook runs after it.
127+
function useTurnDiffTree(files: ReadonlyArray<TurnDiffFileChange>) {
128+
"use memo";
129+
const treeNodes = buildTurnDiffTree(files);
130+
return { treeNodes, directoryPathsKey: collectDirectoryPaths(treeNodes).join("\u0000") };
131+
}
132+
125133
export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
126134
runId: RunId;
127135
files: ReadonlyArray<TurnDiffFileChange>;
@@ -132,11 +140,7 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
132140
}) {
133141
const { files, allDirectoriesExpanded, onOpenTurnDiff, resolvedTheme, runId, onFileContextMenu } =
134142
props;
135-
const treeNodes = useMemo(() => buildTurnDiffTree(files), [files]);
136-
const directoryPathsKey = useMemo(
137-
() => collectDirectoryPaths(treeNodes).join("\u0000"),
138-
[treeNodes],
139-
);
143+
const { treeNodes, directoryPathsKey } = useTurnDiffTree(files);
140144
const hasDirectoryNodes = directoryPathsKey.length > 0;
141145
const expansionStateKey = `${allDirectoriesExpanded ? "expanded" : "collapsed"}\u0000${directoryPathsKey}`;
142146
const [directoryExpansionState, setDirectoryExpansionState] = useState<{
@@ -151,21 +155,18 @@ export const ChangedFilesTree = memo(function ChangedFilesTree(props: {
151155
? directoryExpansionState.overrides
152156
: EMPTY_DIRECTORY_OVERRIDES;
153157

154-
const toggleDirectory = useCallback(
155-
(pathValue: string) => {
156-
setDirectoryExpansionState((current) => {
157-
const nextOverrides = current.key === expansionStateKey ? current.overrides : {};
158-
return {
159-
key: expansionStateKey,
160-
overrides: {
161-
...nextOverrides,
162-
[pathValue]: !(nextOverrides[pathValue] ?? allDirectoriesExpanded),
163-
},
164-
};
165-
});
166-
},
167-
[allDirectoriesExpanded, expansionStateKey],
168-
);
158+
const toggleDirectory = (pathValue: string) => {
159+
setDirectoryExpansionState((current) => {
160+
const nextOverrides = current.key === expansionStateKey ? current.overrides : {};
161+
return {
162+
key: expansionStateKey,
163+
overrides: {
164+
...nextOverrides,
165+
[pathValue]: !(nextOverrides[pathValue] ?? allDirectoriesExpanded),
166+
},
167+
};
168+
});
169+
};
169170

170171
const renderTreeNode = (node: TurnDiffTreeNode, depth: number) => {
171172
const leftPadding = 8 + depth * 14;

0 commit comments

Comments
 (0)