Write HTML. Render video. Built for agents.
JavaScript aiai-agentsanimationclaude-codeffmpegframeworkgsaphtmlhtml-to-videomcpmotion-graphicspuppeteerrenderingtypescriptvideo-editor
fix(core): a hidden scene's contents stay hidden when a child is set visible (#5619)
Miguel Ángel24a9b781715d
diff --git a/packages/core/src/runtime/init.test.ts b/packages/core/src/runtime/init.test.tsindex 40a6b06a48..5c3f5d763c 100644--- a/packages/core/src/runtime/init.test.ts+++ b/packages/core/src/runtime/init.test.ts@@ -512,6 +512,80 @@ describe("initSandboxRuntimeModular", () => {document.head.querySelector("style[data-hf-skip-hidden-images]")?.remove();}});++ it("keeps a hidden scene's contents hidden when a rewound GSAP set marks one visible inline", () => {+ hideTimedClipsUntilFirstPass();+ try {+ document.body.innerHTML =+ `<div data-composition-id="main" data-root="true" data-start="0" data-duration="10" data-width="1920" data-height="1080">` ++ `<div id="scene" style="position: absolute" data-start="5" data-duration="2"><div id="layer"></div></div>` ++ `</div>`;+ window.__timelines = { main: createMockTimeline(10) };+ initSandboxRuntimeModular();+ const layer = document.getElementById("layer")!;+ const shown = (time: number) => {+ window.__player?.seek(time);+ return getComputedStyle(layer).visibility;+ };+ expect(shown(6)).toBe("visible");+ // What GSAP writes when a set recorded while the scene showed is rewound past.+ layer.style.visibility = "visible";+ expect([shown(1), shown(6), shown(8)]).toEqual(["hidden", "visible", "hidden"]);+ } finally {+ revealTimedClipsAfterFirstPass();+ document.head.querySelector("style[data-hf-hidden-clip-contents]")?.remove();+ }+ });++ it("shows a hidden scene's contents in a copy a shader transition forces visible", () => {+ hideTimedClipsUntilFirstPass();+ try {+ document.body.innerHTML =+ `<div data-composition-id="main" data-root="true" data-start="0" data-duration="10" data-width="1920" data-height="1080">` ++ `<div id="scene" style="position: absolute" data-start="5" data-duration="2"><p id="title">Title</p></div>` ++ `</div>`;+ window.__timelines = { main: createMockTimeline(10) };+ initSandboxRuntimeModular();+ window.__player?.seek(1);+ const copy = document.getElementById("scene")!.cloneNode(true) as HTMLElement;+ document.body.append(copy);+ // As showSceneAndClips forces a captured scene and its clips visible.+ copy.style.setProperty("visibility", "visible", "important");+ expect(copy.hasAttribute("data-hf-clip-hidden")).toBe(true);+ const sheet = document.querySelector<HTMLStyleElement>(+ "style[data-hf-hidden-clip-contents]",+ )!.sheet!;+ const rule = sheet.cssRules[0] as CSSStyleRule;+ expect(copy.querySelector("p")!.matches(rule.selectorText)).toBe(false);+ expect(document.getElementById("title")!.matches(rule.selectorText)).toBe(true);+ } finally {+ revealTimedClipsAfterFirstPass();+ document.head.querySelector("style[data-hf-hidden-clip-contents]")?.remove();+ }+ });++ it("leaves an image the HDR layer mask shows inside a container the mask hides", () => {+ hideTimedClipsUntilFirstPass();+ try {+ document.body.innerHTML =+ `<div id="root" data-composition-id="main" data-root="true" data-start="0" data-duration="10" data-width="1920" data-height="1080">` ++ `<img id="logo" src="logo.png" style="position: absolute" data-start="0" data-duration="10" data-hf-render-id="logo">` ++ `</div>`;+ window.__timelines = { main: createMockTimeline(10) };+ initSandboxRuntimeModular();+ window.__player?.seek(1);+ // As the engine's DOM-layer mask hides the other layers of an HDR frame; its show rule is weaker than ours.+ document.getElementById("root")!.style.setProperty("visibility", "hidden", "important");+ const sheet = document.querySelector<HTMLStyleElement>(+ "style[data-hf-hidden-clip-contents]",+ )!.sheet!;+ const rule = sheet.cssRules[0] as CSSStyleRule;+ expect(document.getElementById("logo")!.matches(rule.selectorText)).toBe(false);+ } finally {+ revealTimedClipsAfterFirstPass();+ document.head.querySelector("style[data-hf-hidden-clip-contents]")?.remove();+ }+ });});/**diff --git a/packages/core/src/runtime/init.ts b/packages/core/src/runtime/init.tsindex 0dc4ad4ba4..98311e4943 100644--- a/packages/core/src/runtime/init.ts+++ b/packages/core/src/runtime/init.ts@@ -6,7 +6,12 @@ import { preloadMedia, releaseMedia, lengthIsAuthored, stopMediaDownload } fromimport { installRuntimeControlBridge, postRuntimeMessage, setRuntimeProtocolFps } from "./bridge";import { instantTolerance } from "../clipFacts";import { isInClipWindow } from "./clipWindow";-import { revealTimedClipsAfterFirstPass, SKIPPED_CLIP, skipsHiddenImages } from "./timedClipHide";+import {+ CLIP_HIDDEN_ATTR,+ revealTimedClipsAfterFirstPass,+ SKIPPED_CLIP,+ skipsHiddenImages,+} from "./timedClipHide";import {PREVIEW_ONLY_ATTRS,RUNTIME_STAMPED_ATTR,@@ -295,6 +300,7 @@ const RUNTIME_MEDIA_ATTRS = new Set(["src",COLOR_GRADING_AUTHORED_OPACITY_ATTR,EDIT_ORIGINAL_TRANSLATE_ATTR,+ CLIP_HIDDEN_ATTR,...PREVIEW_ONLY_ATTRS,]);const ownClasses = (value: string) =>@@ -2823,6 +2829,7 @@ export function initSandboxRuntimeModular(): void {clipChainVisibleAt(rawNode.parentElement, currentTime, visibleAt, rootComp);const isRuntimeStamped = stampsForStudio && rawNode.hasAttribute(RUNTIME_STAMPED_ATTR);if (!isRuntimeStamped) rawNode.style.visibility = isVisibleNow ? "visible" : "hidden";+ rawNode.toggleAttribute(CLIP_HIDDEN_ATTR, !isRuntimeStamped && !isVisibleNow);const upcoming =hiddenImagesSkipped && !isVisibleNow && dueSoon(rawNode, visibleAt, currentTime);if (upcoming && !rawNode.hasAttribute(STUDIO_PREVIEW_UPCOMING_ATTR))diff --git a/packages/core/src/runtime/timedClipHide.ts b/packages/core/src/runtime/timedClipHide.tsindex 37e91a4822..af55f3e8c8 100644--- a/packages/core/src/runtime/timedClipHide.ts+++ b/packages/core/src/runtime/timedClipHide.ts@@ -15,6 +15,9 @@ const SKIP_ATTR = "data-hf-skip-hidden-images";export const SKIPPED_CLIP = `[data-start]:not(video, audio, img, [${STUDIO_PREVIEW_UPCOMING_ATTR}], [${RUNTIME_STAMPED_ATTR}])[style*="visibility: hidden"]`;const SKIP_HIDDEN_IMAGES = `${SKIPPED_CLIP} img { display: none !important; }`;const STUDIO_PREVIEW_MARK = `meta[name="${STUDIO_PREVIEW_MARK_META}"]`;+export const CLIP_HIDDEN_ATTR = "data-hf-clip-hidden";+const CONTENTS_ATTR = "data-hf-hidden-clip-contents";+const HIDE_HIDDEN_CLIP_CONTENTS = `[${CLIP_HIDDEN_ATTR}][style*="visibility: hidden"] * { visibility: hidden !important; }`;type FirstPassWindow = Window & {__hfFirstPassHidden?: boolean;@@ -39,6 +42,8 @@ export function hideTimedClipsUntilFirstPass(): void {if (!parent) return;const preview = document.querySelector(STUDIO_PREVIEW_MARK) !== null;if (preview && !skipsHiddenImages()) appendStyle(parent, SKIP_ATTR, SKIP_HIDDEN_IMAGES);+ if (!document.querySelector(`style[${CONTENTS_ATTR}]`))+ appendStyle(parent, CONTENTS_ATTR, HIDE_HIDDEN_CLIP_CONTENTS);const win = window as FirstPassWindow;// A runtime that already initialised may never run another pass to lift a new rule.if (win.__hfFirstPassHidden || win.__hyperframeRuntimeBootstrapped) return;diff --git a/packages/producer/tests/distributed/static-volume-future-set/output/output.mp4 b/packages/producer/tests/distributed/static-volume-future-set/output/output.mp4index cf82b1e1be..9445a62931 100644--- a/packages/producer/tests/distributed/static-volume-future-set/output/output.mp4+++ b/packages/producer/tests/distributed/static-volume-future-set/output/output.mp4@@ -1,3 +1,3 @@version https://git-lfs.github.com/spec/v1-oid sha256:be14baf2cc15850ae357f217cb8f75ae5a2ce5a5a02509170fa27bbfc333de51-size 65309+oid sha256:9be475ab7e29955f7c05cc4b2ab2ea19d6dc484d45b662f8aa01fabf3f0d6b41+size 40122