scriptoriumadmin/Roo-Code
1
0
Fork 0
mirror of https://github.com/RooVetGit/Roo-Code.git synced 2026-10-06 02:47:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: add X button to stop/close task during save/reject prompts

Browse source 
- Added a stop/close button (X icon) that remains visible when approval buttons are shown
- Button allows users to terminate tasks during save/reject phase as requested
- Fixes issue where users could not stop tasks when prompted to save/reject changes

Fixes #6865
This commit is contained in:
Roo Code 2025-08-09 01:26:39 +00:00
parent ad0e33e2d9
commit eed1f15646
1 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
webview-ui/src/components/chat/ChatView.tsx
View file

@ -1942,25 +1942,46 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
</VSCodeButton>
</StandardTooltip>
)}
{(secondaryButtonText || isStreaming) && (
{(secondaryButtonText || isStreaming) && !isStreaming && (
<StandardTooltip
content={
isStreaming
? t("chat:cancel.tooltip")
: secondaryButtonText === t("chat:startNewTask.title")
? t("chat:startNewTask.tooltip")
: secondaryButtonText === t("chat:reject.title")
? t("chat:reject.tooltip")
: secondaryButtonText === t("chat:terminate.title")
? t("chat:terminate.tooltip")
: undefined
secondaryButtonText === t("chat:startNewTask.title")
? t("chat:startNewTask.tooltip")
: secondaryButtonText === t("chat:reject.title")
? t("chat:reject.tooltip")
: secondaryButtonText === t("chat:terminate.title")
? t("chat:terminate.tooltip")
: undefined
}>
<VSCodeButton
appearance="secondary"
disabled={!enableButtons && !(isStreaming && !didClickCancel)}
className={isStreaming ? "flex-[2] ml-0" : "flex-1 ml-[6px]"}
disabled={!enableButtons}
className="flex-1 ml-[6px]"
onClick={() => handleSecondaryButtonClick(inputValue, selectedImages)}>
{isStreaming ? t("chat:cancel.title") : secondaryButtonText}
{secondaryButtonText}
</VSCodeButton>
</StandardTooltip>
)}
{isStreaming && (
<StandardTooltip content={t("chat:cancel.tooltip")}>
<VSCodeButton
appearance="secondary"
disabled={!(isStreaming && !didClickCancel)}
className="flex-[2] ml-0"
onClick={() => handleSecondaryButtonClick(inputValue, selectedImages)}>
{t("chat:cancel.title")}
</VSCodeButton>
</StandardTooltip>
)}
{/* Add stop/close button when not streaming but showing approval buttons */}
{!isStreaming && enableButtons && primaryButtonText && (
<StandardTooltip content={t("chat:terminate.tooltip")}>
<VSCodeButton
appearance="icon"
disabled={false}
className="ml-2"
onClick={() => startNewTask()}>
<span className="codicon codicon-x"></span>
</VSCodeButton>
</StandardTooltip>
)}