Skip to content

feat(desktop): add discard button to unstaged file rows #1698

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
supungbab wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −1
Open

feat(desktop): add discard button to unstaged file rows #1698

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
25 changes: 24 additions & 1 deletion ...s/main/components/WorkspaceView/RightSidebar/ChangesView/components/FileItem/FileItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export function FileItem({
const showStatsDisplay =
showStats && (file.additions > 0 || file.deletions > 0);
const hasIndent = level > 0;
const hasAction = onStage || onUnstage;
const hasAction = onStage || onUnstage || onDiscard;

const isScrollSyncActive =
category && activeFileKey === createFileKey(file, category, commitHash);
Expand Down Expand Up @@ -216,6 +216,29 @@ export function FileItem({

{hasAction && (
<div className="flex items-center opacity-0 group-hover:opacity-100 transition-opacity">
{onDiscard && (
<Tooltip>
<TooltipTrigger asChild>
<Button
variant="ghost"
size="icon"
className="size-5 hover:bg-accent"
onClick={(e) => {
e.stopPropagation();
handleDiscardClick();
}}
disabled={isActioning}
>
{isDeleteAction ? (
<LuTrash2 className="size-3" />
) : (
<LuUndo2 className="size-3" />
)}
</Button>
</TooltipTrigger>
<TooltipContent side="right">{discardLabel}</TooltipContent>
</Tooltip>
)}
{onStage && (
<Tooltip>
<TooltipTrigger asChild>
Expand Down
Loading