@hyperframes/studio 0.8.177 → 0.8.179

package/dist/{chunk-BLXESG6S.js → chunk-563JPIL4.js}

@@ -1010,6 +1010,7 @@ function markScenesStale(iframe, files) {
   }
   meta.content = JSON.stringify(parts);
 }
+var supersededByNewerEdit = () => new DOMException("superseded by a newer edit", "AbortError");
 function sceneSwapFor(iframe) {
   const win = iframe.contentWindow;
   const swap = win?.__hfSwapScenes;
@@ -1535,6 +1536,7 @@ export {
   announcePreviewPromoted,
   onPreviewPromoted,
   markScenesStale,
+  supersededByNewerEdit,
   sceneSwapFor,
   Player
 };

package/dist/index.d.ts

@@ -3463,7 +3463,7 @@ declare function useDomEditSession({ projectId, activeCompPath, compIdToSrc, cap
     handlePreviewCanvasPointerLeave: () => void;
     applyDomSelection: (selection: DomEditSelection | null, options?: ApplyDomSelectionOptions) => void;
     clearDomSelection: () => void;
-    refreshDomEditSelectionFromPreview: (selection: DomEditSelection) => Promise<void>;
+    refreshDomEditSelectionFromPreview: (selection: DomEditSelection, iframe?: HTMLIFrameElement | null) => Promise<void>;
     handleDomStyleCommit: (property: string, value: string) => Promise<DomEditCommitOutcome>;
     handleDomStyleCommitForSelection: (selection: DomEditSelection, propertyOrStylesAsOnePatch: string | Record<string, string>, value?: string) => Promise<DomEditCommitOutcome>;
     handleDomAttributeCommit: (attr: string, value: string) => Promise<void>;

package/dist/index.html

@@ -14,7 +14,7 @@
         document.documentElement.dataset.theme = "paper";
       }
     </script>
-    <script type="module" crossorigin src="/assets/index-B1Gypobp.js"></script>
+    <script type="module" crossorigin src="/assets/index-ueMRyAJ2.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-CESvLzz0.css">
   </head>
   <body>

package/dist/index.js

@@ -39,6 +39,7 @@ import {
   sceneSwapFor,
   secondsToFrame,
   stepFrameTime,
+  supersededByNewerEdit,
   thumbnailRevisionOf,
   timelineSliderToZoomPercent,
   timelineZoomPercentToSlider,
@@ -47,7 +48,7 @@ import {
   usePreviewVariablesStore,
   whenPreviewBooted,
   writeStudioUiPreferences
-} from "./chunk-BLXESG6S.js";
+} from "./chunk-563JPIL4.js";
 import {
   Button,
   ContextMenu,
@@ -32628,7 +32629,7 @@ function useTimelinePlayer({
   const refreshPlayer = useCallback41(() => {
     const iframe = iframeRef.current;
     if (!iframe) return;
-    swapCancelRef.current?.abort(new Error("superseded by a newer edit"));
+    swapCancelRef.current?.abort(supersededByNewerEdit());
     const cancel = new AbortController();
     swapCancelRef.current = cancel;
     logReload("refreshPlayer", () => ({ stack: new Error("refreshPlayer").stack }));
@@ -75094,8 +75095,31 @@ import { useState as useState117, useCallback as useCallback104, useRef as useRe
 
 // src/hooks/useFileTree.ts
 import { useState as useState116, useCallback as useCallback101, useEffect as useEffect112, useMemo as useMemo71, useRef as useRef128 } from "react";
+
+// src/utils/rejectionTelemetry.ts
+function errorProps(value) {
+  if (value instanceof Error) {
+    return {
+      error_message: value.message,
+      error_name: value.name,
+      stack_trace: value.stack?.slice(0, 4e3) ?? null
+    };
+  }
+  return { error_message: String(value), error_name: null, stack_trace: null };
+}
+
+// src/hooks/useFileTree.ts
 import { encodeUrlPath as encodeUrlPath4 } from "@hyperframes/parsers";
 var EMPTY_FILE_LIST = [];
+async function readTreeListing(projectId, signal) {
+  const res = await studioApiFetch(buildProjectApiPath(projectId), { signal });
+  if (!res.ok) throw new Error(`tree fetch failed: ${res.status}`);
+  return res.json();
+}
+function reportRefreshFailure(err) {
+  const { error_name, error_message } = errorProps(err);
+  trackStudioEvent("file_tree_refresh_failed", { error_name, error_message });
+}
 function useFileTree({ projectId, projectIdRef }) {
   const [fetched, setFetched] = useState116(null);
   const current = fetched?.projectId === projectId ? fetched : null;
@@ -75131,6 +75155,7 @@ function useFileTree({ projectId, projectIdRef }) {
   }, [projectId]);
   const refreshRequestRef = useRef128(0);
   const refreshAbortRef = useRef128(null);
+  const failureReportedRef = useRef128(false);
   const refreshFileTree = useCallback101(async () => {
     const pid = projectIdRef.current;
     if (!pid) return;
@@ -75140,12 +75165,14 @@ function useFileTree({ projectId, projectIdRef }) {
     refreshAbortRef.current = controller;
     let data;
     try {
-      const res = await studioApiFetch(buildProjectApiPath(pid), { signal: controller.signal });
-      data = await res.json();
+      data = await readTreeListing(pid, controller.signal);
     } catch (err) {
       if (err instanceof DOMException && err.name === "AbortError") return;
-      throw err;
+      if (!failureReportedRef.current) reportRefreshFailure(err);
+      failureReportedRef.current = true;
+      return;
     }
+    failureReportedRef.current = false;
     if (data.files && requestId === refreshRequestRef.current) {
       setFetched(
         (prev) => prev?.projectId === pid ? {
@@ -79921,8 +79948,9 @@ function useDomSelection({
   });
   const refreshDomEditSelectionFromPreview = useCallback125(
     // fallow-ignore-next-line complexity
-    async (selection) => {
-      const iframe = previewIframeRef.current;
+    async (selection, iframe = previewIframeRef.current) => {
+      const stillSelected = () => domEditSelectionsTargetSame(domEditSelectionRef.current, selection);
+      if (!stillSelected()) return;
       let doc = null;
       try {
         doc = iframe?.contentDocument ?? null;
@@ -79945,7 +79973,7 @@ function useDomSelection({
         return;
       }
       const nextSelection = await buildDomSelectionFromTarget(element, { previous: selection });
-      if (nextSelection) {
+      if (nextSelection && stillSelected()) {
         applyDomSelection(nextSelection, {
           revealPanel: false,
           preserveGroup: true
@@ -80073,7 +80101,6 @@ function useDomSelection({
     buildDomSelectionForTimelineElement,
     handleTimelineElementSelect,
     refreshDomEditSelectionFromPreview,
-    refreshDomEditGroupSelectionsFromPreview,
     applyMarqueeSelection
   };
 }
@@ -83631,14 +83658,10 @@ import { useCallback as useCallback142, useEffect as useEffect119, useRef as use
 import { useEffect as useEffect118, useRef as useRef149 } from "react";
 function useDomEditPreviewSync({
   previewIframe,
-  activeCompPath,
   captionEditMode,
   domEditSelectionRef,
-  domEditGroupSelectionsRef,
   domEditSelection,
-  applyDomSelection,
-  refreshDomEditGroupSelectionsFromPreview,
-  buildDomSelectionFromTarget,
+  refreshDomEditSelectionFromPreview,
   refreshPreviewDocumentVersion,
   syncPreviewHotkeys,
   applyStudioManualEditsToPreviewRef,
@@ -83659,26 +83682,7 @@ function useDomEditPreviewSync({
       }
       if (!doc) return;
       reapplyPositionEditsAfterSeek(doc);
-      const nextElement = findElementForSelection(doc, currentSelection, activeCompPath);
-      if (!nextElement) {
-        const group = domEditGroupSelectionsRef.current;
-        logSelect("preview-sync-lost", {
-          target: currentSelection.selector ?? currentSelection.id ?? null,
-          group: group.length
-        });
-        if (group.length > 1) {
-          await refreshDomEditGroupSelectionsFromPreview(group);
-          return;
-        }
-        applyDomSelection(null, { revealPanel: false });
-        return;
-      }
-      const nextSelection = await buildDomSelectionFromTarget(nextElement, {
-        previous: currentSelection
-      });
-      if (nextSelection) {
-        applyDomSelection(nextSelection, { revealPanel: false, preserveGroup: true });
-      }
+      await refreshDomEditSelectionFromPreview(currentSelection, previewIframe);
     };
     syncPreviewHotkeys(previewIframe);
     void applyStudioManualEditsToPreviewRef.current(previewIframe);
@@ -83692,14 +83696,10 @@ function useDomEditPreviewSync({
     };
     return onPreviewContentReplaced(previewIframe, handleLoad);
   }, [
-    activeCompPath,
-    applyDomSelection,
-    buildDomSelectionFromTarget,
     captionEditMode,
-    domEditGroupSelectionsRef,
     domEditSelectionRef,
     previewIframe,
-    refreshDomEditGroupSelectionsFromPreview,
+    refreshDomEditSelectionFromPreview,
     refreshPreviewDocumentVersion,
     syncPreviewHotkeys,
     applyStudioManualEditsToPreviewRef,
@@ -84079,8 +84079,7 @@ function useDomEditWiring(params) {
     activeCompPath,
     domEditSelection,
     domEditSelectionRef,
-    domEditGroupSelectionsRef,
-    refreshDomEditGroupSelectionsFromPreview,
+    refreshDomEditSelectionFromPreview,
     previewIframeRef,
     previewIframe,
     captionEditMode,
@@ -84091,8 +84090,6 @@ function useDomEditWiring(params) {
     refreshPreviewDocumentVersion,
     syncPreviewHotkeys,
     applyStudioManualEditsToPreviewRef,
-    applyDomSelection,
-    buildDomSelectionFromTarget,
     openSourceForSelection,
     updateGsapProperty,
     updateGsapMeta,
@@ -84189,14 +84186,10 @@ function useDomEditWiring(params) {
   });
   useDomEditPreviewSync({
     previewIframe,
-    activeCompPath,
     captionEditMode,
     domEditSelectionRef,
-    domEditGroupSelectionsRef,
     domEditSelection,
-    applyDomSelection,
-    refreshDomEditGroupSelectionsFromPreview,
-    buildDomSelectionFromTarget,
+    refreshDomEditSelectionFromPreview,
     refreshPreviewDocumentVersion,
     syncPreviewHotkeys,
     applyStudioManualEditsToPreviewRef,
@@ -86204,7 +86197,6 @@ function useDomEditSession({
     buildDomSelectionForTimelineElement,
     handleTimelineElementSelect,
     refreshDomEditSelectionFromPreview,
-    refreshDomEditGroupSelectionsFromPreview,
     applyMarqueeSelection
   } = useDomSelection({
     projectId,
@@ -86444,8 +86436,7 @@ function useDomEditSession({
     activeCompPath,
     domEditSelection,
     domEditSelectionRef,
-    domEditGroupSelectionsRef,
-    refreshDomEditGroupSelectionsFromPreview,
+    refreshDomEditSelectionFromPreview,
     previewIframeRef,
     previewIframe,
     captionEditMode: previewCaptionEditMode,
@@ -86456,8 +86447,6 @@ function useDomEditSession({
     refreshPreviewDocumentVersion,
     syncPreviewHotkeys,
     applyStudioManualEditsToPreviewRef,
-    applyDomSelection,
-    buildDomSelectionFromTarget,
     openSourceForSelection,
     ...gsapScriptEdits,
     handleDomManualEditsReset

package/dist/player.js

@@ -1,6 +1,6 @@
 import {
   Player
-} from "./chunk-BLXESG6S.js";
+} from "./chunk-563JPIL4.js";
 import "./chunk-FF5DM7BQ.js";
 import "./chunk-T43DM7Q6.js";
 import "./chunk-MLKGABMK.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperframes/studio",
-  "version": "0.8.177",
+  "version": "0.8.179",
   "description": "",
   "repository": {
     "type": "git",
@@ -59,12 +59,12 @@
     "dockview-react": "8.3.1",
     "gsap": "^3.13.0",
     "mediabunny": "^1.45.3",
-    "@hyperframes/player": "0.8.177",
-    "@hyperframes/core": "0.8.177",
-    "@hyperframes/parsers": "0.8.177",
-    "@hyperframes/sdk": "0.8.177",
-    "@hyperframes/shader-transitions": "0.8.177",
-    "@hyperframes/studio-server": "0.8.177"
+    "@hyperframes/core": "0.8.179",
+    "@hyperframes/studio-server": "0.8.179",
+    "@hyperframes/sdk": "0.8.179",
+    "@hyperframes/player": "0.8.179",
+    "@hyperframes/shader-transitions": "0.8.179",
+    "@hyperframes/parsers": "0.8.179"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.3.3",
@@ -81,7 +81,7 @@
     "vite": "^6.4.2",
     "vitest": "^4.1.11",
     "zustand": "^5.0.0",
-    "@hyperframes/producer": "0.8.177"
+    "@hyperframes/producer": "0.8.179"
   },
   "peerDependencies": {
     "react": "19",

package/src/hooks/previewPromotionSelection.test.tsx

@@ -2,7 +2,7 @@
 import React, { act } from "react";
 import { createRoot } from "react-dom/client";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import type { DomEditSelection } from "../components/editor/domEditing";
+import { findElementForSelection, type DomEditSelection } from "../components/editor/domEditing";
 import { resolveElementForOverlay } from "../components/editor/domEditOverlayGeometry";
 import {
   makePreview,
@@ -44,14 +44,13 @@ function mountHost(followPromotions: boolean) {
     const live = useLivePreviewIframe(host);
     useDomEditPreviewSync({
       previewIframe: followPromotions ? live : host,
-      activeCompPath: null,
       captionEditMode: false,
       domEditSelectionRef: selectionRef,
-      domEditGroupSelectionsRef: { current: [] },
       domEditSelection: selectionRef.current,
-      refreshDomEditGroupSelectionsFromPreview: async () => {},
-      applyDomSelection: (selection) => void (selectionRef.current = selection),
-      buildDomSelectionFromTarget: async (element) => selectionOf(element),
+      refreshDomEditSelectionFromPreview: async (selection, iframe) => {
+        const element = findElementForSelection(iframe.contentDocument!, selection, null);
+        selectionRef.current = element ? selectionOf(element) : null;
+      },
       refreshPreviewDocumentVersion: () => {},
       syncPreviewHotkeys: () => {},
       applyStudioManualEditsToPreviewRef: { current: async () => {} },

package/src/hooks/useDomEditPreviewSync.test.ts

@@ -25,14 +25,10 @@ describe("useDomEditPreviewSync", () => {
     function Harness() {
       useDomEditPreviewSync({
         previewIframe: iframe,
-        activeCompPath: null,
         captionEditMode: false,
         domEditSelectionRef: { current: null },
-        domEditGroupSelectionsRef: { current: [] },
         domEditSelection: null,
-        refreshDomEditGroupSelectionsFromPreview: async () => {},
-        applyDomSelection: () => {},
-        buildDomSelectionFromTarget: async () => null,
+        refreshDomEditSelectionFromPreview: async () => {},
         refreshPreviewDocumentVersion: refreshVersion,
         syncPreviewHotkeys: () => {},
         applyStudioManualEditsToPreviewRef: { current: applyManualEdits },

package/src/hooks/useDomEditPreviewSync.ts

@@ -4,31 +4,22 @@
  * Extracted from useDomEditSession to keep file sizes under the 600-line limit.
  */
 import { useEffect, useRef } from "react";
-import { findElementForSelection, type DomEditSelection } from "../components/editor/domEditing";
+import type { DomEditSelection } from "../components/editor/domEditing";
 import { reapplyPositionEditsAfterSeek } from "../components/editor/manualEdits";
 import { useDockLayoutStore } from "../components/dock/dockLayoutStore";
 import type { PatchTarget } from "../utils/sourcePatcher";
-import { logSelect } from "../utils/selectDebug";
 import { onPreviewContentReplaced } from "../player/sceneSwap";
-import type { ResolveDomSelectionOptions } from "./useDomSelectionTypes";
 
 interface UseDomEditPreviewSyncParams {
   previewIframe: HTMLIFrameElement | null;
-  activeCompPath: string | null;
   captionEditMode: boolean;
   domEditSelectionRef: React.MutableRefObject<DomEditSelection | null>;
-  domEditGroupSelectionsRef: React.MutableRefObject<DomEditSelection[]>;
   domEditSelection: DomEditSelection | null;
-  /** Re-resolves a whole multi-selection against the current preview document. */
-  refreshDomEditGroupSelectionsFromPreview: (selections: DomEditSelection[]) => Promise<void>;
-  applyDomSelection: (
-    selection: DomEditSelection | null,
-    options?: { revealPanel?: boolean; preserveGroup?: boolean },
-  ) => void;
-  buildDomSelectionFromTarget: (
-    element: HTMLElement,
-    options?: Pick<ResolveDomSelectionOptions, "previous">,
-  ) => Promise<DomEditSelection | null>;
+  /** Re-resolves the selection against the given preview, unless it was deselected meanwhile. */
+  refreshDomEditSelectionFromPreview: (
+    selection: DomEditSelection,
+    iframe: HTMLIFrameElement,
+  ) => Promise<void>;
   refreshPreviewDocumentVersion: () => void;
   syncPreviewHotkeys: (iframe: HTMLIFrameElement | null) => void;
   applyStudioManualEditsToPreviewRef: React.MutableRefObject<
@@ -40,14 +31,10 @@ interface UseDomEditPreviewSyncParams {
 
 export function useDomEditPreviewSync({
   previewIframe,
-  activeCompPath,
   captionEditMode,
   domEditSelectionRef,
-  domEditGroupSelectionsRef,
   domEditSelection,
-  applyDomSelection,
-  refreshDomEditGroupSelectionsFromPreview,
-  buildDomSelectionFromTarget,
+  refreshDomEditSelectionFromPreview,
   refreshPreviewDocumentVersion,
   syncPreviewHotkeys,
   applyStudioManualEditsToPreviewRef,
@@ -73,39 +60,7 @@ export function useDomEditPreviewSync({
       if (!doc) return;
 
       reapplyPositionEditsAfterSeek(doc);
-
-      const nextElement = findElementForSelection(doc, currentSelection, activeCompPath);
-      if (!nextElement) {
-        // The selected element no longer resolves in the (re-synced) document
-        // — comp/hot reload, activeCompPath swap, or post-save replacement.
-        // Clear so overlay geometry isn't computed on a stale, detached node.
-        // (Drag-release-in-gray-zone is handled separately by
-        // suppressNextBoxClickRef; the dragged element still resolves here.)
-        //
-        // One lost member is not the whole selection though. A multi-select that
-        // loses its primary here used to be wiped entirely, so moving a group and
-        // having any one of its elements fail to re-resolve deselected all of
-        // them. Re-resolve the group instead and keep whoever survived; it only
-        // clears when nobody did.
-        const group = domEditGroupSelectionsRef.current;
-        logSelect("preview-sync-lost", {
-          target: currentSelection.selector ?? currentSelection.id ?? null,
-          group: group.length,
-        });
-        if (group.length > 1) {
-          await refreshDomEditGroupSelectionsFromPreview(group);
-          return;
-        }
-        applyDomSelection(null, { revealPanel: false });
-        return;
-      }
-
-      const nextSelection = await buildDomSelectionFromTarget(nextElement, {
-        previous: currentSelection,
-      });
-      if (nextSelection) {
-        applyDomSelection(nextSelection, { revealPanel: false, preserveGroup: true });
-      }
+      await refreshDomEditSelectionFromPreview(currentSelection, previewIframe);
     };
 
     syncPreviewHotkeys(previewIframe);
@@ -122,14 +77,10 @@ export function useDomEditPreviewSync({
 
     return onPreviewContentReplaced(previewIframe, handleLoad);
   }, [
-    activeCompPath,
-    applyDomSelection,
-    buildDomSelectionFromTarget,
     captionEditMode,
-    domEditGroupSelectionsRef,
     domEditSelectionRef,
     previewIframe,
-    refreshDomEditGroupSelectionsFromPreview,
+    refreshDomEditSelectionFromPreview,
     refreshPreviewDocumentVersion,
     syncPreviewHotkeys,
     applyStudioManualEditsToPreviewRef,

package/src/hooks/useDomEditSession.ts

@@ -122,7 +122,6 @@ export function useDomEditSession({
     buildDomSelectionForTimelineElement,
     handleTimelineElementSelect,
     refreshDomEditSelectionFromPreview,
-    refreshDomEditGroupSelectionsFromPreview,
     applyMarqueeSelection,
   } = useDomSelection({
     projectId,
@@ -394,8 +393,7 @@ export function useDomEditSession({
     activeCompPath,
     domEditSelection,
     domEditSelectionRef,
-    domEditGroupSelectionsRef,
-    refreshDomEditGroupSelectionsFromPreview,
+    refreshDomEditSelectionFromPreview,
     previewIframeRef,
     previewIframe,
     captionEditMode: previewCaptionEditMode,
@@ -406,8 +404,6 @@ export function useDomEditSession({
     refreshPreviewDocumentVersion,
     syncPreviewHotkeys,
     applyStudioManualEditsToPreviewRef,
-    applyDomSelection,
-    buildDomSelectionFromTarget,
     openSourceForSelection,
     ...gsapScriptEdits,
     handleDomManualEditsReset,

package/src/hooks/useDomEditWiring.ts

@@ -23,8 +23,10 @@ export interface UseDomEditWiringParams {
   activeCompPath: string | null;
   domEditSelection: DomEditSelection | null;
   domEditSelectionRef: React.MutableRefObject<DomEditSelection | null>;
-  domEditGroupSelectionsRef: React.MutableRefObject<DomEditSelection[]>;
-  refreshDomEditGroupSelectionsFromPreview: (selections: DomEditSelection[]) => Promise<void>;
+  refreshDomEditSelectionFromPreview: (
+    selection: DomEditSelection,
+    iframe: HTMLIFrameElement,
+  ) => Promise<void>;
   previewIframeRef: React.RefObject<HTMLIFrameElement | null>;
   previewIframe: HTMLIFrameElement | null;
   captionEditMode: boolean;
@@ -37,11 +39,6 @@ export interface UseDomEditWiringParams {
   applyStudioManualEditsToPreviewRef: React.MutableRefObject<
     (iframe: HTMLIFrameElement) => Promise<void>
   >;
-  applyDomSelection: (
-    selection: DomEditSelection | null,
-    options?: { revealPanel?: boolean; preserveGroup?: boolean },
-  ) => void;
-  buildDomSelectionFromTarget: (element: HTMLElement) => Promise<DomEditSelection | null>;
   openSourceForSelection?: (sourceFile: string, target: PatchTarget) => void;
   // GSAP script commit ops (from useGsapScriptCommits)
   updateGsapProperty: (
@@ -117,8 +114,7 @@ export function useDomEditWiring(params: UseDomEditWiringParams) {
     activeCompPath,
     domEditSelection,
     domEditSelectionRef,
-    domEditGroupSelectionsRef,
-    refreshDomEditGroupSelectionsFromPreview,
+    refreshDomEditSelectionFromPreview,
     previewIframeRef,
     previewIframe,
     captionEditMode,
@@ -129,8 +125,6 @@ export function useDomEditWiring(params: UseDomEditWiringParams) {
     refreshPreviewDocumentVersion,
     syncPreviewHotkeys,
     applyStudioManualEditsToPreviewRef,
-    applyDomSelection,
-    buildDomSelectionFromTarget,
     openSourceForSelection,
     updateGsapProperty,
     updateGsapMeta,
@@ -251,14 +245,10 @@ export function useDomEditWiring(params: UseDomEditWiringParams) {
 
   useDomEditPreviewSync({
     previewIframe,
-    activeCompPath,
     captionEditMode,
     domEditSelectionRef,
-    domEditGroupSelectionsRef,
     domEditSelection,
-    applyDomSelection,
-    refreshDomEditGroupSelectionsFromPreview,
-    buildDomSelectionFromTarget,
+    refreshDomEditSelectionFromPreview,
     refreshPreviewDocumentVersion,
     syncPreviewHotkeys,
     applyStudioManualEditsToPreviewRef,

package/src/hooks/useDomSelection.test.ts

@@ -326,6 +326,68 @@ describe("useDomSelection", () => {
     harness.cleanup();
   });
 
+  describe("a save's resync after the user moved on", () => {
+    function selectHeadlineInPreview() {
+      const doc = document.implementation.createHTMLDocument("");
+      const element = doc.body.appendChild(
+        Object.assign(doc.createElement("div"), { id: "headline" }),
+      );
+      const headline = makeSelection("Headline", element);
+      const harness = renderHarness(
+        { activeCompPath: "index.html", projectId: "project-1", refreshKey: 0 },
+        { previewDoc: doc },
+      );
+      act(() => harness.current().applyDomSelection(headline));
+      return { headline, harness };
+    }
+
+    it("keeps a deselect made while the save was in flight", async () => {
+      const { headline, harness } = selectHeadlineInPreview();
+      // Escape after a crop's release, before its save returns.
+      act(() => harness.current().applyDomSelection(null, { revealPanel: false }));
+
+      await act(() => harness.current().refreshDomEditSelectionFromPreview(headline));
+
+      expect(harness.current().domEditSelection).toBeNull();
+      harness.cleanup();
+    });
+
+    it.each([
+      ["still in", false],
+      ["gone from", true],
+    ])(
+      "keeps a different pick made while the save was in flight, the saved element %s the preview",
+      async (_, removed) => {
+        const { headline, harness } = selectHeadlineInPreview();
+        const card = makeSelection(
+          "Card",
+          Object.assign(document.createElement("div"), { id: "card" }),
+        );
+        act(() => harness.current().applyDomSelection(card));
+        if (removed) headline.element.remove();
+
+        await act(() => harness.current().refreshDomEditSelectionFromPreview(headline));
+
+        expect(harness.current().domEditSelection).toBe(card);
+        harness.cleanup();
+      },
+    );
+
+    it("keeps a deselect made while the resync was rebuilding the selection", async () => {
+      const { headline, harness } = selectHeadlineInPreview();
+      let resync!: Promise<void>;
+      act(() => {
+        resync = harness.current().refreshDomEditSelectionFromPreview(headline);
+      });
+      act(() => harness.current().applyDomSelection(null, { revealPanel: false }));
+
+      await act(() => resync);
+
+      expect(harness.current().domEditSelection).toBeNull();
+      harness.cleanup();
+    });
+  });
+
   it("clears a committed selection when the active composition path changes", () => {
     const { selection, harness } = setupSelectedHarness();
     expect(harness.current().domEditSelection).toBe(selection);

package/src/hooks/useDomSelection.ts

@@ -356,8 +356,10 @@ export function useDomSelection({
 
   const refreshDomEditSelectionFromPreview = useCallback(
     // fallow-ignore-next-line complexity
-    async (selection: DomEditSelection) => {
-      const iframe = previewIframeRef.current;
+    async (selection: DomEditSelection, iframe = previewIframeRef.current) => {
+      const stillSelected = () =>
+        domEditSelectionsTargetSame(domEditSelectionRef.current, selection);
+      if (!stillSelected()) return;
       let doc: Document | null = null;
       try {
         doc = iframe?.contentDocument ?? null;
@@ -384,7 +386,7 @@ export function useDomSelection({
       }
 
       const nextSelection = await buildDomSelectionFromTarget(element, { previous: selection });
-      if (nextSelection) {
+      if (nextSelection && stillSelected()) {
         applyDomSelection(nextSelection, {
           revealPanel: false,
           preserveGroup: true,
@@ -547,7 +549,6 @@ export function useDomSelection({
     buildDomSelectionForTimelineElement,
     handleTimelineElementSelect,
     refreshDomEditSelectionFromPreview,
-    refreshDomEditGroupSelectionsFromPreview,
     applyMarqueeSelection,
   };
 }

package/src/hooks/useDomSelectionTypes.ts

@@ -89,7 +89,9 @@ export interface UseDomSelectionReturn {
     element: TimelineElement,
   ) => Promise<DomEditSelection | null>;
   handleTimelineElementSelect: (element: TimelineElement | null) => Promise<void>;
-  refreshDomEditSelectionFromPreview: (selection: DomEditSelection) => Promise<void>;
-  refreshDomEditGroupSelectionsFromPreview: (selections: DomEditSelection[]) => Promise<void>;
+  refreshDomEditSelectionFromPreview: (
+    selection: DomEditSelection,
+    iframe?: HTMLIFrameElement | null,
+  ) => Promise<void>;
   applyMarqueeSelection: (selections: DomEditSelection[], additive: boolean) => DomSelectionResult;
 }