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: 13 additions & 13 deletions packages/studio/src/components/editor/manualEditsDom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -555,26 +555,26 @@ function queryStudioElements(doc: Document, attr: string): HTMLElement[] {

function reapplyPathOffsets(doc: Document): void {
for (const el of queryStudioElements(doc, STUDIO_PATH_OFFSET_ATTR)) {
const gsapSkip = gsapAnimatesProperty(el, "x", "y");
// Unlike size below, the offset channels COMPOSE — applying both doubles the move.
if (gsapAnimatesProperty(el, "x", "y")) continue;
const x = el.style.getPropertyValue(STUDIO_OFFSET_X_PROP);
const y = el.style.getPropertyValue(STUDIO_OFFSET_Y_PROP);
if (gsapSkip) continue;
if (x || y) {
applyStudioPathOffset(
el,
{
x: Number.parseFloat(x) || 0,
y: Number.parseFloat(y) || 0,
},
{ updateBase: false },
);
}
if (!x && !y) continue;
const offset = { x: Number.parseFloat(x) || 0, y: Number.parseFloat(y) || 0 };
applyStudioPathOffset(el, offset, { updateBase: false });
}
}

/**
* Put the studio's committed size back after a seek, GSAP-sized elements included.
* Size does not compose the way the offset above does: both channels write width
* and height, so the later write wins on the same number. Standing aside meant
* nothing held the size while a soft reload reverted the old timeline (GSAP hands
* back each tween's recorded starting width), so the element sat at its stylesheet
* size until the new one rendered — the jump after a resize.
*/
function reapplyBoxSizes(doc: Document): void {
for (const el of queryStudioElements(doc, STUDIO_BOX_SIZE_ATTR)) {
if (gsapAnimatesProperty(el, "width", "height")) continue;
const w = Number.parseFloat(el.style.getPropertyValue(STUDIO_WIDTH_PROP));
const h = Number.parseFloat(el.style.getPropertyValue(STUDIO_HEIGHT_PROP));
if (Number.isFinite(w) && Number.isFinite(h) && w > 0 && h > 0) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// @vitest-environment jsdom
import { afterEach, describe, expect, it } from "vitest";
import { reapplyPositionEditsAfterSeek } from "./manualEditsDom";
import { STUDIO_BOX_SIZE_ATTR, STUDIO_HEIGHT_PROP, STUDIO_WIDTH_PROP } from "./manualEditsTypes";

/**
* A resize commit hands the size to a GSAP tween, and a soft reload reverts the
* old timeline before the new one renders — GSAP restores each tween's recorded
* starting width on the way out. Nothing else held the size across that window,
* so the element sat at its stylesheet size for a few hundred milliseconds: the
* jump after a resize. Worse, the next gesture then started from a box that
* disagreed with the studio's own vars and snapped on its first move.
*
* The seek reapply is what closes the window, and it used to stand aside for
* exactly the elements that need it — the ones GSAP sizes.
*/
describe("box size survives a seek while GSAP owns the size", () => {
afterEach(() => {
document.body.innerHTML = "";
Reflect.deleteProperty(window, "__timelines");
});

function cardSizedByGsap(): HTMLElement {
const el = document.createElement("div");
el.id = "card";
el.setAttribute(STUDIO_BOX_SIZE_ATTR, "true");
el.style.setProperty(STUDIO_WIDTH_PROP, "305px");
el.style.setProperty(STUDIO_HEIGHT_PROP, "202px");
document.body.append(el);
// A timeline that animates this element's width/height, as the committed
// resize leaves behind.
Object.assign(window, {
__timelines: {
main: {
getChildren: () => [{ targets: () => [el], vars: { width: 305, height: 202 } }],
},
},
});
return el;
}

it("re-applies the committed size after the timeline gave it back", () => {
const el = cardSizedByGsap();
// The revert: GSAP puts the tween's recorded starting size back.
el.style.width = "395px";
el.style.height = "261px";

reapplyPositionEditsAfterSeek(document);

expect(el.style.width).toBe("305px");
expect(el.style.height).toBe("202px");
});

it("leaves an element alone once its studio size is cleared", () => {
const el = cardSizedByGsap();
el.style.removeProperty(STUDIO_WIDTH_PROP);
el.style.removeProperty(STUDIO_HEIGHT_PROP);
el.style.width = "395px";

reapplyPositionEditsAfterSeek(document);

expect(el.style.width).toBe("395px");
});
});
Loading