The open-source CapCut alternative
Merge branch 'dev' into ripple-editing
Maze Winther5e7c27f542e9
diff --cc apps/web/src/core/managers/timeline-manager.tsindex cf906aee,e0fd9915..f6a1744a--- a/apps/web/src/core/managers/timeline-manager.ts+++ b/apps/web/src/core/managers/timeline-manager.ts@@@ -145,14 -159,12 +160,14 @@@ export class TimelineManagerelements: { trackId: string; elementId: string }[];splitTime: number;retainSide?: "both" | "left" | "right";+ rippleEnabled?: boolean;}): { trackId: string; elementId: string }[] {- const command = new SplitElementsCommand(+ const command = new SplitElementsCommand({elements,splitTime,retainSide,+ rippleEnabled,- );+ });this.editor.command.execute({ command });return command.getRightSideElements();}@@@ -201,12 -213,10 +216,12 @@@deleteElements({elements,+ rippleEnabled = false,}: {elements: { trackId: string; elementId: string }[];+ rippleEnabled?: boolean;}): void {- const command = new DeleteElementsCommand(elements, rippleEnabled);- const command = new DeleteElementsCommand({ elements });++ const command = new DeleteElementsCommand({ elements, rippleEnabled });this.editor.command.execute({ command });}diff --cc apps/web/src/lib/commands/timeline/element/delete-elements.tsindex 9e6ed8cd,3d1e50cc..7fb46c36--- a/apps/web/src/lib/commands/timeline/element/delete-elements.ts+++ b/apps/web/src/lib/commands/timeline/element/delete-elements.ts@@@ -5,12 -5,15 +5,19 @@@ import { isMainTrack, rippleShiftElemenexport class DeleteElementsCommand extends Command {private savedState: TimelineTrack[] | null = null;+ private readonly elements: { trackId: string; elementId: string }[];++ private readonly rippleEnabled: boolean;- constructor(- private elements: { trackId: string; elementId: string }[],- private rippleEnabled = false,- ) {+ constructor({+ elements,++ rippleEnabled = false,+ }: {+ elements: { trackId: string; elementId: string }[];++ rippleEnabled?: boolean;+ }) {super();+ this.elements = elements;++ this.rippleEnabled = rippleEnabled;}execute(): void {@@@ -19,44 -22,25 +26,44 @@@const updatedTracks = this.savedState.map((track) => {- const elementsToDeleteOnTrack = this.elements.filter(- (target) => target.trackId === track.id,- );- const hasElementsToDelete = elementsToDeleteOnTrack.length > 0;- const hasElementsToDelete = this.elements.some(- (elementEntry) => elementEntry.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(- (elementEntry) =>- elementEntry.trackId === track.id &&- elementEntry.elementId === element.id,- ),- ),- } as typeof 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,- ),- );++ 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));diff --cc apps/web/src/lib/commands/timeline/element/split-elements.tsindex 05a23fff,be89e2ff..37ccbb12--- a/apps/web/src/lib/commands/timeline/element/split-elements.ts+++ b/apps/web/src/lib/commands/timeline/element/split-elements.ts@@@ -2,20 -2,29 +2,34 @@@ import { Command } from "@/lib/commandsimport type { TimelineTrack } from "@/types/timeline";import { generateUUID } from "@/utils/id";import { EditorCore } from "@/core";+import { rippleShiftElements } from "@/lib/timeline";+ import { splitAnimationsAtTime } from "@/lib/animation";export class SplitElementsCommand extends Command {private savedState: TimelineTrack[] | null = null;private rightSideElements: { trackId: string; elementId: string }[] = [];private previousSelection: { trackId: string; elementId: string }[] = [];-- constructor(- private elements: { trackId: string; elementId: string }[],- private splitTime: number,- private retainSide: "both" | "left" | "right" = "both",- private rippleEnabled = false,- ) {+ private readonly elements: { trackId: string; elementId: string }[];+ private readonly splitTime: number;+ private readonly retainSide: "both" | "left" | "right";++ private readonly rippleEnabled: boolean;++ constructor({+ elements,+ splitTime,+ retainSide = "both",++ rippleEnabled = false,+ }: {+ elements: { trackId: string; elementId: string }[];+ splitTime: number;+ retainSide?: "both" | "left" | "right";++ rippleEnabled?: boolean;+ }) {super();+ this.elements = elements;+ this.splitTime = splitTime;+ this.retainSide = retainSide;++ this.rippleEnabled = rippleEnabled;}getRightSideElements(): { trackId: string; elementId: string }[] {@@@ -37,99 -46,94 +51,106 @@@return track;}- return {- ...track,- elements: track.elements.flatMap((element) => {- const shouldSplit = elementsToSplit.some(- (elementEntry) => elementEntry.elementId === element.id,- );-- if (!shouldSplit) {- return [element];- }-- const effectiveStart = element.startTime;- const effectiveEnd = element.startTime + element.duration;-- if (- this.splitTime <= effectiveStart ||- this.splitTime >= effectiveEnd- ) {- return [element];- }-- const relativeTime = this.splitTime - element.startTime;- const leftVisibleDuration = relativeTime;- const rightVisibleDuration = element.duration - relativeTime;- const { leftAnimations, rightAnimations } = splitAnimationsAtTime({- animations: element.animations,- splitTime: relativeTime,- shouldIncludeSplitBoundary: true,- });-- if (this.retainSide === "left") {- return [- {- ...element,- duration: leftVisibleDuration,- trimEnd: element.trimEnd + rightVisibleDuration,- name: `${element.name} (left)`,- animations: leftAnimations,- },- ];- }-- 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)`,- animations: rightAnimations,- },- ];- }-- // "both" - split into two pieces- const secondElementId = generateUUID();- this.rightSideElements.push({- trackId: track.id,- elementId: secondElementId,- });-+ let leftVisibleDurationForRipple: number | null = null;++ let elements = track.elements.flatMap((element) => {+ const shouldSplit = elementsToSplit.some(+ (target) => target.elementId === element.id,+ );++ if (!shouldSplit) {+ return [element];+ }++ const effectiveStart = element.startTime;+ const effectiveEnd = element.startTime + element.duration;++ if (+ this.splitTime <= effectiveStart ||+ this.splitTime >= effectiveEnd+ ) {+ return [element];+ }++ const relativeTime = this.splitTime - element.startTime;+ const leftVisibleDuration = relativeTime;+ const rightVisibleDuration = element.duration - relativeTime;++ const { leftAnimations, rightAnimations } = splitAnimationsAtTime({++ animations: element.animations,++ splitTime: relativeTime,++ shouldIncludeSplitBoundary: true,++ });++ if (this.retainSide === "left") {return [{...element,duration: leftVisibleDuration,trimEnd: element.trimEnd + rightVisibleDuration,name: `${element.name} (left)`,+ animations: leftAnimations,},+ ];+ }++ 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)`,+ animations: rightAnimations,},];- }),- } as typeof track;+ }+- const secondElementId = generateUUID();++ // "both" - split into two pieces++ const secondElementId = generateUUID();+ this.rightSideElements.push({+ trackId: track.id,+ elementId: secondElementId,+ });++ return [+ {+ ...element,+ duration: leftVisibleDuration,+ trimEnd: element.trimEnd + rightVisibleDuration,+ name: `${element.name} (left)`,++ animations: leftAnimations,+ },+ {+ ...element,+ id: secondElementId,+ startTime: this.splitTime,+ duration: rightVisibleDuration,+ trimStart: element.trimStart + leftVisibleDuration,+ name: `${element.name} (right)`,++ animations: rightAnimations,+ },+ ];+ });+- if (- this.rippleEnabled &&- leftVisibleDurationForRipple !== null- ) {++ if (this.rippleEnabled && leftVisibleDurationForRipple !== null) {+ elements = rippleShiftElements({+ elements,+ afterTime: this.splitTime,+ shiftAmount: leftVisibleDurationForRipple,+ });+ }++ return { ...track, elements } as typeof track;});editor.timeline.updateTracks(updatedTracks);diff --cc apps/web/src/lib/timeline/index.tsindex b5e74a45,c7236887..887ff7ab--- a/apps/web/src/lib/timeline/index.ts+++ b/apps/web/src/lib/timeline/index.ts@@@ -4,7 -5,7 +5,8 @@@ export * from "./track-element-update"export * from "./element-utils";export * from "./zoom-utils";export * from "./ruler-utils";+export * from "./ripple-utils";+ export * from "./pixel-utils";export function calculateTotalDuration({tracks,