Skip to content

fix(ui): drop Diff header totals that don't fit instead of running under the toolbar #596

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
iamnbutler merged 1 commit into from
Oct 22, 2026
Merged

fix(ui): drop Diff header totals that don't fit instead of running under the toolbar #596

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 24 additions & 21 deletions packages/ui/src/components/diff/diff-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,27 +643,30 @@ function DiffViewContent(props: DiffViewProps & { kept: Kept }) {
<span className="shrink-0 text-muted-foreground">-&gt;</span>
<span className="min-w-0 truncate text-muted-foreground">{base}</span>
</div>
{summary.map(sum => (
<div
key={sum.group || ""}
className="flex shrink-0 items-center gap-2 text-xs font-medium tabular-nums"
>
{sum.group ? <span className="text-muted-foreground">{sum.group}</span> : null}
{sum.fixed
? (
<span className="font-normal text-muted-foreground">
{plural(sum.files, "file", "files")}
</span>
)
: null}
{sum.fixed && !sum.adds && !sum.dels ? null : (
<>
<span className="text-accent">+{sum.adds}</span>
<span className="text-destructive">-{sum.dels}</span>
</>
)}
</div>
))}
{/* One line tall, so totals that don't fit wrap out of sight instead of under the toolbar. */}
<div className="flex h-4 min-w-0 flex-1 basis-0 flex-wrap items-center gap-x-4 overflow-hidden">
{summary.map(sum => (
<div
key={sum.group || ""}
className="flex shrink-0 items-center gap-2 text-xs font-medium tabular-nums"
>
{sum.group ? <span className="text-muted-foreground">{sum.group}</span> : null}
{sum.fixed
? (
<span className="font-normal text-muted-foreground">
{plural(sum.files, "file", "files")}
</span>
)
: null}
{sum.fixed && !sum.adds && !sum.dels ? null : (
<>
<span className="text-accent">+{sum.adds}</span>
<span className="text-destructive">-{sum.dels}</span>
</>
)}
</div>
))}
</div>
</div>
<TooltipProvider>
<div className="flex shrink-0 items-center gap-1.5">
Expand Down