Skip to content

The open-source full-stack studio for Opus 5.5 motion video. Reverse engineering for any video. Code video with HTML: recreate, edit and render. BYOA + BYOK · Motion.md · Images, Video, Music & Voice.

fix(studio): allow still images to extend their left edge

罗高1ef13d8e7aa6
diff --git a/studio/src/hooks/timelineEditingHelpers.ts b/studio/src/hooks/timelineEditingHelpers.ts
index 82b739ce..46624b34 100644
--- a/studio/src/hooks/timelineEditingHelpers.ts
+++ b/studio/src/hooks/timelineEditingHelpers.ts
@@ -31,6 +31,7 @@ import { serializeStudioFileMutations } from "../utils/studioFileMutationCoordin
import type { TimelineZIndexReorderCommit } from "./useTimelineEditingTypes";
import { setCompositionDurationToContent } from "../utils/timelineAssetDrop";
import { rootCompositionDurationOf } from "../utils/rootDuration";
+import { isStillImageTimelineElement } from "../utils/timelineInspector";
import { readFileContent } from "./timelineTimingSync";
import {
findElementForSelection,
@@ -205,6 +206,7 @@ function resolveResizePlaybackStart(
element: TimelineElement,
updates: Pick<TimelineElement, "start" | "playbackStart">,
): { attrName: string; value: number } | null {
+ if (isStillImageTimelineElement(element)) return null;
if (updates.playbackStart != null) {
const attrName = playbackStartAttributeForElement(element).slice("data-".length);
return { attrName, value: updates.playbackStart };
diff --git a/studio/src/player/components/timelineClipDragPreview.ts b/studio/src/player/components/timelineClipDragPreview.ts
index 61299830..a5069b72 100644
--- a/studio/src/player/components/timelineClipDragPreview.ts
+++ b/studio/src/player/components/timelineClipDragPreview.ts
@@ -12,7 +12,11 @@ import {
getTimelineRowGeometry,
type TimelineRowGeometry,
} from "./timelineLayout";
-import { isMusicTrack, isAudioTimelineElement } from "../../utils/timelineInspector";
+import {
+ isMusicTrack,
+ isAudioTimelineElement,
+ isStillImageTimelineElement,
+} from "../../utils/timelineInspector";
import {
TIMELINE_SNAP_PX,
snapMoveToTargets,
@@ -378,9 +382,11 @@ export function computeResizePreview(
minStart,
maxEnd,
playbackStart:
- resize.edge === "start" && canSeedPlaybackStart
- ? (resize.element.playbackStart ?? 0)
- : resize.element.playbackStart,
+ isStillImageTimelineElement(resize.element)
+ ? undefined
+ : resize.edge === "start" && canSeedPlaybackStart
+ ? (resize.element.playbackStart ?? 0)
+ : resize.element.playbackStart,
playbackRate: resize.element.playbackRate,
},
resize.edge,
diff --git a/studio/src/player/components/timelineGroupEditing.test.ts b/studio/src/player/components/timelineGroupEditing.test.ts
index 64c4fde4..22065c7e 100644
--- a/studio/src/player/components/timelineGroupEditing.test.ts
+++ b/studio/src/player/components/timelineGroupEditing.test.ts
@@ -71,6 +71,26 @@ describe("buildTimelineGroupResizeMembers (legacy 36413da7f semantics)", () => {
});
describe("resolveTimelineGroupResizeChanges (rigid group patch set)", () => {
+ it("extends selected images without treating their stale offsets as source bounds", () => {
+ const images = [
+ el("a", { kind: "image", tag: "img", start: 3, duration: 2, playbackStart: 0 }),
+ el("b", { kind: "image", tag: "div", start: 5, duration: 3, playbackStart: 1 }),
+ ];
+ const members = buildTimelineGroupResizeMembers(images, keys("a", "b"), "a", "start")!;
+ const changes = resolveTimelineGroupResizeChanges(members, "start", -2);
+ expect(changes.map(({ start, duration, playbackStart }) => ({ start, duration, playbackStart }))).toEqual([
+ { start: 1, duration: 4, playbackStart: undefined },
+ { start: 3, duration: 5, playbackStart: undefined },
+ ]);
+ });
+
+ it("keeps an image-thumbnail composition bounded by its own source start", () => {
+ const composition = el("a", { kind: "composition", tag: "img", start: 3, playbackStart: 0 });
+ const image = el("b", { kind: "image", tag: "img", start: 5, playbackStart: 0 });
+ const members = buildTimelineGroupResizeMembers([composition, image], keys("a", "b"), "a", "start")!;
+ expect(resolveTimelineGroupResizeChanges(members, "start", -2).map(c => c.start)).toEqual([3, 5]);
+ });
+
it("END edge: extends every member's duration by the shared delta", () => {
const members = buildTimelineGroupResizeMembers(
[el("a", { duration: 2 }), el("b", { duration: 3 })],
diff --git a/studio/src/player/components/timelineGroupEditing.ts b/studio/src/player/components/timelineGroupEditing.ts
index d303d5fd..34450fe4 100644
--- a/studio/src/player/components/timelineGroupEditing.ts
+++ b/studio/src/player/components/timelineGroupEditing.ts
@@ -3,6 +3,7 @@ import { roundToCenti } from "../../utils/rounding";
import type { TimelineElement } from "../store/playerStore";
import { clampToHostStart } from "../store/timelineElement";
import { getTimelineEditCapabilities } from "./timelineEditCapabilities";
+import { isStillImageTimelineElement } from "../../utils/timelineInspector";
const DEFAULT_TIMELINE_MIN_DURATION = 0.1;
const ABSOLUTE_TIMELINE_MIN_DURATION = 0.05;
@@ -243,9 +244,11 @@ export function buildTimelineGroupResizeMembers(
start: element.start,
duration: element.duration,
playbackStart:
- edge === "start" && hasSourcePlaybackOffset(element)
- ? (element.playbackStart ?? 0)
- : element.playbackStart,
+ isStillImageTimelineElement(element)
+ ? undefined
+ : edge === "start" && hasSourcePlaybackOffset(element)
+ ? (element.playbackStart ?? 0)
+ : element.playbackStart,
playbackRate: element.playbackRate,
minStart: clampToHostStart(element, 0),
}));
diff --git a/studio/src/player/lib/timelineDOM.test.ts b/studio/src/player/lib/timelineDOM.test.ts
index 6e3af94c..383e2e69 100644
--- a/studio/src/player/lib/timelineDOM.test.ts
+++ b/studio/src/player/lib/timelineDOM.test.ts
@@ -10,6 +10,7 @@ import { isTimelineIgnoredElement } from "./timelineElementHelpers";
import { clipTimingStart, resolveClipTimingBasis } from "../../hooks/gsapShared";
import { toAuthoredStart } from "../store/timelineElement";
import { computeResizePreview } from "../components/timelineClipDragPreview";
+import { buildTimelineResizeTimingPatch } from "../../hooks/timelineEditingHelpers";
import type { TimelineElement } from "../store/playerStore";
import {
MAX_PLAYBACK_RATE,
@@ -119,6 +120,38 @@ describe("parseTimelineFromDOM — nested rows' keyframe basis", () => {
});
describe("parseTimelineFromDOM — media in-point", () => {
+ it.each(["media-start", "playback-start"])(
+ "extends an image left despite data-%s and preserves its end after saving",
+ (attribute) => {
+ const source = `<div data-composition-id="root" data-duration="10"><img id="image" class="clip" src="image.png" data-start="5" data-duration="3" data-${attribute}="0"></div>`;
+ const element = parseTimelineFromDOM(makeDoc(source), 10)[0]!;
+ const preview = computeResizePreview(
+ {
+ element, edge: "start", originClientX: 0,
+ previewStart: 5, previewDuration: 3, started: true,
+ },
+ -200,
+ { scroll: null, pps: 100, buildSnapTargets: () => [{ time: 2.95, type: "playhead" }] },
+ );
+ expect(preview).toMatchObject({
+ previewStart: 2.95, previewDuration: 5.05, previewPlaybackStart: undefined,
+ });
+ const patched = buildTimelineResizeTimingPatch(source, { id: "image" }, element, {
+ start: preview.previewStart,
+ duration: preview.previewDuration,
+ playbackStart: preview.previewPlaybackStart,
+ });
+ const saved = parseTimelineFromDOM(makeDoc(patched), 10)[0]!;
+ expect(saved.start).toBe(2.95);
+ expect(saved.start + saved.duration).toBe(8);
+ expect(patched).toContain(`data-${attribute}="0"`);
+ const shortened = buildTimelineResizeTimingPatch(patched, { id: "image" }, saved, {
+ start: 3.95, duration: 4.05,
+ });
+ expect(shortened).toContain(`data-${attribute}="0"`);
+ },
+ );
+
it("reads a negative in-point as 0, as the runtime does, so a head trim keeps the clip", () => {
const doc = makeDoc(`
<div data-composition-id="root">
diff --git a/studio/src/utils/timelineInspector.ts b/studio/src/utils/timelineInspector.ts
index 1f652b12..75c0b845 100644
--- a/studio/src/utils/timelineInspector.ts
+++ b/studio/src/utils/timelineInspector.ts
@@ -5,6 +5,14 @@ const AUDIO_TIMELINE_TAGS = new Set(["audio", "music", "sfx", "sound", "narratio
const AUDIO_SOURCE_EXT_RE = /\.(aac|flac|m4a|mp3|ogg|opus|wav)(?:[?#].*)?$/i;
const MUSIC_ID_RE = /\b(music|bgm|soundtrack|background[-_]?music)\b/i;
+/** An image thumbnail does not make a timed sub-composition a still image. */
+export function isStillImageTimelineElement(element: Pick<TimelineElement, "kind" | "tag">): boolean {
+ return (
+ element.kind !== "composition" &&
+ (element.kind === "image" || element.tag.toLowerCase() === "img")
+ );
+}
+
/**
* Is this DOM node an audio clip, judged the way `isAudioTimelineElement`
* judges a timeline element?