Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 20 additions & 5 deletions src/browser/components/AgentListItem/AgentListItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { useWorkspaceFallbackModel } from "@/browser/hooks/useWorkspaceFallbackM
import { useWorkspaceUnread } from "@/browser/hooks/useWorkspaceUnread";
import { useRuntimeStatus } from "@/browser/stores/RuntimeStatusStore";
import { useWorkspaceSidebarState } from "@/browser/stores/WorkspaceStore";
import { stopKeyboardPropagation } from "@/browser/utils/events";
import { isEventFromDialogPortal, stopKeyboardPropagation } from "@/browser/utils/events";
import {
isRunningOrStartingTaskStatus,
type AgentRowRenderMeta,
Expand Down Expand Up @@ -755,13 +755,14 @@ function RegularAgentListItemInner(props: AgentListItemProps) {
isSelected && !isDisabled && "bg-surface-secondary"
)}
style={{ paddingLeft }}
onClick={() => {
onClick={(event) => {
if (isDisabled) return;
if (isEventFromDialogPortal(event.target)) return;
if (ctxMenu.suppressClickIfLongPress()) return;
onSelectWorkspace(workspaceSelection);
}}
onDoubleClick={(event) => {
if (isDisabled || isEditing) {
if (isDisabled || isEditing || isEventFromDialogPortal(event.target)) {
return;
}
const doubleClickTarget =
Expand All @@ -776,7 +777,18 @@ function RegularAgentListItemInner(props: AgentListItemProps) {
startEditing();
event.stopPropagation();
}}
{...ctxMenu.touchHandlers}
onTouchStart={(event) => {
if (isEventFromDialogPortal(event.target)) return;
ctxMenu.touchHandlers.onTouchStart(event);
Comment thread
ThomasK33 marked this conversation as resolved.
}}
onTouchMove={(event) => {
if (isEventFromDialogPortal(event.target)) return;
ctxMenu.touchHandlers.onTouchMove(event);
}}
onTouchEnd={(event) => {
if (isEventFromDialogPortal(event.target)) return;
ctxMenu.touchHandlers.onTouchEnd();
}}
onKeyDown={(e) => {
if (isDisabled || isEditing) return;
// Only treat these shortcuts as row-level controls when the row itself is
Expand Down Expand Up @@ -805,7 +817,10 @@ function RegularAgentListItemInner(props: AgentListItemProps) {
onSelectWorkspace(workspaceSelection);
}
}}
onContextMenu={ctxMenu.onContextMenu}
onContextMenu={(event) => {
if (isEventFromDialogPortal(event.target)) return;
ctxMenu.onContextMenu(event);
}}
role="button"
tabIndex={isDisabled ? -1 : 0}
aria-current={isSelected ? "true" : undefined}
Expand Down
24 changes: 24 additions & 0 deletions src/browser/utils/events.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import "../../../tests/ui/dom";

import { describe, expect, test } from "bun:test";
import { isEventFromDialogPortal } from "./events";

describe("isEventFromDialogPortal", () => {
test("detects targets inside role=dialog ancestors", () => {
const dialog = document.createElement("div");
dialog.setAttribute("role", "dialog");
const button = document.createElement("button");
dialog.append(button);
document.body.append(dialog);

expect(isEventFromDialogPortal(button)).toBe(true);
});

test("returns false for non-dialog targets and null", () => {
const button = document.createElement("button");
document.body.append(button);

expect(isEventFromDialogPortal(button)).toBe(false);
expect(isEventFromDialogPortal(null)).toBe(false);
});
});
7 changes: 7 additions & 0 deletions src/browser/utils/events.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
import type React from "react";

export function isEventFromDialogPortal(target: EventTarget | null): boolean {
// Dialogs rendered through React portals still bubble through the caller's React tree.
// Callers can ignore those events without stopping native propagation that Radix and
// popovers need for outside-interaction tracking.
return target instanceof Element && target.closest('[role="dialog"]') != null;
}

/**
* Stop keyboard event propagation for both React synthetic events and native KeyboardEvents.
*
Expand Down
Loading