refactor: move track pruning into a post-command reactor

1 files changed, 81 insertions, 84 deletions

diff --git a/apps/web/src/lib/commands/timeline/element/delete-elements.ts b/apps/web/src/lib/commands/timeline/element/delete-elements.ts
index 26277f95..9177a3f8 100644
--- a/apps/web/src/lib/commands/timeline/element/delete-elements.ts
+++ b/apps/web/src/lib/commands/timeline/element/delete-elements.ts
@@ -1,84 +1,81 @@
-import { Command, type CommandResult } from "@/lib/commands/base-command";

-import type { TimelineTrack } from "@/lib/timeline";

-import { EditorCore } from "@/core";

-import { rippleShiftElements } from "@/lib/timeline";

-import { isMainTrack } from "@/lib/timeline/placement";

-

-export class DeleteElementsCommand extends Command {

-	private savedState: TimelineTrack[] | null = null;

-	private readonly elements: { trackId: string; elementId: string }[];

-	private readonly rippleEnabled: boolean;

-

-	constructor({

-		elements,

-		rippleEnabled = false,

-	}: {

-		elements: { trackId: string; elementId: string }[];

-		rippleEnabled?: boolean;

-	}) {

-		super();

-		this.elements = elements;

-		this.rippleEnabled = rippleEnabled;

-	}

-

-	execute(): CommandResult {

-		const editor = EditorCore.getInstance();

-		this.savedState = editor.timeline.getTracks();

-

-		const updatedTracks = this.savedState

-			.map((track) => {

-				const elementsToDeleteOnTrack = this.elements.filter(

-					(target) => target.trackId === track.id,

-				);

-				const hasElementsToDelete = elementsToDeleteOnTrack.length > 0;

-

-				if (!hasElementsToDelete) {

-					return track;

-				}

-

-				const deletedElementInfos = elementsToDeleteOnTrack

-					.map((target) =>

-						track.elements.find((element) => element.id === target.elementId),

-					)

-					.filter((element): element is NonNullable<typeof element> => element !== undefined)

-					.map((element) => ({ startTime: element.startTime, duration: element.duration }));

-

-				let elements = track.elements.filter(

-					(element) =>

-						!this.elements.some(

-							(target) =>

-								target.trackId === track.id && target.elementId === element.id,

-						),

-				);

-

-				if (this.rippleEnabled && deletedElementInfos.length > 0) {

-					const sortedByStartDesc = [...deletedElementInfos].sort(

-						(a, b) => b.startTime - a.startTime,

-					);

-					for (const { startTime, duration } of sortedByStartDesc) {

-						elements = rippleShiftElements({

-							elements,

-							afterTime: startTime,

-							shiftAmount: duration,

-						});

-					}

-				}

-

-				return { ...track, elements } as typeof track;

-			})

-			.filter((track) => track.elements.length > 0 || isMainTrack(track));

-

-		editor.timeline.updateTracks(updatedTracks);

-

-		return {

-			select: [],

-		};

-	}

-

-	undo(): void {

-		if (this.savedState) {

-			const editor = EditorCore.getInstance();

-			editor.timeline.updateTracks(this.savedState);

-		}

-	}

-}

+import { Command, type CommandResult } from "@/lib/commands/base-command";
+import type { TimelineTrack } from "@/lib/timeline";
+import { EditorCore } from "@/core";
+import { rippleShiftElements } from "@/lib/timeline";
+
+export class DeleteElementsCommand extends Command {
+	private savedState: TimelineTrack[] | null = null;
+	private readonly elements: { trackId: string; elementId: string }[];
+	private readonly rippleEnabled: boolean;
+
+	constructor({
+		elements,
+		rippleEnabled = false,
+	}: {
+		elements: { trackId: string; elementId: string }[];
+		rippleEnabled?: boolean;
+	}) {
+		super();
+		this.elements = elements;
+		this.rippleEnabled = rippleEnabled;
+	}
+
+	execute(): CommandResult {
+		const editor = EditorCore.getInstance();
+		this.savedState = editor.timeline.getTracks();
+
+		const updatedTracks = this.savedState.map((track) => {
+				const elementsToDeleteOnTrack = this.elements.filter(
+					(target) => target.trackId === track.id,
+				);
+				const hasElementsToDelete = elementsToDeleteOnTrack.length > 0;
+
+				if (!hasElementsToDelete) {
+					return track;
+				}
+
+				const deletedElementInfos = elementsToDeleteOnTrack
+					.map((target) =>
+						track.elements.find((element) => element.id === target.elementId),
+					)
+					.filter((element): element is NonNullable<typeof element> => element !== undefined)
+					.map((element) => ({ startTime: element.startTime, duration: element.duration }));
+
+				let elements = track.elements.filter(
+					(element) =>
+						!this.elements.some(
+							(target) =>
+								target.trackId === track.id && target.elementId === element.id,
+						),
+				);
+
+				if (this.rippleEnabled && deletedElementInfos.length > 0) {
+					const sortedByStartDesc = [...deletedElementInfos].sort(
+						(a, b) => b.startTime - a.startTime,
+					);
+					for (const { startTime, duration } of sortedByStartDesc) {
+						elements = rippleShiftElements({
+							elements,
+							afterTime: startTime,
+							shiftAmount: duration,
+						});
+					}
+				}
+
+				return { ...track, elements } as typeof track;
+			});
+
+		editor.timeline.updateTracks(updatedTracks);
+
+		return {
+			select: [],
+		};
+	}
+
+	undo(): void {
+		if (this.savedState) {
+			const editor = EditorCore.getInstance();
+			editor.timeline.updateTracks(this.savedState);
+		}
+	}
+}