The open-source CapCut alternative
Merge branch 'feature/track-placement'
Maze Wintherd23be079cce6
diff --cc apps/web/src/components/editor/panels/timeline/index.tsxindex 5b1ebb96,f435c8ea..819413e6--- a/apps/web/src/components/editor/panels/timeline/index.tsx+++ b/apps/web/src/components/editor/panels/timeline/index.tsx@@@ -52,7 -52,7 +52,7 @@@ importgetTimelineZoomMin,getTimelinePaddingPx,} from "@/lib/timeline";-import { isMainTrack } from "@/lib/track-placement";++import { isMainTrack } from "@/lib/timeline/placement";import { TimelineToolbar } from "./timeline-toolbar";import { useElementSelection } from "@/hooks/timeline/element/use-element-selection";import { useTimelineSeek } from "@/hooks/timeline/use-timeline-seek";diff --cc apps/web/src/core/managers/scenes-manager.tsindex 3c53efd6,c5d434bb..43938f96--- a/apps/web/src/core/managers/scenes-manager.ts+++ b/apps/web/src/core/managers/scenes-manager.ts@@@ -12,7 -12,7 +12,7 @@@ importgetFrameTime,isBookmarkAtTime,} from "@/lib/timeline/bookmarks";- import { ensureMainTrack } from "@/lib/timeline/track-utils";-import { ensureMainTrack } from "@/lib/track-placement";++import { ensureMainTrack } from "@/lib/timeline/placement";import {CreateSceneCommand,DeleteSceneCommand,diff --cc apps/web/src/hooks/timeline/use-timeline-drag-drop.tsindex 9693e8d8,07318c01..ce6f1341--- a/apps/web/src/hooks/timeline/use-timeline-drag-drop.ts+++ b/apps/web/src/hooks/timeline/use-timeline-drag-drop.ts@@@ -1,609 -1,609 +1,610 @@@-import { useState, useCallback, type RefObject } from "react";-import { useEditor } from "@/hooks/use-editor";-import { processMediaAssets } from "@/lib/media/processing";-import { toast } from "sonner";-import { showMediaUploadToast } from "@/lib/media/upload-toast";-import { TIMELINE_CONSTANTS } from "@/constants/timeline-constants";-import { snapTimeToFrame } from "@/lib/time";-import {- buildTextElement,- buildGraphicElement,- buildStickerElement,- buildElementFromMedia,- buildEffectElement,-} from "@/lib/timeline/element-utils";-import { AddTrackCommand, InsertElementCommand } from "@/lib/commands/timeline";-import { BatchCommand } from "@/lib/commands";-import { computeDropTarget } from "@/lib/timeline/drop-utils";-import { getDragData, hasDragData } from "@/lib/drag-data";-import { isMainTrack } from "@/lib/track-placement";-import type { TrackType, DropTarget, ElementType } from "@/lib/timeline";-import type {- MediaDragData,- GraphicDragData,- StickerDragData,- EffectDragData,-} from "@/lib/timeline/drag";--interface UseTimelineDragDropProps {- containerRef: RefObject<HTMLDivElement | null>;- headerRef?: RefObject<HTMLElement | null>;- tracksScrollRef?: RefObject<HTMLDivElement | null>;- zoomLevel: number;-}--export function useTimelineDragDrop({- containerRef,- headerRef,- tracksScrollRef,- zoomLevel,-}: UseTimelineDragDropProps) {- const editor = useEditor();- const [isDragOver, setIsDragOver] = useState(false);- const [dropTarget, setDropTarget] = useState<DropTarget | null>(null);- const [dragElementType, setElementType] = useState<ElementType | null>(null);-- const getSnappedTime = useCallback(- ({ time }: { time: number }) => {- const projectFps = editor.project.getActive().settings.fps;- return snapTimeToFrame({ time, fps: projectFps });- },- [editor],- );-- const getElementType = useCallback(- ({ dataTransfer }: { dataTransfer: DataTransfer }): ElementType | null => {- const dragData = getDragData({ dataTransfer });- if (!dragData) return null;-- if (dragData.type === "text") return "text";- if (dragData.type === "graphic") return "graphic";- if (dragData.type === "sticker") return "sticker";- if (dragData.type === "effect") return "effect";- if (dragData.type === "media") {- return dragData.mediaType;- }- return null;- },- [],- );-- const getElementDuration = useCallback(- ({- elementType,- mediaId,- }: {- elementType: ElementType;- mediaId?: string;- }): number => {- if (- elementType === "text" ||- elementType === "graphic" ||- elementType === "sticker" ||- elementType === "effect"- ) {- return TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;- }- if (mediaId) {- const mediaAssets = editor.media.getAssets();- const media = mediaAssets.find((m) => m.id === mediaId);- return media?.duration ?? TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;- }- return TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;- },- [editor],- );-- const handleDragEnter = useCallback((e: React.DragEvent) => {- e.preventDefault();- const hasAsset = hasDragData({ dataTransfer: e.dataTransfer });- const hasFiles = e.dataTransfer.types.includes("Files");- if (!hasAsset && !hasFiles) return;- setIsDragOver(true);- }, []);-- const handleDragOver = useCallback(- (e: React.DragEvent) => {- e.preventDefault();-- const scrollContainer = tracksScrollRef?.current;- const referenceRect =- scrollContainer?.getBoundingClientRect() ??- containerRef.current?.getBoundingClientRect();- if (!referenceRect) return;-- const headerHeight =- headerRef?.current?.getBoundingClientRect().height ?? 0;- const scrollLeft = scrollContainer?.scrollLeft ?? 0;- const scrollTop = scrollContainer?.scrollTop ?? 0;- const hasFiles = e.dataTransfer.types.includes("Files");- const isExternal =- hasFiles && !hasDragData({ dataTransfer: e.dataTransfer });-- const elementType = getElementType({ dataTransfer: e.dataTransfer });-- if (!elementType && hasFiles && isExternal) {- setDropTarget(null);- setElementType(null);- return;- }-- if (!elementType) return;-- setElementType(elementType);-- const dragData = getDragData({ dataTransfer: e.dataTransfer });- const duration = getElementDuration({- elementType,- mediaId: dragData?.type === "media" ? dragData.id : undefined,- });-- const mouseX = e.clientX - referenceRect.left + scrollLeft;- const mouseY = e.clientY - referenceRect.top + scrollTop - headerHeight;-- const targetElementTypes =- dragData?.type === "effect"- ? (dragData as EffectDragData).targetElementTypes- : dragData?.type === "media"- ? (dragData as MediaDragData).targetElementTypes- : undefined;-- const tracks = editor.timeline.getTracks();- const currentTime = editor.playback.getCurrentTime();- const target = computeDropTarget({- elementType,- mouseX,- mouseY,- tracks,- playheadTime: currentTime,- isExternalDrop: isExternal,- elementDuration: duration,- pixelsPerSecond: TIMELINE_CONSTANTS.PIXELS_PER_SECOND,- zoomLevel,- targetElementTypes,- });-- target.xPosition = getSnappedTime({ time: target.xPosition });-- setDropTarget(target);- e.dataTransfer.dropEffect = "copy";- },- [- containerRef,- headerRef,- tracksScrollRef,- zoomLevel,- getElementType,- getElementDuration,- getSnappedTime,- editor,- ],- );-- const handleDragLeave = useCallback(- (e: React.DragEvent) => {- e.preventDefault();- const rect = containerRef.current?.getBoundingClientRect();- if (rect) {- const { clientX, clientY } = e;- if (- clientX < rect.left ||- clientX > rect.right ||- clientY < rect.top ||- clientY > rect.bottom- ) {- setIsDragOver(false);- setDropTarget(null);- setElementType(null);- }- }- },- [containerRef],- );-- const executeTextDrop = useCallback(- ({- target,- dragData,- }: {- target: DropTarget;- dragData: { name?: string; content?: string };- }) => {- const element = buildTextElement({- raw: {- name: dragData.name ?? "",- content: dragData.content ?? "",- },- startTime: target.xPosition,- });-- if (target.isNewTrack) {- const addTrackCmd = new AddTrackCommand("text", target.trackIndex);- const insertCmd = new InsertElementCommand({- element,- placement: { mode: "explicit", trackId: addTrackCmd.getTrackId() },- });- editor.command.execute({- command: new BatchCommand([addTrackCmd, insertCmd]),- });- return;- }-- const tracks = editor.timeline.getTracks();- const track = tracks[target.trackIndex];- if (!track) return;- editor.timeline.insertElement({- placement: { mode: "explicit", trackId: track.id },- element,- });- },- [editor],- );-- const executeStickerDrop = useCallback(- ({- target,- dragData,- }: {- target: DropTarget;- dragData: StickerDragData;- }) => {- const element = buildStickerElement({- stickerId: dragData.stickerId,- name: dragData.name,- startTime: target.xPosition,- });-- if (target.isNewTrack) {- const addTrackCmd = new AddTrackCommand("graphic", target.trackIndex);- const insertCmd = new InsertElementCommand({- element,- placement: { mode: "explicit", trackId: addTrackCmd.getTrackId() },- });- editor.command.execute({- command: new BatchCommand([addTrackCmd, insertCmd]),- });- return;- }-- const tracks = editor.timeline.getTracks();- const track = tracks[target.trackIndex];- if (!track) return;- editor.timeline.insertElement({- placement: { mode: "explicit", trackId: track.id },- element,- });- },- [editor],- );-- const executeGraphicDrop = useCallback(- ({- target,- dragData,- }: {- target: DropTarget;- dragData: GraphicDragData;- }) => {- const element = buildGraphicElement({- definitionId: dragData.definitionId,- name: dragData.name,- startTime: target.xPosition,- params: dragData.params,- });-- if (target.isNewTrack) {- const addTrackCmd = new AddTrackCommand("graphic", target.trackIndex);- const insertCmd = new InsertElementCommand({- element,- placement: { mode: "explicit", trackId: addTrackCmd.getTrackId() },- });- editor.command.execute({- command: new BatchCommand([addTrackCmd, insertCmd]),- });- return;- }-- const tracks = editor.timeline.getTracks();- const track = tracks[target.trackIndex];- if (!track) return;- editor.timeline.insertElement({- placement: { mode: "explicit", trackId: track.id },- element,- });- },- [editor],- );-- const executeMediaDrop = useCallback(- ({ target, dragData }: { target: DropTarget; dragData: MediaDragData }) => {- if (target.targetElement) {- toast.info("Replace media source is coming soon!");- return;- }-- const mediaAssets = editor.media.getAssets();- const mediaAsset = mediaAssets.find((m) => m.id === dragData.id);- if (!mediaAsset) return;-- const trackType: TrackType =- dragData.mediaType === "audio" ? "audio" : "video";-- const duration =- mediaAsset.duration ?? TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;- const element = buildElementFromMedia({- mediaId: mediaAsset.id,- mediaType: mediaAsset.type,- name: mediaAsset.name,- duration,- startTime: target.xPosition,- });-- if (target.isNewTrack) {- const addTrackCmd = new AddTrackCommand(trackType, target.trackIndex);- const insertCmd = new InsertElementCommand({- element,- placement: { mode: "explicit", trackId: addTrackCmd.getTrackId() },- });- editor.command.execute({- command: new BatchCommand([addTrackCmd, insertCmd]),- });- return;- }-- const tracks = editor.timeline.getTracks();- const track = tracks[target.trackIndex];- if (!track) return;- editor.timeline.insertElement({- placement: { mode: "explicit", trackId: track.id },- element,- });- },- [editor],- );-- const executeEffectDrop = useCallback(- ({- target,- dragData,- }: {- target: DropTarget;- dragData: EffectDragData;- }) => {- if (target.targetElement) {- editor.timeline.addClipEffect({- trackId: target.targetElement.trackId,- elementId: target.targetElement.elementId,- effectType: dragData.effectType,- });- return;- }-- const tracks = editor.timeline.getTracks();- const effectTrack = tracks.find((t) => t.type === "effect");- let trackId: string;-- if (effectTrack) {- trackId = effectTrack.id;- } else if (target.isNewTrack) {- const addTrackCmd = new AddTrackCommand("effect", target.trackIndex);- const insertCmd = new InsertElementCommand({- element: buildEffectElement({- effectType: dragData.effectType,- startTime: target.xPosition,- }),- placement: { mode: "explicit", trackId: addTrackCmd.getTrackId() },- });- editor.command.execute({- command: new BatchCommand([addTrackCmd, insertCmd]),- });- return;- } else {- const track = tracks[target.trackIndex];- if (!track || track.type !== "effect") return;- trackId = track.id;- }-- const element = buildEffectElement({- effectType: dragData.effectType,- startTime: target.xPosition,- });-- editor.timeline.insertElement({- placement: { mode: "explicit", trackId },- element,- });- },- [editor],- );-- const executeFileDrop = useCallback(- async ({- files,- mouseX,- mouseY,- }: {- files: File[];- mouseX: number;- mouseY: number;- }) => {- const activeProject = editor.project.getActiveOrNull();- if (!activeProject) return;-- await showMediaUploadToast({- filesCount: files.length,- promise: async () => {- const processedAssets = await processMediaAssets({ files });- const projectId = activeProject.metadata.id;-- for (const asset of processedAssets) {- const createdAsset = await editor.media.addMediaAsset({- projectId,- asset,- });- if (!createdAsset) continue;-- const duration =- createdAsset.duration ?? TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;- const currentTracks = editor.timeline.getTracks();- const currentTime = editor.playback.getCurrentTime();- const onlyTrack = currentTracks[0];- const reuseMainTrackId =- createdAsset.type !== "audio" &&- currentTracks.length === 1 &&- !!onlyTrack &&- isMainTrack(onlyTrack) &&- onlyTrack.elements.length === 0- ? onlyTrack.id- : null;- const dropTarget = reuseMainTrackId- ? null- : computeDropTarget({- elementType: createdAsset.type,- mouseX,- mouseY,- tracks: currentTracks,- playheadTime: currentTime,- isExternalDrop: true,- elementDuration: duration,- pixelsPerSecond: TIMELINE_CONSTANTS.PIXELS_PER_SECOND,- zoomLevel,- });-- const trackType: TrackType =- createdAsset.type === "audio" ? "audio" : "video";-- let trackId: string | undefined;- if (reuseMainTrackId) {- trackId = reuseMainTrackId;- } else {- if (!dropTarget) continue;- if (dropTarget.isNewTrack) {- const addTrackCmd = new AddTrackCommand(- trackType,- dropTarget.trackIndex,- );- trackId = addTrackCmd.getTrackId();- editor.command.execute({ command: addTrackCmd });- } else {- trackId = currentTracks[dropTarget.trackIndex]?.id;- }- }-- if (!trackId) continue;-- const element = buildElementFromMedia({- mediaId: createdAsset.id,- mediaType: createdAsset.type,- name: createdAsset.name,- duration,- startTime: dropTarget?.xPosition ?? currentTime,- buffer:- createdAsset.type === "audio"- ? new AudioBuffer({ length: 1, sampleRate: 44100 })- : undefined,- });-- const insertCmd = new InsertElementCommand({- element,- placement: { mode: "explicit", trackId },- });- editor.command.execute({ command: insertCmd });- }-- return {- uploadedCount: processedAssets.length,- assetNames: processedAssets.map((asset) => asset.name),- };- },- });- },- [editor, zoomLevel],- );-- const handleDrop = useCallback(- async (e: React.DragEvent) => {- e.preventDefault();-- const hasAsset = hasDragData({ dataTransfer: e.dataTransfer });- const hasFiles = e.dataTransfer.files?.length > 0;-- if (!hasAsset && !hasFiles) return;-- const currentTarget = dropTarget;- setIsDragOver(false);- setDropTarget(null);- setElementType(null);-- try {- if (hasAsset) {- if (!currentTarget) return;- const dragData = getDragData({ dataTransfer: e.dataTransfer });- if (!dragData) return;-- if (dragData.type === "text") {- executeTextDrop({ target: currentTarget, dragData });- } else if (dragData.type === "graphic") {- executeGraphicDrop({- target: currentTarget,- dragData: dragData as GraphicDragData,- });- } else if (dragData.type === "sticker") {- executeStickerDrop({ target: currentTarget, dragData });- } else if (dragData.type === "effect") {- executeEffectDrop({- target: currentTarget,- dragData: dragData as EffectDragData,- });- } else {- executeMediaDrop({ target: currentTarget, dragData });- }- } else if (hasFiles) {- const scrollContainer = tracksScrollRef?.current;- const referenceRect =- scrollContainer?.getBoundingClientRect() ??- containerRef.current?.getBoundingClientRect();- if (!referenceRect) return;- const scrollLeft = scrollContainer?.scrollLeft ?? 0;- const scrollTop = scrollContainer?.scrollTop ?? 0;- const mouseX = e.clientX - referenceRect.left + scrollLeft;- const headerHeight =- headerRef?.current?.getBoundingClientRect().height ?? 0;- const mouseY =- e.clientY - referenceRect.top + scrollTop - headerHeight;- await executeFileDrop({- files: Array.from(e.dataTransfer.files),- mouseX,- mouseY,- });- }- } catch (err) {- console.error("Failed to process drop:", err);- }- },- [- dropTarget,- executeTextDrop,- executeGraphicDrop,- executeStickerDrop,- executeMediaDrop,- executeEffectDrop,- executeFileDrop,- containerRef,- headerRef,- tracksScrollRef,- ],- );-- return {- isDragOver,- dropTarget,- dragElementType,- dragProps: {- onDragEnter: handleDragEnter,- onDragOver: handleDragOver,- onDragLeave: handleDragLeave,- onDrop: handleDrop,- },- };-}+import { useState, useCallback, type RefObject } from "react";+import { useEditor } from "@/hooks/use-editor";+import { processMediaAssets } from "@/lib/media/processing";+import { toast } from "sonner";+import { showMediaUploadToast } from "@/lib/media/upload-toast";+import { TIMELINE_CONSTANTS } from "@/constants/timeline-constants";+import { snapTimeToFrame } from "opencut-wasm";+import {+ buildTextElement,+ buildGraphicElement,+ buildStickerElement,+ buildElementFromMedia,+ buildEffectElement,+} from "@/lib/timeline/element-utils";+import { AddTrackCommand, InsertElementCommand } from "@/lib/commands/timeline";+import { BatchCommand } from "@/lib/commands";+import { computeDropTarget } from "@/lib/timeline/drop-utils";+import { getDragData, hasDragData } from "@/lib/drag-data";- import { isMainTrack } from "@/lib/timeline/track-utils";++import { isMainTrack } from "@/lib/timeline/placement";+import type { TrackType, DropTarget, ElementType } from "@/lib/timeline";+import type {+ MediaDragData,+ GraphicDragData,+ StickerDragData,+ EffectDragData,+} from "@/lib/timeline/drag";++interface UseTimelineDragDropProps {+ containerRef: RefObject<HTMLDivElement | null>;+ headerRef?: RefObject<HTMLElement | null>;+ tracksScrollRef?: RefObject<HTMLDivElement | null>;+ zoomLevel: number;+}++export function useTimelineDragDrop({+ containerRef,+ headerRef,+ tracksScrollRef,+ zoomLevel,+}: UseTimelineDragDropProps) {+ const editor = useEditor();+ const [isDragOver, setIsDragOver] = useState(false);+ const [dropTarget, setDropTarget] = useState<DropTarget | null>(null);+ const [dragElementType, setElementType] = useState<ElementType | null>(null);++ const getSnappedTime = useCallback(+ ({ time }: { time: number }) => {+ const projectFps = editor.project.getActive().settings.fps;+ return snapTimeToFrame({ time, fps: projectFps });+ },+ [editor],+ );++ const getElementType = useCallback(+ ({ dataTransfer }: { dataTransfer: DataTransfer }): ElementType | null => {+ const dragData = getDragData({ dataTransfer });+ if (!dragData) return null;++ if (dragData.type === "text") return "text";+ if (dragData.type === "graphic") return "graphic";+ if (dragData.type === "sticker") return "sticker";+ if (dragData.type === "effect") return "effect";+ if (dragData.type === "media") {+ return dragData.mediaType;+ }+ return null;+ },+ [],+ );++ const getElementDuration = useCallback(+ ({+ elementType,+ mediaId,+ }: {+ elementType: ElementType;+ mediaId?: string;+ }): number => {+ if (+ elementType === "text" ||+ elementType === "graphic" ||+ elementType === "sticker" ||+ elementType === "effect"+ ) {+ return TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;+ }+ if (mediaId) {+ const mediaAssets = editor.media.getAssets();+ const media = mediaAssets.find((m) => m.id === mediaId);+ return media?.duration ?? TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;+ }+ return TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;+ },+ [editor],+ );++ const handleDragEnter = useCallback((e: React.DragEvent) => {+ e.preventDefault();+ const hasAsset = hasDragData({ dataTransfer: e.dataTransfer });+ const hasFiles = e.dataTransfer.types.includes("Files");+ if (!hasAsset && !hasFiles) return;+ setIsDragOver(true);+ }, []);++ const handleDragOver = useCallback(+ (e: React.DragEvent) => {+ e.preventDefault();++ const scrollContainer = tracksScrollRef?.current;+ const referenceRect =+ scrollContainer?.getBoundingClientRect() ??+ containerRef.current?.getBoundingClientRect();+ if (!referenceRect) return;++ const headerHeight =+ headerRef?.current?.getBoundingClientRect().height ?? 0;+ const scrollLeft = scrollContainer?.scrollLeft ?? 0;+ const scrollTop = scrollContainer?.scrollTop ?? 0;+ const hasFiles = e.dataTransfer.types.includes("Files");+ const isExternal =+ hasFiles && !hasDragData({ dataTransfer: e.dataTransfer });++ const elementType = getElementType({ dataTransfer: e.dataTransfer });++ if (!elementType && hasFiles && isExternal) {+ setDropTarget(null);+ setElementType(null);+ return;+ }++ if (!elementType) return;++ setElementType(elementType);++ const dragData = getDragData({ dataTransfer: e.dataTransfer });+ const duration = getElementDuration({+ elementType,+ mediaId: dragData?.type === "media" ? dragData.id : undefined,+ });++ const mouseX = e.clientX - referenceRect.left + scrollLeft;+ const mouseY = e.clientY - referenceRect.top + scrollTop - headerHeight;++ const targetElementTypes =+ dragData?.type === "effect"+ ? (dragData as EffectDragData).targetElementTypes+ : dragData?.type === "media"+ ? (dragData as MediaDragData).targetElementTypes+ : undefined;++ const tracks = editor.timeline.getTracks();+ const currentTime = editor.playback.getCurrentTime();+ const target = computeDropTarget({+ elementType,+ mouseX,+ mouseY,+ tracks,+ playheadTime: currentTime,+ isExternalDrop: isExternal,+ elementDuration: duration,+ pixelsPerSecond: TIMELINE_CONSTANTS.PIXELS_PER_SECOND,+ zoomLevel,+ targetElementTypes,+ });++ target.xPosition = getSnappedTime({ time: target.xPosition });++ setDropTarget(target);+ e.dataTransfer.dropEffect = "copy";+ },+ [+ containerRef,+ headerRef,+ tracksScrollRef,+ zoomLevel,+ getElementType,+ getElementDuration,+ getSnappedTime,+ editor,+ ],+ );++ const handleDragLeave = useCallback(+ (e: React.DragEvent) => {+ e.preventDefault();+ const rect = containerRef.current?.getBoundingClientRect();+ if (rect) {+ const { clientX, clientY } = e;+ if (+ clientX < rect.left ||+ clientX > rect.right ||+ clientY < rect.top ||+ clientY > rect.bottom+ ) {+ setIsDragOver(false);+ setDropTarget(null);+ setElementType(null);+ }+ }+ },+ [containerRef],+ );++ const executeTextDrop = useCallback(+ ({+ target,+ dragData,+ }: {+ target: DropTarget;+ dragData: { name?: string; content?: string };+ }) => {+ const element = buildTextElement({+ raw: {+ name: dragData.name ?? "",+ content: dragData.content ?? "",+ },+ startTime: target.xPosition,+ });++ if (target.isNewTrack) {+ const addTrackCmd = new AddTrackCommand("text", target.trackIndex);+ const insertCmd = new InsertElementCommand({+ element,+ placement: { mode: "explicit", trackId: addTrackCmd.getTrackId() },+ });+ editor.command.execute({+ command: new BatchCommand([addTrackCmd, insertCmd]),+ });+ return;+ }++ const tracks = editor.timeline.getTracks();+ const track = tracks[target.trackIndex];+ if (!track) return;+ editor.timeline.insertElement({+ placement: { mode: "explicit", trackId: track.id },+ element,+ });+ },+ [editor],+ );++ const executeStickerDrop = useCallback(+ ({+ target,+ dragData,+ }: {+ target: DropTarget;+ dragData: StickerDragData;+ }) => {+ const element = buildStickerElement({+ stickerId: dragData.stickerId,+ name: dragData.name,+ startTime: target.xPosition,+ });++ if (target.isNewTrack) {+ const addTrackCmd = new AddTrackCommand("graphic", target.trackIndex);+ const insertCmd = new InsertElementCommand({+ element,+ placement: { mode: "explicit", trackId: addTrackCmd.getTrackId() },+ });+ editor.command.execute({+ command: new BatchCommand([addTrackCmd, insertCmd]),+ });+ return;+ }++ const tracks = editor.timeline.getTracks();+ const track = tracks[target.trackIndex];+ if (!track) return;+ editor.timeline.insertElement({+ placement: { mode: "explicit", trackId: track.id },+ element,+ });+ },+ [editor],+ );++ const executeGraphicDrop = useCallback(+ ({+ target,+ dragData,+ }: {+ target: DropTarget;+ dragData: GraphicDragData;+ }) => {+ const element = buildGraphicElement({+ definitionId: dragData.definitionId,+ name: dragData.name,+ startTime: target.xPosition,+ params: dragData.params,+ });++ if (target.isNewTrack) {+ const addTrackCmd = new AddTrackCommand("graphic", target.trackIndex);+ const insertCmd = new InsertElementCommand({+ element,+ placement: { mode: "explicit", trackId: addTrackCmd.getTrackId() },+ });+ editor.command.execute({+ command: new BatchCommand([addTrackCmd, insertCmd]),+ });+ return;+ }++ const tracks = editor.timeline.getTracks();+ const track = tracks[target.trackIndex];+ if (!track) return;+ editor.timeline.insertElement({+ placement: { mode: "explicit", trackId: track.id },+ element,+ });+ },+ [editor],+ );++ const executeMediaDrop = useCallback(+ ({ target, dragData }: { target: DropTarget; dragData: MediaDragData }) => {+ if (target.targetElement) {+ toast.info("Replace media source is coming soon!");+ return;+ }++ const mediaAssets = editor.media.getAssets();+ const mediaAsset = mediaAssets.find((m) => m.id === dragData.id);+ if (!mediaAsset) return;++ const trackType: TrackType =+ dragData.mediaType === "audio" ? "audio" : "video";++ const duration =+ mediaAsset.duration ?? TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;+ const element = buildElementFromMedia({+ mediaId: mediaAsset.id,+ mediaType: mediaAsset.type,+ name: mediaAsset.name,+ duration,+ startTime: target.xPosition,+ });++ if (target.isNewTrack) {+ const addTrackCmd = new AddTrackCommand(trackType, target.trackIndex);+ const insertCmd = new InsertElementCommand({+ element,+ placement: { mode: "explicit", trackId: addTrackCmd.getTrackId() },+ });+ editor.command.execute({+ command: new BatchCommand([addTrackCmd, insertCmd]),+ });+ return;+ }++ const tracks = editor.timeline.getTracks();+ const track = tracks[target.trackIndex];+ if (!track) return;+ editor.timeline.insertElement({+ placement: { mode: "explicit", trackId: track.id },+ element,+ });+ },+ [editor],+ );++ const executeEffectDrop = useCallback(+ ({+ target,+ dragData,+ }: {+ target: DropTarget;+ dragData: EffectDragData;+ }) => {+ if (target.targetElement) {+ editor.timeline.addClipEffect({+ trackId: target.targetElement.trackId,+ elementId: target.targetElement.elementId,+ effectType: dragData.effectType,+ });+ return;+ }++ const tracks = editor.timeline.getTracks();+ const effectTrack = tracks.find((t) => t.type === "effect");+ let trackId: string;++ if (effectTrack) {+ trackId = effectTrack.id;+ } else if (target.isNewTrack) {+ const addTrackCmd = new AddTrackCommand("effect", target.trackIndex);+ const insertCmd = new InsertElementCommand({+ element: buildEffectElement({+ effectType: dragData.effectType,+ startTime: target.xPosition,+ }),+ placement: { mode: "explicit", trackId: addTrackCmd.getTrackId() },+ });+ editor.command.execute({+ command: new BatchCommand([addTrackCmd, insertCmd]),+ });+ return;+ } else {+ const track = tracks[target.trackIndex];+ if (!track || track.type !== "effect") return;+ trackId = track.id;+ }++ const element = buildEffectElement({+ effectType: dragData.effectType,+ startTime: target.xPosition,+ });++ editor.timeline.insertElement({+ placement: { mode: "explicit", trackId },+ element,+ });+ },+ [editor],+ );++ const executeFileDrop = useCallback(+ async ({+ files,+ mouseX,+ mouseY,+ }: {+ files: File[];+ mouseX: number;+ mouseY: number;+ }) => {+ const activeProject = editor.project.getActiveOrNull();+ if (!activeProject) return;++ await showMediaUploadToast({+ filesCount: files.length,+ promise: async () => {+ const processedAssets = await processMediaAssets({ files });+ const projectId = activeProject.metadata.id;++ for (const asset of processedAssets) {+ const createdAsset = await editor.media.addMediaAsset({+ projectId,+ asset,+ });+ if (!createdAsset) continue;++ const duration =- createdAsset.duration ?? TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;++ createdAsset.duration ??++ TIMELINE_CONSTANTS.DEFAULT_ELEMENT_DURATION;+ const currentTracks = editor.timeline.getTracks();+ const currentTime = editor.playback.getCurrentTime();+ const onlyTrack = currentTracks[0];+ const reuseMainTrackId =+ createdAsset.type !== "audio" &&+ currentTracks.length === 1 &&+ !!onlyTrack &&+ isMainTrack(onlyTrack) &&+ onlyTrack.elements.length === 0+ ? onlyTrack.id+ : null;+ const dropTarget = reuseMainTrackId+ ? null+ : computeDropTarget({+ elementType: createdAsset.type,+ mouseX,+ mouseY,+ tracks: currentTracks,+ playheadTime: currentTime,+ isExternalDrop: true,+ elementDuration: duration,+ pixelsPerSecond: TIMELINE_CONSTANTS.PIXELS_PER_SECOND,+ zoomLevel,+ });++ const trackType: TrackType =+ createdAsset.type === "audio" ? "audio" : "video";++ let trackId: string | undefined;+ if (reuseMainTrackId) {+ trackId = reuseMainTrackId;+ } else {+ if (!dropTarget) continue;+ if (dropTarget.isNewTrack) {+ const addTrackCmd = new AddTrackCommand(+ trackType,+ dropTarget.trackIndex,+ );+ trackId = addTrackCmd.getTrackId();+ editor.command.execute({ command: addTrackCmd });+ } else {+ trackId = currentTracks[dropTarget.trackIndex]?.id;+ }+ }++ if (!trackId) continue;++ const element = buildElementFromMedia({+ mediaId: createdAsset.id,+ mediaType: createdAsset.type,+ name: createdAsset.name,+ duration,+ startTime: dropTarget?.xPosition ?? currentTime,+ buffer:+ createdAsset.type === "audio"+ ? new AudioBuffer({ length: 1, sampleRate: 44100 })+ : undefined,+ });++ const insertCmd = new InsertElementCommand({+ element,+ placement: { mode: "explicit", trackId },+ });+ editor.command.execute({ command: insertCmd });+ }++ return {+ uploadedCount: processedAssets.length,+ assetNames: processedAssets.map((asset) => asset.name),+ };+ },+ });+ },+ [editor, zoomLevel],+ );++ const handleDrop = useCallback(+ async (e: React.DragEvent) => {+ e.preventDefault();++ const hasAsset = hasDragData({ dataTransfer: e.dataTransfer });+ const hasFiles = e.dataTransfer.files?.length > 0;++ if (!hasAsset && !hasFiles) return;++ const currentTarget = dropTarget;+ setIsDragOver(false);+ setDropTarget(null);+ setElementType(null);++ try {+ if (hasAsset) {+ if (!currentTarget) return;+ const dragData = getDragData({ dataTransfer: e.dataTransfer });+ if (!dragData) return;++ if (dragData.type === "text") {+ executeTextDrop({ target: currentTarget, dragData });+ } else if (dragData.type === "graphic") {+ executeGraphicDrop({+ target: currentTarget,+ dragData: dragData as GraphicDragData,+ });+ } else if (dragData.type === "sticker") {+ executeStickerDrop({ target: currentTarget, dragData });+ } else if (dragData.type === "effect") {+ executeEffectDrop({+ target: currentTarget,+ dragData: dragData as EffectDragData,+ });+ } else {+ executeMediaDrop({ target: currentTarget, dragData });+ }+ } else if (hasFiles) {+ const scrollContainer = tracksScrollRef?.current;+ const referenceRect =+ scrollContainer?.getBoundingClientRect() ??+ containerRef.current?.getBoundingClientRect();+ if (!referenceRect) return;+ const scrollLeft = scrollContainer?.scrollLeft ?? 0;+ const scrollTop = scrollContainer?.scrollTop ?? 0;+ const mouseX = e.clientX - referenceRect.left + scrollLeft;+ const headerHeight =+ headerRef?.current?.getBoundingClientRect().height ?? 0;+ const mouseY =+ e.clientY - referenceRect.top + scrollTop - headerHeight;+ await executeFileDrop({+ files: Array.from(e.dataTransfer.files),+ mouseX,+ mouseY,+ });+ }+ } catch (err) {+ console.error("Failed to process drop:", err);+ }+ },+ [+ dropTarget,+ executeTextDrop,+ executeGraphicDrop,+ executeStickerDrop,+ executeMediaDrop,+ executeEffectDrop,+ executeFileDrop,+ containerRef,+ headerRef,+ tracksScrollRef,+ ],+ );++ return {+ isDragOver,+ dropTarget,+ dragElementType,+ dragProps: {+ onDragEnter: handleDragEnter,+ onDragOver: handleDragOver,+ onDragLeave: handleDragLeave,+ onDrop: handleDrop,+ },+ };+}diff --cc apps/web/src/lib/commands/timeline/clipboard/paste.tsindex d9c54ec3,f48bc2da..e1b43364--- a/apps/web/src/lib/commands/timeline/clipboard/paste.ts+++ b/apps/web/src/lib/commands/timeline/clipboard/paste.ts@@@ -6,13 -6,12 +6,12 @@@ import typeClipboardItem,} from "@/lib/timeline";import { generateUUID } from "@/utils/id";- import { wouldElementOverlap } from "@/lib/timeline/element-utils";import {- buildEmptyTrack,- getHighestInsertIndexForTrack,+ applyPlacement,+ resolveTrackPlacement,isMainTrack,enforceMainTrackStart,- } from "@/lib/timeline/track-utils";-} from "@/lib/track-placement";++} from "@/lib/timeline/placement";import { cloneAnimations } from "@/lib/animation";export class PasteCommand extends Command {diff --cc apps/web/src/lib/commands/timeline/element/delete-elements.tsindex 9b27a3c2,b3078851..4bbb0d48--- a/apps/web/src/lib/commands/timeline/element/delete-elements.ts+++ b/apps/web/src/lib/commands/timeline/element/delete-elements.ts@@@ -1,7 -1,8 +1,8 @@@import { Command } from "@/lib/commands/base-command";import type { TimelineTrack } from "@/lib/timeline";import { EditorCore } from "@/core";- import { isMainTrack, rippleShiftElements } from "@/lib/timeline";+ import { rippleShiftElements } from "@/lib/timeline";-import { isMainTrack } from "@/lib/track-placement";++import { isMainTrack } from "@/lib/timeline/placement";export class DeleteElementsCommand extends Command {private savedState: TimelineTrack[] | null = null;diff --cc apps/web/src/lib/commands/timeline/element/duplicate-elements.tsindex 346f8c73,6b9edae0..a4f7ca82--- a/apps/web/src/lib/commands/timeline/element/duplicate-elements.ts+++ b/apps/web/src/lib/commands/timeline/element/duplicate-elements.ts@@@ -2,10 -2,7 +2,7 @@@ import { Command } from "@/lib/commandsimport type { TimelineElement, TimelineTrack } from "@/lib/timeline";import { generateUUID } from "@/utils/id";import { EditorCore } from "@/core";- import {- buildEmptyTrack,- getHighestInsertIndexForTrack,- } from "@/lib/timeline/track-utils";-import { applyPlacement, resolveTrackPlacement } from "@/lib/track-placement";++import { applyPlacement, resolveTrackPlacement } from "@/lib/timeline/placement";import { cloneAnimations } from "@/lib/animation";interface DuplicateElementsParams {diff --cc apps/web/src/lib/commands/timeline/element/insert-element.tsindex e6d6ee99,d224cfdb..cdff3565--- a/apps/web/src/lib/commands/timeline/element/insert-element.ts+++ b/apps/web/src/lib/commands/timeline/element/insert-element.ts@@@ -5,23 -5,18 +5,18 @@@ import typeTimelineTrack,TimelineElement,TrackType,- ElementType,} from "@/lib/timeline";import { generateUUID } from "@/utils/id";+ import { requiresMediaId } from "@/lib/timeline/element-utils";+ import type { MediaAsset } from "@/lib/media/types";+ import { TIMELINE_CONSTANTS } from "@/constants/timeline-constants";+ import { graphicsRegistry, registerDefaultGraphics } from "@/lib/graphics";import {- requiresMediaId,- wouldElementOverlap,- } from "@/lib/timeline/element-utils";- import {- buildEmptyTrack,+ applyPlacement,canElementGoOnTrack,- getDefaultInsertIndexForTrack,+ resolveTrackPlacement,validateElementTrackCompatibility,- enforceMainTrackStart,- } from "@/lib/timeline/track-utils";- import type { MediaAsset } from "@/lib/media/types";- import { ELEMENT_TRACK_MAP, TIMELINE_CONSTANTS } from "@/constants/timeline-constants";- import { graphicsRegistry, registerDefaultGraphics } from "@/lib/graphics";-} from "@/lib/track-placement";++} from "@/lib/timeline/placement";type InsertElementPlacement =| { mode: "explicit"; trackId: string }diff --cc apps/web/src/lib/commands/timeline/element/move-elements.tsindex 24605d0b,f9144d38..73d07bff--- a/apps/web/src/lib/commands/timeline/element/move-elements.ts+++ b/apps/web/src/lib/commands/timeline/element/move-elements.ts@@@ -10,7 -10,7 +10,7 @@@ importisMainTrack,validateElementTrackCompatibility,enforceMainTrackStart,- } from "@/lib/timeline/track-utils";-} from "@/lib/track-placement";++} from "@/lib/timeline/placement";import { rippleShiftElements } from "@/lib/timeline/ripple-utils";export class MoveElementCommand extends Command {diff --cc apps/web/src/lib/commands/timeline/element/update-element-start-time.tsindex d640d001,cd7e9bd9..ff81cff2--- a/apps/web/src/lib/commands/timeline/element/update-element-start-time.ts+++ b/apps/web/src/lib/commands/timeline/element/update-element-start-time.ts@@@ -1,7 -1,7 +1,7 @@@import { Command } from "@/lib/commands/base-command";import type { TimelineTrack } from "@/lib/timeline";import { EditorCore } from "@/core";- import { enforceMainTrackStart } from "@/lib/timeline/track-utils";-import { enforceMainTrackStart } from "@/lib/track-placement";++import { enforceMainTrackStart } from "@/lib/timeline/placement";export class UpdateElementStartTimeCommand extends Command {private savedState: TimelineTrack[] | null = null;diff --cc apps/web/src/lib/commands/timeline/element/update-element-trim.tsindex b2c77418,54ec5697..13ee66dd--- a/apps/web/src/lib/commands/timeline/element/update-element-trim.ts+++ b/apps/web/src/lib/commands/timeline/element/update-element-trim.ts@@@ -3,7 -3,7 +3,7 @@@ import type { TimelineTrack } from "@/limport { EditorCore } from "@/core";import { clampAnimationsToDuration } from "@/lib/animation";import { isRetimableElement, rippleShiftElements } from "@/lib/timeline";- import { enforceMainTrackStart } from "@/lib/timeline/track-utils";-import { enforceMainTrackStart } from "@/lib/track-placement";++import { enforceMainTrackStart } from "@/lib/timeline/placement";export class UpdateElementTrimCommand extends Command {private savedState: TimelineTrack[] | null = null;diff --cc apps/web/src/lib/commands/timeline/track/add-track.tsindex b1f0daa0,43286b95..104c0462--- a/apps/web/src/lib/commands/timeline/track/add-track.ts+++ b/apps/web/src/lib/commands/timeline/track/add-track.ts@@@ -5,7 -5,7 +5,7 @@@ import { EditorCore } from "@/core"import {buildEmptyTrack,getDefaultInsertIndexForTrack,- } from "@/lib/timeline/track-utils";-} from "@/lib/track-placement";++} from "@/lib/timeline/placement";export class AddTrackCommand extends Command {private trackId: string;diff --cc apps/web/src/lib/commands/timeline/track/remove-track.tsindex a9859a1a,b5d57a3d..f35edbe4--- a/apps/web/src/lib/commands/timeline/track/remove-track.ts+++ b/apps/web/src/lib/commands/timeline/track/remove-track.ts@@@ -1,7 -1,7 +1,7 @@@import { Command } from "@/lib/commands/base-command";import { EditorCore } from "@/core";import type { TimelineTrack } from "@/lib/timeline";- import { getMainTrack } from "@/lib/timeline";-import { getMainTrack } from "@/lib/track-placement";++import { getMainTrack } from "@/lib/timeline/placement";export class RemoveTrackCommand extends Command {private savedState: TimelineTrack[] | null = null;diff --cc apps/web/src/lib/preview/element-bounds.tsindex c8420467,a53cf08e..380a008c--- a/apps/web/src/lib/preview/element-bounds.ts+++ b/apps/web/src/lib/preview/element-bounds.ts@@@ -1,6 -1,6 +1,6 @@@import type { TimelineTrack, TimelineElement } from "@/lib/timeline";import type { MediaAsset } from "@/lib/media/types";- import { isMainTrack } from "@/lib/timeline";-import { isMainTrack } from "@/lib/track-placement";++import { isMainTrack } from "@/lib/timeline/placement";import { STICKER_INTRINSIC_SIZE_FALLBACK } from "@/constants/sticker-constants";import { DEFAULT_GRAPHIC_SOURCE_SIZE } from "@/lib/graphics";import { measureTextElement } from "@/lib/text/measure-element";diff --cc apps/web/src/lib/scenes.tsindex 9a63242c,96bdfd64..1b5b293c--- a/apps/web/src/lib/scenes.ts+++ b/apps/web/src/lib/scenes.ts@@@ -1,7 -1,7 +1,7 @@@import type { TScene } from "@/lib/timeline";import { generateUUID } from "@/utils/id";import { calculateTotalDuration } from "@/lib/timeline";- import { ensureMainTrack } from "@/lib/timeline/track-utils";-import { ensureMainTrack } from "@/lib/track-placement";++import { ensureMainTrack } from "@/lib/timeline/placement";export function getMainScene({ scenes }: { scenes: TScene[] }): TScene | null {return scenes.find((scene) => scene.isMain) || null;diff --cc apps/web/src/lib/timeline/drop-utils.tsindex cba8c65e,8c995029..161d2714--- a/apps/web/src/lib/timeline/drop-utils.ts+++ b/apps/web/src/lib/timeline/drop-utils.ts@@@ -3,14 -3,8 +3,8 @@@ import typeTimelineElement,} from "@/lib/timeline";import { TRACK_CONFIG, TRACK_GAP } from "@/constants/timeline-constants";- import { wouldElementOverlap } from "./element-utils";import type { ComputeDropTargetParams, DropTarget } from "@/lib/timeline";- import {- canElementGoOnTrack,- isMainTrack,- enforceMainTrackStart,- } from "./track-utils";-import { resolveTrackPlacement } from "@/lib/track-placement";++import { resolveTrackPlacement } from "@/lib/timeline/placement";function findElementAtPosition({mouseX,diff --cc apps/web/src/lib/timeline/placement/__tests__/resolve.test.tsindex 00000000,db9c38f3..95424160mode 000000,100644..100644--- a/apps/web/src/lib/timeline/placement/__tests__/resolve.test.ts+++ b/apps/web/src/lib/timeline/placement/__tests__/resolve.test.ts@@@ -1,0 -1,462 +1,462 @@@+ import { describe, expect, test } from "bun:test";+ import type { ElementType, TimelineElement, TimelineTrack, TrackType } from "@/lib/timeline";-import { resolveTrackPlacement } from "@/lib/track-placement";++import { resolveTrackPlacement } from "@/lib/timeline/placement";++ function buildElement({+ id,+ type,+ startTime,+ duration,+ }: {+ id: string;+ type: ElementType;+ startTime: number;+ duration: number;+ }): TimelineElement {+ return {+ id,+ type,+ name: id,+ startTime,+ duration,+ trimStart: 0,+ trimEnd: 0,+ } as TimelineElement;+ }++ function buildTrack({+ id,+ type,+ elements = [],+ isMain = false,+ }: {+ id: string;+ type: TrackType;+ elements?: TimelineElement[];+ isMain?: boolean;+ }): TimelineTrack {+ if (type === "video") {+ return {+ id,+ type,+ name: id,+ elements: elements as TimelineTrack["elements"],+ isMain,+ muted: false,+ hidden: false,+ };+ }++ if (type === "audio") {+ return {+ id,+ type,+ name: id,+ elements: elements as TimelineTrack["elements"],+ muted: false,+ };+ }++ return {+ id,+ type,+ name: id,+ elements: elements as TimelineTrack["elements"],+ hidden: false,+ };+ }++ function buildTimeSpan({+ startTime,+ duration,+ excludeElementId,+ }: {+ startTime: number;+ duration: number;+ excludeElementId?: string;+ }) {+ return { startTime, duration, excludeElementId };+ }++ describe("resolveTrackPlacement", () => {+ test("explicit returns the requested compatible track", () => {+ const tracks = [buildTrack({ id: "text-1", type: "text" })];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "text",+ timeSpans: [buildTimeSpan({ startTime: 2, duration: 3 })],+ strategy: { type: "explicit", trackId: "text-1" },+ }),+ ).toEqual({+ kind: "existingTrack",+ trackId: "text-1",+ trackIndex: 0,+ trackType: "text",+ });+ });++ test("explicit rejects missing and incompatible tracks", () => {+ const tracks = [buildTrack({ id: "video-1", type: "video", isMain: true })];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "text",+ timeSpans: [buildTimeSpan({ startTime: 0, duration: 1 })],+ strategy: { type: "explicit", trackId: "missing" },+ }),+ ).toBeNull();++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "text",+ timeSpans: [buildTimeSpan({ startTime: 0, duration: 1 })],+ strategy: { type: "explicit", trackId: "video-1" },+ }),+ ).toBeNull();+ });++ test("firstAvailable picks the first compatible track without overlap", () => {+ const tracks = [+ buildTrack({+ id: "text-1",+ type: "text",+ elements: [buildElement({ id: "a", type: "text", startTime: 0, duration: 5 })],+ }),+ buildTrack({ id: "text-2", type: "text" }),+ ];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "text",+ timeSpans: [buildTimeSpan({ startTime: 2, duration: 1 })],+ strategy: { type: "firstAvailable" },+ }),+ ).toEqual({+ kind: "existingTrack",+ trackId: "text-2",+ trackIndex: 1,+ trackType: "text",+ });+ });++ test("firstAvailable creates a new track when all compatible tracks are full", () => {+ const tracks = [+ buildTrack({+ id: "graphic-1",+ type: "graphic",+ elements: [+ buildElement({ id: "a", type: "graphic", startTime: 0, duration: 5 }),+ ],+ }),+ buildTrack({+ id: "video-main",+ type: "video",+ isMain: true,+ }),+ buildTrack({ id: "audio-1", type: "audio" }),+ ];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "graphic",+ timeSpans: [buildTimeSpan({ startTime: 1, duration: 1 })],+ strategy: { type: "firstAvailable" },+ }),+ ).toEqual({+ kind: "newTrack",+ trackType: "graphic",+ insertIndex: 1,+ insertPosition: null,+ });+ });++ test("preferIndex uses the preferred track when it fits", () => {+ const tracks = [buildTrack({ id: "audio-1", type: "audio" })];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "audio",+ timeSpans: [buildTimeSpan({ startTime: 3, duration: 2 })],+ strategy: {+ type: "preferIndex",+ trackIndex: 0,+ hoverDirection: "below",+ },+ }),+ ).toEqual({+ kind: "existingTrack",+ trackId: "audio-1",+ trackIndex: 0,+ trackType: "audio",+ });+ });++ test("preferIndex creates a new overlay track above the main track", () => {+ const tracks = [+ buildTrack({ id: "video-main", type: "video", isMain: true }),+ buildTrack({ id: "audio-1", type: "audio" }),+ ];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "graphic",+ timeSpans: [buildTimeSpan({ startTime: 1, duration: 2 })],+ strategy: {+ type: "preferIndex",+ trackIndex: 1,+ hoverDirection: "below",+ },+ }),+ ).toEqual({+ kind: "newTrack",+ trackType: "graphic",+ insertIndex: 0,+ insertPosition: "above",+ });+ });++ test("preferIndex keeps audio tracks below the main track", () => {+ const tracks = [+ buildTrack({ id: "text-1", type: "text" }),+ buildTrack({ id: "video-main", type: "video", isMain: true }),+ buildTrack({ id: "audio-1", type: "audio" }),+ ];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "audio",+ timeSpans: [buildTimeSpan({ startTime: 0, duration: 1 })],+ strategy: {+ type: "preferIndex",+ trackIndex: 0,+ hoverDirection: "above",+ createNewTrackOnly: true,+ },+ }),+ ).toEqual({+ kind: "newTrack",+ trackType: "audio",+ insertIndex: 2,+ insertPosition: "below",+ });+ });++ test("aboveSource tries the track above source, then any compatible track", () => {+ const tracks = [+ buildTrack({ id: "text-top", type: "text" }),+ buildTrack({+ id: "text-middle",+ type: "text",+ elements: [buildElement({ id: "a", type: "text", startTime: 0, duration: 5 })],+ }),+ buildTrack({ id: "text-source", type: "text" }),+ ];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "text",+ timeSpans: [buildTimeSpan({ startTime: 1, duration: 1 })],+ strategy: { type: "aboveSource", sourceTrackIndex: 2 },+ }),+ ).toEqual({+ kind: "existingTrack",+ trackId: "text-top",+ trackIndex: 0,+ trackType: "text",+ });+ });++ test("aboveSource creates a new track near the source when none fit", () => {+ const tracks = [+ buildTrack({+ id: "text-top",+ type: "text",+ elements: [buildElement({ id: "a", type: "text", startTime: 0, duration: 5 })],+ }),+ buildTrack({+ id: "text-source",+ type: "text",+ elements: [buildElement({ id: "b", type: "text", startTime: 0, duration: 5 })],+ }),+ ];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "text",+ timeSpans: [buildTimeSpan({ startTime: 1, duration: 1 })],+ strategy: { type: "aboveSource", sourceTrackIndex: 1 },+ }),+ ).toEqual({+ kind: "newTrack",+ trackType: "text",+ insertIndex: 1,+ insertPosition: null,+ });+ });++ test("alwaysNew honors highest and default insertion rules", () => {+ const tracks = [+ buildTrack({ id: "video-main", type: "video", isMain: true }),+ buildTrack({ id: "audio-1", type: "audio" }),+ ];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "audio",+ timeSpans: [],+ strategy: { type: "alwaysNew", position: "highest" },+ }),+ ).toEqual({+ kind: "newTrack",+ trackType: "audio",+ insertIndex: 1,+ insertPosition: null,+ });++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "audio",+ timeSpans: [],+ strategy: { type: "alwaysNew", position: "default" },+ }),+ ).toEqual({+ kind: "newTrack",+ trackType: "audio",+ insertIndex: 2,+ insertPosition: null,+ });+ });++ test("batch time spans reject tracks when any span overlaps", () => {+ const tracks = [+ buildTrack({+ id: "audio-1",+ type: "audio",+ elements: [+ buildElement({ id: "a", type: "audio", startTime: 0, duration: 2 }),+ buildElement({ id: "b", type: "audio", startTime: 5, duration: 2 }),+ ],+ }),+ ];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "audio",+ timeSpans: [+ buildTimeSpan({ startTime: 2.5, duration: 1 }),+ buildTimeSpan({ startTime: 5.5, duration: 1 }),+ ],+ strategy: { type: "firstAvailable" },+ }),+ ).toEqual({+ kind: "newTrack",+ trackType: "audio",+ insertIndex: 1,+ insertPosition: null,+ });+ });++ test("handles empty timelines, single tracks, and track-type derivation", () => {+ expect(+ resolveTrackPlacement({+ tracks: [],+ elementType: "video",+ timeSpans: [buildTimeSpan({ startTime: 0, duration: 3 })],+ strategy: {+ type: "preferIndex",+ trackIndex: 0,+ hoverDirection: "below",+ createNewTrackOnly: true,+ },+ }),+ ).toEqual({+ kind: "newTrack",+ trackType: "video",+ insertIndex: 0,+ insertPosition: null,+ });++ expect(+ resolveTrackPlacement({+ tracks: [buildTrack({ id: "audio-1", type: "audio" })],+ elementType: "audio",+ timeSpans: [],+ strategy: { type: "alwaysNew", position: "default" },+ }),+ ).toEqual({+ kind: "newTrack",+ trackType: "audio",+ insertIndex: 1,+ insertPosition: null,+ });+ });++ test("existingTrack on main video includes adjustedStartTime when start snaps", () => {+ const tracks = [+ buildTrack({+ id: "video-main",+ type: "video",+ isMain: true,+ elements: [+ buildElement({ id: "a", type: "video", startTime: 5, duration: 5 }),+ ],+ }),+ ];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "video",+ timeSpans: [buildTimeSpan({ startTime: 2, duration: 2 })],+ strategy: { type: "explicit", trackId: "video-main" },+ }),+ ).toEqual({+ kind: "existingTrack",+ trackId: "video-main",+ trackIndex: 0,+ trackType: "video",+ adjustedStartTime: 0,+ });+ });++ test("preferIndex uses vertical drag direction when hovered track is incompatible", () => {+ const tracks = [+ buildTrack({ id: "text-1", type: "text" }),+ buildTrack({ id: "video-main", type: "video", isMain: true }),+ buildTrack({ id: "audio-1", type: "audio" }),+ ];++ expect(+ resolveTrackPlacement({+ tracks,+ elementType: "audio",+ timeSpans: [buildTimeSpan({ startTime: 0, duration: 1 })],+ strategy: {+ type: "preferIndex",+ trackIndex: 0,+ hoverDirection: "above",+ verticalDragDirection: "down",+ },+ }),+ ).toEqual({+ kind: "newTrack",+ trackType: "audio",+ insertIndex: 2,+ insertPosition: "below",+ });+ });+ });diff --cc apps/web/src/services/renderer/scene-builder.tsindex 1c3e6ad2,e4010223..8fd8631b--- a/apps/web/src/services/renderer/scene-builder.ts+++ b/apps/web/src/services/renderer/scene-builder.ts@@@ -12,7 -12,7 +12,7 @@@ import { EffectLayerNode } from "./nodeimport type { BaseNode } from "./nodes/base-node";import type { TBackground, TCanvasSize } from "@/lib/project/types";import { DEFAULT_BLUR_INTENSITY } from "@/constants/project-constants";- import { isMainTrack } from "@/lib/timeline";-import { isMainTrack } from "@/lib/track-placement";++import { isMainTrack } from "@/lib/timeline/placement";const PREVIEW_MAX_IMAGE_SIZE = 2048;