Skip to content

Write HTML. Render video. Built for agents.

fix(studio): drilling in opens the composition's full project path (#4689)

Miguel Ángela0c72ad64a3a
diff --git a/packages/studio/src/components/editor/domEditing.test.ts b/packages/studio/src/components/editor/domEditing.test.ts
index 6cb6922e9d..4f2090df51 100644
--- a/packages/studio/src/components/editor/domEditing.test.ts
+++ b/packages/studio/src/components/editor/domEditing.test.ts
@@ -17,6 +17,7 @@ import {
resolveDomEditCapabilities,
resolveDomEditSelection,
} from "./domEditing";
+import { normalizeTimelineCompositionSource } from "./domEditingDom";
function createDocument(markup: string): Document {
const window = new Window();
@@ -910,6 +911,34 @@ describe("resolveDomEditSelection", () => {
expect(first).not.toBe(second);
});
+ it("reads a preview prefix only from a URL, not from a project folder named preview", () => {
+ expect(normalizeTimelineCompositionSource("sections/preview/x.html")).toBe(
+ "sections/preview/x.html",
+ );
+ expect(
+ normalizeTimelineCompositionSource(
+ "http://localhost:5190/api/projects/p/preview/sections/x.html",
+ ),
+ ).toBe("sections/x.html");
+ expect(normalizeTimelineCompositionSource("/api/projects/p/preview/comp/sections/x.html")).toBe(
+ "sections/x.html",
+ );
+ });
+
+ it("finds a composition host authored with a ./ path", () => {
+ const document = createDocument(`
+ <div data-composition-id="scene" data-composition-file="./compositions/scene.html"></div>
+ `);
+
+ expect(
+ findElementForTimelineElement(
+ document,
+ { id: "scene", compositionSrc: "./compositions/scene.html" },
+ { activeCompositionPath: null, isMasterView: true },
+ )?.getAttribute("data-composition-id"),
+ ).toBe("scene");
+ });
+
it("resolves generated timeline ids without throwing", () => {
const document = createDocument(`
<div data-composition-id="hook">
diff --git a/packages/studio/src/components/editor/domEditingDom.ts b/packages/studio/src/components/editor/domEditingDom.ts
index de9f76c91b..7ef6628988 100644
--- a/packages/studio/src/components/editor/domEditingDom.ts
+++ b/packages/studio/src/components/editor/domEditingDom.ts
@@ -199,6 +199,7 @@ export function getSourceFileForElement(
export function normalizeTimelineCompositionSource(value: string | undefined): string | undefined {
const trimmed = value?.trim();
if (!trimmed) return undefined;
+ if (!/^([a-z][a-z0-9+.-]*:|\/)/i.test(trimmed)) return trimmed;
let pathname = trimmed;
try {
diff --git a/packages/studio/src/components/nle/useCompositionStack.test.tsx b/packages/studio/src/components/nle/useCompositionStack.test.tsx
index 1d4b29bd51..980404829b 100644
--- a/packages/studio/src/components/nle/useCompositionStack.test.tsx
+++ b/packages/studio/src/components/nle/useCompositionStack.test.tsx
@@ -8,6 +8,59 @@ import { useCompositionStack } from "./useCompositionStack";
installReactActEnvironment();
+describe("useCompositionStack — drilling into a composition file", () => {
+ afterEach(() => {
+ document.body.innerHTML = "";
+ });
+
+ for (const compositionSrc of [
+ "sections/compositions/x.html",
+ "http://localhost:5190/api/projects/p/preview/sections/compositions/x.html",
+ "/api/projects/p/preview/comp/sections/compositions/x.html",
+ ]) {
+ it(`opens the full project path for ${compositionSrc}`, async () => {
+ const host = document.createElement("div");
+ document.body.append(host);
+ const root = createRoot(host);
+ let stack!: ReturnType<typeof useCompositionStack>;
+ function Harness() {
+ stack = useCompositionStack({ projectId: "p" });
+ return null;
+ }
+ await act(async () => {
+ root.render(<Harness />);
+ });
+ await act(async () => {
+ stack.handleDrillDown({ id: "x", compositionSrc });
+ });
+ expect(stack.compositionStack[1]).toMatchObject({
+ id: "sections/compositions/x.html",
+ previewUrl: "/api/projects/p/preview/comp/sections/compositions/x.html",
+ });
+ act(() => root.unmount());
+ });
+ }
+
+ it("keeps a top-level compositions/ path and drops a leading ./", async () => {
+ const host = document.createElement("div");
+ document.body.append(host);
+ const root = createRoot(host);
+ let stack!: ReturnType<typeof useCompositionStack>;
+ function Harness() {
+ stack = useCompositionStack({ projectId: "p" });
+ return null;
+ }
+ await act(async () => {
+ root.render(<Harness />);
+ });
+ await act(async () => {
+ stack.handleDrillDown({ id: "x", compositionSrc: "./compositions/x.html" });
+ });
+ expect(stack.compositionStack[1]?.id).toBe("compositions/x.html");
+ act(() => root.unmount());
+ });
+});
+
describe("useCompositionStack — project scoping", () => {
afterEach(() => {
document.body.innerHTML = "";
diff --git a/packages/studio/src/components/nle/useCompositionStack.ts b/packages/studio/src/components/nle/useCompositionStack.ts
index da758733d8..f32cf83b51 100644
--- a/packages/studio/src/components/nle/useCompositionStack.ts
+++ b/packages/studio/src/components/nle/useCompositionStack.ts
@@ -4,6 +4,7 @@ import { useState, useCallback, useRef, useEffect } from "react";
import { liveTime, usePlayerStore } from "../../player/store/playerStore";
import type { CompositionLevel } from "./CompositionBreadcrumb";
import { encodePreviewPath } from "../../player/components/thumbnailUtils";
+import { normalizeTimelineCompositionSource } from "../editor/domEditingDom";
interface UseCompositionStackOptions {
projectId: string;
@@ -79,14 +80,9 @@ export function useCompositionStack({
(element: { id: string; compositionSrc?: string }) => {
if (!element.compositionSrc) return;
- const compId = element.id;
- let resolvedPath = compIdToSrcRef.current.get(compId);
-
- if (!resolvedPath) {
- const src = element.compositionSrc;
- const compMatch = src.match(/compositions\/.*\.html/);
- resolvedPath = compMatch ? compMatch[0] : src;
- }
+ const src = compIdToSrcRef.current.get(element.id) ?? element.compositionSrc;
+ const normalized = normalizeTimelineCompositionSource(src) ?? src;
+ const resolvedPath = normalized.replace(/^(\.\/|\/)+/, "");
usePlayerStore.getState().setElements([]);