Skip to content

Commit d0559e3

Browse files
committed
fix(core): a render lands where preview does when a set interrupts a tween
1 parent 72326a3 commit d0559e3

2 files changed

Lines changed: 77 additions & 5 deletions

File tree

‎packages/core/src/runtime/adapters/gsap.order.test.ts‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,3 +109,63 @@ describe("a render that captures frames out of order", () => {
109109
expect(rendersOfTwoSeeks(FPS)).toEqual(rendersOfTwoSeeks());
110110
});
111111
});
112+
113+
// A panel fading out while a set brings it back: the set is what preview and a seek show once the fade has ended.
114+
function fadeInterruptedBySet(standIn: boolean) {
115+
const panel = { opacity: 1 };
116+
const timeline = gsap.timeline({ paused: true });
117+
timeline.fromTo(panel, { opacity: 1 }, { opacity: 0, duration: 1, ease: "none" }, 0);
118+
timeline.set(panel, { opacity: 1 }, 0.3);
119+
return {
120+
panel,
121+
timeline: standIn ? producerStandIn(timeline) : (timeline as unknown as RuntimeTimelineLike),
122+
};
123+
}
124+
125+
const SET_FPS = 30;
126+
127+
/** The panel at each frame, rendered when `fps` is given, previewed when it is not. */
128+
function panelAt(frames: number[], fps?: number, standIn = false): Map<number, number> {
129+
const { panel, timeline } = fadeInterruptedBySet(standIn);
130+
const structure = { owner: timeline, version: "1" };
131+
const opacity = new Map<number, number>();
132+
for (const frame of frames) {
133+
seekGsapTimeline(timeline, frame / SET_FPS, true, structure, fps);
134+
opacity.set(frame, panel.opacity);
135+
}
136+
return opacity;
137+
}
138+
139+
describe("a render where a set interrupts a running tween", () => {
140+
const preview = panelAt(range(0, 90));
141+
142+
it("lands every frame where preview does when one worker renders in order", () => {
143+
for (const [frame, opacity] of panelAt(range(0, 90), SET_FPS)) {
144+
expect([frame, opacity]).toEqual([frame, preview.get(frame)]);
145+
}
146+
});
147+
148+
it("lands every frame where preview does when workers start partway through", () => {
149+
for (const start of [5, 15, 29, 31, 45]) {
150+
for (const [frame, opacity] of panelAt(range(start, 90), SET_FPS)) {
151+
expect([start, frame, opacity]).toEqual([start, frame, preview.get(frame)]);
152+
}
153+
}
154+
});
155+
156+
it("lands every frame where preview does behind the producer's timeline stand-in", () => {
157+
for (const start of [0, 15, 45]) {
158+
for (const [frame, opacity] of panelAt(range(start, 90), SET_FPS, true)) {
159+
expect([start, frame, opacity]).toEqual([start, frame, preview.get(frame)]);
160+
}
161+
}
162+
});
163+
164+
it("shows the set's value after the tween ends, whichever way the frames are shared out", () => {
165+
for (let worker = 0; worker < 6; worker++) {
166+
for (const [frame, opacity] of panelAt(range(worker, 90, 6), SET_FPS)) {
167+
if (frame / SET_FPS >= 1) expect([frame, opacity]).toEqual([frame, 1]);
168+
}
169+
}
170+
});
171+
});

‎packages/core/src/runtime/adapters/gsap.ts‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,19 @@ function framesSkippedSinceLastSeek(
260260
return [...replay].sort((x, y) => y - x).map((back) => t - back / fps);
261261
}
262262

263+
/** Moves the playhead and settles any overlap that ended on the way; returns where it was. */
264+
function landOn(
265+
timeline: RuntimeTimelineLike,
266+
t: number,
267+
suppressEvents: boolean,
268+
version: string,
269+
): number {
270+
const from = Number(timeline.totalTime?.());
271+
timeline.totalTime?.(t, suppressEvents);
272+
settleOverlapsEndedBetween(timeline, from, t, version);
273+
return from;
274+
}
275+
263276
export function seekGsapTimeline(
264277
timeline: RuntimeTimelineLike,
265278
t: number,
@@ -271,14 +284,13 @@ export function seekGsapTimeline(
271284
if (typeof timeline.seek === "function") timeline.seek(t, suppressEvents);
272285
return false;
273286
}
287+
const version = structure?.version ?? "";
274288
if (renderFps) {
275-
for (const time of framesSkippedSinceLastSeek(timeline, t, renderFps, structure?.version)) {
276-
timeline.totalTime(time, suppressEvents);
289+
for (const time of framesSkippedSinceLastSeek(timeline, t, renderFps, version)) {
290+
landOn(timeline, time, suppressEvents, version);
277291
}
278292
}
279-
const from = Number(timeline.totalTime());
280-
timeline.totalTime(t, suppressEvents);
281-
if (!renderFps) settleOverlapsEndedBetween(timeline, from, t, structure?.version ?? "");
293+
const from = landOn(timeline, t, suppressEvents, version);
282294
if (t < from && structure) reapplyStepsInAuthoredOrder(timeline, structure, t);
283295
if (from !== t || !gsapNeverRendered(timeline)) return false;
284296
rerenderGsapTimelineAt(

0 commit comments

Comments
 (0)