@devries-cameron20 / t3code Mirror · read-only / commits / dd5061364b
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 21, 13:30 UTC

perf(web): completed Markdown blocks no longer render twice (#33794)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

Lakshmi Tanmay committed Nov 14, 2026 at 22:36 UTC dd5061364bbf52f5008a16fb22e367c3680bdbd1
4 files changed +47 -15
apps/web/src/components/ChatMarkdown.browser.test.tsx
+22 -2
@@ -291,7 +291,10 @@ it("reuses the parse of a streaming reply's finished blocks when it remounts", a
291 <ChatMarkdown cwd="/tmp/project" text={"Finished block\n\nStill growing"} isStreaming />
292 );
293 {
294 - await using _first = await render(message);
294 + await using first = await render(
295 + <ChatMarkdown cwd="/tmp/project" text={"Finished block\n\n"} isStreaming />,
296 + );
297 + await first.rerender(message);
298 }
299 await using screen = await render(message);
300 await expect.element(screen.getByText("Still growing")).toBeVisible();
@@ -306,11 +309,28 @@ it("reuses the parse of a remounted message that has stable extra plugins", asyn
309 <ChatMarkdown cwd="/tmp/project" text="Cached text" extraRemarkPlugins={countingPlugins} />
310 );
311 {
309 - await using _first = await render(message);
312 + await using first = await render(
313 + <ChatMarkdown
314 + cwd="/tmp/project"
315 + text="Cached text"
316 + extraRemarkPlugins={countingPlugins}
317 + isStreaming
318 + />,
319 + );
320 + await first.rerender(message);
321 }
322 await using screen = await render(message);
323 await expect.element(screen.getByText("Cached text")).toBeVisible();
324 expect(parsed).toHaveBeenCalledTimes(1);
325 + const changed = vi.fn();
326 + await screen.rerender(
327 + <ChatMarkdown
328 + cwd="/tmp/project"
329 + text="Cached text"
330 + extraRemarkPlugins={[() => () => void changed()]}
331 + />,
332 + );
333 + expect(changed).toHaveBeenCalledTimes(1);
334 });
335
336 it("highlights a code block's own source when an earlier block of the same length was cached", async () => {
apps/web/src/components/ChatMarkdown.tsx
+7 -3
@@ -81,6 +81,7 @@ import React, {
81 type MouseEvent as ReactMouseEvent,
82 use,
83 memo,
84 + useEffect,
85 useLayoutEffect,
86 useRef,
87 useState,
@@ -1822,9 +1823,12 @@ const MarkdownSource = memo(function MarkdownSource({
1823 components: CHAT_MARKDOWN_COMPONENTS,
1824 urlTransform: markdownUrlTransform,
1825 });
1825 - return (
1826 - <ChatMarkdownTextContext value={text}>{render(text, shared && cache)}</ChatMarkdownTextContext>
1827 - );
1826 + const element = render(text);
1827 + // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Caching during render would make React Compiler rebuild the element when `cache` flips.
1828 + useEffect(() => {
1829 + if (shared && cache) render.remember(text, element);
1830 + }, [render, text, element, shared, cache]);
1831 + return <ChatMarkdownTextContext value={text}>{element}</ChatMarkdownTextContext>;
1832 });
1833
1834 function ChatMarkdown({
apps/web/src/components/chat/markdownRenderer.test.tsx
+9 -6
@@ -45,9 +45,10 @@ describe("createMarkdownRenderer", () => {
45 {source}
46 </ReactMarkdown>,
47 );
48 - const element = render(source, true);
48 + const element = render(source);
49 expect(renderToStaticMarkup(element)).toBe(expected);
50 - expect(render(source, true)).toBe(element);
50 + render.remember(source, element);
51 + expect(render(source)).toBe(element);
52 });
53
54 it("renders what react-markdown renders while a reply streams through the incremental parser", () => {
@@ -62,7 +63,7 @@ describe("createMarkdownRenderer", () => {
63 rehypePlugins: CHAT_MARKDOWN_REHYPE_PLUGINS,
64 components: {},
65 urlTransform,
65 - })(source, false);
66 + })(source);
67 expect(renderToStaticMarkup(streamed)).toBe(
68 renderToStaticMarkup(
69 <ReactMarkdown
@@ -78,8 +79,10 @@ describe("createMarkdownRenderer", () => {
79 });
80
81 it("keeps cached messages when one far larger than the cache is rendered", () => {
81 - const element = render("Kept *message*", true);
82 - render("x".repeat(600_000), true);
83 - expect(render("Kept *message*", true)).toBe(element);
82 + const element = render("Kept *message*");
83 + render.remember("Kept *message*", element);
84 + const large = "x".repeat(600_000);
85 + render.remember(large, render(large));
86 + expect(render("Kept *message*")).toBe(element);
87 });
88 });
apps/web/src/components/chat/markdownRenderer.ts
+9 -4
@@ -82,7 +82,7 @@ export function createMarkdownRenderer({
82 }
83 };
84
85 - return (text: string, cache: boolean): ReactElement => {
85 + const render = (text: string): ReactElement => {
86 const key = keyPrefix + text;
87 const cached = rendered.get(key);
88 if (cached !== undefined) {
@@ -94,7 +94,7 @@ export function createMarkdownRenderer({
94 const file = new VFile(text);
95 const tree = processor.runSync(processor.parse(file), file) as Root;
96 prepare(tree);
97 - const element = toJsxRuntime(tree, {
97 + return toJsxRuntime(tree, {
98 Fragment,
99 components,
100 ignoreInvalidStyle: true,
@@ -103,7 +103,12 @@ export function createMarkdownRenderer({
103 passKeys: true,
104 passNode: true,
105 });
106 - if (cache) remember(key, element);
107 - return element;
106 };
107 +
108 + return Object.assign(render, {
109 + remember(text: string, element: ReactElement) {
110 + const key = keyPrefix + text;
111 + if (!rendered.has(key)) remember(key, element);
112 + },
113 + });
114 }