Skip to content

feat(diff): add line wrap toggle #1250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tyler-builds wants to merge 2 commits into
base: main
Choose a base branch
from
+22 −1
Open

feat(diff): add line wrap toggle #1250

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e44cb04
feat(diff): add line wrap toggle
tyler-builds Mar 20, 2026
87fad1e
Change ToggleGroup to single Toggle for diff line wrapping
tyler-builds Mar 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion apps/web/src/components/DiffPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@ import { FileDiff, type FileDiffMetadata, Virtualizer } from "@pierre/diffs/reac
import { useQuery } from "@tanstack/react-query";
import { useNavigate, useParams, useSearch } from "@tanstack/react-router";
import { ThreadId, type TurnId } from "@t3tools/contracts";
import { ChevronLeftIcon, ChevronRightIcon, Columns2Icon, Rows3Icon } from "lucide-react";
import {
ChevronLeftIcon,
ChevronRightIcon,
Columns2Icon,
Rows3Icon,
WrapTextIcon,
} from "lucide-react";
import {
type WheelEvent as ReactWheelEvent,
useCallback,
Expand All @@ -30,6 +36,7 @@ import { DiffPanelLoadingState, DiffPanelShell, type DiffPanelMode } from "./Dif
import { ToggleGroup, Toggle } from "./ui/toggle-group";

type DiffRenderMode = "stacked" | "split";
type DiffOverflowMode = "scroll" | "wrap";
type DiffThemeType = "light" | "dark";

const DIFF_PANEL_UNSAFE_CSS = `
Expand Down Expand Up @@ -162,6 +169,7 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
const { resolvedTheme } = useTheme();
const { settings } = useAppSettings();
const [diffRenderMode, setDiffRenderMode] = useState<DiffRenderMode>("stacked");
const [diffOverflowMode, setDiffOverflowMode] = useState<DiffOverflowMode>("scroll");
const patchViewportRef = useRef<HTMLDivElement>(null);
const turnStripRef = useRef<HTMLDivElement>(null);
const [canScrollTurnStripLeft, setCanScrollTurnStripLeft] = useState(false);
Expand Down Expand Up @@ -509,6 +517,18 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
<Columns2Icon className="size-3" />
</Toggle>
</ToggleGroup>
<Toggle
className="shrink-0 [-webkit-app-region:no-drag]"
variant="outline"
size="xs"
aria-label="Toggle line wrapping"
pressed={diffOverflowMode === "wrap"}
onPressedChange={(pressed) => {
setDiffOverflowMode(pressed ? "wrap" : "scroll");
}}
>
<WrapTextIcon className="size-3" />
</Toggle>
</>
);

Expand Down Expand Up @@ -584,6 +604,7 @@ export default function DiffPanel({ mode = "inline" }: DiffPanelProps) {
lineDiffType: "none",
theme: resolveDiffThemeName(resolvedTheme),
themeType: resolvedTheme as DiffThemeType,
overflow: diffOverflowMode === "wrap" ? "wrap" : "scroll",
unsafeCSS: DIFF_PANEL_UNSAFE_CSS,
}}
/>
Expand Down