The best way to control Claude Code, Codex and more from any computer or phone
fix(mobile): refreshing a review diff keeps unfolded files open (#35682)
Julius Marminge committed
Nov 12, 2026 at 15:50 UTC
56b6c2a8bf9b617c98643ccedbe76880e94ff3f1
2 files changed
+104
-12
apps/mobile/src/features/review/reviewFileVisibility.test.tsx
new
+69
@@ -0,0 +1,69 @@
1
+import { renderToStaticMarkup } from "react-dom/server";
2
+import { expect, it, vi } from "vite-plus/test";
3
+
4
+import { buildReviewParsedDiff, type ReviewRenderableFile } from "./reviewModel";
5
+import { useReviewFileVisibility } from "./reviewFileVisibility";
6
+
7
+const stored = vi.hoisted(() => ({ expanded: undefined as ReadonlyArray<string> | undefined }));
8
+vi.mock("./reviewState", () => ({
9
+ updateReviewExpandedFileIds: (
10
+ _threadKey: string,
11
+ _sectionId: string,
12
+ update: (current: ReadonlyArray<string> | undefined) => ReadonlyArray<string> | undefined,
13
+ ) => {
14
+ stored.expanded = update(stored.expanded);
15
+ },
16
+ updateReviewViewedFileIds: () => {},
17
+}));
18
+
19
+function patch(path: string, line: string) {
20
+ return `diff --git a/${path} b/${path}\n--- a/${path}\n+++ b/${path}\n@@ -1 +1 @@\n-old\n+${line}\n`;
21
+}
22
+
23
+function files(diff: string): ReadonlyArray<ReviewRenderableFile> {
24
+ const parsed = buildReviewParsedDiff(diff, "turn:3");
25
+ if (parsed.kind !== "files") throw new Error("Expected structured diff");
26
+ return parsed.files;
27
+}
28
+
29
+function visibility(current: ReadonlyArray<ReviewRenderableFile>) {
30
+ let result: ReturnType<typeof useReviewFileVisibility> | undefined;
31
+ function Probe({ report }: { report: (value: typeof result) => void }) {
32
+ report(
33
+ useReviewFileVisibility({
34
+ threadKey: "thread",
35
+ sectionId: "turn:3",
36
+ files: current,
37
+ cachedExpandedFileIds: stored.expanded,
38
+ cachedViewedFileIds: undefined,
39
+ }),
40
+ );
41
+ return null;
42
+ }
43
+ renderToStaticMarkup(<Probe report={(value) => (result = value)} />);
44
+ return result!;
45
+}
46
+
47
+it("keeps files the reader left open expanded when the section's diff changes", () => {
48
+ stored.expanded = undefined;
49
+ const before = files(patch("a.ts", "one") + patch("b.ts", "two"));
50
+ visibility(before).toggleExpandedFile(before[0]!.id);
51
+ expect(visibility(before).collapsedFileIds).toEqual([before[0]!.id]);
52
+
53
+ const after = files(patch("a.ts", "changed") + patch("b.ts", "two"));
54
+ const collapsedPaths = visibility(after).collapsedFileIds.map(
55
+ (id) => after.find((file) => file.id === id)!.path,
56
+ );
57
+ expect(collapsedPaths).not.toContain("b.ts");
58
+});
59
+
60
+it("folds only the selected entry when a file becomes a symlink", () => {
61
+ stored.expanded = undefined;
62
+ const current = files(
63
+ "diff --git a/a.ts b/a.ts\ndeleted file mode 100644\n--- a/a.ts\n+++ /dev/null\n@@ -1 +0,0 @@\n-old\n" +
64
+ "diff --git a/a.ts b/a.ts\nnew file mode 120000\n--- /dev/null\n+++ b/a.ts\n@@ -0,0 +1 @@\n+b.ts\n\\ No newline at end of file\n",
65
+ );
66
+ expect(current).toHaveLength(2);
67
+ visibility(current).toggleExpandedFile(current[0]!.id);
68
+ expect(visibility(current).collapsedFileIds).toEqual([current[0]!.id]);
69
+});
apps/mobile/src/features/review/reviewFileVisibility.ts
+35
-12
@@ -3,10 +3,25 @@ import { useCallback, useMemo } from "react";
3
import { updateReviewExpandedFileIds, updateReviewViewedFileIds } from "./reviewState";
4
import type { ReviewRenderableFile } from "./reviewModel";
5
6
-function getDefaultReviewExpandedFileIds(
6
+// File ids are scoped to one diff text, so a refresh renames every file. Expansion is
7
+// stored by path, which survives a refresh; the occurrence index keeps apart entries
8
+// that share a path, such as the deletion and addition when a file becomes a symlink.
9
+function getReviewFileExpansionKeys(
10
files: ReadonlyArray<ReviewRenderableFile>,
11
): ReadonlyArray<string> {
9
- return files.map((file) => file.id);
12
+ const seen = new Map<string, number>();
13
+ return files.map((file) => {
14
+ const occurrence = seen.get(file.path) ?? 0;
15
+ seen.set(file.path, occurrence + 1);
16
+ return `${occurrence}:${file.path}`;
17
+ });
18
+}
19
+
20
+function getExpandedReviewFileKeys(
21
+ keys: ReadonlyArray<string>,
22
+ storedKeys: ReadonlyArray<string> | undefined,
23
+): ReadonlyArray<string> {
24
+ return storedKeys === undefined ? keys : keys.filter((key) => storedKeys.includes(key));
25
}
26
27
function getValidReviewFileIds(
@@ -14,7 +29,7 @@ function getValidReviewFileIds(
29
fileIds: ReadonlyArray<string> | undefined,
30
): ReadonlyArray<string> {
31
if (fileIds === undefined) {
17
- return getDefaultReviewExpandedFileIds(files);
32
+ return files.map((file) => file.id);
33
}
34
35
const fileIdSet = new Set(files.map((file) => file.id));
@@ -49,10 +64,13 @@ export function useReviewFileVisibility(input: {
64
}) {
65
const { cachedExpandedFileIds, cachedViewedFileIds, files, sectionId, threadKey } = input;
66
52
- const expandedFileIds = useMemo(
53
- () => getValidReviewFileIds(files, cachedExpandedFileIds),
54
- [cachedExpandedFileIds, files],
55
- );
67
+ const expansionKeys = useMemo(() => getReviewFileExpansionKeys(files), [files]);
68
+ const expandedFileIds = useMemo(() => {
69
+ const expandedKeys = new Set(getExpandedReviewFileKeys(expansionKeys, cachedExpandedFileIds));
70
+ return files
71
+ .filter((_, index) => expandedKeys.has(expansionKeys[index]!))
72
+ .map((file) => file.id);
73
+ }, [cachedExpandedFileIds, expansionKeys, files]);
74
const viewedFileIds = useMemo(
75
() => getValidExplicitReviewFileIds(files, cachedViewedFileIds),
76
[cachedViewedFileIds, files],
@@ -73,11 +91,15 @@ export function useReviewFileVisibility(input: {
91
return;
92
}
93
94
+ const key = expansionKeys[files.findIndex((file) => file.id === fileId)];
95
+ if (key === undefined) {
96
+ return;
97
+ }
98
updateReviewExpandedFileIds(threadKey, sectionId, (existing) =>
77
- toggleReviewFileId(getValidReviewFileIds(files, existing), fileId),
99
+ toggleReviewFileId(getExpandedReviewFileKeys(expansionKeys, existing), key),
100
);
101
},
80
- [files, sectionId, threadKey],
102
+ [expansionKeys, files, sectionId, threadKey],
103
);
104
105
const toggleViewedFile = useCallback(
@@ -91,13 +113,14 @@ export function useReviewFileVisibility(input: {
113
toggleReviewFileId(getValidExplicitReviewFileIds(files, existing), fileId),
114
);
115
94
- if (shouldCollapse) {
116
+ const key = expansionKeys[files.findIndex((file) => file.id === fileId)];
117
+ if (shouldCollapse && key !== undefined) {
118
updateReviewExpandedFileIds(threadKey, sectionId, (existing) =>
96
- removeReviewFileId(getValidReviewFileIds(files, existing), fileId),
119
+ removeReviewFileId(getExpandedReviewFileKeys(expansionKeys, existing), key),
120
);
121
}
122
},
100
- [files, sectionId, threadKey, viewedFileIds],
123
+ [expansionKeys, files, sectionId, threadKey, viewedFileIds],
124
);
125
126
return {