@devries-cameron20 / t3code-1 / commits / a621be8d15
Fork 0

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

fix(web): open code blocks and diffs follow a changed word wrap default (#35922)

Julius Marminge committed Nov 12, 2026 at 20:59 UTC a621be8d15428234bbbc9fc88a8b447c5c75774e
4 files changed +47 -8
apps/web/src/components/DiffPanel.tsx
+3 -2
@@ -232,7 +232,8 @@ export default function DiffPanel({
232 wordWrap: settings.wordWrap,
233 }));
234 const diffLayout = settings.diffLayout;
235 - const [wordWrap, setWordWrap] = useState(settings.wordWrap);
235 + const [wordWrapOverride, setWordWrapOverride] = useState<boolean | null>(null);
236 + const wordWrap = wordWrapOverride ?? settings.wordWrap;
237 const diffIgnoreWhitespace =
238 useDiffPanelSessionStore((state) => state.ignoreWhitespace) ?? settings.diffIgnoreWhitespace;
239 const [fileTreeOpen, setFileTreeOpen] = useLocalStorage(
@@ -1218,7 +1219,7 @@ export default function DiffPanel({
1219 size="sm"
1220 pressed={wordWrap}
1221 onPressedChange={(pressed) => {
1221 - setWordWrap(Boolean(pressed));
1222 + setWordWrapOverride(Boolean(pressed));
1223 }}
1224 />
1225 }
apps/web/src/components/chat/MarkdownCodeBlock.browser.test.tsx new
+35
@@ -0,0 +1,35 @@
1 +import { expect, it } from "vite-plus/test";
2 +
3 +import { act, render } from "../../../test/render";
4 +import "../../index.css";
5 +
6 +import { ensureClientSettingsHydrated, persistClientSettingsPatch } from "../../hooks/useSettings";
7 +import { MarkdownCodeBlock } from "./MarkdownCodeBlock";
8 +
9 +const setWordWrap = (wordWrap: boolean) =>
10 + act(() => persistClientSettingsPatch({ wordWrap }, async () => {}));
11 +
12 +it("follows a changed word wrap default while mounted", async () => {
13 + await ensureClientSettingsHydrated();
14 + await setWordWrap(false);
15 + await using screen = await render(
16 + <MarkdownCodeBlock
17 + code="a long line"
18 + language="text"
19 + fenceTitle={null}
20 + theme="light"
21 + isStreaming={false}
22 + >
23 + <pre>
24 + <code>a long line</code>
25 + </pre>
26 + </MarkdownCodeBlock>,
27 + { router: false }, // The code block reads no route state.
28 + );
29 + const block = () => screen.container.querySelector(".chat-markdown-codeblock");
30 + expect(block()?.getAttribute("data-wrap")).toBe("false");
31 +
32 + await setWordWrap(true);
33 + await expect.element(screen.getByRole("button", { name: "Disable line wrap" })).toBeVisible();
34 + expect(block()?.getAttribute("data-wrap")).toBe("true");
35 +});
apps/web/src/components/chat/MarkdownCodeBlock.tsx
+5 -3
@@ -3,7 +3,7 @@ import { toHtml } from "hast-util-to-html";
3 import React, { use, useEffect, useState, type ReactNode } from "react";
4
5 import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";
6 -import { getClientSettings } from "../../hooks/useSettings";
6 +import { useClientSettings } from "../../hooks/useSettings";
7 import type { DiffThemeName } from "../../lib/diffRendering";
8 import {
9 createIncrementalHighlightedDocument,
@@ -161,7 +161,9 @@ export function MarkdownCodeBlock({
161 cause,
162 ),
163 });
164 - const [wrapped, setWrapped] = useState(() => getClientSettings().wordWrap);
164 + const defaultWrapped = useClientSettings((settings) => settings.wordWrap);
165 + const [wrapOverride, setWrapOverride] = useState<boolean | null>(null);
166 + const wrapped = wrapOverride ?? defaultWrapped;
167 const wrapLabel = wrapped ? "Disable line wrap" : "Wrap lines";
168 const copyLabel = copied ? "Copied" : "Copy code";
169 const command = code.trim();
@@ -227,7 +229,7 @@ export function MarkdownCodeBlock({
229 variant={wrapped ? "secondary" : "ghost-muted"}
230 size="icon-xs"
231 aria-pressed={wrapped}
230 - onClick={() => setWrapped((value) => !value)}
232 + onClick={() => setWrapOverride(!wrapped)}
233 aria-label={wrapLabel}
234 />
235 }
apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
+4 -3
@@ -395,7 +395,8 @@ function PullRequestCodeTab({
395 const effectiveFoldOverride =
396 foldOverride ?? (settings.diffFilesCollapsed ? "folded" : "expanded");
397 const diffLayout = settings.diffLayout;
398 - const [wordWrap, setWordWrap] = useState(settings.wordWrap);
398 + const [wordWrapOverride, setWordWrapOverride] = useState<boolean | null>(null);
399 + const wordWrap = wordWrapOverride ?? settings.wordWrap;
400 const [ignoreWhitespace, setIgnoreWhitespace] = useState(settings.diffIgnoreWhitespace);
401 const [fileTreeOpen, setFileTreeOpen] = useLocalStorage(
402 PULL_REQUEST_FILE_TREE_STORAGE_KEY,
@@ -1315,7 +1316,7 @@ function PullRequestCodeTab({
1316 </DropdownMenuCheckboxItem>
1317 <DropdownMenuCheckboxItem
1318 checked={wordWrap}
1318 - onCheckedChange={(checked) => setWordWrap(checked)}
1319 + onCheckedChange={(checked) => setWordWrapOverride(checked)}
1320 >
1321 Wrap lines
1322 </DropdownMenuCheckboxItem>
@@ -1386,7 +1387,7 @@ function PullRequestCodeTab({
1387 size="sm"
1388 pressed={wordWrap}
1389 onPressedChange={(pressed) => {
1389 - setWordWrap(Boolean(pressed));
1390 + setWordWrapOverride(Boolean(pressed));
1391 }}
1392 />
1393 }