From 96d545547f202dc381ebc1f7902e88a1c426f3bd Mon Sep 17 00:00:00 2001 From: Miguel Angel Simon Sierra Date: Fri, 18 Sep 2026 21:21:12 -0400 Subject: [PATCH] fix(studio): a wrong-zone aim still creates a track and a group drag keeps relocating --- .../player/components/timelineClipDragPreview.test.ts | 10 +++++++++- .../studio/src/player/components/timelineCollision.ts | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/studio/src/player/components/timelineClipDragPreview.test.ts b/packages/studio/src/player/components/timelineClipDragPreview.test.ts index 346770f9d0..c954f29c56 100644 --- a/packages/studio/src/player/components/timelineClipDragPreview.test.ts +++ b/packages/studio/src/player/components/timelineClipDragPreview.test.ts @@ -168,7 +168,7 @@ describe("computeDragPreview — plain horizontal drag never arms a phantom inse expect(next.previewTrack).toBe(0); }); - it("uses the expanded row midpoint when choosing the side for an automatic insert", () => { + it("uses the expanded row midpoint when choosing the side for a group drag's automatic insert", () => { const rowHeights = [TRACK_H + 2 * LANE_H, TRACK_H]; const dragged = clip("dragged", 0, 0, 1, 3); const occupied = [dragged, clip("block-0", 0, 0, 1, 2), clip("block-1", 1, 0, 1, 1)]; @@ -194,8 +194,16 @@ describe("computeDragPreview — plain horizontal drag never arms a phantom inse const next = computeDragPreview(drag, 0, clientY, { ...ctx(rowHeights, occupied), trackOrder: [0, 1], + selectedKeys: new Set(["dragged", "block-1"]), }); expect(next.insertRow).toBe(0); + // A single clip dropped on the same occupied lanes stays put and overwrites instead. + const single = computeDragPreview(drag, 0, clientY, { + ...ctx(rowHeights, occupied), + trackOrder: [0, 1], + }); + expect(single.insertRow).toBeNull(); + expect(single.previewTrack).toBe(0); }); }); diff --git a/packages/studio/src/player/components/timelineCollision.ts b/packages/studio/src/player/components/timelineCollision.ts index 23a6e4b99c..eb459c1d68 100644 --- a/packages/studio/src/player/components/timelineCollision.ts +++ b/packages/studio/src/player/components/timelineCollision.ts @@ -111,10 +111,10 @@ export function resolveZoneDropPlacement(input: { } const desired = clampTrackToZone(desiredTrack, order, audioRow, isAudio); - if (!input.relocateOnOverlap && order.includes(desired)) { + const zoneTracks = order.filter((t) => audioTracks.has(t) === isAudio); + if (!input.relocateOnOverlap && zoneTracks.includes(desired)) { return { track: desired, insertRow: null }; } - const zoneTracks = order.filter((t) => audioTracks.has(t) === isAudio); const placement = resolvePlacement({ elements, desiredTrack: desired,