Skip to content

Commit 7e9dcb2

Browse files
fix(web): open code blocks and diffs follow a changed word wrap default
Chat code blocks, the diff panel and the pull request Code tab copied the word wrap setting into local state when they mounted, so changing the default in Settings left them on the old value until a reload. They now read the setting live and keep only a per-view override, as file previews already do. Fixes #35898 Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent b558343 commit 7e9dcb2

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

‎apps/web/src/components/DiffPanel.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,8 @@ export default function DiffPanel({
232232
wordWrap: settings.wordWrap,
233233
}));
234234
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;
236237
const diffIgnoreWhitespace =
237238
useDiffPanelSessionStore((state) => state.ignoreWhitespace) ?? settings.diffIgnoreWhitespace;
238239
const [fileTreeOpen, setFileTreeOpen] = useLocalStorage(
@@ -1218,7 +1219,7 @@ export default function DiffPanel({
12181219
size="sm"
12191220
pressed={wordWrap}
12201221
onPressedChange={(pressed) => {
1221-
setWordWrap(Boolean(pressed));
1222+
setWordWrapOverride(Boolean(pressed));
12221223
}}
12231224
/>
12241225
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { toHtml } from "hast-util-to-html";
33
import React, { use, useEffect, useState, type ReactNode } from "react";
44

55
import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";
6-
import { getClientSettings } from "../../hooks/useSettings";
6+
import { useClientSettings } from "../../hooks/useSettings";
77
import type { DiffThemeName } from "../../lib/diffRendering";
88
import {
99
createIncrementalHighlightedDocument,
@@ -161,7 +161,9 @@ export function MarkdownCodeBlock({
161161
cause,
162162
),
163163
});
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;
165167
const wrapLabel = wrapped ? "Disable line wrap" : "Wrap lines";
166168
const copyLabel = copied ? "Copied" : "Copy code";
167169
const command = code.trim();
@@ -227,7 +229,7 @@ export function MarkdownCodeBlock({
227229
variant={wrapped ? "secondary" : "ghost-muted"}
228230
size="icon-xs"
229231
aria-pressed={wrapped}
230-
onClick={() => setWrapped((value) => !value)}
232+
onClick={() => setWrapOverride(!wrapped)}
231233
aria-label={wrapLabel}
232234
/>
233235
}

‎apps/web/src/components/pullRequest/PullRequestCodeTab.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,8 @@ function PullRequestCodeTab({
395395
const effectiveFoldOverride =
396396
foldOverride ?? (settings.diffFilesCollapsed ? "folded" : "expanded");
397397
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;
399400
const [ignoreWhitespace, setIgnoreWhitespace] = useState(settings.diffIgnoreWhitespace);
400401
const [fileTreeOpen, setFileTreeOpen] = useLocalStorage(
401402
PULL_REQUEST_FILE_TREE_STORAGE_KEY,
@@ -1315,7 +1316,7 @@ function PullRequestCodeTab({
13151316
</DropdownMenuCheckboxItem>
13161317
<DropdownMenuCheckboxItem
13171318
checked={wordWrap}
1318-
onCheckedChange={(checked) => setWordWrap(checked)}
1319+
onCheckedChange={(checked) => setWordWrapOverride(checked)}
13191320
>
13201321
Wrap lines
13211322
</DropdownMenuCheckboxItem>
@@ -1386,7 +1387,7 @@ function PullRequestCodeTab({
13861387
size="sm"
13871388
pressed={wordWrap}
13881389
onPressedChange={(pressed) => {
1389-
setWordWrap(Boolean(pressed));
1390+
setWordWrapOverride(Boolean(pressed));
13901391
}}
13911392
/>
13921393
}

0 commit comments

Comments
 (0)