From 44d8c4c8764d49a8e8d0ae713432c07f07cb7597 Mon Sep 17 00:00:00 2001
From: Maze Winther <mazewinther@gmail.com>
Date: Mon, 6 Apr 2026 00:02:23 +0200
Subject: refactor: unify element updates into pipeline and centralize ripple

---
 .../commands/timeline/element/delete-elements.ts   | 63 +++++++---------------
 1 file changed, 19 insertions(+), 44 deletions(-)

(limited to 'apps/web/src/lib/commands/timeline/element/delete-elements.ts')

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 1e1ad661..c8cc4494 100644
--- a/apps/web/src/lib/commands/timeline/element/delete-elements.ts
+++ b/apps/web/src/lib/commands/timeline/element/delete-elements.ts
@@ -1,23 +1,18 @@
 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 | undefined {
@@ -25,45 +20,25 @@ export class DeleteElementsCommand extends Command {
 		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;
-			});
+			const elementsToDeleteOnTrack = this.elements.filter(
+				(target) => target.trackId === track.id,
+			);
+
+			if (elementsToDeleteOnTrack.length === 0) {
+				return track;
+			}
+
+			const elements = track.elements.filter(
+				(element) =>
+					!this.elements.some(
+						(target) =>
+							target.trackId === track.id &&
+							target.elementId === element.id,
+					),
+			);
+
+			return { ...track, elements } as typeof track;
+		});
 
 		editor.timeline.updateTracks(updatedTracks);
 
-- 
cgit v1.3.1