Open source CapCut alternative.
TypeScript
feat(site): transition bars copy and paste
David Le204c19546894
diff --git a/site/src/cut/lib/store.test.ts b/site/src/cut/lib/store.test.tsindex 98be96b8..dda4b9cc 100644--- a/site/src/cut/lib/store.test.ts+++ b/site/src/cut/lib/store.test.ts@@ -925,6 +925,99 @@ describe("bars and clip edges", () => {expect(clipById(a.id).animOut).toEqual({ style: "fade", seconds: 0.8 });});+ test("a copied bar pastes onto the cut nearest the playhead", () => {+ const av = asset(12);+ const a = vclip({ track: 0, start: 0, out: 4, assetId: av.id });+ const b = vclip({ track: 0, start: 4, out: 4, assetId: av.id });+ const c = vclip({ track: 0, start: 8, out: 4, assetId: av.id });+ useEditor.setState({ assets: [av], clips: [a, b, c] });+ s().setClipTransition(a.id, 0.8, "wipeleft");+ const bar = s().transitions[0];+ useEditor.setState({+ selection: { kind: "transition", id: bar.id },+ multiSelection: [{ kind: "transition", id: bar.id }],+ });+ expect(s().copySelection()).toBe(true);+ useEditor.setState({ currentTime: 7.7 }); // in reach of the b|c cut at 8+ expect(s().paste()).toBe(true);+ expect(s().transitions.length).toBe(2);+ // The paste plays that cut with the copied blend, fields and all.+ expect(clipById(b.id).transition).toBeCloseTo(0.8);+ expect(clipById(b.id).transitionStyle).toBe("wipeleft");+ expect(parkedTransitions(s().clips, s().transitions)).toEqual([]);+ expect(s().selection).toEqual({ kind: "transition", id: s().transitions[1].id });+ });++ test("a bar pasted onto an occupied cut replaces the incumbent", () => {+ const av = asset(12);+ const a = vclip({ track: 0, start: 0, out: 4, assetId: av.id });+ const b = vclip({ track: 0, start: 4, out: 4, assetId: av.id });+ const c = vclip({ track: 0, start: 8, out: 4, assetId: av.id });+ useEditor.setState({ assets: [av], clips: [a, b, c] });+ s().setClipTransition(a.id, 0.8, "wipeleft");+ s().setClipTransition(b.id, 0.4, "crossfade");+ const bar = s().transitions.find((t) => t.style === "wipeleft")!;+ useEditor.setState({+ selection: { kind: "transition", id: bar.id },+ multiSelection: [{ kind: "transition", id: bar.id }],+ });+ s().copySelection();+ useEditor.setState({ currentTime: 8.2 });+ s().paste();+ // One bar on the b|c cut: the pasted wipe; the crossfade left with it.+ expect(s().transitions.length).toBe(2);+ expect(clipById(b.id).transition).toBeCloseTo(0.8);+ expect(clipById(b.id).transitionStyle).toBe("wipeleft");+ expect(parkedTransitions(s().clips, s().transitions)).toEqual([]);+ });++ test("a bar pasted far from any boundary parks at the playhead", () => {+ const av = asset(8);+ const a = vclip({ track: 0, start: 0, out: 4, assetId: av.id });+ const b = vclip({ track: 0, start: 4, out: 4, assetId: av.id });+ useEditor.setState({ assets: [av], clips: [a, b] });+ s().setClipTransition(a.id, 0.6, "dipblack");+ const bar = s().transitions[0];+ useEditor.setState({+ selection: { kind: "transition", id: bar.id },+ multiSelection: [{ kind: "transition", id: bar.id }],+ });+ s().copySelection();+ useEditor.setState({ currentTime: 6 }); // 2s from the cuts at 4 and 8+ s().paste();+ expect(s().transitions.length).toBe(2);+ const pasted = s().transitions[1];+ expect(pasted.start).toBeCloseTo(6);+ expect(pasted.style).toBe("dipblack");+ expect(parkedTransitions(s().clips, s().transitions)).toEqual([pasted]);+ });++ test("clips copied with their bar keep the blend on their own cut", () => {+ const av = asset(12);+ const a = vclip({ track: 0, start: 0, out: 3, assetId: av.id });+ const b = vclip({ track: 0, start: 3, out: 3, assetId: av.id });+ useEditor.setState({ assets: [av], clips: [a, b] });+ s().setClipTransition(a.id, 0.5, "crosszoom");+ const bar = s().transitions[0];+ useEditor.setState({+ selection: { kind: "transition", id: bar.id },+ multiSelection: [+ { kind: "clip", id: a.id },+ { kind: "clip", id: b.id },+ { kind: "transition", id: bar.id },+ ],+ });+ expect(s().copySelection()).toBe(true);+ useEditor.setState({ currentTime: 8 });+ expect(s().paste()).toBe(true);+ const pastedClips = s().clips.filter((x) => x.id !== a.id && x.id !== b.id);+ expect(pastedClips.map((x) => x.start)).toEqual([8, 11]);+ // The bar followed the pair, so the copied cut at 11 plays the same blend.+ expect(pastedClips[0].transition).toBeCloseTo(0.5);+ expect(pastedClips[0].transitionStyle).toBe("crosszoom");+ expect(parkedTransitions(s().clips, s().transitions)).toEqual([]);+ });+test("an animation on a far edge leaves an unrelated transition alone", () => {const av = asset(4);const a = vclip({ track: 0, start: 0, out: 4, assetId: av.id });diff --git a/site/src/cut/lib/store.ts b/site/src/cut/lib/store.tsindex 23edbe9d..db903c95 100644--- a/site/src/cut/lib/store.ts+++ b/site/src/cut/lib/store.ts@@ -579,9 +579,15 @@ const genAudioIds = new Set<string>();type ClipboardItem =| { kind: "clip"; item: VideoClip }| { kind: "audio"; item: AudioClip }- | { kind: "overlay"; item: Overlay };+ | { kind: "overlay"; item: Overlay }+ | { kind: "transition"; item: TimelineTransition };let clipboard: ClipboardItem[] = [];+/** How far (seconds) a pasted transition bar reaches for a cut or clip edge+ * around the playhead. Within it the bar lands playing that boundary, like a+ * drop from the panel; past it the bar parks exactly at the playhead. */+const BAR_PASTE_REACH = 1;+/** Bumped whenever subtitle lanes renumber (a track removal). Async work that* captured a lane index checks it before landing, so a result can't write to* what is now a different language's track. */@@ -3936,6 +3942,9 @@ export const useEditor = create<EditorState>((baseSet, get, api) => {} else if (sel?.kind === "overlay") {const o = s.overlays.find((x) => x.id === sel.id);if (o) items.push({ kind: "overlay", item: { ...o } });+ } else if (sel?.kind === "transition") {+ const t = s.transitions.find((x) => x.id === sel.id);+ if (t) items.push({ kind: "transition", item: { ...t } });}}if (items.length === 0) return false;@@ -3951,11 +3960,13 @@ export const useEditor = create<EditorState>((baseSet, get, api) => {if (clipboard.some((cb) => {const assetId =- cb.kind === "overlay"- ? isStickerOverlay(cb.item)- ? cb.item.assetId- : undefined- : cb.item.assetId;+ cb.kind === "transition"+ ? undefined+ : cb.kind === "overlay"+ ? isStickerOverlay(cb.item)+ ? cb.item.assetId+ : undefined+ : cb.item.assetId;return assetId !== undefined && !s.assets.some((a) => a.id === assetId);}))@@ -3967,13 +3978,18 @@ export const useEditor = create<EditorState>((baseSet, get, api) => {let clips = cur.clips;let audioClips = cur.audioClips;let overlays = cur.overlays;+ let transitions = cur.transitions;// A copy is its own thing: pasted group members stay grouped with each// other and join nothing that was already on the timeline.const regroup = groupRemap(uid);+ // When clips ride the same paste, their transition bars follow them by+ // this shift, so a copied sequence keeps its blends on its own cuts.+ let clipDelta: number | null = null;// Every item aims for the playhead but respects what already sits on// its lane: an occupied spot slides the paste right to the next gap// that fits. Earlier items of this same paste count too.for (const cb of clipboard) {+ if (cb.kind === "transition") continue; // placed below, once clips landedif (cb.kind === "clip") {// Collision is per-track: a clip lands clear of others on its own// row only.@@ -3983,6 +3999,7 @@ export const useEditor = create<EditorState>((baseSet, get, api) => {id: uid(),start: nextFreeStart(taken, t, clipLen(cb.item)),};+ clipDelta ??= clip.start - cb.item.start;clips = [...clips, clip].sort((a, b) => a.start - b.start);newSel.push({ kind: "clip", id: clip.id });} else if (cb.kind === "audio") {@@ -4009,7 +4026,51 @@ export const useEditor = create<EditorState>((baseSet, get, api) => {newSel.push({ kind: "overlay", id: item.id });}}- return { clips, audioClips, overlays, selection: newSel[newSel.length - 1] ?? null, multiSelection: newSel };+ // Transition bars land last, against the row as this paste left it.+ // Bars copied together with clips keep their place in the copied+ // sequence; a bar-only paste lands like a drop from the panel — onto+ // the boundary nearest the playhead when one is in reach (replacing+ // whatever played there), parked exactly at the playhead otherwise. A+ // multi-bar paste keeps the bars' spacing, anchored by the earliest.+ const barItems = clipboard+ .flatMap((cb) => (cb.kind === "transition" ? [cb.item] : []))+ .sort((a, b) => a.start - b.start);+ if (barItems.length > 0) {+ let delta = clipDelta;+ if (delta === null) {+ const first = barItems[0];+ const bounds = transitionBoundaries(clips);+ const near = bounds.reduce<TransitionBoundary | null>(+ (found, b) => (!found || Math.abs(b.at - t) < Math.abs(found.at - t) ? b : found),+ null+ );+ if (near && Math.abs(near.at - t) <= BAR_PASTE_REACH) {+ delta =+ (near.kind === "in" ? near.at : near.at - first.seconds) - first.start;+ // The landed bar takes over the boundary; the bar that played+ // it leaves with it, the way a drop replaces the incumbent.+ const roles = resolveTransitions(clips, transitions);+ const incumbent = transitions.find((x) =>+ (roles.get(x.id) ?? []).some(+ (r) => r.kind === near.kind && r.clipId === near.clipId+ )+ );+ if (incumbent) transitions = transitions.filter((x) => x.id !== incumbent.id);+ } else {+ delta = t - first.start;+ }+ }+ for (const item of barItems) {+ const bar: TimelineTransition = {+ ...item,+ id: uid(),+ start: Math.max(0, item.start + delta),+ };+ transitions = [...transitions, bar];+ newSel.push({ kind: "transition", id: bar.id });+ }+ }+ return { clips, audioClips, overlays, transitions, selection: newSel[newSel.length - 1] ?? null, multiSelection: newSel };});return true;},