From b650d0d198bae4dfd440ba2bad32b4a2351862aa Mon Sep 17 00:00:00 2001 From: Michael Wang Date: Mon, 16 Nov 2026 01:01:13 +0000 Subject: [PATCH] fix(studio): keep a host's sandbox-origin seal on the preview frame (#7886) --- packages/studio/src/player/components/Player.test.ts | 10 ++++++++++ packages/studio/src/player/components/Player.tsx | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/packages/studio/src/player/components/Player.test.ts b/packages/studio/src/player/components/Player.test.ts index 18c74b1d2c..21afa543c2 100644 --- a/packages/studio/src/player/components/Player.test.ts +++ b/packages/studio/src/player/components/Player.test.ts @@ -18,12 +18,14 @@ Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true }); let root: Root | null = null; let lifecycleLog: string[] = []; +const playersMade: HTMLElement[] = []; class TestHyperframesPlayer extends HTMLElement { readonly iframeElement = document.createElement("iframe"); constructor() { super(); + playersMade.push(this); this.attachShadow({ mode: "open" }); const addIframeListener = this.iframeElement.addEventListener.bind(this.iframeElement); @@ -243,6 +245,14 @@ describe("a host's sandbox origin", () => { expect(player.getAttribute("src")).toBe("/api/projects/demo/preview"); }); + it("keeps the seal a host puts on the player from its ref", async () => { + const seal = (iframe: HTMLIFrameElement | null) => + iframe && playersMade.at(-1)?.setAttribute("sandbox-origin", "opaque"); + const { player } = await mountPlayer({ ref: seal }); + await settle(); + expect(player.getAttribute("sandbox-origin")).toBe("opaque"); + }); + it("leaves a same-origin preview on its plain path without asking for a token", async () => { const fetch = vi.spyOn(globalThis, "fetch"); const { player } = await mountPlayer(); diff --git a/packages/studio/src/player/components/Player.tsx b/packages/studio/src/player/components/Player.tsx index 4812f3065c..9e7247a38e 100644 --- a/packages/studio/src/player/components/Player.tsx +++ b/packages/studio/src/player/components/Player.tsx @@ -341,7 +341,8 @@ export const Player = forwardRef( player.addEventListener("painted", handlePainted); player.addEventListener("error", handleError); - // Bridge the inner iframe to the forwarded ref for useTimelinePlayer. + // Sealed before the ref (useTimelinePlayer's bridge) sees the frame, never unsealed: a host may seal it too. + if (opaque) player.toggleAttribute("sandbox-origin", true); if (typeof ref === "function") { ref(iframe); } else if (ref) { @@ -352,7 +353,6 @@ export const Player = forwardRef( player.setAttribute("shader-loading", "player"); player.setAttribute("low-power-idle", ""); player.toggleAttribute("no-load-timeout", noLoadTimeout === true); - player.toggleAttribute("sandbox-origin", opaque); player.setAttribute("width", String(portrait ? 1080 : 1920)); player.setAttribute("height", String(portrait ? 1920 : 1080)); player.style.width = "100%";