Skip to content

fix: prevent edit mode activation when clicking interactive elements in message views #2377

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
akshaydeo merged 2 commits into from
Mar 30, 2026
Merged

fix: prevent edit mode activation when clicking interactive elements in message views #2377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62a7c89
fix/ui-fixes-on-routing-rules-sheet
impoiler Mar 28, 2026
153f5cf
fix/stop click propagation on action buttons in prompt messages to pr…
impoiler Mar 30, 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
6 changes: 3 additions & 3 deletions ui/app/workspace/logs/sheets/logDetailsSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,17 +177,17 @@ export function LogDetailSheet({ log, open, onOpenChange, handleDelete, onNaviga
</SheetTitle>
</div>
<div className="flex items-center">
<Button variant="ghost" className="size-8" disabled={!hasPrev} onClick={() => onNavigate?.("prev")} aria-label="Previous log" data-testid="logdetails-prev-button">
<Button variant="ghost" className="size-8" disabled={!hasPrev} onClick={() => onNavigate?.("prev")} aria-label="Previous log" data-testid="logdetails-prev-button" type="button">
<ChevronUp className="size-4" />
</Button>
<Button variant="ghost" className="size-8" disabled={!hasNext} onClick={() => onNavigate?.("next")} aria-label="Next log" data-testid="logdetails-next-button">
<Button variant="ghost" className="size-8" disabled={!hasNext} onClick={() => onNavigate?.("next")} aria-label="Next log" data-testid="logdetails-next-button" type="button">
<ChevronDown className="size-4" />
</Button>
</div>
<AlertDialog>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" className="size-8">
<Button variant="ghost" className="size-8" type="button">
<MoreVertical className="h-3 w-3" />
</Button>
</DropdownMenuTrigger>
Expand Down
6 changes: 3 additions & 3 deletions ui/app/workspace/mcp-logs/views/mcpLogDetailsSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,17 @@ export function MCPLogDetailSheet({ log, open, onOpenChange, handleDelete, onNav
</SheetTitle>
</div>
<div className="flex items-center">
<Button variant="ghost" className="size-8" disabled={!hasPrev} onClick={() => onNavigate?.("prev")} aria-label="Previous log" data-testid="mcp-log-nav-prev">
<Button variant="ghost" className="size-8" disabled={!hasPrev} onClick={() => onNavigate?.("prev")} aria-label="Previous log" data-testid="mcp-log-nav-prev" type="button">
<ChevronUp className="size-4" />
</Button>
<Button variant="ghost" className="size-8" disabled={!hasNext} onClick={() => onNavigate?.("next")} aria-label="Next log" data-testid="mcp-log-nav-next">
<Button variant="ghost" className="size-8" disabled={!hasNext} onClick={() => onNavigate?.("next")} aria-label="Next log" data-testid="mcp-log-nav-next" type="button">
<ChevronDown className="size-4" />
</Button>
</div>
<AlertDialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen}>
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" className="size-8">
<Button variant="ghost" className="size-8" type="button">
<MoreVertical className="h-3 w-3" />
</Button>
</DropdownMenuTrigger>
Expand Down
2 changes: 1 addition & 1 deletion ui/app/workspace/plugins/sheets/pluginSequenceSheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export default function PluginSequenceSheet({ open, onClose, plugins }: PluginSe
<Button type="button" variant="outline" onClick={onClose} disabled={isLoading} data-testid="plugin-sequence-cancel-button">
Cancel
</Button>
<Button onClick={handleSave} disabled={isLoading} isLoading={isLoading} data-testid="plugin-sequence-save-button">
<Button onClick={handleSave} disabled={isLoading} isLoading={isLoading} data-testid="plugin-sequence-save-button" type="button">
Save Sequence
</Button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/app/workspace/routing-rules/components/celBuilder/celRuleBuilder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ export function CELRuleBuilder({
<div className="space-y-2">
<div className="flex items-center justify-between">
<Label>CEL Expression Preview</Label>
<Button variant="outline" size="sm" onClick={handleCopy} disabled={!celExpression} className="gap-2">
<Button variant="outline" size="sm" onClick={handleCopy} disabled={!celExpression} className="gap-2" type="button">
{copied ? (
<>
<Check className="h-4 w-4" />
Expand Down
6 changes: 4 additions & 2 deletions ui/components/prompts/components/messagesView/assistantMessageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,10 @@ export function AssistantMessageView({
) : (
<div
className={!disabled && !isStreaming ? "cursor-text" : undefined}
onClick={() => {
if (!disabled && !isStreaming) setEditMode(true);
onClick={(e) => {
if (disabled || isStreaming || editMode) return;
if ((e.target as HTMLElement).closest("button, a, [role='button']")) return;
setEditMode(true);
}}
>
<Markdown content={content} isStreaming={isStreaming} className="text-muted-foreground" />
Expand Down
8 changes: 5 additions & 3 deletions ui/components/prompts/components/messagesView/systemMessageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export function SystemMessageView({
</div>
</div>

<div onClick={() => { if (!disabled && !editMode) setEditMode(true); }} className={!disabled && !editMode ? "cursor-text" : ""}>
<div onClick={(e) => { if (!disabled && !editMode && !(e.target as HTMLElement).closest("button, a, [role='button']")) setEditMode(true); }} className={!disabled && !editMode ? "cursor-text" : ""}>
Comment thread
greptile-apps[bot] marked this conversation as resolved.
Comment thread
impoiler marked this conversation as resolved.
{editMode ? (
<RichTextarea
autoFocus
Expand Down Expand Up @@ -168,8 +168,10 @@ export function SystemMessageView({
) : (
<div
className={!disabled ? "cursor-text" : undefined}
onClick={() => {
if (!disabled) setEditMode(true);
onClick={(e) => {
if (disabled || editMode) return;
if ((e.target as HTMLElement).closest("button, a, [role='button']")) return;
setEditMode(true);
}}
>
<Markdown content={content} className="text-muted-foreground" />
Expand Down
6 changes: 4 additions & 2 deletions ui/components/prompts/components/messagesView/userMessageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,10 @@ export function UserMessageView({
) : (
<div
className={!disabled ? "cursor-text" : undefined}
onClick={() => {
if (!disabled) setEditMode(true);
onClick={(e) => {
if (disabled || editMode) return;
if ((e.target as HTMLElement).closest("button, a, [role='button']")) return;
setEditMode(true);
}}
>
<Markdown content={content} className="text-muted-foreground" />
Expand Down
Loading