From e06a6ec6b39b3488a1e8f516b20d16fe0a9bacf9 Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Tue, 20 Jan 2026 14:28:00 -0800 Subject: [PATCH 1/8] Working drag --- .../TabsContent/GroupStrip/GroupItem.tsx | 46 +++++- .../TabsContent/GroupStrip/GroupStrip.tsx | 145 ++++++++++-------- .../TabsContent/GroupStrip/NewTabDropZone.tsx | 52 +++++++ .../BasePaneWindow/BasePaneWindow.tsx | 5 + .../ContentView/TabsContent/TabView/index.tsx | 9 +- .../src/renderer/stores/drag-pane-store.ts | 22 +++ .../renderer/stores/tabs/actions/move-pane.ts | 8 + 7 files changed, 221 insertions(+), 66 deletions(-) create mode 100644 apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx create mode 100644 apps/desktop/src/renderer/stores/drag-pane-store.ts diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx index e5be43c3685..209677914da 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx @@ -2,10 +2,16 @@ import { Button } from "@superset/ui/button"; import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip"; import { cn } from "@superset/ui/utils"; import { useEffect, useRef, useState } from "react"; +import { useDrop } from "react-dnd"; import { HiMiniXMark } from "react-icons/hi2"; +import { MosaicDragType } from "react-mosaic-component"; import { StatusIndicator } from "renderer/screens/main/components/StatusIndicator"; +import { useDragPaneStore } from "renderer/stores/drag-pane-store"; import type { PaneStatus, Tab } from "renderer/stores/tabs/types"; -import { getTabDisplayName } from "renderer/stores/tabs/utils"; +import { + extractPaneIdsFromLayout, + getTabDisplayName, +} from "renderer/stores/tabs/utils"; interface GroupItemProps { tab: Tab; @@ -14,6 +20,7 @@ interface GroupItemProps { onSelect: () => void; onClose: () => void; onRename: (newName: string) => void; + onPaneDrop?: (paneId: string) => void; } export function GroupItem({ @@ -23,12 +30,39 @@ export function GroupItem({ onSelect, onClose, onRename, + onPaneDrop, }: GroupItemProps) { const displayName = getTabDisplayName(tab); const [isEditing, setIsEditing] = useState(false); const [editValue, setEditValue] = useState(""); const inputRef = useRef(null); + const [{ isOver, canDrop }, drop] = useDrop({ + accept: MosaicDragType.WINDOW, + canDrop: () => { + const { draggingPaneId, draggingSourceTabId } = + useDragPaneStore.getState(); + if (!draggingPaneId) return false; + // Can't drop on same tab + if (draggingSourceTabId === tab.id) return false; + // Can't drop if pane already in this tab (duplicate prevention) + const existingPaneIds = extractPaneIdsFromLayout(tab.layout); + return !existingPaneIds.includes(draggingPaneId); + }, + drop: () => { + const { draggingPaneId } = useDragPaneStore.getState(); + if (!draggingPaneId) return; + // Double-check pane isn't already in this tab + const existingPaneIds = extractPaneIdsFromLayout(tab.layout); + if (existingPaneIds.includes(draggingPaneId)) return; + onPaneDrop?.(draggingPaneId); + }, + collect: (monitor) => ({ + isOver: monitor.isOver(), + canDrop: monitor.canDrop(), + }), + }); + useEffect(() => { if (isEditing && inputRef.current) { inputRef.current.focus(); @@ -67,7 +101,15 @@ export function GroupItem({ ); return ( -
+
{ + drop(node); + }} + className={cn( + "group relative flex items-center shrink-0 h-full border-r border-border transition-colors", + isOver && canDrop && "bg-primary/10 border-primary", + )} + > {isEditing ? (
s.renameTab); const removeTab = useTabsStore((s) => s.removeTab); const setActiveTab = useTabsStore((s) => s.setActiveTab); + const movePaneToTab = useTabsStore((s) => s.movePaneToTab); + const movePaneToNewTab = useTabsStore((s) => s.movePaneToNewTab); const { presets } = usePresets(); const isDark = useIsDarkTheme(); @@ -116,6 +122,15 @@ export function GroupStrip() { renameTab(tabId, newName); }; + const checkIsLastPaneInTab = useCallback( + (paneId: string) => { + const pane = panes[paneId]; + if (!pane) return true; + return isLastPaneInTab(panes, pane.tabId); + }, + [panes], + ); + return (
{tabs.length > 0 && ( @@ -136,77 +151,83 @@ export function GroupStrip() { onSelect={() => handleSelectGroup(tab.id)} onClose={() => handleCloseGroup(tab.id)} onRename={(newName) => handleRenameGroup(tab.id, newName)} + onPaneDrop={(paneId) => movePaneToTab(paneId, tab.id)} />
))}
)} - -
- - + movePaneToNewTab(paneId)} + isLastPaneInTab={checkIsLastPaneInTab} + > + +
+ + + + + + + + + - - - - - - -
+ + {presets.length > 0 && ( + <> + {presets.map((preset) => { + const presetIcon = getPresetIcon(preset.name, isDark); + return ( + handleSelectPreset(preset)} + className="gap-2" + > + {presetIcon ? ( + + ) : ( + + )} + {preset.name || "default"} + {preset.isDefault && ( + + )} + + ); + })} + + + )} + - - - -
- - {presets.length > 0 && ( - <> - {presets.map((preset) => { - const presetIcon = getPresetIcon(preset.name, isDark); - return ( - handleSelectPreset(preset)} - className="gap-2" - > - {presetIcon ? ( - - ) : ( - - )} - {preset.name || "default"} - {preset.isDefault && ( - - )} - - ); - })} - - - )} - - - Configure Presets - - -
+ + Configure Presets + + + +
); } diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx new file mode 100644 index 00000000000..65f2a71afda --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx @@ -0,0 +1,52 @@ +import { cn } from "@superset/ui/utils"; +import type { ReactNode } from "react"; +import { useDrop } from "react-dnd"; +import { MosaicDragType } from "react-mosaic-component"; +import { useDragPaneStore } from "renderer/stores/drag-pane-store"; + +interface NewTabDropZoneProps { + onDrop: (paneId: string) => void; + isLastPaneInTab: (paneId: string) => boolean; + children: ReactNode; +} + +export function NewTabDropZone({ + onDrop, + isLastPaneInTab, + children, +}: NewTabDropZoneProps) { + const [{ isOver, canDrop }, drop] = useDrop({ + accept: MosaicDragType.WINDOW, + canDrop: () => { + const { draggingPaneId } = useDragPaneStore.getState(); + if (!draggingPaneId) return false; + // Don't allow if it's the only pane in its tab + return !isLastPaneInTab(draggingPaneId); + }, + drop: () => { + const { draggingPaneId } = useDragPaneStore.getState(); + if (!draggingPaneId) return; + // Double-check it's not the last pane + if (isLastPaneInTab(draggingPaneId)) return; + onDrop(draggingPaneId); + }, + collect: (monitor) => ({ + isOver: monitor.isOver(), + canDrop: monitor.canDrop(), + }), + }); + + return ( +
{ + drop(node); + }} + className={cn( + "flex items-center h-full flex-1 min-w-0 transition-colors rounded", + isOver && canDrop && "bg-primary/10 ring-1 ring-primary", + )} + > + {children} +
+ ); +} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/components/BasePaneWindow/BasePaneWindow.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/components/BasePaneWindow/BasePaneWindow.tsx index 7e7c3d0b2a8..2ee835df905 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/components/BasePaneWindow/BasePaneWindow.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/components/BasePaneWindow/BasePaneWindow.tsx @@ -1,6 +1,7 @@ import { useRef } from "react"; import type { MosaicBranch } from "react-mosaic-component"; import { MosaicWindow } from "react-mosaic-component"; +import { useDragPaneStore } from "renderer/stores/drag-pane-store"; import type { SplitOrientation } from "../../hooks"; import { useSplitOrientation } from "../../hooks"; @@ -43,6 +44,8 @@ export function BasePaneWindow({ }: BasePaneWindowProps) { const containerRef = useRef(null); const splitOrientation = useSplitOrientation(containerRef); + const setDragging = useDragPaneStore((s) => s.setDragging); + const clearDragging = useDragPaneStore((s) => s.clearDragging); const handleFocus = () => { setFocusedPane(tabId, paneId); @@ -75,6 +78,8 @@ export function BasePaneWindow({ title="" renderToolbar={() => renderToolbar(handlers)} className={isActive ? "mosaic-window-focused" : ""} + onDragStart={() => setDragging(paneId, tabId)} + onDragEnd={() => clearDragging()} > {/* biome-ignore lint/a11y/useKeyWithClickEvents lint/a11y/noStaticElementInteractions: Focus handler for pane */}
void; + clearDragging: () => void; +} + +export const useDragPaneStore = create( + (set) => ({ + draggingPaneId: null, + draggingSourceTabId: null, + setDragging: (paneId, tabId) => + set({ draggingPaneId: paneId, draggingSourceTabId: tabId }), + clearDragging: () => + set({ draggingPaneId: null, draggingSourceTabId: null }), + }), +); diff --git a/apps/desktop/src/renderer/stores/tabs/actions/move-pane.ts b/apps/desktop/src/renderer/stores/tabs/actions/move-pane.ts index f3dbe83b487..dcb2d87ac09 100644 --- a/apps/desktop/src/renderer/stores/tabs/actions/move-pane.ts +++ b/apps/desktop/src/renderer/stores/tabs/actions/move-pane.ts @@ -2,6 +2,7 @@ import type { MosaicNode } from "react-mosaic-component"; import type { Pane, Tab, TabsState } from "../types"; import { addPaneToLayout, + extractPaneIdsFromLayout, generateId, generateTabName, getFirstPaneId, @@ -36,6 +37,13 @@ export function movePaneToTab( ) return null; + // Defense in depth: Check for duplicate pane in target tab + const targetPaneIds = extractPaneIdsFromLayout(targetTab.layout); + if (targetPaneIds.includes(paneId)) { + console.warn("[move-pane] Attempted to add duplicate pane:", paneId); + return null; + } + const isLastPane = isLastPaneInTab(state.panes, sourceTab.id); const newSourceLayout = removePaneFromLayout(sourceTab.layout, paneId); const newTargetLayout = addPaneToLayout(targetTab.layout, paneId); From 43d2da101e2358b98f0f1d73e1dbb02f6b1765d9 Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Tue, 20 Jan 2026 14:37:02 -0800 Subject: [PATCH 2/8] style(desktop): refine drag-drop visual feedback for tabs - Tabs show subtle bg-primary/5 highlight when dragging over - NewTabDropZone shows left indicator bar without layout shift --- .../ContentView/TabsContent/GroupStrip/GroupItem.tsx | 4 ++-- .../ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx index 209677914da..2d805691fb7 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx @@ -106,8 +106,8 @@ export function GroupItem({ drop(node); }} className={cn( - "group relative flex items-center shrink-0 h-full border-r border-border transition-colors", - isOver && canDrop && "bg-primary/10 border-primary", + "group relative flex items-center shrink-0 h-full border-r border-border", + isOver && canDrop && "bg-primary/5", )} > {isEditing ? ( diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx index 65f2a71afda..64250eab58e 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx @@ -41,11 +41,11 @@ export function NewTabDropZone({ ref={(node) => { drop(node); }} - className={cn( - "flex items-center h-full flex-1 min-w-0 transition-colors rounded", - isOver && canDrop && "bg-primary/10 ring-1 ring-primary", - )} + className="relative flex items-center h-full flex-1 min-w-0" > + {isOver && canDrop && ( +
+ )} {children}
); From 2825defa1c26df4a050248efa0b6b279052d5ade Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Tue, 20 Jan 2026 14:40:05 -0800 Subject: [PATCH 3/8] fix(desktop): return drop result to prevent mosaic conflict Return { handled: true } from drop handlers to signal that the drop was processed, preventing mosaic from also trying to handle the drop. --- .../ContentView/TabsContent/GroupStrip/GroupItem.tsx | 5 +++-- .../ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx index 2d805691fb7..87100c1a17a 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx @@ -51,11 +51,12 @@ export function GroupItem({ }, drop: () => { const { draggingPaneId } = useDragPaneStore.getState(); - if (!draggingPaneId) return; + if (!draggingPaneId) return undefined; // Double-check pane isn't already in this tab const existingPaneIds = extractPaneIdsFromLayout(tab.layout); - if (existingPaneIds.includes(draggingPaneId)) return; + if (existingPaneIds.includes(draggingPaneId)) return undefined; onPaneDrop?.(draggingPaneId); + return { handled: true }; }, collect: (monitor) => ({ isOver: monitor.isOver(), diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx index 64250eab58e..ef83571192a 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx @@ -25,10 +25,11 @@ export function NewTabDropZone({ }, drop: () => { const { draggingPaneId } = useDragPaneStore.getState(); - if (!draggingPaneId) return; + if (!draggingPaneId) return undefined; // Double-check it's not the last pane - if (isLastPaneInTab(draggingPaneId)) return; + if (isLastPaneInTab(draggingPaneId)) return undefined; onDrop(draggingPaneId); + return { handled: true }; }, collect: (monitor) => ({ isOver: monitor.isOver(), From 82882025bed4344d911de67046604eeb9d0894b9 Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Tue, 20 Jan 2026 14:46:27 -0800 Subject: [PATCH 4/8] Allow drag into tabs --- .../TabsContent/GroupStrip/GroupItem.tsx | 66 +++++++++++-------- .../TabsContent/GroupStrip/NewTabDropZone.tsx | 46 +++++++------ 2 files changed, 63 insertions(+), 49 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx index 87100c1a17a..3fc79c7401b 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupItem.tsx @@ -8,10 +8,7 @@ import { MosaicDragType } from "react-mosaic-component"; import { StatusIndicator } from "renderer/screens/main/components/StatusIndicator"; import { useDragPaneStore } from "renderer/stores/drag-pane-store"; import type { PaneStatus, Tab } from "renderer/stores/tabs/types"; -import { - extractPaneIdsFromLayout, - getTabDisplayName, -} from "renderer/stores/tabs/utils"; +import { getTabDisplayName } from "renderer/stores/tabs/utils"; interface GroupItemProps { tab: Tab; @@ -37,32 +34,43 @@ export function GroupItem({ const [editValue, setEditValue] = useState(""); const inputRef = useRef(null); - const [{ isOver, canDrop }, drop] = useDrop({ - accept: MosaicDragType.WINDOW, - canDrop: () => { - const { draggingPaneId, draggingSourceTabId } = - useDragPaneStore.getState(); - if (!draggingPaneId) return false; - // Can't drop on same tab - if (draggingSourceTabId === tab.id) return false; - // Can't drop if pane already in this tab (duplicate prevention) - const existingPaneIds = extractPaneIdsFromLayout(tab.layout); - return !existingPaneIds.includes(draggingPaneId); - }, - drop: () => { - const { draggingPaneId } = useDragPaneStore.getState(); - if (!draggingPaneId) return undefined; - // Double-check pane isn't already in this tab - const existingPaneIds = extractPaneIdsFromLayout(tab.layout); - if (existingPaneIds.includes(draggingPaneId)) return undefined; - onPaneDrop?.(draggingPaneId); - return { handled: true }; - }, - collect: (monitor) => ({ - isOver: monitor.isOver(), - canDrop: monitor.canDrop(), + const [{ isOver, canDrop }, drop] = useDrop< + unknown, + { handled: true }, + { isOver: boolean; canDrop: boolean } + >( + () => ({ + accept: MosaicDragType.WINDOW, + canDrop: () => { + const { draggingPaneId, draggingSourceTabId } = + useDragPaneStore.getState(); + // Must have valid drag state AND be dropping on a different tab + return ( + !!draggingPaneId && + !!draggingSourceTabId && + draggingSourceTabId !== tab.id + ); + }, + drop: () => { + const { draggingPaneId, draggingSourceTabId, clearDragging } = + useDragPaneStore.getState(); + if ( + draggingPaneId && + draggingSourceTabId && + draggingSourceTabId !== tab.id + ) { + onPaneDrop?.(draggingPaneId); + } + clearDragging(); + return { handled: true }; + }, + collect: (monitor) => ({ + isOver: monitor.isOver(), + canDrop: monitor.canDrop(), + }), }), - }); + [onPaneDrop, tab.id], + ); useEffect(() => { if (isEditing && inputRef.current) { diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx index ef83571192a..a73b1e064f2 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/NewTabDropZone.tsx @@ -15,27 +15,33 @@ export function NewTabDropZone({ isLastPaneInTab, children, }: NewTabDropZoneProps) { - const [{ isOver, canDrop }, drop] = useDrop({ - accept: MosaicDragType.WINDOW, - canDrop: () => { - const { draggingPaneId } = useDragPaneStore.getState(); - if (!draggingPaneId) return false; - // Don't allow if it's the only pane in its tab - return !isLastPaneInTab(draggingPaneId); - }, - drop: () => { - const { draggingPaneId } = useDragPaneStore.getState(); - if (!draggingPaneId) return undefined; - // Double-check it's not the last pane - if (isLastPaneInTab(draggingPaneId)) return undefined; - onDrop(draggingPaneId); - return { handled: true }; - }, - collect: (monitor) => ({ - isOver: monitor.isOver(), - canDrop: monitor.canDrop(), + const [{ isOver, canDrop }, drop] = useDrop< + unknown, + { handled: true }, + { isOver: boolean; canDrop: boolean } + >( + () => ({ + accept: MosaicDragType.WINDOW, + canDrop: () => { + const { draggingPaneId } = useDragPaneStore.getState(); + if (!draggingPaneId) return false; + return !isLastPaneInTab(draggingPaneId); + }, + drop: () => { + const { draggingPaneId, clearDragging } = useDragPaneStore.getState(); + if (draggingPaneId && !isLastPaneInTab(draggingPaneId)) { + onDrop(draggingPaneId); + } + clearDragging(); + return { handled: true }; + }, + collect: (monitor) => ({ + isOver: monitor.isOver(), + canDrop: monitor.canDrop(), + }), }), - }); + [onDrop, isLastPaneInTab], + ); return (
Date: Tue, 20 Jan 2026 15:19:00 -0800 Subject: [PATCH 5/8] Fix dragging into tab logic --- .../TabsContent/GroupStrip/GroupStrip.tsx | 15 +++++++-------- .../ContentView/TabsContent/TabView/index.tsx | 9 +++++++-- apps/desktop/src/renderer/stores/tabs/store.ts | 13 +++++++++---- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx index 1f00c5b186d..8dfaf1eaa3f 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx @@ -122,14 +122,13 @@ export function GroupStrip() { renameTab(tabId, newName); }; - const checkIsLastPaneInTab = useCallback( - (paneId: string) => { - const pane = panes[paneId]; - if (!pane) return true; - return isLastPaneInTab(panes, pane.tabId); - }, - [panes], - ); + const checkIsLastPaneInTab = useCallback((paneId: string) => { + // Get fresh panes from store to avoid stale closure issues during drag-drop + const freshPanes = useTabsStore.getState().panes; + const pane = freshPanes[paneId]; + if (!pane) return true; + return isLastPaneInTab(freshPanes, pane.tabId); + }, []); return (
diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/index.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/index.tsx index 597b94abb8b..12a99a69b50 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/index.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/TabView/index.tsx @@ -83,6 +83,11 @@ export function TabView({ tab }: TabViewProps) { return; } + // Get fresh pane data from store to avoid stale closure issues + // This is critical for drag-drop operations where panes may have been + // moved to another tab between when this callback was created and invoked + const freshPanes = useTabsStore.getState().panes; + const oldPaneIds = extractPaneIdsFromLayout(tab.layout); const newPaneIds = extractPaneIdsFromLayout(newLayout); @@ -94,7 +99,7 @@ export function TabView({ tab }: TabViewProps) { // Remove panes that were removed via Mosaic UI // But skip panes that were moved to another tab (their tabId changed) for (const removedId of removedPaneIds) { - const pane = allPanes[removedId]; + const pane = freshPanes[removedId]; // Only remove if pane still belongs to this tab (actual removal, not move) if (pane && pane.tabId === tab.id) { removePane(removedId); @@ -103,7 +108,7 @@ export function TabView({ tab }: TabViewProps) { updateTabLayout(tab.id, newLayout); }, - [tab.id, tab.layout, updateTabLayout, removePane, allPanes], + [tab.id, tab.layout, updateTabLayout, removePane], ); const renderPane = useCallback( diff --git a/apps/desktop/src/renderer/stores/tabs/store.ts b/apps/desktop/src/renderer/stores/tabs/store.ts index ca7755507bb..bdb8ca25e62 100644 --- a/apps/desktop/src/renderer/stores/tabs/store.ts +++ b/apps/desktop/src/renderer/stores/tabs/store.ts @@ -305,11 +305,16 @@ export const useTabsStore = create()( const newPanes = { ...state.panes }; for (const paneId of removedPaneIds) { - // P2: Only kill terminal for actual terminal panes (avoid unnecessary IPC) - if (state.panes[paneId]?.type === "terminal") { - killTerminalForPane(paneId); + const pane = state.panes[paneId]; + // Only delete panes that actually belong to this tab + // During drag operations, Mosaic may temporarily include foreign panes + // in layouts - we must not delete those when they're "removed" + if (pane && pane.tabId === tabId) { + if (pane.type === "terminal") { + killTerminalForPane(paneId); + } + delete newPanes[paneId]; } - delete newPanes[paneId]; } // Update focused pane if it was removed From b7f1846deb83f6fa7b1de9f6f13ac12ec8524adf Mon Sep 17 00:00:00 2001 From: Kiet Ho Date: Tue, 20 Jan 2026 17:38:53 -0800 Subject: [PATCH 6/8] UI changes --- .../TabsContent/GroupStrip/GroupStrip.tsx | 8 +++++--- .../TabsContent/GroupStrip/NewTabDropZone.tsx | 2 +- .../ContentView/TabsContent/TabView/index.tsx | 19 ++++++++++++------- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx index 8dfaf1eaa3f..d750c7fa23f 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx @@ -134,7 +134,7 @@ export function GroupStrip() {
{tabs.length > 0 && (
{tabs.map((tab) => ( @@ -167,7 +167,7 @@ export function GroupStrip() {