Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions packages/studio/src/hooks/timelineEditingHelpers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,32 @@ describe("applyTimelineStackingReorder", () => {
});

describe("patchIframeDomTiming", () => {
it("patches a top-level composition host in its parent source file", () => {
const iframe = makeIframeWith(`
<div data-composition-id="root">
<div
id="scene-host"
data-composition-id="scene"
data-composition-src="compositions/scene.html"
data-start="2"
></div>
</div>
`);
const host = iframe.contentDocument?.getElementById("scene-host");
const target = el({
id: "scene-host",
tag: "div",
kind: "composition",
domId: "scene-host",
sourceFile: "index.html",
compositionSrc: "compositions/scene.html",
});

patchIframeDomTiming(iframe, target, [["data-start", "9"]], "index.html");

expect(host?.getAttribute("data-start")).toBe("9");
});

it("resolves selectorIndex within the element's source file", () => {
const iframe = makeIframeWith(`
<div data-composition-id="root">
Expand Down
11 changes: 10 additions & 1 deletion packages/studio/src/hooks/timelineEditingHelpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ import { saveProjectFilesWithHistory, type RecordEditInput } from "../utils/stud
import type { TimelineZIndexReorderCommit } from "./useTimelineEditingTypes";
import { setCompositionDurationToContent } from "../utils/timelineAssetDrop";
import { readFileContent } from "./timelineTimingSync";
import { findElementForSelection } from "../components/editor/domEditingElement";
import {
findElementForSelection,
findElementForTimelineElement,
} from "../components/editor/domEditingElement";
export { deleteSelectedKeyframes } from "./deleteSelectedKeyframes";
export { readFileContent };
function isHTMLElement(element: Element | null): element is HTMLElement {
Expand Down Expand Up @@ -137,6 +140,12 @@ export function findTimelineElementInIframe(
try {
const doc = iframe?.contentDocument;
if (!doc) return null;
if (element.kind === "composition" && element.compositionSrc) {
return findElementForTimelineElement(doc, element, {
activeCompositionPath,
isMasterView: true,
});
}
return findElementForSelection(
doc,
{
Expand Down
Loading