diff --git a/packages/core/src/runtime/adapters/gsap.order.test.ts b/packages/core/src/runtime/adapters/gsap.order.test.ts index 28a993ab45..d15e6510f0 100644 --- a/packages/core/src/runtime/adapters/gsap.order.test.ts +++ b/packages/core/src/runtime/adapters/gsap.order.test.ts @@ -109,3 +109,63 @@ describe("a render that captures frames out of order", () => { expect(rendersOfTwoSeeks(FPS)).toEqual(rendersOfTwoSeeks()); }); }); + +// A panel fading out while a set brings it back: the set is what preview and a seek show once the fade has ended. +function fadeInterruptedBySet(standIn: boolean) { + const panel = { opacity: 1 }; + const timeline = gsap.timeline({ paused: true }); + timeline.fromTo(panel, { opacity: 1 }, { opacity: 0, duration: 1, ease: "none" }, 0); + timeline.set(panel, { opacity: 1 }, 0.3); + return { + panel, + timeline: standIn ? producerStandIn(timeline) : (timeline as unknown as RuntimeTimelineLike), + }; +} + +const SET_FPS = 30; + +/** The panel at each frame, rendered when `fps` is given, previewed when it is not. */ +function panelAt(frames: number[], fps?: number, standIn = false): Map { + const { panel, timeline } = fadeInterruptedBySet(standIn); + const structure = { owner: timeline, version: "1" }; + const opacity = new Map(); + for (const frame of frames) { + seekGsapTimeline(timeline, frame / SET_FPS, true, structure, fps); + opacity.set(frame, panel.opacity); + } + return opacity; +} + +describe("a render where a set interrupts a running tween", () => { + const preview = panelAt(range(0, 90)); + + it("lands every frame where preview does when one worker renders in order", () => { + for (const [frame, opacity] of panelAt(range(0, 90), SET_FPS)) { + expect([frame, opacity]).toEqual([frame, preview.get(frame)]); + } + }); + + it("lands every frame where preview does when workers start partway through", () => { + for (const start of [5, 15, 29, 31, 45]) { + for (const [frame, opacity] of panelAt(range(start, 90), SET_FPS)) { + expect([start, frame, opacity]).toEqual([start, frame, preview.get(frame)]); + } + } + }); + + it("lands every frame where preview does behind the producer's timeline stand-in", () => { + for (const start of [0, 15, 45]) { + for (const [frame, opacity] of panelAt(range(start, 90), SET_FPS, true)) { + expect([start, frame, opacity]).toEqual([start, frame, preview.get(frame)]); + } + } + }); + + it("shows the set's value after the tween ends, whichever way the frames are shared out", () => { + for (let worker = 0; worker < 6; worker++) { + for (const [frame, opacity] of panelAt(range(worker, 90, 6), SET_FPS)) { + if (frame / SET_FPS >= 1) expect([frame, opacity]).toEqual([frame, 1]); + } + } + }); +}); diff --git a/packages/core/src/runtime/adapters/gsap.ts b/packages/core/src/runtime/adapters/gsap.ts index 41d1c39753..2b6682be15 100644 --- a/packages/core/src/runtime/adapters/gsap.ts +++ b/packages/core/src/runtime/adapters/gsap.ts @@ -260,6 +260,18 @@ function framesSkippedSinceLastSeek( return [...replay].sort((x, y) => y - x).map((back) => t - back / fps); } +function landOn( + timeline: RuntimeTimelineLike, + t: number, + suppressEvents: boolean, + version: string, +): number { + const from = Number(timeline.totalTime?.()); + timeline.totalTime?.(t, suppressEvents); + settleOverlapsEndedBetween(timeline, from, t, version); + return from; +} + export function seekGsapTimeline( timeline: RuntimeTimelineLike, t: number, @@ -271,14 +283,13 @@ export function seekGsapTimeline( if (typeof timeline.seek === "function") timeline.seek(t, suppressEvents); return false; } + const version = structure?.version ?? ""; if (renderFps) { - for (const time of framesSkippedSinceLastSeek(timeline, t, renderFps, structure?.version)) { - timeline.totalTime(time, suppressEvents); + for (const time of framesSkippedSinceLastSeek(timeline, t, renderFps, version)) { + landOn(timeline, time, suppressEvents, version); } } - const from = Number(timeline.totalTime()); - timeline.totalTime(t, suppressEvents); - if (!renderFps) settleOverlapsEndedBetween(timeline, from, t, structure?.version ?? ""); + const from = landOn(timeline, t, suppressEvents, version); if (t < from && structure) reapplyStepsInAuthoredOrder(timeline, structure, t); if (from !== t || !gsapNeverRendered(timeline)) return false; rerenderGsapTimelineAt(