From 9b5fd6eb077a3fb2380f42414b65405030a01fcd Mon Sep 17 00:00:00 2001 From: Maze Winther Date: Sun, 8 Feb 2026 01:51:25 +0100 Subject: feat: ensure elements on main track starts at 0 --- .../timeline/element/update-element-start-time.ts | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'apps/web/src/lib/commands/timeline/element/update-element-start-time.ts') 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; }); -- cgit v1.3.1