Skip to content

Fix branch selector layout and flexbox truncation in git review panel #12

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
SDSLeon merged 1 commit into from
May 23, 2026
+18 −18
Merged

Fix branch selector layout and flexbox truncation in git review panel #12

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions src/renderer/components/common/BranchSelector/BranchSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export interface BranchSelectorProps {
popoverPlacement?: "top" | "bottom";
forceHideLabel?: boolean;
iconOnly?: boolean;
className?: string;
}

export function BranchSelector(props: BranchSelectorProps) {
Expand Down Expand Up @@ -161,10 +162,10 @@ export function BranchSelector(props: BranchSelectorProps) {
}

return (
<div className="flex items-center gap-1">
<div className={`flex items-center gap-1 ${props.className ?? ""}`}>
{worktreeMode && <span className="shrink-0 text-xs text-muted">from</span>}
<Popover isOpen={isOpen} onOpenChange={setIsOpen}>
<Popover.Trigger>
<Popover.Trigger className="flex flex-1 min-w-0 items-center">
{trigger ?? (
<Tooltip delay={0}>
<Button
Expand Down
31 changes: 15 additions & 16 deletions src/renderer/views/GitReviewOverlay/parts/GitReviewPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,24 +152,21 @@ export function GitReviewPanel(props: {
{/* Header — full when standalone, slim git-actions-only bar when parent provides its own header */}
{hideHeader ? (
<div className="flex h-7 shrink-0 items-center gap-1.5 border-b border-[color:var(--border)] pl-1.5 pr-3 text-xs leading-tight">
{gitStatus?.branch && (
{gitStatus?.branch ? (
<>
{statusKey ? (
<>
<div className="flex min-w-0 flex-1 items-center gap-1.5">
<GitBranch className="size-3 shrink-0 text-muted/50" />
<div className="min-w-0">
<Tooltip delay={300}>
<Tooltip.Trigger tabIndex={-1} role="none">
<div className="max-w-[100px] truncate text-muted">
{gitStatus.branch}
</div>
</Tooltip.Trigger>
<Tooltip.Content placement="bottom">{gitStatus.branch}</Tooltip.Content>
</Tooltip>
</div>
</>
<Tooltip delay={300}>
<Tooltip.Trigger className="min-w-0 flex-1" tabIndex={-1} role="none">
<span className="block truncate text-muted">{gitStatus.branch}</span>
</Tooltip.Trigger>
<Tooltip.Content placement="bottom">{gitStatus.branch}</Tooltip.Content>
</Tooltip>
</div>
) : (
<BranchSelector
className="min-w-0 flex-1"
projectId={project.id}
currentBranch={gitStatus.branch}
value={gitStatus.branch}
Expand All @@ -179,11 +176,11 @@ export function GitReviewPanel(props: {
trigger={
<button
type="button"
className="flex min-w-0 cursor-pointer items-center gap-1 rounded px-1.5 py-1 hover:bg-foreground/5"
className="flex min-w-0 flex-1 cursor-pointer items-center gap-1 rounded px-1.5 py-1 hover:bg-foreground/5"
aria-label="Switch branch"
>
<GitBranch className="size-3 shrink-0 text-muted/50" />
<span className="max-w-[200px] truncate text-muted">
<span className="block flex-1 truncate text-left text-muted">
{gitStatus.branch}
</span>
</button>
Expand All @@ -196,8 +193,9 @@ export function GitReviewPanel(props: {
</span>
)}
</>
) : (
<div className="flex-1" />
)}
<div className="flex-1" />
{onRemove && (
<button
type="button"
Expand Down Expand Up @@ -259,6 +257,7 @@ export function GitReviewPanel(props: {
</>
) : (
<BranchSelector
className="min-w-0 flex-1"
projectId={project.id}
currentBranch={gitStatus.branch}
value={gitStatus.branch}
Expand Down