diff options
Diffstat (limited to 'apps/web/src/lib/commands/timeline')
4 files changed, 88 insertions, 9 deletions
diff --git a/apps/web/src/lib/commands/timeline/clipboard/paste.ts b/apps/web/src/lib/commands/timeline/clipboard/paste.ts index 9c979790..39feb8ce 100644 --- a/apps/web/src/lib/commands/timeline/clipboard/paste.ts +++ b/apps/web/src/lib/commands/timeline/clipboard/paste.ts @@ -10,6 +10,8 @@ import { wouldElementOverlap } from "@/lib/timeline/element-utils"; import { buildEmptyTrack, getHighestInsertIndexForTrack, + isMainTrack, + enforceMainTrackStart, } from "@/lib/timeline/track-utils"; export class PasteCommand extends Command { @@ -65,11 +67,32 @@ export class PasteCommand extends Command { if (resolvedTargetIndex >= 0) { const targetTrack = updatedTracks[resolvedTargetIndex]; + let adjustedElements = elementsToAdd; + + if (isMainTrack(targetTrack)) { + const earliestElement = elementsToAdd.reduce((earliest, element) => + element.startTime < earliest.startTime ? element : earliest, + ); + const adjustedEarliestStartTime = enforceMainTrackStart({ + tracks: updatedTracks, + targetTrackId: targetTrack.id, + requestedStartTime: earliestElement.startTime, + }); + const delta = adjustedEarliestStartTime - earliestElement.startTime; + + if (delta !== 0) { + adjustedElements = elementsToAdd.map((element) => ({ + ...element, + startTime: Math.max(0, element.startTime + delta), + })); + } + } + updatedTracks[resolvedTargetIndex] = { ...targetTrack, - elements: [...targetTrack.elements, ...elementsToAdd], + elements: [...targetTrack.elements, ...adjustedElements], } as TimelineTrack; - for (const element of elementsToAdd) { + for (const element of adjustedElements) { this.pastedElements.push({ trackId: targetTrack.id, elementId: element.id, diff --git a/apps/web/src/lib/commands/timeline/element/insert-element.ts b/apps/web/src/lib/commands/timeline/element/insert-element.ts index f95935a5..6067d72b 100644 --- a/apps/web/src/lib/commands/timeline/element/insert-element.ts +++ b/apps/web/src/lib/commands/timeline/element/insert-element.ts @@ -17,6 +17,7 @@ import { canElementGoOnTrack, getDefaultInsertIndexForTrack, validateElementTrackCompatibility, + enforceMainTrackStart, } from "@/lib/timeline/track-utils"; import type { MediaAsset } from "@/types/assets"; import { TIMELINE_CONSTANTS } from "@/constants/timeline-constants"; @@ -204,9 +205,18 @@ export class InsertElementCommand extends Command { return null; } + const adjustedElement = this.adjustElementForMainTrack({ + tracks, + targetTrackId: targetTrack.id, + element, + }); + const updatedTracks = tracks.map((track) => track.id === targetTrack.id - ? { ...track, elements: [...track.elements, element] } + ? { + ...track, + elements: [...track.elements, adjustedElement], + } : track, ) as TimelineTrack[]; @@ -248,9 +258,18 @@ export class InsertElementCommand extends Command { }); if (existingTrack) { + const adjustedElement = this.adjustElementForMainTrack({ + tracks, + targetTrackId: existingTrack.id, + element, + }); + const updatedTracks = tracks.map((track) => track.id === existingTrack.id - ? { ...track, elements: [...track.elements, element] } + ? { + ...track, + elements: [...track.elements, adjustedElement], + } : track, ) as TimelineTrack[]; @@ -298,6 +317,23 @@ export class InsertElementCommand extends Command { }); } + private adjustElementForMainTrack({ + tracks, + targetTrackId, + element, + }: { + tracks: TimelineTrack[]; + targetTrackId: string; + element: TimelineElement; + }): TimelineElement { + const adjustedStartTime = enforceMainTrackStart({ + tracks, + targetTrackId, + requestedStartTime: element.startTime, + }); + return { ...element, startTime: adjustedStartTime }; + } + private getTrackTypeForElement({ element, }: { diff --git a/apps/web/src/lib/commands/timeline/element/move-elements.ts b/apps/web/src/lib/commands/timeline/element/move-elements.ts index 2d4f9236..2fe06694 100644 --- a/apps/web/src/lib/commands/timeline/element/move-elements.ts +++ b/apps/web/src/lib/commands/timeline/element/move-elements.ts @@ -9,6 +9,7 @@ import { buildEmptyTrack, isMainTrack, validateElementTrackCompatibility, + enforceMainTrackStart, } from "@/lib/timeline/track-utils"; export class MoveElementCommand extends Command { @@ -66,9 +67,16 @@ export class MoveElementCommand extends Command { return; } + const adjustedStartTime = enforceMainTrackStart({ + tracks: tracksToUpdate, + targetTrackId: this.targetTrackId, + requestedStartTime: this.newStartTime, + excludeElementId: this.elementId, + }); + const movedElement: TimelineElement = { ...element, - startTime: this.newStartTime, + startTime: adjustedStartTime, }; const isSameTrack = this.sourceTrackId === this.targetTrackId; diff --git 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 index 5312000f..51dcb63d 100644 --- 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,6 +1,7 @@ import { Command } from "@/lib/commands/base-command"; import type { TimelineTrack } from "@/types/timeline"; import { EditorCore } from "@/core"; +import { enforceMainTrackStart } from "@/lib/timeline/track-utils"; export class UpdateElementStartTimeCommand extends Command { private savedState: TimelineTrack[] | null = null; @@ -16,7 +17,8 @@ export class UpdateElementStartTimeCommand extends Command { const editor = EditorCore.getInstance(); this.savedState = editor.timeline.getTracks(); - const updatedTracks = this.savedState.map((track) => { + const currentTracks = this.savedState; + const updatedTracks = currentTracks.map((track) => { const hasElementsToUpdate = this.elements.some( (el) => el.trackId === track.id, ); @@ -29,9 +31,19 @@ export class UpdateElementStartTimeCommand extends Command { const shouldUpdate = this.elements.some( (el) => el.elementId === element.id && el.trackId === track.id, ); - return shouldUpdate - ? { ...element, startTime: Math.max(0, this.startTime) } - : element; + if (!shouldUpdate) { + return element; + } + + const baseStartTime = Math.max(0, this.startTime); + const adjustedStartTime = enforceMainTrackStart({ + tracks: currentTracks, + targetTrackId: track.id, + requestedStartTime: baseStartTime, + excludeElementId: element.id, + }); + + return { ...element, startTime: adjustedStartTime }; }); return { ...track, elements: newElements } as typeof track; }); |