2 files changed, 115 insertions, 75 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 91eb6397..9e6ed8cd 100644
--- a/apps/web/src/lib/commands/timeline/element/delete-elements.ts
+++ b/apps/web/src/lib/commands/timeline/element/delete-elements.ts
@@ -1,12 +1,15 @@
 import { Command } from "@/lib/commands/base-command";
 import type { TimelineTrack } from "@/types/timeline";
 import { EditorCore } from "@/core";
-import { isMainTrack } from "@/lib/timeline";
+import { isMainTrack, rippleShiftElements } from "@/lib/timeline";
 
 export class DeleteElementsCommand extends Command {
 	private savedState: TimelineTrack[] | null = null;
 
-	constructor(private elements: { trackId: string; elementId: string }[]) {
+	constructor(
+		private elements: { trackId: string; elementId: string }[],
+		private rippleEnabled = false,
+	) {
 		super();
 	}
 
@@ -16,23 +19,44 @@ export class DeleteElementsCommand extends Command {
 
 		const updatedTracks = this.savedState
 			.map((track) => {
-				const hasElementsToDelete = this.elements.some(
-					(el) => el.trackId === track.id,
-				);
+			const elementsToDeleteOnTrack = this.elements.filter(
+				(target) => target.trackId === track.id,
+			);
+			const hasElementsToDelete = elementsToDeleteOnTrack.length > 0;
 
-				if (!hasElementsToDelete) {
-					return track;
-				}
+			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 }));
 
-				return {
-					...track,
-					elements: track.elements.filter(
-						(element) =>
-							!this.elements.some(
-								(el) => el.trackId === track.id && el.elementId === element.id,
-							),
+			let elements = track.elements.filter(
+				(element) =>
+					!this.elements.some(
+						(target) =>
+							target.trackId === track.id && target.elementId === element.id,
 					),
-				} as typeof track;
+			);
+
+				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));
 
diff --git a/apps/web/src/lib/commands/timeline/element/split-elements.ts b/apps/web/src/lib/commands/timeline/element/split-elements.ts
index abe133c9..05a23fff 100644
--- a/apps/web/src/lib/commands/timeline/element/split-elements.ts
+++ b/apps/web/src/lib/commands/timeline/element/split-elements.ts
@@ -2,6 +2,7 @@ import { Command } from "@/lib/commands/base-command";
 import type { TimelineTrack } from "@/types/timeline";
 import { generateUUID } from "@/utils/id";
 import { EditorCore } from "@/core";
+import { rippleShiftElements } from "@/lib/timeline";
 
 export class SplitElementsCommand extends Command {
 	private savedState: TimelineTrack[] | null = null;
@@ -12,6 +13,7 @@ export class SplitElementsCommand extends Command {
 		private elements: { trackId: string; elementId: string }[],
 		private splitTime: number,
 		private retainSide: "both" | "left" | "right" = "both",
+		private rippleEnabled = false,
 	) {
 		super();
 	}
@@ -28,74 +30,39 @@ export class SplitElementsCommand extends Command {
 
 		const updatedTracks = this.savedState.map((track) => {
 			const elementsToSplit = this.elements.filter(
-				(el) => el.trackId === track.id,
+				(target) => target.trackId === track.id,
 			);
 
 			if (elementsToSplit.length === 0) {
 				return track;
 			}
 
-			return {
-				...track,
-				elements: track.elements.flatMap((element) => {
-					const shouldSplit = elementsToSplit.some(
-						(el) => el.elementId === element.id,
-					);
+			let leftVisibleDurationForRipple: number | null = null;
 
-					if (!shouldSplit) {
-						return [element];
-					}
-
-					const effectiveStart = element.startTime;
-					const effectiveEnd = element.startTime + element.duration;
+			let elements = track.elements.flatMap((element) => {
+				const shouldSplit = elementsToSplit.some(
+					(target) => target.elementId === element.id,
+				);
 
-					if (
-						this.splitTime <= effectiveStart ||
-						this.splitTime >= effectiveEnd
-					) {
-						return [element];
-					}
+				if (!shouldSplit) {
+					return [element];
+				}
 
-					const relativeTime = this.splitTime - element.startTime;
-					const leftVisibleDuration = relativeTime;
-					const rightVisibleDuration = element.duration - relativeTime;
+				const effectiveStart = element.startTime;
+				const effectiveEnd = element.startTime + element.duration;
 
-					if (this.retainSide === "left") {
-						return [
-							{
-								...element,
-								duration: leftVisibleDuration,
-								trimEnd: element.trimEnd + rightVisibleDuration,
-								name: `${element.name} (left)`,
-							},
-						];
-					}
+				if (
+					this.splitTime <= effectiveStart ||
+					this.splitTime >= effectiveEnd
+				) {
+					return [element];
+				}
 
-					if (this.retainSide === "right") {
-						const newId = generateUUID();
-						this.rightSideElements.push({
-							trackId: track.id,
-							elementId: newId,
-						});
-						return [
-							{
-								...element,
-								id: newId,
-								startTime: this.splitTime,
-								duration: rightVisibleDuration,
-								trimStart: element.trimStart + leftVisibleDuration,
-								name: `${element.name} (right)`,
-							},
-						];
-					}
-
-					// "both" - split into two pieces
-					const secondElementId = generateUUID();
-					this.rightSideElements.push({
-						trackId: track.id,
-						elementId: secondElementId,
-					});
+				const relativeTime = this.splitTime - element.startTime;
+				const leftVisibleDuration = relativeTime;
+				const rightVisibleDuration = element.duration - relativeTime;
 
+				if (this.retainSide === "left") {
 					return [
 						{
 							...element,
@@ -103,17 +70,66 @@ export class SplitElementsCommand extends Command {
 							trimEnd: element.trimEnd + rightVisibleDuration,
 							name: `${element.name} (left)`,
 						},
+					];
+				}
+
+				if (this.retainSide === "right") {
+					if (this.rippleEnabled && elementsToSplit.length === 1) {
+						leftVisibleDurationForRipple = leftVisibleDuration;
+					}
+					const newId = generateUUID();
+					this.rightSideElements.push({
+						trackId: track.id,
+						elementId: newId,
+					});
+					return [
 						{
 							...element,
-							id: secondElementId,
+							id: newId,
 							startTime: this.splitTime,
 							duration: rightVisibleDuration,
 							trimStart: element.trimStart + leftVisibleDuration,
 							name: `${element.name} (right)`,
 						},
 					];
-				}),
-			} as typeof track;
+				}
+
+			const secondElementId = generateUUID();
+				this.rightSideElements.push({
+					trackId: track.id,
+					elementId: secondElementId,
+				});
+
+				return [
+					{
+						...element,
+						duration: leftVisibleDuration,
+						trimEnd: element.trimEnd + rightVisibleDuration,
+						name: `${element.name} (left)`,
+					},
+					{
+						...element,
+						id: secondElementId,
+						startTime: this.splitTime,
+						duration: rightVisibleDuration,
+						trimStart: element.trimStart + leftVisibleDuration,
+						name: `${element.name} (right)`,
+					},
+				];
+			});
+
+			if (
+				this.rippleEnabled &&
+				leftVisibleDurationForRipple !== null
+			) {
+				elements = rippleShiftElements({
+					elements,
+					afterTime: this.splitTime,
+					shiftAmount: leftVisibleDurationForRipple,
+				});
+			}
+
+			return { ...track, elements } as typeof track;
 		});
 
 		editor.timeline.updateTracks(updatedTracks);