diff --git a/apps/web/components/kanban-board.tsx b/apps/web/components/kanban-board.tsx index fc7d2ae317..ff71c66fa9 100644 --- a/apps/web/components/kanban-board.tsx +++ b/apps/web/components/kanban-board.tsx @@ -136,6 +136,8 @@ function useKanbanBoardStore() { interface KanbanBoardProps { onPreviewTask?: (task: Task) => void; onOpenTask?: (task: Task) => void; + /** Fired before the edit dialog opens so the preview panel can close itself. */ + onBeforeEdit?: () => void; } function useKanbanBoardHooks( @@ -227,6 +229,7 @@ function useMultiSelectDerived( function useKanbanBoardSetup( onPreviewTask: KanbanBoardProps["onPreviewTask"], onOpenTask: KanbanBoardProps["onOpenTask"], + onBeforeEdit: KanbanBoardProps["onBeforeEdit"], ) { const router = useRouter(); const { isMobile } = useResponsiveBreakpoint(); @@ -251,6 +254,15 @@ function useKanbanBoardSetup( onPreviewTask, onOpenTask, }); + // Close preview before the edit dialog opens; destructure for stable useCallback dep. + const { handleEdit } = hooks; + const handleEditWithCleanup = useCallback( + (task: Task) => { + onBeforeEdit?.(); + handleEdit(task); + }, + [onBeforeEdit, handleEdit], + ); const multiSelect = useTaskMultiSelect(kanban.workflowId); const { isMultiSelectMode, toggleSelect } = multiSelect; @@ -299,6 +311,7 @@ function useKanbanBoardSetup( searchQuery, setSearchQuery, ...hooks, + handleEdit: handleEditWithCleanup, ...automation, handleOpenTask, handleCardClick: handleCardClickOrSelect, @@ -310,8 +323,8 @@ function useKanbanBoardSetup( }; } -export function KanbanBoard({ onPreviewTask, onOpenTask }: KanbanBoardProps = {}) { - const s = useKanbanBoardSetup(onPreviewTask, onOpenTask); +export function KanbanBoard({ onPreviewTask, onOpenTask, onBeforeEdit }: KanbanBoardProps = {}) { + const s = useKanbanBoardSetup(onPreviewTask, onOpenTask, onBeforeEdit); if (!s.isMounted) { return
; diff --git a/apps/web/components/kanban-card-menu-items.tsx b/apps/web/components/kanban-card-menu-items.tsx index 1c42863264..c3da448b79 100644 --- a/apps/web/components/kanban-card-menu-items.tsx +++ b/apps/web/components/kanban-card-menu-items.tsx @@ -360,6 +360,8 @@ function ContextEntry({ entry }: { entry: KanbanCardMenuEntry }) { data-testid={entry.testId} disabled={entry.disabled} className={entry.destructive ? "text-destructive focus:text-destructive" : undefined} + // React events bubble through the React tree even from a portal — stop here so the card's onClick doesn't navigate. + onClick={(event) => event.stopPropagation()} onSelect={() => { if (!entry.disabled) entry.onSelect?.(); }} @@ -402,6 +404,8 @@ function DropdownEntry({ entry }: { entry: KanbanCardMenuEntry }) { data-testid={entry.testId} disabled={entry.disabled} className={entry.destructive ? "text-destructive focus:text-destructive" : undefined} + // React events bubble through the React tree even from a portal — stop here so the card's onClick doesn't navigate. + onClick={(event) => event.stopPropagation()} onSelect={(event) => { event.stopPropagation(); if (!entry.disabled) entry.onSelect?.(); diff --git a/apps/web/components/kanban-with-preview.tsx b/apps/web/components/kanban-with-preview.tsx index 6d723add32..740a785114 100644 --- a/apps/web/components/kanban-with-preview.tsx +++ b/apps/web/components/kanban-with-preview.tsx @@ -316,7 +316,11 @@ function FloatingPreviewLayout({ return ( <>
- +
- +
{isOpen && (