Skip to content

Use same button style for compress matching streaks #1884

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

Merged
mkst merged 3 commits into from
Mar 24, 2026
Merged

Use same button style for compress matching streaks #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68d7f1c
Use same button style for compress matching streaks
mkst Mar 24, 2026
a9fa0b8
PR feedback
mkst Mar 24, 2026
55470d9
fixup that last commit
mkst Mar 24, 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
37 changes: 10 additions & 27 deletions frontend/src/components/Diff/Diff.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
useState,
} from "react";

import { FoldIcon, UnfoldIcon } from "@primer/octicons-react";
import { FoldIcon } from "@primer/octicons-react";
import type { EditorView } from "codemirror";
import AutoSizer from "react-virtualized-auto-sizer";
import { FixedSizeList } from "react-window";
Expand Down Expand Up @@ -170,28 +170,6 @@ function DiffBody({
);
}

function CompressToggleButton({
enabled,
setEnabled,
}: {
enabled: boolean;
setEnabled: (enabled: boolean) => void;
}) {
return (
<button
className={styles.compressionToggle}
onClick={() => setEnabled(!enabled)}
title={
enabled
? "Do not compress streaks of matching lines"
: "Compress streaks of matching lines"
}
>
{enabled ? <FoldIcon size={24} /> : <UnfoldIcon size={24} />}
</button>
);
}

export function scrollToLineNumber(
editorView: RefObject<EditorView>,
lineNumber: number,
Expand Down Expand Up @@ -463,27 +441,32 @@ export default function Diff({
<div className={styles.spacer} />
<ToggleButton
label="T"
title={"Target column"}
title="Target column"
enabled={columnState.base}
setEnabled={(enabled) =>
setColumn("base", enabled)
}
/>
<ToggleButton
label="C"
title={"Current column"}
title="Current column"
enabled={columnState.current}
setEnabled={(enabled) =>
setColumn("current", enabled)
}
/>
<ToggleButton
label="3"
title={"3-way diff"}
title="3-way diff"
enabled={threeWayDiffEnabled}
setEnabled={handleSetThreeWayDiff}
/>
<CompressToggleButton
<ToggleButton
label={<FoldIcon size={16} />}
disabledLabel="Collapse streaks of "
enabledLabel="Show all "
title="matching lines"
padding="px-1 py-1"
enabled={compressionEnabled}
setEnabled={setCompressionEnabled}
/>
Expand Down
17 changes: 14 additions & 3 deletions frontend/src/components/Diff/ToggleButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,38 @@
import type { JSX } from "react";
import clsx from "clsx";

type ToggleButtonProps = {
label: string;
label: string | JSX.Element;
enabled: boolean;
setEnabled: (enabled: boolean) => void;
title?: string;
disabledLabel?: string;
enabledLabel?: string;
padding?: string;
};

export default function ToggleButton({
label,
enabled,
setEnabled,
title,
disabledLabel = "Show ",
enabledLabel = "Hide ",
padding = "px-2 py-1",
}: ToggleButtonProps) {
return (
<button
onClick={() => {
setEnabled(!enabled);
}}
aria-pressed={enabled}
title={`${enabled ? "Hide " : "Show "}${title}`}
title={
title
? `${enabled ? enabledLabel : disabledLabel}${title}`
: undefined
}
className={clsx(
"px-2 py-1",
padding,
"text-md",
"rounded-md border",
"transition-all duration-150",
Expand Down
Loading