Skip to content

Commit 48a2923

Browse files
t3dotggclaude
andauthored
fix(web): file preview wrap buttons no longer turn off word wrap everywhere (#26432)
Co-authored-by: Claude Opus 5.5 <[email protected]>
1 parent c3858bf commit 48a2923

5 files changed

Lines changed: 46 additions & 11 deletions

File tree

‎apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ vi.mock(import("~/assets/assetUrls"), async (original) => ({
1818
// The real source view highlights through a worker pool; the text it receives is what matters here.
1919
// Never load the original: its highlighter graph can outlast waitFor on a cold CI browser.
2020
vi.mock(import("./ReadOnlySourcePreview"), () => ({
21-
default: ({ text }: { text: string }) => <pre>{text}</pre>,
21+
default: ({ text, wordWrap }: { text: string; wordWrap?: boolean }) => (
22+
<pre data-word-wrap={String(wordWrap)}>{text}</pre>
23+
),
2224
}));
2325

2426
// The Word engine compiles about 30 MB of WebAssembly in a fresh worker per document, which took
@@ -41,6 +43,7 @@ vi.mock(import("./office/WordDocument"), async () => {
4143
};
4244
});
4345

46+
import { getClientSettings } from "~/hooks/useSettings";
4447
import { AttachmentFilePreview } from "./AttachmentFilePreview";
4548
import LargeTextViewer from "./LargeTextViewer";
4649
import VirtualTablePreview from "./VirtualTablePreview";
@@ -492,6 +495,7 @@ describe("large text preview recovery", () => {
492495
workspaceMutationId={mutation}
493496
revealLine={null}
494497
revealRequestId={0}
498+
wordWrap
495499
/>
496500
</div>
497501
);
@@ -2341,6 +2345,22 @@ it("toggles a Mermaid attachment between diagram and source through the lazy pre
23412345
expect(screen.container.querySelector('[role="alert"]')).toBeNull();
23422346
});
23432347

2348+
it("unwraps one text attachment without turning off the word wrap setting", async () => {
2349+
const file = new Blob(["a long line"], { type: "text/plain" });
2350+
await using screen = await render(
2351+
<AttachmentFilePreview
2352+
name="notes.txt"
2353+
mimeType={file.type}
2354+
sizeBytes={file.size}
2355+
file={file}
2356+
/>,
2357+
);
2358+
await screen.getByRole("button", { name: "Disable word wrap" }).click();
2359+
await expect.element(screen.getByRole("button", { name: "Enable word wrap" })).toBeVisible();
2360+
expect(getClientSettings().wordWrap).toBe(true);
2361+
expect(screen.container.querySelector("pre")?.dataset.wordWrap).toBe("false");
2362+
});
2363+
23442364
it("mounts a bounded set of saved notebook outputs as the reader scrolls", async () => {
23452365
const notebook = {
23462366
nbformat: 4,

‎apps/web/src/components/files/AttachmentFilePreview.tsx‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { MorphIcon } from "~/components/MorphIcon";
2121
import { ScrollArea } from "~/components/ui/scroll-area";
2222
import { toastManager } from "~/components/ui/toast";
2323
import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
24-
import { useClientSettings, updateClientSettings } from "~/hooks/useSettings";
24+
import { useClientSettings } from "~/hooks/useSettings";
2525
import { cn } from "~/lib/utils";
2626

2727
import { BinaryFilePreview } from "./BinaryFilePreview";
@@ -55,7 +55,7 @@ const SourcePreview = lazy(() => import("./ReadOnlySourcePreview"));
5555

5656
const STALE_URL_MS = 5 * 60_000;
5757

58-
export function ReadOnlySourcePreview(props: { name: string; text: string }) {
58+
export function ReadOnlySourcePreview(props: { name: string; text: string; wordWrap?: boolean }) {
5959
return (
6060
<Suspense fallback={<FileSurfaceLoading className="p-4" />}>
6161
<SourcePreview {...props} />
@@ -214,7 +214,9 @@ export function AttachmentFilePreview(props: {
214214
return () => controller.abort();
215215
}, [url, needsText, streamsText, revision, props.sizeBytes, props.file, refresh]);
216216
const failure = error ?? (needsText ? contentError : null);
217-
const wordWrap = useClientSettings((settings) => settings.wordWrap);
217+
const defaultWordWrap = useClientSettings((settings) => settings.wordWrap);
218+
const [wordWrapOverride, setWordWrapOverride] = useState<boolean | null>(null);
219+
const wordWrap = wordWrapOverride ?? defaultWordWrap;
218220
const showsRawText =
219221
failure === null &&
220222
needsText &&
@@ -272,6 +274,7 @@ export function AttachmentFilePreview(props: {
272274
onRetry={() => setRevision((value) => value + 1)}
273275
delimiter={rendered ? delimiter : null}
274276
copyContents={copyContents}
277+
wordWrap={wordWrap}
275278
/>
276279
</Suspense>
277280
) : !url || (needsText && !content) ? (
@@ -292,7 +295,7 @@ export function AttachmentFilePreview(props: {
292295
/>
293296
</ScrollArea>
294297
) : (
295-
<ReadOnlySourcePreview name={props.name} text={content.text} />
298+
<ReadOnlySourcePreview name={props.name} text={content.text} wordWrap={wordWrap} />
296299
)
297300
) : kind === "archive" || kind === "sqlite" ? (
298301
<BinaryFilePreview
@@ -387,7 +390,7 @@ export function AttachmentFilePreview(props: {
387390
<FileSurfaceAction
388391
label={wordWrap ? "Disable word wrap" : "Enable word wrap"}
389392
pressed={wordWrap}
390-
onPress={() => updateClientSettings({ wordWrap: !wordWrap })}
393+
onPress={() => setWordWrapOverride(!wordWrap)}
391394
>
392395
<WrapTextIcon className="size-3.5" />
393396
</FileSurfaceAction>

‎apps/web/src/components/files/FilePreviewPanel.tsx‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import { MediaVideoPlayer } from "~/components/media/MediaVideoPlayer";
5656
import { MediaActions, type MediaActionSource } from "~/components/media/MediaActions";
5757
import { MorphIcon } from "~/components/MorphIcon";
5858
import { useRemoteOpenState } from "~/remoteOpen";
59-
import { useClientSettings, updateClientSettings } from "~/hooks/useSettings";
59+
import { useClientSettings } from "~/hooks/useSettings";
6060
import { useTheme } from "~/hooks/useTheme";
6161
import { getLocalStorageItem, setLocalStorageItem, useLocalStorage } from "~/hooks/useLocalStorage";
6262
import { resolveDiffThemeName } from "~/lib/diffRendering";
@@ -996,7 +996,9 @@ export default function FilePreviewPanel({
996996
attachment === undefined ? resolveFilePreviewPath(requestedPath, cwd) : requestedPath;
997997
const draft = typeof composerDraftTarget === "string";
998998
const { resolvedTheme } = useTheme();
999-
const wordWrap = useClientSettings((settings) => settings.wordWrap);
999+
const defaultWordWrap = useClientSettings((settings) => settings.wordWrap);
1000+
const [wordWrapOverride, setWordWrapOverride] = useState<boolean | null>(null);
1001+
const wordWrap = wordWrapOverride ?? defaultWordWrap;
10001002
const canOperatePreview = useEnvironmentScope(environmentId, AuthPreviewOperateScope);
10011003
const primaryEnvironmentId = usePrimaryEnvironmentId();
10021004
const remoteOpenState = useRemoteOpenState(environmentId);
@@ -1291,7 +1293,7 @@ export default function FilePreviewPanel({
12911293
<FileSurfaceAction
12921294
label={wordWrap ? "Disable word wrap" : "Enable word wrap"}
12931295
pressed={wordWrap}
1294-
onPress={() => updateClientSettings({ wordWrap: !wordWrap })}
1296+
onPress={() => setWordWrapOverride(!wordWrap)}
12951297
>
12961298
<WrapTextIcon className="size-3.5" />
12971299
</FileSurfaceAction>
@@ -1403,6 +1405,7 @@ export default function FilePreviewPanel({
14031405
workspaceMutationId={workspaceMutationId}
14041406
revealLine={revealLine}
14051407
revealRequestId={revealRequestId}
1408+
wordWrap={wordWrap}
14061409
/>
14071410
) : relativePath &&
14081411
absolutePath &&
@@ -1488,6 +1491,7 @@ export default function FilePreviewPanel({
14881491
text={file.data.contents}
14891492
cacheKey={projectFileCacheKey(cwd, relativePath, file.data.contents)}
14901493
onPostRender={onFilePostRender}
1494+
wordWrap={wordWrap}
14911495
/>
14921496
) : (
14931497
<DiffWorkerPoolProvider>
@@ -1557,6 +1561,7 @@ export function WorkspaceLargeTextPreview(props: {
15571561
workspaceMutationId: string | null;
15581562
revealLine: number | null;
15591563
revealRequestId: number;
1564+
wordWrap: boolean;
15601565
}) {
15611566
const resource = {
15621567
_tag: "media-file",
@@ -1659,6 +1664,7 @@ export function WorkspaceLargeTextPreview(props: {
16591664
delimiter={props.delimiter}
16601665
revealLine={props.revealLine}
16611666
revealRequestId={props.revealRequestId}
1667+
wordWrap={props.wordWrap}
16621668
/>
16631669
</Suspense>
16641670
</>

‎apps/web/src/components/files/LargeTextViewer.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ export default function LargeTextViewer(props: {
3636
readonly delimiter: "," | "\t" | null;
3737
readonly revealLine?: number | null;
3838
readonly revealRequestId?: number;
39+
/** A preview's own wrap toggle; omitted follows the word wrap setting. */
40+
readonly wordWrap?: boolean;
3941
}) {
4042
const [meta, setMeta] = useState<Extract<TextPreviewResult, { type: "meta" }> | null>(null);
4143
const [pages, setPages] = useState(new Map<number, string[][]>());
@@ -46,7 +48,8 @@ export default function LargeTextViewer(props: {
4648
reject: (cause: Error) => void;
4749
} | null>(null);
4850
const pending = useRef(new Set<number>());
49-
const wordWrap = useClientSettings((settings) => settings.wordWrap);
51+
const defaultWordWrap = useClientSettings((settings) => settings.wordWrap);
52+
const wordWrap = props.wordWrap ?? defaultWordWrap;
5053
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Own the prefix fetch and indexing worker, cancelling requests and pending copies when the source changes or unmounts.
5154
useEffect(() => {
5255
// oxlint-disable-next-line react/set-state-in-effect -- A replacement source must discard the previous worker's error and pages.

‎apps/web/src/components/files/ReadOnlySourcePreview.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ export default function ReadOnlySourcePreview(props: {
1313
readonly text: string;
1414
readonly cacheKey?: string;
1515
readonly onPostRender?: FileOptions<unknown, undefined>["onPostRender"];
16+
/** A preview's own wrap toggle; omitted follows the word wrap setting. */
17+
readonly wordWrap?: boolean;
1618
}) {
1719
const resolvedTheme = useRenderedAppearance();
18-
const wordWrap = useClientSettings((settings) => settings.wordWrap);
20+
const defaultWordWrap = useClientSettings((settings) => settings.wordWrap);
21+
const wordWrap = props.wordWrap ?? defaultWordWrap;
1922
return (
2023
<DiffWorkerPoolProvider>
2124
<Virtualizer

0 commit comments

Comments
 (0)