@hyperframes/studio 0.8.98 → 0.8.100

package/src/hooks/useDomEditTextCommits.test.tsx

@@ -125,13 +125,20 @@ afterEach(() => {
 });
 
 describe("useDomEditTextCommits", () => {
-  function richTextProbe() {
-    const { iframe, element } = previewElement('<h1 id="t">Old</h1>', "t");
+  function richTextProbe(
+    html = '<h1 id="t">Old</h1>',
+    overrides: (doc: Document) => Partial<UseDomEditTextCommitsParams> = () => ({}),
+  ) {
+    const { iframe, element } = previewElement(html, "t");
     const persist = vi.fn().mockResolvedValue(undefined);
+    const showToast = vi.fn();
     const base = commitParams({
       previewIframeRef: { current: iframe },
       domEditSelection: selectionFor(element),
+      buildDomSelectionFromTarget: vi.fn(async (target: HTMLElement) => selectionFor(target)),
       persistDomEditOperations: persist,
+      showToast,
+      ...overrides(element.ownerDocument),
     });
     const captured: { hook: ReturnType<typeof useDomEditTextCommits> | null } = { hook: null };
     function Probe({ readOnlyPreview }: { readOnlyPreview: boolean }) {
@@ -143,13 +150,25 @@ describe("useDomEditTextCommits", () => {
     const save = captured.hook!.handleDomRichTextCommit;
     const commit = { element, html: "New", previousHtml: "Old" };
     element.innerHTML = "New";
-    return { root, Probe, persist, element, save: () => act(async () => save(commit)) };
+    return {
+      root,
+      Probe,
+      persist,
+      showToast,
+      element,
+      save: () => act(async () => save(commit)),
+    };
   }
 
-  it("saves in-place text while the preview is editable", async () => {
-    const { persist, save } = richTextProbe();
+  it("saves in-place text while the preview is editable, and refreshes the selection it edited", async () => {
+    const applyDomSelection = vi.fn();
+    const { persist, element, save } = richTextProbe(undefined, () => ({ applyDomSelection }));
     await save();
     expect(persist).toHaveBeenCalledTimes(1);
+    expect(applyDomSelection).toHaveBeenCalledWith(
+      expect.objectContaining({ element }),
+      expect.objectContaining({ preserveGroup: true }),
+    );
   });
 
   it("refuses in-place text once the preview turns read-only, through an earlier handler, and puts the old text back", async () => {
@@ -160,6 +179,44 @@ describe("useDomEditTextCommits", () => {
     expect(element.innerHTML).toBe("Old");
   });
 
+  it("saves the edited element, and leaves the selection alone, when the selection is another element or none", async () => {
+    for (const selected of ["card", null]) {
+      const applyDomSelection = vi.fn();
+      const { persist, element, save } = richTextProbe(
+        '<div id="card"><p id="t">Old</p></div>',
+        (doc) => ({
+          domEditSelection: selected ? selectionFor(doc.getElementById(selected)!) : null,
+          applyDomSelection,
+          buildDomSelectionFromTarget: vi.fn(async (target: HTMLElement) => ({
+            ...selectionFor(target),
+            label: "Resolved from the edited element",
+          })),
+        }),
+      );
+      await save();
+      expect(persist).toHaveBeenCalledTimes(1);
+      expect(persist.mock.calls[0]![0]).toMatchObject({
+        element,
+        label: "Resolved from the edited element",
+      });
+      expect(applyDomSelection).not.toHaveBeenCalled();
+      cleanup?.();
+      cleanup = null;
+    }
+  });
+
+  it("says so and puts the old text back when the edited text cannot be saved", async () => {
+    const error = vi.spyOn(console, "error").mockImplementation(() => {});
+    const { persist, showToast, element, save } = richTextProbe(undefined, () => ({
+      buildDomSelectionFromTarget: vi.fn(async () => null),
+    }));
+    await save();
+    expect(persist).not.toHaveBeenCalled();
+    expect(showToast).toHaveBeenCalledWith(expect.stringContaining("Couldn't save"), "error");
+    expect(error).toHaveBeenCalled();
+    expect(element.innerHTML).toBe("Old");
+  });
+
   it("keeps concurrent text commit ownership isolated by target", async () => {
     const { iframe, element: firstElement } = previewElement(
       "<div id='first'>First</div><div id='second'>Second</div>",

package/src/hooks/useDomEditTextCommits.ts

@@ -29,6 +29,7 @@ import {
 import { commitDomStyles } from "./domStyleCommit";
 import { useDomEditAttributeCommits } from "./useDomEditAttributeCommits";
 import type { InlineTextEditCommit } from "./useInlineTextEdit";
+import type { ResolveDomSelectionOptions } from "./useDomSelectionTypes";
 
 // ── Types ──
 
@@ -44,7 +45,7 @@ export interface UseDomEditTextCommitsParams {
   refreshDomEditSelectionFromPreview: (selection: DomEditSelection) => void;
   buildDomSelectionFromTarget: (
     target: HTMLElement,
-    options?: { preferClipAncestor?: boolean },
+    options?: ResolveDomSelectionOptions,
   ) => Promise<DomEditSelection | null>;
   persistDomEditOperations: PersistDomEditOperations;
   resolveImportedFontAsset: (fontFamilyValue: string) => ImportedFontAsset | null;
@@ -56,15 +57,6 @@ function canCommitInlineTextSelection(selection: DomEditSelection, element: HTML
   return canEditElementTextInline(element);
 }
 
-function ownsCurrentPreviewElement(
-  selection: DomEditSelection,
-  element: HTMLElement,
-  document: Document | null | undefined,
-): document is Document {
-  if (!document || !element.isConnected) return false;
-  return element === selection.element && element.ownerDocument === document;
-}
-
 async function resyncDomTextSelectionFromPreview(
   doc: Document | null | undefined,
   selection: DomEditSelection,
@@ -96,6 +88,8 @@ export function useDomEditTextCommits({
 }: UseDomEditTextCommitsParams) {
   const latestReadOnlyPreviewRef = useRef(readOnlyPreview);
   latestReadOnlyPreviewRef.current = readOnlyPreview;
+  const latestSelectionRef = useRef(domEditSelection);
+  latestSelectionRef.current = domEditSelection;
   const domTextCommitVersionRef = useRef(new Map<string, symbol>());
   const domStyleCommitVersionRef = useRef(new Map<string, symbol>());
 
@@ -238,29 +232,36 @@ export function useDomEditTextCommits({
    */
   const handleDomRichTextCommit = useCallback(
     async ({ element, html, previousHtml }: InlineTextEditCommit) => {
-      if (!domEditSelection) return;
-      if (latestReadOnlyPreviewRef.current) {
+      const putBack = () => {
         if (element.isConnected && element.innerHTML === html) element.innerHTML = previousHtml;
-        return;
+      };
+      if (latestReadOnlyPreviewRef.current) return putBack();
+      const refuse = (reason: string) => {
+        console.error("[Studio] text edit not saved:", reason, element);
+        showToast(`Couldn't save the text edit: ${reason}`, "error");
+        putBack();
+      };
+      // The edited node, not the current selection: a press can open an edit on a child of what
+      // is selected, and a host can clear the selection before the edit closes.
+      const doc = previewIframeRef.current?.contentDocument;
+      if (!doc || !element.isConnected || element.ownerDocument !== doc) {
+        return refuse("the text's element is gone from the preview");
+      }
+      const selection = await buildDomSelectionFromTarget(element, {
+        exactTarget: true,
+        skipSourceProbe: true,
+      });
+      if (selection?.element !== element) {
+        return refuse("this text was not found in the composition's source");
+      }
+      // The same gate that let the edit open, not the design panel's field rule: an element
+      // whose text holds a line break has no fields, and editing in place rewrites its markup.
+      if (!canCommitInlineTextSelection(selection, element)) {
+        return refuse("this text can't be edited in place");
       }
-      // The same gate that let the edit open, not the design panel's.
-      //
-      // The panel's rule is about its text fields, and it has none for an
-      // element whose text contains a line break: a `<span>` holding `<br>`s
-      // is not a leaf, so nothing inside is a field and the element reports no
-      // editable text at all. Editing in place does not use fields — it
-      // rewrites the element's own markup — so refusing on that rule refused
-      // elements the caret had just been opened in, and every colour the user
-      // chose was dropped on the way out with nothing said about it.
-      if (!canCommitInlineTextSelection(domEditSelection, element)) return;
-      const iframe = previewIframeRef.current;
-      const doc = iframe?.contentDocument;
-      // A preview reload replaces the document. Never resolve this commit onto
-      // the replacement node: it did not own the edit or its rollback snapshot.
-      if (!ownsCurrentPreviewElement(domEditSelection, element, doc)) return;
       const isLatestTextCommit = bumpDomEditCommitMapVersion(
         domTextCommitVersionRef.current,
-        getDomEditTargetKey(domEditSelection),
+        getDomEditTargetKey(selection),
       );
       const operations = [buildDomEditRichTextPatchOperation(html)];
       let appliedHtml = "";
@@ -274,7 +275,7 @@ export function useDomEditTextCommits({
           appliedHtml = element.innerHTML;
         },
         persist: async () => {
-          await persistDomEditOperations(domEditSelection, operations, {
+          await persistDomEditOperations(selection, operations, {
             label: "Edit text",
             skipRefresh: true,
             shouldSave: isLatestTextCommit,
@@ -288,13 +289,13 @@ export function useDomEditTextCommits({
             element.innerHTML = previousHtml;
           }
         },
-        onError: (error) =>
-          reportDomEditPersistFailure(domEditSelection, operations, error, showToast),
-        shouldResync: isLatestTextCommit,
+        onError: (error) => reportDomEditPersistFailure(selection, operations, error, showToast),
+        // Re-select only what is still selected: the selection may have moved on, or a host cleared it.
+        shouldResync: () => isLatestTextCommit() && latestSelectionRef.current?.element === element,
         resync: () =>
           resyncDomTextSelectionFromPreview(
             doc,
-            domEditSelection,
+            selection,
             activeCompPath,
             buildDomSelectionFromTarget,
             applyDomSelection,
@@ -306,7 +307,6 @@ export function useDomEditTextCommits({
       activeCompPath,
       applyDomSelection,
       buildDomSelectionFromTarget,
-      domEditSelection,
       persistDomEditOperations,
       previewIframeRef,
       showToast,

package/src/hooks/useDomGeometryCommit.test.tsx

@@ -16,6 +16,11 @@ vi.mock("../utils/studioTelemetry", () => ({ trackStudioEvent: vi.fn() }));
 
 const SOURCE = '<div id="card">Card</div><div id="other">Other</div>';
 
+/** GSAP already renders this element's transform, so a move takes the GSAP writer. */
+function gsapPositioned(element: HTMLElement): HTMLElement {
+  return Object.assign(element, { _gsap: { renderTransform: () => {} } });
+}
+
 /** A warm parse where only another element animates, and a GSAP writer answering `status`. */
 function stubServer(status = 200, parseStatus = 200) {
   const mutations: unknown[] = [];
@@ -116,7 +121,8 @@ describe("useDomGeometryCommit, from the package entry", () => {
       onRotationCommit: hook().commitRotation,
     };
 
-    const outcome = await overlayCommits.onPathOffsetCommit(makeSelection("card", element), {
+    const card = makeSelection("card", gsapPositioned(element));
+    const outcome = await overlayCommits.onPathOffsetCommit(card, {
       x: 40,
       y: 20,
     });
@@ -132,6 +138,56 @@ describe("useDomGeometryCommit, from the package entry", () => {
     unmount();
   });
 
+  function stubPatchServer(patchStatus = 200) {
+    const calls = { urls: [] as string[], patches: [] as unknown[] };
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(async (input: RequestInfo | URL, init?: RequestInit) => {
+        const url = String(input instanceof Request ? input.url : input);
+        calls.urls.push(url);
+        if (url.includes("/patch-element/")) calls.patches.push(JSON.parse(String(init?.body)));
+        const saved = { ok: true, changed: true, matched: true, content: "AFTER", version: "v2" };
+        const body = url.includes("/files/") ? { content: SOURCE } : saved;
+        const status = url.includes("/patch-element/") ? patchStatus : 200;
+        return new Response(JSON.stringify(body), {
+          status,
+          headers: { "content-type": "application/json" },
+        });
+      }),
+    );
+    return calls;
+  }
+
+  it("saves a GSAP-free move as its inline translate, with no GSAP script and no animation read", async () => {
+    const calls = stubPatchServer();
+    const { element, recordEdit, hook, unmount } = renderHost();
+
+    const card = makeSelection("card", element);
+    await expect(hook().commitPathOffset(card, { x: 130.5, y: 90 })).resolves.toEqual({ ok: true });
+
+    expect(element.style.getPropertyValue("translate")).toBe("130.5px 90px");
+    expect(calls.patches).toEqual([
+      expect.objectContaining({
+        operations: [{ type: "inline-style", property: "translate", value: "130.5px 90px" }],
+      }),
+    ]);
+    expect(calls.urls.filter((url) => url.includes("gsap"))).toEqual([]);
+    expect(recordEdit).toHaveBeenCalledTimes(1);
+    unmount();
+  });
+
+  it("puts a GSAP-free element's translate back when its move cannot be saved", async () => {
+    stubPatchServer(500);
+    const { element, hook, unmount } = renderHost();
+    element.style.setProperty("translate", "40px 30px");
+
+    await expect(
+      hook().commitPathOffset(makeSelection("card", element), { x: 1, y: 2 }),
+    ).rejects.toThrow();
+    expect(element.style.getPropertyValue("translate")).toBe("40px 30px");
+    unmount();
+  });
+
   it("keeps the same commits across renders, so the overlay's handlers stay put", () => {
     stubServer();
     const { hook, rerender, unmount } = renderHost();
@@ -148,7 +204,7 @@ describe("useDomGeometryCommit, from the package entry", () => {
     const { element, recordEdit, hook, unmount } = renderHost({ showToast });
 
     await expect(
-      hook().commitPathOffset(makeSelection("card", element), { x: 40, y: 20 }),
+      hook().commitPathOffset(makeSelection("card", gsapPositioned(element)), { x: 40, y: 20 }),
     ).rejects.toThrow();
     expect(recordEdit).not.toHaveBeenCalled();
     expect(showToast).toHaveBeenCalledWith(expect.any(String), "error");
@@ -204,7 +260,8 @@ describe("useDomGeometryCommit, from the package entry", () => {
     const mutations = stubServer();
     const { element, recordEdit, hook, unmount } = renderHost();
 
-    const move = hook().commitPathOffset(makeSelection("card", element), { x: 40, y: 20 });
+    const card = makeSelection("card", gsapPositioned(element));
+    const move = hook().commitPathOffset(card, { x: 40, y: 20 });
     await hook().waitForPendingSaves();
 
     expect(mutations).toHaveLength(1);
@@ -280,7 +337,8 @@ describe("useDomGeometryCommit, one word of a staggered phrase", () => {
       offsetLeft: { get: () => 100 + (Number.parseFloat(word.style.left) || 0) },
       offsetTop: { get: () => 200 + (Number.parseFloat(word.style.top) || 0) },
     });
-    return { ...makeSelection("How", word), id: undefined, selector: ".w", hfId: "hf-w0" };
+    const selection = makeSelection("How", gsapPositioned(word));
+    return { ...selection, id: undefined, selector: ".w", hfId: "hf-w0" };
   }
 
   it("saves left/top on the dragged word only and never rewrites the shared tween", async () => {

package/src/hooks/useDomGeometryCommit.ts

@@ -136,6 +136,7 @@ export function useDomGeometryCommit({
     trackGsapInteractionFailure,
     stageElementPositionOffset,
     handleDomBoxSizeCommit: noDomBoxSizeRoute,
+    commitPositionPatchToHtml: commitWithFreshQueue,
     addGsapAnimation: gsap.addGsapAnimation,
     convertToKeyframes: gsap.convertToKeyframes,
     setArcPath: gsap.setArcPath,

package/src/hooks/useDomGeometryCommits.test.tsx

@@ -13,6 +13,8 @@ import {
   readStudioRotation,
 } from "../components/editor/manualEdits";
 import { useDomGeometryCommits, type UseDomGeometryCommitsParams } from "./useDomGeometryCommits";
+import { DomEditCropHandles } from "../components/editor/DomEditCropHandles";
+import { withInlineLayoutBox } from "./domSelectionTestHarness";
 
 (globalThis as unknown as { IS_REACT_ACT_ENVIRONMENT: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
 
@@ -145,8 +147,10 @@ describe("useDomGeometryCommits read-only preview", () => {
 });
 
 describe("useDomGeometryCommits element position offset", () => {
-  it("persists left/top on the element and no translate offset", async () => {
-    const element = document.createElement("span");
+  it("persists left/top on a word a shared tween positions, and no translate offset", async () => {
+    const element = Object.assign(document.createElement("span"), {
+      _gsap: { renderTransform: () => {} },
+    });
     Object.defineProperties(element, {
       offsetLeft: { get: () => 100 + (Number.parseFloat(element.style.left) || 0) },
       offsetTop: { get: () => 200 + (Number.parseFloat(element.style.top) || 0) },
@@ -170,3 +174,113 @@ describe("useDomGeometryCommits element position offset", () => {
     unmount();
   });
 });
+
+describe("useDomGeometryCommits resize of a cropped element", () => {
+  it("saves the crop scaled per axis with the box in the resize's own commit", async () => {
+    const element = withInlineLayoutBox(document.createElement("div"));
+    element.id = "cropped";
+    element.style.cssText = "width: 300px; height: 200px; clip-path: inset(8px 60px 16px 30px)";
+    document.body.append(element);
+    const selection = {
+      id: "cropped",
+      selector: "#cropped",
+      element,
+    } as unknown as DomEditSelection;
+    const commitPositionPatchToHtml = vi
+      .fn<UseDomGeometryCommitsParams["commitPositionPatchToHtml"]>()
+      .mockResolvedValue(undefined);
+    const { commits, unmount } = mountCommits(commitPositionPatchToHtml);
+    const rect = { left: 0, top: 0, width: 300, height: 200, editScaleX: 1, editScaleY: 1 };
+    const host = document.createElement("div");
+    const crop = createRoot(host);
+    act(() =>
+      crop.render(
+        <DomEditCropHandles selection={selection} overlayRect={rect} onStyleCommit={vi.fn()} />,
+      ),
+    );
+
+    await commits().handleDomBoxSizeCommit(selection, { width: 450, height: 250 });
+
+    const scaled = "inset(10px 90px 20px 45px)";
+    expect(commitPositionPatchToHtml).toHaveBeenCalledTimes(1);
+    expect(commitPositionPatchToHtml.mock.calls[0]![1]).toContainEqual({
+      type: "inline-style",
+      property: "clip-path",
+      value: scaled,
+    });
+    act(() => crop.unmount());
+    expect(element.style.getPropertyValue("clip-path")).toBe(scaled);
+    unmount();
+  });
+
+  function mountCroppedSelection(id: string, authored: string) {
+    const element = withInlineLayoutBox(document.createElement("div"));
+    element.id = id;
+    element.style.cssText = authored;
+    document.body.append(element);
+    const selection = { id, selector: `#${id}`, element } as unknown as DomEditSelection;
+    const commitPositionPatchToHtml = vi
+      .fn<UseDomGeometryCommitsParams["commitPositionPatchToHtml"]>()
+      .mockResolvedValue(undefined);
+    const mounted = mountCommits(commitPositionPatchToHtml);
+    const onStyleCommit = vi.fn((property: string, value: string) => {
+      element.style.setProperty(property, value);
+    });
+    const rect = { left: 0, top: 0, width: 300, height: 200, editScaleX: 1, editScaleY: 1 };
+    const crop = createRoot(document.body.appendChild(document.createElement("div")));
+    const draw = () =>
+      act(() =>
+        crop.render(
+          <DomEditCropHandles
+            selection={selection}
+            overlayRect={rect}
+            onStyleCommit={onStyleCommit}
+          />,
+        ),
+      );
+    draw();
+    const dragRightEdge = (by: number) => {
+      const handle = document.querySelector<HTMLButtonElement>('[aria-label="Crop right"]')!;
+      const press = (type: string, clientX: number) =>
+        act(() =>
+          handle.dispatchEvent(new PointerEvent(type, { bubbles: true, pointerId: 3, clientX })),
+        );
+      press("pointerdown", 100);
+      press("pointermove", 100 - by);
+      press("pointerup", 100 - by);
+    };
+    const resize = () =>
+      mounted.commits().handleDomBoxSizeCommit(selection, { width: 450, height: 300 });
+    const done = () => {
+      act(() => crop.unmount());
+      mounted.unmount();
+    };
+    return { element, onStyleCommit, draw, dragRightEdge, resize, done };
+  }
+
+  it("after an undo while still selected, the next crop drag starts from the undone crop", async () => {
+    const authored = "width: 300px; height: 200px; clip-path: inset(0px 60px 0px 0px)";
+    const h = mountCroppedSelection("undone", authored);
+    await h.resize();
+    // Undo writes the file's style attribute back onto the same live element.
+    h.element.setAttribute("style", authored);
+    h.draw();
+    h.dragRightEdge(20);
+
+    expect(h.onStyleCommit).toHaveBeenCalledWith("clip-path", "inset(0px 80px 0px 0px)");
+    h.done();
+    expect(h.element.style.getPropertyValue("clip-path")).toBe("inset(0px 80px 0px 0px)");
+  });
+
+  it("a crop drag right after a resize, with no render between, starts from the scaled crop", async () => {
+    const h = mountCroppedSelection(
+      "resized",
+      "width: 300px; height: 200px; clip-path: inset(0px 60px 0px 0px)",
+    );
+    await h.resize();
+    h.dragRightEdge(20);
+
+    expect(h.onStyleCommit).toHaveBeenCalledWith("clip-path", "inset(0px 110px 0px 0px)");
+    h.done();
+  });
+});

package/src/hooks/useDomGeometryCommits.ts

@@ -15,6 +15,7 @@ import {
   clearStudioRotation,
 } from "../components/editor/manualEdits";
 import { stageElementOffset } from "./elementOffsetStager";
+import { prepareCropResize } from "../components/editor/cropResize";
 import {
   buildPathOffsetPatches,
   buildBoxSizePatches,
@@ -103,7 +104,9 @@ export function useDomGeometryCommits({
       if (gsapFallback) return gsapFallback;
       const beforeSize = captureStudioBoxSize(selection.element);
       const beforeOffset = offset ? captureStudioPathOffset(selection.element) : null;
+      const stageCrop = prepareCropResize(selection.element);
       applyStudioBoxSize(selection.element, next);
+      const crop = stageCrop();
       // Anchored-corner resize (NW/NE/SW) also moves the element to keep the
       // opposite corner fixed. Apply the offset and emit BOTH patch sets in a
       // SINGLE commit: one persist = one undo entry, and there is no
@@ -111,6 +114,7 @@ export function useDomGeometryCommits({
       // offset is not (that frame was the release "jump"). Both builders read
       // the already-mutated live element, so concatenation is safe.
       const patches = buildBoxSizePatches(selection.element);
+      if (crop) patches.push(crop.patch);
       if (offset) {
         applyStudioPathOffset(selection.element, offset);
         patches.push(...buildPathOffsetPatches(selection.element));
@@ -121,6 +125,7 @@ export function useDomGeometryCommits({
       }).catch((error) => {
         restoreStudioBoxSize(selection.element, beforeSize);
         if (beforeOffset) restoreStudioPathOffset(selection.element, beforeOffset);
+        crop?.revert();
         throw error;
       });
     },

package/src/hooks/useElementLifecycleOps.multiDelete.test.tsx

@@ -92,7 +92,9 @@ describe("useElementLifecycleOps — deleting a canvas multi-selection", () => {
   it("reports a successful SDK delete as landed", async () => {
     const ops = mountDeleteOps({
       projectIdRef: { current: "p1" },
-      onTrySdkDelete: vi.fn(async () => ({ status: "committed", version: "v1" }) as const),
+      onTrySdkDelete: vi.fn(
+        async () => ({ status: "committed", version: "v1", before: "", after: "" }) as const,
+      ),
     });
 
     const target = { ...selectionFor("a"), hfId: "hf-a" };