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 Motion preview, gallery, and project editing regressions

qindongfb0e8edc0c76
diff --git a/.codex-plugin/plugin.json b/.codex-plugin/plugin.json
index 06e48c38..c4049c54 100644
--- a/.codex-plugin/plugin.json
+++ b/.codex-plugin/plugin.json
@@ -1,12 +1,12 @@
{
"name": "motion",
"version": "0.6.3",
- "description": "OpenDesign — an Agent workspace with Motion templates, editable artifacts and MCP collaboration.",
+ "description": "Create, animate, edit, preview, and export motion graphics and motion videos in OpenMotion, including template-based creation and reference video recreation. 用于制作动效视频、Motion 视频、动画和参考视频复刻。",
"skills": "./skills/",
"mcpServers": "./.mcp.json",
"requires_local_executor": true,
"interface": {
"displayName": "OpenDesign",
- "shortDescription": "需求、分镜、模板选择到原生动画制作与成片校验"
+ "shortDescription": "制作、复刻和编辑 Motion 视频"
}
}
diff --git a/shared/workspace-studio.ts b/shared/workspace-studio.ts
index 68afa51e..14619d5c 100644
--- a/shared/workspace-studio.ts
+++ b/shared/workspace-studio.ts
@@ -7,6 +7,7 @@ import { WorkspaceStore } from '../workspace.ts';
import { HYPERFRAMES_VERSION, repairGeneratedRegistry } from '../hyperframes.ts';
import { isMain } from './entry.ts';
import { withAvailableHistorySteps } from './studio-history-availability.ts';
+import type { ProjectHistory } from '@hyperframes/studio-server';
export async function startWorkspaceStudio(runtimeRoot: string, dataDirectory: string, initialDirectory: string, port: number) {
const require = createRequire(path.join(runtimeRoot, 'package.json'));
@@ -37,9 +38,17 @@ export async function startWorkspaceStudio(runtimeRoot: string, dataDirectory: s
const host = createStudioServer({ projectDir: scoped.projectDirectory, projectName: id,
origin: () => origin, historyRoot });
const openHistory = host.adapter.history;
+ const wrappedHistories = new WeakMap<ProjectHistory, ProjectHistory>();
host.adapter.history = async () => {
const history = await openHistory();
- return history && withAvailableHistorySteps(history, historyRoot);
+ if (!history) return history;
+ let wrapped = wrappedHistories.get(history);
+ if (!wrapped) {
+ // Native edit windows compare the history owner by identity across HTTP requests.
+ wrapped = withAvailableHistorySteps(history, historyRoot);
+ wrappedHistories.set(history, wrapped);
+ }
+ return wrapped;
};
return host;
})().catch(error => { hosts.delete(id); throw error; });
diff --git a/skills/motion-director/SKILL.md b/skills/motion-director/SKILL.md
index 7d12c349..296976e7 100644
--- a/skills/motion-director/SKILL.md
+++ b/skills/motion-director/SKILL.md
@@ -75,6 +75,8 @@ MCP-only 使用 resources/read `motion://workflow/director/start` 读取本页
多段视频优先制作包含代表性动作及其上下文的低成本动态样片,保留真实节奏与关键尺寸。纯视觉风险可先做风格帧;声音驱动作品的材料与定时顺序按声音叙事参考决定。不要固定先做开头,也不要规定样片必须多长。
+用户要求先看关键画面再制作时,按影片顺序展示实际制作的风格帧,覆盖开场、主要段落和结尾。注明每帧对应的内容与必要的动作说明,等用户确认视觉方向后再扩成全片,沿用已确认的构图、排印、配色和信息层级。帧数随作品结构决定。
+
从零制作且 Motion 表现是主要目标时,优先选最容易退化为普通展示、又对观看体验重要的关键段落。先实现这个样片所需的对象与上下文,再扩成全片;不要先把所有段落做成静态版式,最后只给它们补入场。样片应同时包含关键视觉材料与代表性动作;材质、颜色或排印是主要观看价值时,保留其辨识特征与对比,不能用通用占位图替代后直接判通过。分别检查视觉吸引力与动态组织;字号、接点或功能关系正确只证明相应部分。已有成片的局部修改可直接截取相关区间,无需重建流程。
用样片验证场间交接时,区间须覆盖前段最后的有效状态、交接过程和后段已可跟随的状态;止于接点的单场预览不算验证该交接。复用现有时间线与预览,异常时再用密帧定位。
diff --git a/studio/src/components/editor/PropertyPanel.test.tsx b/studio/src/components/editor/PropertyPanel.test.tsx
index 91e820fa..f53a2e03 100644
--- a/studio/src/components/editor/PropertyPanel.test.tsx
+++ b/studio/src/components/editor/PropertyPanel.test.tsx
@@ -331,6 +331,14 @@ describe("PropertyPanel — STUDIO_FLAT_INSPECTOR_ENABLED off", () => {
});
});
+it.each([false, true])("omits the hide action for a selection without its own timeline row (flat: %s)", async (flat) => {
+ const { host, root } = await renderPanel(flat, baseElement(), { onToggleElementHidden: vi.fn() }, {
+ selectedElementId: "child.html#mono-label",
+ });
+ expect(host.querySelector('button[aria-label="Hide element"]')).toBeNull();
+ act(() => root.unmount());
+});
+
describe("PropertyPanel — STUDIO_FLAT_INSPECTOR_ENABLED on", () => {
it("renders the flat header, the Text group open by default, and the flat footer", async () => {
const { host, root } = await renderPanel(true);
@@ -940,6 +948,9 @@ describe("PropertyPanel — Motion is for things that move", () => {
it("offers a mute on an audible audio clip and toggles it through the timeline", async () => {
const onToggleElementHidden = vi.fn();
+ usePlayerStore.setState({ elements: [
+ { id: "vo-1", tag: "audio", start: 0, duration: 2, track: 0 },
+ ] });
const { host, root } = await renderPanel(
true,
audioClipElement(),
diff --git a/studio/src/components/editor/PropertyPanel.tsx b/studio/src/components/editor/PropertyPanel.tsx
index a2626e49..02ce435a 100644
--- a/studio/src/components/editor/PropertyPanel.tsx
+++ b/studio/src/components/editor/PropertyPanel.tsx
@@ -121,6 +121,9 @@ export const PropertyPanel = memo(function PropertyPanel(props: PropertyPanelPro
const clipboardTimerRef = useRef<ReturnType<typeof setTimeout>>(undefined);
const timelineElements = usePlayerStore((s) => s.elements);
const selectedElementId = usePlayerStore((s) => s.selectedElementId);
+ const hasVisibilityTarget = selectedElementId !== null
+ && timelineElements.some((item) => (item.key ?? item.id) === selectedElementId);
+ const toggleTimelineVisibility = hasVisibilityTarget ? onToggleElementHidden : undefined;
const selectedElementHidden = isSelectedElementHidden(timelineElements, selectedElementId);
const visibilityToggleLabel = selectedElementHidden ? "Show element" : "Hide element";
// Audio gets no visibility toggle in this classic panel; the timeline and the flat panel offer it as a mute.
@@ -261,6 +264,7 @@ export const PropertyPanel = memo(function PropertyPanel(props: PropertyPanelPro
return (
<PropertyPanelFlat
{...props}
+ onToggleElementHidden={toggleTimelineVisibility}
key={selectionIdentityKey(element)}
element={element}
styles={styles}
@@ -314,7 +318,7 @@ export const PropertyPanel = memo(function PropertyPanel(props: PropertyPanelPro
selectedElementId={selectedElementId}
selectedElementHidden={selectedElementHidden}
visibilityLabel={visibilityToggleLabel}
- onToggleHidden={audioSelection ? undefined : onToggleElementHidden}
+ onToggleHidden={audioSelection ? undefined : toggleTimelineVisibility}
/>
</div>
</div>
diff --git a/studio/src/components/editor/SnapToolbar.tsx b/studio/src/components/editor/SnapToolbar.tsx
index 93c94790..aaff0a07 100644
--- a/studio/src/components/editor/SnapToolbar.tsx
+++ b/studio/src/components/editor/SnapToolbar.tsx
@@ -194,9 +194,9 @@ export const SnapToolbar = memo(function SnapToolbar() {
{gridPopoverOpen && (
<div
ref={popoverRef}
- className="absolute right-0 top-full mt-1 rounded-lg bg-raised border border-border p-3 shadow-xl min-w-[180px]"
+ className="absolute right-0 top-full mt-1 min-w-[180px] rounded-lg border border-border bg-raised p-3 text-text-0 shadow-xl"
>
- <label className="flex items-center justify-between text-xs text-white/80 mb-2">
+ <label className="mb-2 flex items-center justify-between gap-2 text-xs">
<span>{t("Grid spacing")}</span>
<input
type="number"
@@ -222,10 +222,10 @@ export const SnapToolbar = memo(function SnapToolbar() {
updatePrefs({ gridSpacing: val });
}
}}
- className="w-16 rounded-sm bg-neutral-900 border border-neutral-600 px-1.5 py-0.5 text-xs text-white text-right tabular-nums outline-hidden focus:border-studio-accent"
+ className="w-16 rounded-sm border border-border bg-bg-0 px-1.5 py-0.5 text-right text-xs text-text-0 tabular-nums outline-hidden focus:border-studio-accent"
/>
</label>
- <label className="flex items-center gap-2 text-xs text-white/80 cursor-pointer">
+ <label className="flex cursor-pointer items-center gap-2 text-xs">
<input
type="checkbox"
checked={prefs.snapToGrid}
diff --git a/studio/src/components/nle/PreviewOverlays.tsx b/studio/src/components/nle/PreviewOverlays.tsx
index a0948278..12ba0e5f 100644
--- a/studio/src/components/nle/PreviewOverlays.tsx
+++ b/studio/src/components/nle/PreviewOverlays.tsx
@@ -63,23 +63,26 @@ export function PreviewOverlays({
const { domEditSelection } = useDomEditSelectionContext();
if (blockPreview) {
+ const { videoUrl, posterUrl, onVideoError, onPosterError, title } = blockPreview;
return (
<>
<TopologyLens iframeRef={previewIframeRef} activeCompositionPath={activeCompPath} />
<div className="absolute inset-0 z-30 bg-black pointer-events-none">
- {blockPreview.videoUrl ? (
+ {videoUrl ? (
<video
- src={blockPreview.videoUrl}
+ src={videoUrl}
+ onError={() => onVideoError?.(videoUrl)}
autoPlay
muted
loop
playsInline
className="w-full h-full object-contain"
/>
- ) : blockPreview.posterUrl ? (
+ ) : posterUrl ? (
<img
- src={blockPreview.posterUrl}
- alt={blockPreview.title}
+ src={posterUrl}
+ alt={title}
+ onError={() => onPosterError?.(posterUrl)}
className="w-full h-full object-contain"
/>
) : null}
diff --git a/studio/src/components/nle/PreviewPane.tsx b/studio/src/components/nle/PreviewPane.tsx
index af7dc414..db826dba 100644
--- a/studio/src/components/nle/PreviewPane.tsx
+++ b/studio/src/components/nle/PreviewPane.tsx
@@ -168,7 +168,7 @@ export function PreviewPane({
</div>
{/* Transport row: no own background or border — the controls sit flat on
the preview panel's surface (CapCut-style). */}
- <div className="shrink-0">
+ <div className="shrink-0" data-preview-transport="">
{!mvp && !isFullscreen && compositionStack.length > 1 && (
<CompositionBreadcrumb stack={compositionStack} onNavigate={handleNavigateComposition} />
)}
diff --git a/studio/src/components/sidebar/BlocksTab.test.tsx b/studio/src/components/sidebar/BlocksTab.test.tsx
new file mode 100644
index 00000000..91e57eef
--- /dev/null
+++ b/studio/src/components/sidebar/BlocksTab.test.tsx
@@ -0,0 +1,46 @@
+// @vitest-environment happy-dom
+
+import { act } from "react";
+import { afterEach, expect, it, vi } from "vitest";
+import { cleanupMounted, mountHost } from "../ui/mountHost.testHelpers";
+import { BlocksTab, type BlockPreviewInfo } from "./BlocksTab";
+
+vi.mock("../../contexts/StudioContext", () => ({ useStudioShellContext: () => ({}) }));
+vi.mock("../../hooks/useBlockCatalog", () => ({
+ useBlockCatalog: () => ({
+ loading: false,
+ search: "",
+ filteredBlocks: [{
+ name: "carousel",
+ title: "Carousel",
+ description: "A scene",
+ type: "hyperframes:block",
+ category: "scenes",
+ preview: { video: "/scene.mp4", poster: "/scene.jpg" },
+ }],
+ }),
+}));
+
+afterEach(() => {
+ cleanupMounted();
+ vi.useRealTimers();
+});
+
+it("falls back from a failed hover video to its poster, then restores the composition", () => {
+ vi.useFakeTimers();
+ const onPreview = vi.fn<(preview: BlockPreviewInfo | null) => void>();
+ const host = mountHost(<BlocksTab onPreviewBlock={onPreview} />);
+ act(() => host.querySelector("[draggable]")!.dispatchEvent(new PointerEvent("pointerover", { bubbles: true })));
+ act(() => vi.advanceTimersByTime(300));
+
+ const preview = () => onPreview.mock.lastCall?.[0];
+ expect(preview()?.videoUrl).toBe("/scene.mp4");
+ act(() => preview()?.onVideoError?.("/scene.mp4"));
+ expect(preview()?.videoUrl).toBeUndefined();
+ expect(preview()?.posterUrl).toBe("/scene.jpg");
+ expect(host.querySelector('img[alt="Carousel"]')).toBeTruthy();
+
+ act(() => host.querySelector('img[alt="Carousel"]')!.dispatchEvent(new Event("error")));
+ expect(preview()).toBeNull();
+ expect(host.textContent).toContain("Preview unavailable");
+});
diff --git a/studio/src/components/sidebar/BlocksTab.tsx b/studio/src/components/sidebar/BlocksTab.tsx
index 0f390c41..143eed5e 100644
--- a/studio/src/components/sidebar/BlocksTab.tsx
+++ b/studio/src/components/sidebar/BlocksTab.tsx
@@ -17,9 +17,12 @@ import { usePlayerStore } from "../../player";
import { formatTime } from "../../player/lib/time";
import { useStudioShellContext } from "../../contexts/StudioContext";
import { TIMELINE_BLOCK_MIME } from "../../utils/timelineAssetDrop";
+import blurInPosterUrl from "./blur-in-preview.svg?url";
export interface BlockPreviewInfo {
videoUrl?: string;
posterUrl?: string;
+ onVideoError?: (url: string) => void;
+ onPosterError?: (url: string) => void;
title: string;
}
@@ -101,7 +104,7 @@ export const BlocksTab = memo(function BlocksTab({ onAddBlock, onPreviewBlock }:
duration={dur}
category={block.category}
tags={block.tags}
- posterUrl={block.preview?.poster}
+ posterUrl={block.name === "blur-in" ? blurInPosterUrl : block.preview?.poster}
videoUrl={block.preview?.video}
onPreview={onPreviewBlock}
onShowPrompt={setPromptModal}
@@ -275,17 +278,30 @@ function BlockCard({
}) {
const { t } = useI18n();
const [hovered, setHovered] = useState(false);
+ const [failedPoster, setFailedPoster] = useState<string>();
+ const [failedVideo, setFailedVideo] = useState<string>();
const [addState, setAddState] = useState<"idle" | "adding" | "added" | "failed">("idle");
const hoverTimer = useRef<ReturnType<typeof setTimeout> | null>(null);
const colors = getCategoryColors(category);
const needsWebGL = tags?.includes("html-in-canvas") || tags?.includes("webgl");
+ const poster = posterUrl !== failedPoster ? posterUrl : undefined;
+ const video = videoUrl !== failedVideo ? videoUrl : undefined;
const handleEnter = useCallback(() => {
- hoverTimer.current = setTimeout(() => {
- setHovered(true);
- onPreview?.({ videoUrl, posterUrl, title });
- }, 300);
- }, [onPreview, videoUrl, posterUrl, title]);
+ hoverTimer.current = setTimeout(() => setHovered(true), 300);
+ }, []);
+
+ useEffect(() => {
+ if (!hovered || (!video && !poster) || !onPreview) return;
+ onPreview({
+ videoUrl: video,
+ posterUrl: poster,
+ onVideoError: setFailedVideo,
+ onPosterError: setFailedPoster,
+ title,
+ });
+ return () => onPreview(null);
+ }, [hovered, onPreview, video, poster, title]);
const handleLeave = useCallback(() => {
if (hoverTimer.current) {
@@ -293,8 +309,7 @@ function BlockCard({
hoverTimer.current = null;
}
setHovered(false);
- onPreview?.(null);
- }, [onPreview]);
+ }, []);
useEffect(() => {
return () => {
@@ -367,29 +382,23 @@ function BlockCard({
onPointerLeave={handleLeave}
>
<div className="aspect-video w-full overflow-hidden relative">
- {hovered && videoUrl ? (
+ {video && (hovered || !poster) ? (
<video
- src={videoUrl}
- autoPlay
+ src={video}
+ autoPlay={hovered}
+ preload="metadata"
+ onError={() => setFailedVideo(video)}
muted
loop
playsInline
className="w-full h-full object-cover"
/>
- ) : posterUrl ? (
- <img src={posterUrl} alt={title} loading="lazy" className="w-full h-full object-cover" />
- ) : videoUrl ? (
- <video
- src={videoUrl}
- muted
- playsInline
- preload="metadata"
- className="w-full h-full object-cover"
- />
+ ) : poster ? (
+ <img src={poster} alt={title} loading="lazy" onError={() => setFailedPoster(poster)} className="w-full h-full object-cover" />
) : (
- <div className={`w-full h-full flex items-center justify-center ${colors.bg}`}>
- <span className={`text-[9px] font-medium ${colors.text}`}>
- {t(BLOCK_CATEGORIES.find((c) => c.id === category)?.label ?? category)}
+ <div className="flex h-full w-full items-center justify-center bg-panel-bg">
+ <span className="text-[10px] text-panel-text-3">
+ {t("Preview unavailable")}
</span>
</div>
)}
diff --git a/studio/src/components/sidebar/blur-in-preview.svg b/studio/src/components/sidebar/blur-in-preview.svg
new file mode 100644
index 00000000..58478826
--- /dev/null
+++ b/studio/src/components/sidebar/blur-in-preview.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 180" role="img" aria-labelledby="title">
+ <title id="title">Blur In word reveal</title>
+ <!-- Representative reveal state of the Hyperframes Blur In text component. -->
+ <defs>
+ <filter id="soft"><feGaussianBlur stdDeviation="1.4"/></filter>
+ <filter id="blur"><feGaussianBlur stdDeviation="3.5"/></filter>
+ </defs>
+ <path fill="#0a0a0a" d="M0 0h320v180H0z"/>
+ <g fill="#f3f3f3" font-family="system-ui, sans-serif" font-size="25" font-weight="600">
+ <text x="24" y="98">Design</text>
+ <text x="111" y="98">systems</text>
+ <text x="213" y="99" opacity=".75" filter="url(#soft)">for</text>
+ <text x="252" y="102" opacity=".45" filter="url(#blur)">video</text>
+ </g>
+</svg>
diff --git a/studio/src/hooks/useTimelineAssetDropOps.test.tsx b/studio/src/hooks/useTimelineAssetDropOps.test.tsx
index d67028a8..a0d6ecd2 100644
--- a/studio/src/hooks/useTimelineAssetDropOps.test.tsx
+++ b/studio/src/hooks/useTimelineAssetDropOps.test.tsx
@@ -7,6 +7,8 @@ import { mountReactHarness } from "./domSelectionTestHarness";
import { usePlayerStore } from "../player/store/playerStore";
import type { TimelineElement } from "../player";
import type { TimelineDropPlacement } from "../player/components/timelineCallbacks";
+import { useToast } from "./useToast";
+import { translate } from "../i18n/messages";
(globalThis as unknown as { IS_REACT_ACT_ENVIRONMENT: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
@@ -38,12 +40,15 @@ function renderDropHook(
let drop: DropFn | null = null;
let fileDrop: FileDropFn | null = null;
let compositionDrop: CompositionDropFn | null = null;
+ let toasts: ReturnType<typeof useToast>["toasts"] = [];
function Harness() {
+ const feedback = useToast();
+ toasts = feedback.toasts;
const handlers = useTimelineAssetDropOps({
projectIdRef: { current: "project" },
activeCompPath: "index.html",
timelineElements,
- showToast: vi.fn(),
+ showToast: feedback.showToast,
writeProjectFile,
recordEdit: vi.fn().mockResolvedValue(undefined),
reloadPreview: vi.fn(),
@@ -59,6 +64,7 @@ function renderDropHook(
return Object.assign(() => drop!, {
file: () => fileDrop!,
composition: () => compositionDrop!,
+ toasts: () => toasts,
});
}
@@ -319,4 +325,29 @@ describe("useTimelineAssetDropOps handleTimelineAssetDrop", () => {
expect(fetchMock).not.toHaveBeenCalled();
expect(writeProjectFile).not.toHaveBeenCalled();
});
+
+ it.each([
+ [
+ "Composition insertion would create a cycle",
+ "添加这个合成会造成循环引用,请选择其他合成。",
+ ],
+ [
+ "Composition source has no valid data-composition-duration",
+ "请先为合成设置有效时长,再添加到时间轴。",
+ ],
+ ])("localizes and deduplicates the composition rejection: %s", async (reason, message) => {
+ const writeProjectFile = vi.fn();
+ const drop = renderDropHook("", writeProjectFile);
+ vi.mocked(fetch).mockImplementation(async (_url, options) => options?.method === "POST"
+ ? Response.json({ error: reason }, { status: 400 })
+ : Response.json({ version: "current" }));
+
+ await act(async () => {
+ await drop.composition()("scene.html", { start: 1, track: 0 });
+ await drop.composition()("scene.html", { start: 1, track: 0 });
+ });
+
+ expect(drop.toasts().map((toast) => translate("zh-CN", toast.message))).toEqual([message]);
+ expect(writeProjectFile).not.toHaveBeenCalled();
+ });
});
diff --git a/studio/src/hooks/useTimelineAssetDropOps.ts b/studio/src/hooks/useTimelineAssetDropOps.ts
index 2ce00332..3f44077a 100644
--- a/studio/src/hooks/useTimelineAssetDropOps.ts
+++ b/studio/src/hooks/useTimelineAssetDropOps.ts
@@ -3,6 +3,7 @@
// Extracted verbatim from useTimelineEditing.ts to keep it under the studio
// 600-line cap.
import { useCallback, type MutableRefObject, type RefObject } from "react";
+import { compositionInsertionFailureMessage } from "../i18n/editorErrors";
import type { TimelineElement } from "../player";
import type { TimelineDropPlacement } from "../player/components/timelineCallbacks";
import { resolveDropTrack } from "../utils/timelineDropTrackInsert";
@@ -307,10 +308,7 @@ export function useTimelineAssetDropOps({
});
showToast("Composition added to the timeline.", "info");
} catch (error) {
- showToast(
- error instanceof Error ? error.message : "Failed to add composition to timeline",
- "error",
- );
+ showToast(compositionInsertionFailureMessage(error), "error");
}
},
[
diff --git a/studio/src/hooks/useToast.ts b/studio/src/hooks/useToast.ts
index 209bfc7e..2d967c12 100644
--- a/studio/src/hooks/useToast.ts
+++ b/studio/src/hooks/useToast.ts
@@ -16,7 +16,7 @@ let nextToastId = 1;
/**
* Stacked toasts (max 3). Info toasts auto-dismiss after 4s; error toasts
- * persist until explicitly dismissed so failures can't silently vanish.
+ * persist until explicitly dismissed. Identical active errors share one toast.
*/
export function useToast() {
const [toasts, setToasts] = useState<ToastItem[]>([]);
@@ -53,6 +53,9 @@ export function useToast() {
(message: string, tone: AppToast["tone"] = "error"): number => {
const id = nextToastId++;
setToasts((prev) => {
+ if (tone === "error" && prev.some((toast) => toast.tone === tone && toast.message === message && !toast.leaving)) {
+ return prev;
+ }
const next = [...prev, { id, message, tone }];
// Cap the stack; drop the oldest (and its pending timer).
while (next.length > MAX_TOASTS) {
diff --git a/studio/src/i18n/ConnectionI18n.test.ts b/studio/src/i18n/ConnectionI18n.test.ts
index 7a317138..0df98891 100644
--- a/studio/src/i18n/ConnectionI18n.test.ts
+++ b/studio/src/i18n/ConnectionI18n.test.ts
@@ -7,6 +7,83 @@ import { dictionaries, languages, translate, type Locale } from './messages';
let controller: ReturnType<typeof mountConnection> | undefined;
afterEach(() => { controller?.destroy(); controller = undefined; document.body.replaceChildren(); vi.restoreAllMocks(); vi.unstubAllGlobals(); vi.useRealTimers(); });
+it('keeps the current video frame visible when an animated gallery preview pauses', async () => {
+ vi.stubGlobal('matchMedia', () => ({ matches: false, addEventListener() {}, removeEventListener() {} }));
+ vi.stubGlobal('IntersectionObserver', class { observe() {} disconnect() {} });
+ vi.spyOn(HTMLMediaElement.prototype, 'pause').mockImplementation(function (this: HTMLMediaElement) {
+ this.dispatchEvent(new Event('pause'));
+ });
+ vi.spyOn(HTMLMediaElement.prototype, 'load').mockImplementation(() => {});
+ const template = {
+ id: 'prism', title: 'Published template', tags: [], collection: 'example', kind: 'prism',
+ previewUrl: '/preview.mp4', posterUrl: '/poster.jpg',
+ };
+ vi.stubGlobal('fetch', vi.fn(async (url: string) => url.endsWith('/integration')
+ ? new Response(null, { status: 503 })
+ : Response.json({ items: [template], total: 1, entryTotal: 1, catalogTotal: 1, offset: 0, next: null })));
+ const root = document.createElement('div');
+ root.innerHTML = '<input id="template-search"><button id="connection-templates"></button>' + page;
+ document.body.append(root);
+ controller = mountConnection(root, { locale: 'en', t: message => message, close() {}, useTemplate() {} });
+ controller.resume();
+ await vi.waitFor(() => expect(root.querySelector('.connect-template-media video')).not.toBeNull());
+ const video = root.querySelector<HTMLVideoElement>('.connect-template-media video')!;
+ const poster = root.querySelector<HTMLImageElement>('.connect-template-media img')!;
+ poster.dispatchEvent(new Event('load'));
+ video.dispatchEvent(new Event('loadeddata'));
+ expect(video.hidden).toBe(true);
+ expect(poster.hidden).toBe(false);
+
+ video.currentTime = 3.5;
+ video.dispatchEvent(new Event('playing'));
+ root.querySelector<HTMLButtonElement>('#toggle-previews')!.click();
+ expect(video.hidden).toBe(false);
+ expect(poster.hidden).toBe(true);
+ expect(video.currentTime).toBe(3.5);
+ localStorage.removeItem('openmotion.template-previews');
+});
+
+it('recovers a preview whose media buffer was discarded in a background tab', async () => {
+ vi.stubGlobal('matchMedia', () => ({ matches: false, addEventListener() {}, removeEventListener() {} }));
+ vi.stubGlobal('IntersectionObserver', class { observe() {} disconnect() {} });
+ const hidden = vi.spyOn(document, 'hidden', 'get').mockReturnValue(false);
+ const load = vi.spyOn(HTMLMediaElement.prototype, 'load').mockImplementation(() => {});
+ vi.spyOn(HTMLMediaElement.prototype, 'pause').mockImplementation(() => {});
+ const template = { id: 'prism', title: 'Published template', tags: [], collection: 'example',
+ kind: 'prism', previewUrl: '/preview.mp4' };
+ vi.stubGlobal('fetch', vi.fn(async (url: string) => url.endsWith('/integration')
+ ? new Response(null, { status: 503 })
+ : Response.json({ items: [template], total: 1, entryTotal: 1, catalogTotal: 1, offset: 0, next: null })));
+ const root = document.createElement('div');
+ root.innerHTML = '<input id="template-search"><button id="connection-templates"></button>' + page;
+ document.body.append(root);
+ controller = mountConnection(root, { locale: 'en', t: message => message, close() {}, useTemplate() {} });
+ controller.resume();
+ await vi.waitFor(() => expect(root.querySelector('.connect-template-cover')).not.toBeNull());
+ root.querySelector<HTMLButtonElement>('.connect-template-cover')!.click();
+ const video = root.querySelector<HTMLVideoElement>('#template-preview-stage video')!;
+ vi.stubGlobal('HTMLMediaElement', Object.assign(Object.create(HTMLMediaElement), { HAVE_CURRENT_DATA: 2 }));
+ const ready = vi.spyOn(video, 'readyState', 'get').mockReturnValue(2);
+ const setVisibility = (isHidden: boolean) => {
+ hidden.mockReturnValue(isHidden);
+ document.dispatchEvent(new Event('visibilitychange'));
+ };
+
+ video.currentTime = 3.5;
+ setVisibility(true);
+ setVisibility(false);
+ expect(load).not.toHaveBeenCalled();
+
+ setVisibility(true);
+ ready.mockReturnValue(0);
+ setVisibility(false);
+ expect(load).toHaveBeenCalledTimes(1);
+ expect(video.autoplay).toBe(false);
+ video.currentTime = 0;
+ video.dispatchEvent(new Event('loadedmetadata'));
+ expect(video.currentTime).toBe(3.5);
+});
+
it('polls cache warnings independently of publication changes and preserves gallery cards', async () => {
vi.useFakeTimers();
vi.stubGlobal('matchMedia', () => ({ matches: false, addEventListener() {}, removeEventListener() {} }));
diff --git a/studio/src/i18n/editorErrors.ts b/studio/src/i18n/editorErrors.ts
index e2f2dfbc..2ca519aa 100644
--- a/studio/src/i18n/editorErrors.ts
+++ b/studio/src/i18n/editorErrors.ts
@@ -1,5 +1,6 @@
import { isKnownMessage } from './messages';
import type { Translate } from './I18n';
+import { getStudioSaveStatusCode } from '../utils/studioSaveDiagnostics';
export function historyFailureMessage(message: string, t: Translate): string {
if (isKnownMessage(message)) return t(message);
@@ -18,3 +19,17 @@ export function splitFailureMessage(error: unknown): string {
if (isKnownMessage(message)) return message;
return 'Could not split the clip. Check the current clip and retry.';
}
+
+export function compositionInsertionFailureMessage(error: unknown): string {
+ const status = getStudioSaveStatusCode(error);
+ if (status === 409) return 'The project changed. Refresh the editor before trying again.';
+ if (status === 400 && error instanceof Error) {
+ if (error.message.includes('Composition insertion would create a cycle')) {
+ return 'Adding this composition would create a circular reference. Choose a different composition.';
+ }
+ if (error.message.includes('Composition source has no valid data-composition-duration')) {
+ return 'Set a valid duration on the composition before adding it to the timeline.';
+ }
+ }
+ return 'The operation could not be completed. Check the project and retry.';
+}
diff --git a/studio/src/i18n/mvp-zh-CN.json b/studio/src/i18n/mvp-zh-CN.json
index c958e1e4..546f6c47 100644
--- a/studio/src/i18n/mvp-zh-CN.json
+++ b/studio/src/i18n/mvp-zh-CN.json
@@ -270,6 +270,8 @@
"Upload failed: network error": "上传失败:网络错误",
"Only image, video, and audio assets can be dropped onto the timeline.": "只能将图片、视频和音频素材拖入时间轴。",
"Composition added to the timeline.": "已将合成添加到时间轴。",
+ "Adding this composition would create a circular reference. Choose a different composition.": "添加这个合成会造成循环引用,请选择其他合成。",
+ "Set a valid duration on the composition before adding it to the timeline.": "请先为合成设置有效时长,再添加到时间轴。",
"Project-wide color grading cannot copy relative LUT paths. Apply to this file or use a URL/data LUT.": "全工程调色无法复制相对路径的 LUT。请应用到当前文件,或使用网址/内嵌数据 LUT。",
"No color grading changed": "调色未发生变化",
"Opening this project in the HyperFrames desktop app": "正在 HyperFrames 桌面应用中打开此工程",
diff --git a/studio/src/motion/TimelineMediaBar.tsx b/studio/src/motion/TimelineMediaBar.tsx
index 9b73820c..649a0668 100644
--- a/studio/src/motion/TimelineMediaBar.tsx
+++ b/studio/src/motion/TimelineMediaBar.tsx
@@ -85,7 +85,7 @@ function ConnectedTimelineMediaBar() {
|| state.canvas.isScrubbing || state.canvas.draggedElement || state.canvas.resizingClip || state.canvas.marqueeRect
|| state.overlays.clipContextMenu || state.overlays.kfContextMenu || state.overlays.gapContextMenu
|| dismissed === identity || (!range && !clip && caret === null);
- const popover = useMediaPopoverPosition(anchor, 680, !hidden && !ask);
+ const popover = useMediaPopoverPosition(anchor, 680, !hidden && !ask, true);
useEffect(() => {
if (hidden || ask) return;
let timer: ReturnType<typeof setTimeout> | undefined;
@@ -105,6 +105,7 @@ function ConnectedTimelineMediaBar() {
else schedule();
};
const outside = (event: PointerEvent) => {
+ if (event.target instanceof Element && event.target.closest('[data-preview-transport]')) return;
if (popover.ref.current?.contains(event.target as Node)) return;
cancel();
setDismissed(identity);
diff --git a/studio/src/motion/mediaPopoverPosition.ts b/studio/src/motion/mediaPopoverPosition.ts
index 9933f293..8d68ceb3 100644
--- a/studio/src/motion/mediaPopoverPosition.ts
+++ b/studio/src/motion/mediaPopoverPosition.ts
@@ -21,6 +21,7 @@ export function mediaPopoverPosition(
anchor: MediaAnchorRect,
panel: { width: number; height: number },
viewport: { left: number; top: number; width: number; height: number },
+ reserved?: MediaAnchorRect,
) {
const margin = 12, gap = 8;
const leftEdge = viewport.left + margin, rightEdge = viewport.left + viewport.width - margin;
@@ -33,9 +34,15 @@ export function mediaPopoverPosition(
const side = panel.height <= above || (panel.height > below && above >= below) ? 'top' : 'bottom';
const maxHeight = side === 'top' ? above : below;
const height = Math.min(panel.height, maxHeight);
- return {
- left: clamp((anchor.left + anchor.right - panel.width) / 2, leftEdge, rightEdge - panel.width),
- top: side === 'top' ? anchorTop - gap - height : anchorBottom + gap,
- maxHeight,
- };
+ const left = clamp((anchor.left + anchor.right - panel.width) / 2, leftEdge, rightEdge - panel.width);
+ const top = side === 'top' ? anchorTop - gap - height : anchorBottom + gap;
+ if (reserved && reserved.bottom > reserved.top && reserved.right > left && reserved.left < left + panel.width
+ && reserved.bottom > top && reserved.top < top + height) {
+ const roomAbove = Math.max(0, reserved.top - topEdge - gap);
+ const roomBelow = Math.max(0, bottomEdge - reserved.bottom - gap);
+ return roomBelow >= panel.height || roomBelow > roomAbove
+ ? { left, top: reserved.bottom + gap, maxHeight: roomBelow }
+ : { left, top: Math.max(topEdge, reserved.top - gap - panel.height), maxHeight: roomAbove };
+ }
+ return { left, top, maxHeight };
}
diff --git a/studio/src/motion/useMediaPopoverPosition.ts b/studio/src/motion/useMediaPopoverPosition.ts
index 20637011..656e6f73 100644
--- a/studio/src/motion/useMediaPopoverPosition.ts
+++ b/studio/src/motion/useMediaPopoverPosition.ts
@@ -2,8 +2,10 @@ import { useCallback, useLayoutEffect, useRef, useState, type CSSProperties } fr
import { mediaPopoverPosition, type MediaPopoverAnchor } from './mediaPopoverPosition';
/** Measure the actual surface and follow its opener through scrolling and Dock resizing. */
-export function useMediaPopoverPosition(anchor: MediaPopoverAnchor | undefined, width: number, enabled = true) {
- const ref = useRef<HTMLElement>(null);
+export function useMediaPopoverPosition<T extends HTMLElement = HTMLElement>(
+ anchor: MediaPopoverAnchor | undefined, width: number, enabled = true, avoidPreviewTransport = false,
+) {
+ const ref = useRef<T>(null);
// Keep mount-time autofocus available; the layout effect sets the final position before paint.
const [style, setStyle] = useState<CSSProperties>({ left: 12, top: 12 });
const update = useCallback(() => {
@@ -16,34 +18,37 @@ export function useMediaPopoverPosition(anchor: MediaPopoverAnchor | undefined,
const panelWidth = rect.width || Math.min(width, bounds.width - 24);
const panelHeight = Math.max(rect.height, panel.scrollHeight + panel.offsetHeight - panel.clientHeight);
// Programmatic callers without an opener get a centered, viewport-safe panel.
- const next = anchor ? mediaPopoverPosition(anchor.getBoundingClientRect(), { width: panelWidth, height: panelHeight }, bounds) : {
+ const reserved = avoidPreviewTransport ? document.querySelector('[data-preview-transport]')?.getBoundingClientRect() : undefined;
+ const next = anchor ? mediaPopoverPosition(anchor.getBoundingClientRect(), { width: panelWidth, height: panelHeight }, bounds, reserved) : {
left: bounds.left + (bounds.width - panelWidth) / 2,
top: bounds.top + Math.max(12, (bounds.height - panelHeight) / 2),
maxHeight: bounds.height - 24,
};
setStyle(previous => previous.left === next.left && previous.top === next.top && previous.maxHeight === next.maxHeight ? previous : next);
- }, [anchor, width, enabled]);
+ }, [anchor, width, enabled, avoidPreviewTransport]);
// Results, tabs and expanded parameters can resize the panel in the same commit.
// Measure before paint as well as observing external layout/image changes.
useLayoutEffect(update);
useLayoutEffect(() => {
const panel = ref.current;
if (!enabled || !panel) return;
- const observer = new ResizeObserver(update);
- observer.observe(panel);
+ const observer = typeof ResizeObserver === 'undefined' ? undefined : new ResizeObserver(update);
+ observer?.observe(panel);
+ const transport = avoidPreviewTransport && document.querySelector('[data-preview-transport]');
+ if (transport) observer?.observe(transport);
// Ancestor size changes include the split panes that can move the opener without resizing it.
- for (let element = anchor?.contextElement; element; element = element.parentElement ?? undefined) observer.observe(element);
+ for (let element = anchor?.contextElement; element; element = element.parentElement ?? undefined) observer?.observe(element);
window.addEventListener('resize', update);
window.addEventListener('scroll', update, { capture: true, passive: true });
window.visualViewport?.addEventListener('resize', update);
window.visualViewport?.addEventListener('scroll', update);
return () => {
- observer.disconnect();
+ observer?.disconnect();
window.removeEventListener('resize', update);
window.removeEventListener('scroll', update, true);
window.visualViewport?.removeEventListener('resize', update);
window.visualViewport?.removeEventListener('scroll', update);
};
- }, [anchor, enabled, update]);
+ }, [anchor, enabled, update, avoidPreviewTransport]);
return { ref, style };
}
diff --git a/studio/src/player/components/EditModal.test.tsx b/studio/src/player/components/EditModal.test.tsx
index 81aaad01..cf2089b8 100644
--- a/studio/src/player/components/EditModal.test.tsx
+++ b/studio/src/player/components/EditModal.test.tsx
@@ -45,6 +45,34 @@ describe("EditPopover", () => {
act(() => root.unmount());
});
+
+ it("places the clip prompt outside the playback controls and keeps it inside the viewport", () => {
+ const transport = document.createElement("div");
+ transport.setAttribute("data-preview-transport", "");
+ vi.spyOn(transport, "getBoundingClientRect").mockReturnValue(new DOMRect(200, 300, 400, 40));
+ const host = document.createElement("div");
+ document.body.append(transport, host);
+ const height = vi.spyOn(HTMLElement.prototype, "scrollHeight", "get").mockReturnValue(200);
+ const root = createRoot(host);
+ const close = vi.fn();
+ try {
+ act(() => root.render(
+ <EditPopover rangeStart={1} rangeEnd={2} anchorX={400} anchorY={450} onClose={close} />,
+ ));
+ const surface = document.querySelector("textarea")!.closest<HTMLElement>('[style*="position: fixed"]')!;
+ const top = Number.parseFloat(surface.style.top);
+ expect(top >= 340 || top + 200 <= 300).toBe(true);
+ expect(top + Math.min(200, Number.parseFloat(surface.style.maxHeight))).toBeLessThan(window.innerHeight);
+ act(() => {
+ vi.advanceTimersByTime(100);
+ transport.dispatchEvent(new MouseEvent("mousedown", { bubbles: true }));
+ });
+ expect(close).not.toHaveBeenCalled();
+ } finally {
+ act(() => root.unmount());
+ height.mockRestore();
+ }
+ });
});
const overlappingClips: TimelineElement[] = [
diff --git a/studio/src/player/components/EditModal.tsx b/studio/src/player/components/EditModal.tsx
index 384ec85f..8d480993 100644
--- a/studio/src/player/components/EditModal.tsx
+++ b/studio/src/player/components/EditModal.tsx
@@ -6,6 +6,7 @@ import { usePlayerStore } from "../store/playerStore";
import { formatTime } from "../lib/time";
import { buildPromptCopyText, buildTimelineAgentPrompt } from "./timelineEditing";
import { copyTextToClipboard } from "../../utils/clipboard";
+import { useMediaPopoverPosition } from "../../motion/useMediaPopoverPosition";
interface EditPopoverProps {
rangeStart: number;
@@ -54,8 +55,11 @@ export function EditPopover({ rangeStart, rangeEnd, anchorX, anchorY, onClose, i
const [copiedAgentPrompt, setCopiedAgentPrompt] = useState(false);
const [copiedPromptOnly, setCopiedPromptOnly] = useState(false);
const [copyError, setCopyError] = useState(false);
- const popoverRef = useRef<HTMLDivElement>(null);
const textareaRef = useRef<HTMLTextAreaElement>(null);
+ const anchor = useMemo(() => ({
+ getBoundingClientRect: () => ({ left: anchorX, right: anchorX, top: anchorY, bottom: anchorY }),
+ }), [anchorX, anchorY]);
+ const { ref: popoverRef, style: placement } = useMediaPopoverPosition<HTMLDivElement>(anchor, 320, true, true);
const elementsInRange = useMemo(() => {
// A single-clip request must not expand to overlapping clips, even if its
@@ -84,12 +88,17 @@ export function EditPopover({ rangeStart, rangeEnd, anchorX, anchorY, onClose, i
useMountEffect(() => {
const handleClick = (e: MouseEvent) => {
- if (popoverRef.current && !popoverRef.current.contains(e.target as Node)) {
+ const target = e.target;
+ if (target instanceof Element && target.closest("[data-preview-transport]")) return;
+ if (target instanceof Node && popoverRef.current && !popoverRef.current.contains(target)) {
onClose();
}
};
- setTimeout(() => window.addEventListener("mousedown", handleClick), 100);
- return () => window.removeEventListener("mousedown", handleClick);
+ const timer = setTimeout(() => window.addEventListener("mousedown", handleClick), 100);
+ return () => {
+ clearTimeout(timer);
+ window.removeEventListener("mousedown", handleClick);
+ };
});
const buildClipboardText = useCallback(() => {
@@ -133,14 +142,14 @@ export function EditPopover({ rangeStart, rangeEnd, anchorX, anchorY, onClose, i
const style: React.CSSProperties = {
position: "fixed",
- left: Math.max(8, Math.min(anchorX - 160, window.innerWidth - 336)),
- top: Math.max(8, anchorY - 280),
+ ...placement,
+ overflowY: "auto",
zIndex: 200,
};
return createPortal(
<div ref={popoverRef} style={style}>
- <div className="w-80 bg-neutral-900 border border-neutral-700/60 rounded-xl shadow-2xl shadow-black/40 overflow-hidden">
+ <div className="w-80 max-w-[calc(100vw-24px)] bg-neutral-900 border border-neutral-700/60 rounded-xl shadow-2xl shadow-black/40 overflow-hidden">
{/* Header */}
<div className="flex items-center justify-between px-4 py-2.5 border-b border-neutral-800/60">
<div className="flex items-center gap-2">
diff --git a/studio/src/player/components/SpeedMenu.tsx b/studio/src/player/components/SpeedMenu.tsx
index f1a21726..cb6222aa 100644
--- a/studio/src/player/components/SpeedMenu.tsx
+++ b/studio/src/player/components/SpeedMenu.tsx
@@ -54,7 +54,7 @@ export const SpeedMenu = memo(function SpeedMenu({
<MenuRadioItem
key={rate}
value={rate}
- className={`rounded-none px-3 py-1.5 font-mono text-[11px] tabular-nums [&>span:last-child]:hidden ${rate === playbackRate ? "bg-hover font-semibold" : ""}`}
+ className={`gap-2 rounded-none px-3 py-1.5 font-mono text-[11px] tabular-nums ${rate === playbackRate ? "bg-hover font-semibold text-text-0" : ""}`}
>
{rate}x
</MenuRadioItem>
diff --git a/tests/multi-project.test.ts b/tests/multi-project.test.ts
index f48e3fe2..0520792a 100644
--- a/tests/multi-project.test.ts
+++ b/tests/multi-project.test.ts
@@ -22,6 +22,14 @@ test('one native service keeps both projects editable, scoped and recoverable af
const response = await fetch(`${base()}/motion-api/projects/${id}/open`, { method: 'POST', headers: { Origin: base(), 'Content-Type': 'application/json' }, body: JSON.stringify({ expectedRevision: current.revision, expectedProjectId: current.projectId }) });
assert.equal(response.status, 200, await response.clone().text());
};
+ const call = async (name: string, args: Record<string, unknown>) => {
+ const response = await fetch(`${base()}/motion-api/phase1/call`, {
+ method: 'POST', headers: { Origin: base(), 'Content-Type': 'application/json' },
+ body: JSON.stringify({ name, arguments: args }),
+ });
+ assert.equal(response.status, 200, await response.clone().text());
+ return response.json();
+ };
try {
const initialStudio = running.studio, initialIdentity = await (await fetch(new URL('/__hyperframes_config', initialStudio.url))).json();
const fileA = await source(a);
@@ -51,6 +59,14 @@ test('one native service keeps both projects editable, scoped and recoverable af
for (const id of [a, b]) {
const history = await fetch(`${base()}/api/projects/${id}/history`);
assert.equal(history.status, 200, await history.clone().text());
+ const project = await call('motion_get_project', { projectId: id });
+ const edit = await call('motion_edit_project', {
+ projectId: id, requestId: crypto.randomUUID(), expectedRevision: project.revision,
+ expectedVersionId: project.currentVersionId, presentation: 'background',
+ files: [{ path: 'agent-notes.txt', content: `Edited in ${id}` }],
+ });
+ assert.equal(edit.changed, true);
+ assert.equal(await readFile(path.join(store.projectDirectoryFor(id), 'agent-notes.txt'), 'utf8'), `Edited in ${id}`);
}
for (const id of [crypto.randomUUID(), '..%2Fescape']) {
assert.ok([400, 404].includes((await fetch(`${base()}/api/projects/${id}/files/index.html`)).status));
diff --git a/web/template-gallery.ts b/web/template-gallery.ts
index f87a00c6..209a2a31 100644
--- a/web/template-gallery.ts
+++ b/web/template-gallery.ts
@@ -49,11 +49,12 @@ export function mountTemplates(root: HTMLElement, options: {
// IntersectionObserver assigns src lazily; a hidden native-lazy image would never load.
poster.alt = ''; poster.loading = 'eager'; poster.decoding = 'async';
video.muted = true; video.playsInline = true; video.loop = true; video.preload = 'metadata'; video.setAttribute('aria-hidden', 'true');
- let posterReady = false, frameReady = false, failed = false, playing = false, started = false;
+ let posterReady = false, frameReady = false, failed = false, playing = false, hasPlayed = false, started = false;
let timer: ReturnType<typeof setTimeout> | undefined;
const update = () => {
- poster.hidden = !posterReady; video.hidden = !frameReady || (posterReady && !playing);
- content.hidden = posterReady || frameReady; media.dataset.previewState = playing ? 'playing' : frameReady ? 'frame' : posterReady ? 'poster' : failed ? 'unavailable' : 'content';
+ const showFrame = frameReady && (hasPlayed || !posterReady);
+ poster.hidden = !posterReady || showFrame; video.hidden = !showFrame;
+ content.hidden = posterReady || frameReady; media.dataset.previewState = playing ? 'playing' : showFrame ? 'frame' : posterReady ? 'poster' : failed ? 'unavailable' : 'content';
language.text(status, failed ? "Preview unavailable · You can still copy the recreation instruction" : !template.previewUrl && !template.posterUrl ? "View template content and source" : "Loading preview…");
};
const unregister = playback.register(template.id, {
@@ -64,7 +65,7 @@ export function mountTemplates(root: HTMLElement, options: {
poster.onerror = () => { posterReady = false; if (!template.previewUrl || failed) failed = true; update(); };
video.onloadedmetadata = () => { if (Number.isFinite(video.duration) && video.duration > .2) video.currentTime = Math.min(.6, video.duration / 4); };
video.onloadeddata = () => { clearTimeout(timer); frameReady = true; failed = false; update(); playback.update(template.id, { ready: true }); };
- video.onplaying = () => { playing = true; update(); };
+ video.onplaying = () => { playing = hasPlayed = true; update(); };
video.onpause = () => { playing = false; update(); };
video.onerror = () => { clearTimeout(timer); failed = true; playing = false; frameReady = false; playback.update(template.id, { ready: false }); update(); };
const start = () => {
@@ -215,10 +216,35 @@ export function mountTemplates(root: HTMLElement, options: {
dialog.classList.toggle('connect-preview-dialog--portrait', template.ratio === '9:16' || template.kind === 'builtin');
if (template.previewUrl) {
const video = document.createElement('video'); video.controls = true; video.muted = true; video.playsInline = true; video.autoplay = !reducedMotion.matches; video.loop = true; video.preload = 'metadata'; language.attribute(video, 'aria-label', '{title} reference video', { title: template.title }); if (template.posterUrl) video.poster = template.posterUrl;
+ const mediaEvents = new AbortController();
+ let hiddenTime: number | undefined;
let timer: ReturnType<typeof setTimeout>;
const failed = () => { clearTimeout(timer); language.text(element('preview-error'), "Preview could not load. View the template content and recreation instruction, or reopen the preview to try again."); element('preview-error').hidden = false; };
- video.onerror = failed; video.onloadeddata = () => clearTimeout(timer); video.src = template.previewUrl; stage.append(video); timer = setTimeout(failed, 15000);
- previewCleanup = () => { clearTimeout(timer); video.onerror = null; video.pause(); video.removeAttribute('src'); video.load(); };
+ video.onerror = failed;
+ video.onloadeddata = () => { clearTimeout(timer); element('preview-error').hidden = true; };
+ document.addEventListener('visibilitychange', () => {
+ if (document.hidden) {
+ if (video.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA) hiddenTime = video.currentTime;
+ video.pause();
+ return;
+ }
+ const time = hiddenTime;
+ hiddenTime = undefined;
+ if (time === undefined || (!video.error && video.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA)) return;
+ // A discarded media buffer needs a fresh decoder. Keep the viewer paused and restore its position.
+ video.autoplay = false;
+ video.addEventListener('loadedmetadata', () => {
+ video.currentTime = Number.isFinite(video.duration) ? Math.min(time, video.duration) : time;
+ }, { once: true, signal: mediaEvents.signal });
+ clearTimeout(timer);
+ timer = setTimeout(failed, 15000);
+ video.load();
+ }, { signal: mediaEvents.signal });
+ video.src = template.previewUrl; stage.append(video); timer = setTimeout(failed, 15000);
+ previewCleanup = () => {
+ clearTimeout(timer); mediaEvents.abort(); video.onerror = null; video.onloadeddata = null;
+ video.pause(); video.removeAttribute('src'); video.load();
+ };
} else if (template.posterUrl) {
const poster = document.createElement('img'); language.attribute(poster, 'alt', '{title} template cover', { title: template.title }); poster.src = template.posterUrl; stage.append(poster);
poster.onerror = () => { stage.replaceChildren(contentPreview(template)); }; previewCleanup = () => { poster.onerror = null; poster.removeAttribute('src'); };
@@ -240,7 +266,7 @@ export function mountTemplates(root: HTMLElement, options: {
dialog.addEventListener('close', () => { previewCleanup(); previewCleanup = () => {}; preview = undefined; configurePlayback(); }, { signal: lifetime.signal });
element('copy-preview-template').onclick = event => { if (preview) copyTemplate(preview, event.currentTarget as HTMLButtonElement); };
element('use-preview-template').onclick = () => { if (preview && isEditableTemplate(preview)) { const id = preview.id; dialog.close(); options.useTemplate(id); } };
- document.addEventListener('visibilitychange', () => { configurePlayback(); if (document.hidden) element('template-preview-stage').querySelector('video')?.pause(); }, { signal: lifetime.signal });
+ document.addEventListener('visibilitychange', configurePlayback, { signal: lifetime.signal });
function suspend() { active = false; if (request) { request.abort(); loaded = false; } clearTimeout(debounce); clearInterval(rotation); configurePlayback(); if (dialog.open) dialog.close(); previewCleanup(); }
return {
updateConnection,