feat: cross-window tab drag-and-drop #221
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| // One-use drag token for cross-window tab drag-and-drop authentication. | ||
| // | ||
| // When an external drag starts, the source renderer generates a random token | ||
| // and registers it here via IPC alongside the tab ID being dragged. Only one | ||
| // token is active at a time — registering a new one replaces any previous one. | ||
| // | ||
| // When the drop target calls tabs:move-tab-to-window-space with a dragToken, | ||
| // validateAndConsumeToken is called to verify the token matches the registered | ||
| // tab and then immediately clears it so it cannot be reused. | ||
|
|
||
| interface ActiveDragToken { | ||
| token: string; | ||
| tabId: number; | ||
| } | ||
|
|
||
| let activeToken: ActiveDragToken | null = null; | ||
|
|
||
| /** | ||
| * Registers a new one-use drag token tied to a specific tab. | ||
| * Any previously registered token is discarded. | ||
| */ | ||
| export function registerToken(token: string, tabId: number): void { | ||
| activeToken = { token, tabId }; | ||
| } | ||
|
|
||
| /** | ||
| * Validates the provided token against the active token and, if valid, | ||
| * consumes it so it cannot be used again. Returns true only if the token | ||
| * matches and is bound to the expected tab ID. | ||
| */ | ||
| export function validateAndConsumeToken(token: string, tabId: number): boolean { | ||
| if (!activeToken) return false; | ||
| if (activeToken.token !== token || activeToken.tabId !== tabId) return false; | ||
| activeToken = null; | ||
| return true; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,21 @@ | ||
| import { | ||
| TabGroupSourceData, | ||
| canDropExternalTabGroup, | ||
| canDropElementTabGroup, | ||
| parseExternalTabGroupDrop | ||
| } from "@/lib/tab-drag-mime"; | ||
| import { DropIndicator } from "@/components/browser-ui/browser-sidebar/_components/drop-indicator"; | ||
| import { useEffect, useRef, useState } from "react"; | ||
| import { Space } from "~/flow/interfaces/sessions/spaces"; | ||
| import { | ||
| dropTargetForElements, | ||
| ElementDropTargetEventBasePayload | ||
| } from "@atlaskit/pragmatic-drag-and-drop/element/adapter"; | ||
| import { | ||
| dropTargetForExternal, | ||
| ExternalDropTargetEventBasePayload | ||
| } from "@atlaskit/pragmatic-drag-and-drop/external/adapter"; | ||
| import { combine } from "@atlaskit/pragmatic-drag-and-drop/combine"; | ||
|
|
||
| type TabDropTargetProps = { | ||
| spaceData: Space; | ||
|
|
@@ -26,49 +36,59 @@ export function TabDropTarget({ spaceData, isSpaceLight, moveTab, biggestIndex } | |
| const el = dropTargetRef.current; | ||
| if (!el) return () => {}; | ||
|
|
||
| function handleDrop(sourceData: TabGroupSourceData, isExternal: boolean) { | ||
| setShowDropIndicator(false); | ||
|
|
||
| const sourceTabId = sourceData.primaryTabId; | ||
| const newPos = biggestIndex + 1; | ||
|
|
||
| if (sourceData.spaceId !== spaceData.id || isExternal) { | ||
| if (sourceData.profileId !== spaceData.profileId) { | ||
| // TODO: @MOVE_TABS_BETWEEN_PROFILES not supported yet | ||
| } else { | ||
| flow.tabs.moveTabToWindowSpace(sourceTabId, spaceData.id, newPos, sourceData.dragToken); | ||
| } | ||
|
Comment on lines
+49
to
50
There was a problem hiding this comment. Passes drag credential unconditionally; inconsistent with
The same concern applies to Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time! |
||
| } else { | ||
| moveTab(sourceTabId, newPos); | ||
| } | ||
| } | ||
|
|
||
| function onDrop(args: ElementDropTargetEventBasePayload) { | ||
| const sourceData = args.source.data as TabGroupSourceData; | ||
| handleDrop(sourceData, false); | ||
| } | ||
|
|
||
| function onExternalDrop(args: ExternalDropTargetEventBasePayload) { | ||
| setShowDropIndicator(false); | ||
|
|
||
| const sourceData = parseExternalTabGroupDrop(args.source); | ||
| if (!sourceData) return; | ||
| handleDrop(sourceData, true); | ||
| } | ||
|
|
||
| function onChange() { | ||
| setShowDropIndicator(true); | ||
| } | ||
|
|
||
| return combine( | ||
| dropTargetForElements({ | ||
| element: el, | ||
| canDrop: (args) => canDropElementTabGroup(args.source.data, { profileId: spaceData.profileId }), | ||
| onDrop: onDrop, | ||
| onDragEnter: onChange, | ||
| onDrag: onChange, | ||
| onDragLeave: () => setShowDropIndicator(false) | ||
| }), | ||
|
|
||
| dropTargetForExternal({ | ||
| element: el, | ||
| canDrop: (args) => canDropExternalTabGroup(args.source.types, spaceData.profileId), | ||
| onDrop: onExternalDrop, | ||
| onDragEnter: onChange, | ||
| onDrag: onChange, | ||
| onDragLeave: () => setShowDropIndicator(false) | ||
| }) | ||
| ); | ||
| }, [spaceData.profileId, isSpaceLight, moveTab, biggestIndex, spaceData.id]); | ||
|
|
||
| return ( | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Stale token persists after a cancelled drag
When a drag is initiated,
registerTokenis called immediately. If the user cancels the drag (presses Escape, releases outside a valid target, etc.), the token is never consumed andactiveTokenkeeps the stale entry indefinitely. The stale token is only evicted if the user starts a new drag (which replacesactiveToken) or completes a valid drop.In practice the stale token cannot be replayed by the renderer —
getInitialDataForExternalis a fire-and-forget closure and never stores the token in component state, so the renderer has no reference to it after the callback returns. The risk is low, but consider adding a cleanup ondragendor a short TTL to make the guarantee explicit: