Skip to content

Your lightweight open-source personal agent.

perf(webui): reduce file activity layout work (#6587)

chengyongru94bfd3ff7d8e
diff --git a/webui/browser/file-diff.spec.ts b/webui/browser/file-diff.spec.ts
index de044ccc1..8d0e0958f 100644
--- a/webui/browser/file-diff.spec.ts
+++ b/webui/browser/file-diff.spec.ts
@@ -22,6 +22,15 @@ async function expectTokenColor(section: Locator, text: string, variable: string
}, { text, variable })).toBe(true);
}
+async function expectExpandedDiff(section: Locator) {
+ const wrapper = section.getByTestId("syntax-highlighted-diff-hunk");
+ // Expansion updates the window and its spacers on the next animation frame.
+ await expect.poll(() => wrapper.evaluate(node => {
+ const rowHeight = Math.floor((parseFloat(getComputedStyle(node).lineHeight) + 2) * 64) / 64;
+ return node.getBoundingClientRect().height >= 600 * rowHeight - 1;
+ })).toBe(true);
+}
+
for (const dark of [false, true]) {
for (const narrow of [false, true]) {
test(`read-only diffs preserve source, colors and reading sizes: ${dark ? "dark" : "light"}, ${narrow ? "narrow" : "desktop"}`, async ({ page }) => {
@@ -94,6 +103,7 @@ test("large diffs retain bounded expansion, release and truncated-file actions",
await expect(long.locator("[data-code] [data-line]")).toHaveCount(160);
await expect(long.locator("[data-code] [data-line]").last()).toHaveText('export const item160 = "第 160 行 — readable code";');
await long.getByTestId("file-edit-diff-expand-lines").click();
+ await expectExpandedDiff(long);
const scroller = page.getByTestId("diff-fixture-scroller");
const seen = new Set<number>();
const height = await scroller.evaluate(node => node.scrollHeight);
@@ -135,6 +145,7 @@ for (const file of ["worker.ts", "long-separated.ts"]) {
await expect(section.locator("[data-code] [data-line]")).toHaveCount(160);
await expectKeywordColor(section.locator("[data-code] [data-line]"));
await section.getByTestId("file-edit-diff-expand-lines").click();
+ await expectExpandedDiff(section);
const scroller = page.getByTestId("diff-fixture-scroller");
const seen = new Set<number>();
const height = await scroller.evaluate(node => node.scrollHeight);
@@ -180,6 +191,7 @@ for (const [file, renderedIndex, sourceLine, reverse] of [["long.ts", 58, 59, fa
await section.getByTestId("file-edit-diff-toggle").click();
await expectKeywordColor(section.locator("[data-code] [data-line]"));
await section.getByTestId("file-edit-diff-expand-lines").click();
+ await expectExpandedDiff(section);
const scroller = page.getByTestId("diff-fixture-scroller");
const height = await scroller.evaluate(node => node.scrollHeight);
await section.getByTestId("syntax-highlighted-diff-hunk").evaluate((node, index) => {
diff --git a/webui/browser/file-edit-path.spec.ts b/webui/browser/file-edit-path.spec.ts
index 77805e86b..f73373a01 100644
--- a/webui/browser/file-edit-path.spec.ts
+++ b/webui/browser/file-edit-path.spec.ts
@@ -48,8 +48,7 @@ for (const width of [360, 1024]) {
await longPath.press("Enter");
await expect(page.getByLabel("Opened file")).toHaveText(longEditPath);
await expect(hint).toBeHidden();
- await page.getByRole("button", { name: /View changes/ }).first().click();
- await expect(page.getByTestId("file-edit-diff")).toBeVisible();
+ // Check hover before expanding the diff above it, which moves the image row.
const imagePath = references.nth(3);
await expect(imagePath).toContainText("…");
await imagePath.hover();
@@ -62,9 +61,15 @@ for (const width of [360, 1024]) {
await page.mouse.move(0, 0);
await imagePath.focus();
await expect(hint).toContainText(longEditPath.replace("serve_fixture.py", "screenshot.png"));
+ await page.getByRole("button", { name: /View changes/ }).first().click();
+ await expect(page.getByTestId("file-edit-diff")).toBeVisible();
await page.setViewportSize({ width: 1600, height: 800 });
await page.getByLabel("File edits").evaluate((element) => { (element as HTMLElement).style.maxWidth = "none"; });
await expect(longPath).not.toContainText("…");
expect(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth)).toBe(true);
+ await page.setViewportSize({ width, height: 800 });
+ await page.getByLabel("File edits").evaluate((element) => { (element as HTMLElement).style.maxWidth = "640px"; });
+ await expect(longPath).toContainText("…");
+ await expect(references.nth(1)).not.toContainText("…");
});
}
diff --git a/webui/src/components/FileReferenceChip.tsx b/webui/src/components/FileReferenceChip.tsx
index 066aa6235..517719584 100644
--- a/webui/src/components/FileReferenceChip.tsx
+++ b/webui/src/components/FileReferenceChip.tsx
@@ -160,11 +160,18 @@ function StartTruncatedText({ children, className, ...props }: HTMLAttributes<HT
const content = useRef<HTMLSpanElement>(null);
const [clipped, setClipped] = useState(false);
useLayoutEffect(() => {
- const update = () => setClipped(content.current!.getBoundingClientRect().width > container.current!.getBoundingClientRect().width);
- const observer = new ResizeObserver(update);
- observer.observe(container.current!);
- observer.observe(content.current!);
- update();
+ let availableWidth = 0;
+ let contentWidth = 0;
+ const observer = new ResizeObserver((entries) => {
+ for (const entry of entries) {
+ const width = entry.borderBoxSize[0].inlineSize;
+ if (entry.target === container.current) availableWidth = width;
+ else contentWidth = width;
+ }
+ setClipped(contentWidth > availableWidth);
+ });
+ observer.observe(container.current!, { box: "border-box" });
+ observer.observe(content.current!, { box: "border-box" });
return () => observer.disconnect();
}, []);
return <span ref={container} className={cn("inline-flex items-baseline overflow-hidden whitespace-nowrap", className)}>
diff --git a/webui/src/components/thread/activity/PierreFileDiff.tsx b/webui/src/components/thread/activity/PierreFileDiff.tsx
index a694ea7f8..034dffb45 100644
--- a/webui/src/components/thread/activity/PierreFileDiff.tsx
+++ b/webui/src/components/thread/activity/PierreFileDiff.tsx
@@ -10,6 +10,7 @@ import { CODE_TEXTMATE_THEME, CODE_THEME, CODE_THEME_NAME, codeHighlighterLangua
import { DiffViewportContext } from "./DiffViewportContext";
import type { DiffSyntaxHighlightProps } from "./DiffSyntaxHighlight";
import { DIFF_GAP_HEIGHT, diffRenderWindow, diffRowOffsets } from "./diff-render-window";
+import { cancelDiffRender, scheduleDiffRender } from "./diff-render-batch";
import { selectedDiffRows } from "./diff-selection";
const THEME = CODE_THEME_NAME;
@@ -116,11 +117,9 @@ export function PierreFileDiff({ text, language, diff, lineLimit }: DiffSyntaxHi
instance.setOptions(options);
const scroller = viewport?.scroller.current;
const eventTarget = scroller ?? window;
- let frame = 0;
let previous: RenderRange | undefined;
let forceRender = true;
- const render = () => {
- frame = 0;
+ const measure = () => {
const lineHeight = Math.floor((parseFloat(getComputedStyle(wrapper).lineHeight) + 2) * 64) / 64;
const offsets = diffRowOffsets(diff, lineLimit, lineHeight);
const rootRect = scroller?.getBoundingClientRect();
@@ -129,11 +128,13 @@ export function PierreFileDiff({ text, language, diff, lineLimit }: DiffSyntaxHi
const height = rootRect?.height ?? window.innerHeight;
const range = diffRenderWindow(diff, offsets, top - height, top + height * 2, lineHeight, selectedDiffRows(wrapper, metadata));
if (!forceRender && previous && Object.keys(range).every(key => range[key as keyof RenderRange] === previous![key as keyof RenderRange])) return;
- previous = range;
- instance.render({ fileDiff: metadata, containerWrapper: wrapper, renderRange: range, forceRender });
- forceRender = false;
+ return () => {
+ previous = range;
+ instance.render({ fileDiff: metadata, containerWrapper: wrapper, renderRange: range, forceRender });
+ forceRender = false;
+ };
};
- const schedule = () => { if (!frame) frame = requestAnimationFrame(render); };
+ const schedule = () => scheduleDiffRender(measure);
// This observer projects a read-only window; ThreadCameraController remains the sole scroll writer.
const resize = new ResizeObserver(schedule);
resize.observe(wrapper);
@@ -144,9 +145,9 @@ export function PierreFileDiff({ text, language, diff, lineLimit }: DiffSyntaxHi
eventTarget.addEventListener("scroll", schedule, { passive: true });
document.addEventListener("selectionchange", schedule);
window.addEventListener("resize", schedule);
- render();
+ schedule();
return () => {
- cancelAnimationFrame(frame);
+ cancelDiffRender(measure);
resize.disconnect();
typography.disconnect();
eventTarget.removeEventListener("scroll", schedule);
diff --git a/webui/src/components/thread/activity/diff-render-batch.ts b/webui/src/components/thread/activity/diff-render-batch.ts
new file mode 100644
index 000000000..02fb455d6
--- /dev/null
+++ b/webui/src/components/thread/activity/diff-render-batch.ts
@@ -0,0 +1,25 @@
+type MeasureDiff = () => (() => void) | undefined;
+
+const pending = new Set<MeasureDiff>();
+let frame = 0;
+
+export function scheduleDiffRender(measure: MeasureDiff) {
+ pending.add(measure);
+ if (frame) return;
+ frame = requestAnimationFrame(() => {
+ frame = 0;
+ const measures = [...pending];
+ pending.clear();
+ // Measure every mounted diff before any Pierre render invalidates layout.
+ const renders = measures.map(read => read());
+ for (const render of renders) render?.();
+ });
+}
+
+export function cancelDiffRender(measure: MeasureDiff) {
+ pending.delete(measure);
+ if (!pending.size && frame) {
+ cancelAnimationFrame(frame);
+ frame = 0;
+ }
+}
diff --git a/webui/src/tests/diff-syntax-highlight.test.tsx b/webui/src/tests/diff-syntax-highlight.test.tsx
index 589ba1bff..30547e94f 100644
--- a/webui/src/tests/diff-syntax-highlight.test.tsx
+++ b/webui/src/tests/diff-syntax-highlight.test.tsx
@@ -1,6 +1,7 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
import { getDiffMetadata } from "@/components/thread/activity/PierreFileDiff";
+import { cancelDiffRender, scheduleDiffRender } from "@/components/thread/activity/diff-render-batch";
import { DIFF_GAP_HEIGHT, diffRenderWindow, diffRowOffsets } from "@/components/thread/activity/diff-render-window";
import { parseRenderableFileDiff } from "@/lib/file-diff";
@@ -83,3 +84,33 @@ describe("file diff render windows", () => {
expect(tail.bufferAfter).toBe(0);
});
});
+
+it("batches diff geometry before DOM writes and cancels an unmounted diff", () => {
+ const frames: FrameRequestCallback[] = [];
+ const cancel = vi.fn();
+ vi.stubGlobal("requestAnimationFrame", (callback: FrameRequestCallback) => frames.push(callback));
+ vi.stubGlobal("cancelAnimationFrame", cancel);
+ const calls: string[] = [];
+ const first = () => { calls.push("read first"); return () => { calls.push("write first"); }; };
+ const second = () => { calls.push("read second"); return () => { calls.push("write second"); }; };
+ const unmounted = vi.fn();
+ try {
+ scheduleDiffRender(first);
+ scheduleDiffRender(second);
+ scheduleDiffRender(first);
+ scheduleDiffRender(unmounted);
+ cancelDiffRender(unmounted);
+ expect(frames).toHaveLength(1);
+ frames[0](0);
+ expect(calls).toEqual(["read first", "read second", "write first", "write second"]);
+ expect(unmounted).not.toHaveBeenCalled();
+ scheduleDiffRender(first);
+ cancelDiffRender(first);
+ expect(cancel).toHaveBeenCalledWith(2);
+ } finally {
+ cancelDiffRender(first);
+ cancelDiffRender(second);
+ cancelDiffRender(unmounted);
+ vi.unstubAllGlobals();
+ }
+});