@tldraw/editor 3.16.0-canary.fa3749606e52 → 3.16.0-canary.faec5de49906

package/dist-cjs/lib/editor/Editor.js

@@ -88,7 +88,6 @@ var import_defaultShapes = require("../config/defaultShapes");
 var import_constants = require("../constants");
 var import_exportToSvg = require("../exports/exportToSvg");
 var import_getSvgAsImage = require("../exports/getSvgAsImage");
-var import_environment = require("../globals/environment");
 var import_menus = require("../globals/menus");
 var import_time = require("../globals/time");
 var import_options = require("../options");
@@ -123,8 +122,8 @@ var import_TextManager = require("./managers/TextManager/TextManager");
 var import_TickManager = require("./managers/TickManager/TickManager");
 var import_UserPreferencesManager = require("./managers/UserPreferencesManager/UserPreferencesManager");
 var import_RootState = require("./tools/RootState");
-var __setMetaKeyTimeout_dec, __setCtrlKeyTimeout_dec, __setAltKeyTimeout_dec, __setShiftKeyTimeout_dec, _getIsReadonly_dec, _getIsFocused_dec, _getSharedOpacity_dec, _getSharedStyles_dec, __getSelectionSharedStyles_dec, __getBindingsIndexCache_dec, _getCurrentPageRenderingShapesSorted_dec, _getCurrentPageShapesSorted_dec, _getCurrentPageShapes_dec, _getCurrentPageBounds_dec, _getCulledShapes_dec, _getNotVisibleShapes_dec, __getShapeMaskedPageBoundsCache_dec, __getShapeMaskCache_dec, __getShapeClipPathCache_dec, __getShapePageBoundsCache_dec, __getShapePageTransformCache_dec, __getShapeHandlesCache_dec, __getAllAssetsQuery_dec, _getCurrentPageShapeIdsSorted_dec, _getCurrentPageId_dec, _getPages_dec, __getAllPagesQuery_dec, _getRenderingShapes_dec, _getCollaboratorsOnCurrentPage_dec, _getCollaborators_dec, __getCollaboratorsQuery_dec, _getViewportPageBounds_dec, _getViewportScreenCenter_dec, _getViewportScreenBounds_dec, _getZoomLevel_dec, _getCameraForFollowing_dec, _getViewportPageBoundsForFollowing_dec, _getCamera_dec, __unsafe_getCameraId_dec, _getErasingShapes_dec, _getErasingShapeIds_dec, _getHintingShape_dec, _getHintingShapeIds_dec, _getHoveredShape_dec, _getHoveredShapeId_dec, _getRichTextEditor_dec, _getEditingShape_dec, _getEditingShapeId_dec, _getFocusedGroup_dec, _getFocusedGroupId_dec, _getSelectionRotatedScreenBounds_dec, _getSelectionRotatedPageBounds_dec, _getSelectionRotation_dec, _getSelectionPageBounds_dec, _getOnlySelectedShape_dec, _getOnlySelectedShapeId_dec, _getCurrentPageShapesInReadingOrder_dec, _getSelectedShapes_dec, _getSelectedShapeIds_dec, __getCurrentPageStateId_dec, _getCurrentPageState_dec, __getPageStatesQuery_dec, _getPageStates_dec, _getIsMenuOpen_dec, _getOpenMenus_dec, _getInstanceState_dec, _getDocumentSettings_dec, _getCurrentToolId_dec, _getCurrentTool_dec, _getPath_dec, _getCanRedo_dec, _getCanUndo_dec, _getIsShapeHiddenCache_dec, _a, _init;
-class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_dec = [import_state.computed], _getCanUndo_dec = [import_state.computed], _getCanRedo_dec = [import_state.computed], _getPath_dec = [import_state.computed], _getCurrentTool_dec = [import_state.computed], _getCurrentToolId_dec = [import_state.computed], _getDocumentSettings_dec = [import_state.computed], _getInstanceState_dec = [import_state.computed], _getOpenMenus_dec = [import_state.computed], _getIsMenuOpen_dec = [import_state.computed], _getPageStates_dec = [import_state.computed], __getPageStatesQuery_dec = [import_state.computed], _getCurrentPageState_dec = [import_state.computed], __getCurrentPageStateId_dec = [import_state.computed], _getSelectedShapeIds_dec = [import_state.computed], _getSelectedShapes_dec = [import_state.computed], _getCurrentPageShapesInReadingOrder_dec = [import_state.computed], _getOnlySelectedShapeId_dec = [import_state.computed], _getOnlySelectedShape_dec = [import_state.computed], _getSelectionPageBounds_dec = [import_state.computed], _getSelectionRotation_dec = [import_state.computed], _getSelectionRotatedPageBounds_dec = [import_state.computed], _getSelectionRotatedScreenBounds_dec = [import_state.computed], _getFocusedGroupId_dec = [import_state.computed], _getFocusedGroup_dec = [import_state.computed], _getEditingShapeId_dec = [import_state.computed], _getEditingShape_dec = [import_state.computed], _getRichTextEditor_dec = [import_state.computed], _getHoveredShapeId_dec = [import_state.computed], _getHoveredShape_dec = [import_state.computed], _getHintingShapeIds_dec = [import_state.computed], _getHintingShape_dec = [import_state.computed], _getErasingShapeIds_dec = [import_state.computed], _getErasingShapes_dec = [import_state.computed], __unsafe_getCameraId_dec = [import_state.computed], _getCamera_dec = [import_state.computed], _getViewportPageBoundsForFollowing_dec = [import_state.computed], _getCameraForFollowing_dec = [import_state.computed], _getZoomLevel_dec = [import_state.computed], _getViewportScreenBounds_dec = [import_state.computed], _getViewportScreenCenter_dec = [import_state.computed], _getViewportPageBounds_dec = [import_state.computed], __getCollaboratorsQuery_dec = [import_state.computed], _getCollaborators_dec = [import_state.computed], _getCollaboratorsOnCurrentPage_dec = [import_state.computed], _getRenderingShapes_dec = [import_state.computed], __getAllPagesQuery_dec = [import_state.computed], _getPages_dec = [import_state.computed], _getCurrentPageId_dec = [import_state.computed], _getCurrentPageShapeIdsSorted_dec = [import_state.computed], __getAllAssetsQuery_dec = [import_state.computed], __getShapeHandlesCache_dec = [import_state.computed], __getShapePageTransformCache_dec = [import_state.computed], __getShapePageBoundsCache_dec = [import_state.computed], __getShapeClipPathCache_dec = [import_state.computed], __getShapeMaskCache_dec = [import_state.computed], __getShapeMaskedPageBoundsCache_dec = [import_state.computed], _getNotVisibleShapes_dec = [import_state.computed], _getCulledShapes_dec = [import_state.computed], _getCurrentPageBounds_dec = [import_state.computed], _getCurrentPageShapes_dec = [import_state.computed], _getCurrentPageShapesSorted_dec = [import_state.computed], _getCurrentPageRenderingShapesSorted_dec = [import_state.computed], __getBindingsIndexCache_dec = [import_state.computed], __getSelectionSharedStyles_dec = [import_state.computed], _getSharedStyles_dec = [(0, import_state.computed)({ isEqual: (a, b) => a.equals(b) })], _getSharedOpacity_dec = [import_state.computed], _getIsFocused_dec = [import_state.computed], _getIsReadonly_dec = [import_state.computed], __setShiftKeyTimeout_dec = [import_utils.bind], __setAltKeyTimeout_dec = [import_utils.bind], __setCtrlKeyTimeout_dec = [import_utils.bind], __setMetaKeyTimeout_dec = [import_utils.bind], _a) {
+var __setMetaKeyTimeout_dec, __setCtrlKeyTimeout_dec, __setAltKeyTimeout_dec, __setShiftKeyTimeout_dec, _getIsReadonly_dec, _getIsFocused_dec, _getSharedOpacity_dec, _getSharedStyles_dec, __getSelectionSharedStyles_dec, __getBindingsIndexCache_dec, _getCurrentPageRenderingShapesSorted_dec, _getCurrentPageShapesSorted_dec, _getCurrentPageShapes_dec, _getCurrentPageBounds_dec, _getCulledShapes_dec, _getNotVisibleShapes_dec, __getShapeMaskedPageBoundsCache_dec, __getShapeMaskCache_dec, __getShapeClipPathCache_dec, __getShapePageBoundsCache_dec, __getShapePageTransformCache_dec, __getShapeHandlesCache_dec, __getAllAssetsQuery_dec, _getCurrentPageShapeIdsSorted_dec, _getCurrentPageId_dec, _getPages_dec, __getAllPagesQuery_dec, _getRenderingShapes_dec, _getCollaboratorsOnCurrentPage_dec, _getCollaborators_dec, __getCollaboratorsQuery_dec, _getViewportPageBounds_dec, _getViewportScreenCenter_dec, _getViewportScreenBounds_dec, _getZoomLevel_dec, _getCameraForFollowing_dec, _getViewportPageBoundsForFollowing_dec, _getCamera_dec, __unsafe_getCameraId_dec, _getErasingShapes_dec, _getErasingShapeIds_dec, _getHintingShape_dec, _getHintingShapeIds_dec, _getHoveredShape_dec, _getHoveredShapeId_dec, _getRichTextEditor_dec, _getEditingShape_dec, _getEditingShapeId_dec, _getFocusedGroup_dec, _getFocusedGroupId_dec, _getSelectionRotatedScreenBounds_dec, _getSelectionRotatedPageBounds_dec, _getSelectionRotation_dec, _getSelectionPageBounds_dec, _getOnlySelectedShape_dec, _getOnlySelectedShapeId_dec, _getCurrentPageShapesInReadingOrder_dec, _getSelectedShapes_dec, _getSelectedShapeIds_dec, __getCurrentPageStateId_dec, _getCurrentPageState_dec, __getPageStatesQuery_dec, _getPageStates_dec, _getInstanceState_dec, _getDocumentSettings_dec, _getCurrentToolId_dec, _getCurrentTool_dec, _getPath_dec, _getCanRedo_dec, _getCanUndo_dec, _getIsShapeHiddenCache_dec, _a, _init;
+class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_dec = [import_state.computed], _getCanUndo_dec = [import_state.computed], _getCanRedo_dec = [import_state.computed], _getPath_dec = [import_state.computed], _getCurrentTool_dec = [import_state.computed], _getCurrentToolId_dec = [import_state.computed], _getDocumentSettings_dec = [import_state.computed], _getInstanceState_dec = [import_state.computed], _getPageStates_dec = [import_state.computed], __getPageStatesQuery_dec = [import_state.computed], _getCurrentPageState_dec = [import_state.computed], __getCurrentPageStateId_dec = [import_state.computed], _getSelectedShapeIds_dec = [import_state.computed], _getSelectedShapes_dec = [import_state.computed], _getCurrentPageShapesInReadingOrder_dec = [import_state.computed], _getOnlySelectedShapeId_dec = [import_state.computed], _getOnlySelectedShape_dec = [import_state.computed], _getSelectionPageBounds_dec = [import_state.computed], _getSelectionRotation_dec = [import_state.computed], _getSelectionRotatedPageBounds_dec = [import_state.computed], _getSelectionRotatedScreenBounds_dec = [import_state.computed], _getFocusedGroupId_dec = [import_state.computed], _getFocusedGroup_dec = [import_state.computed], _getEditingShapeId_dec = [import_state.computed], _getEditingShape_dec = [import_state.computed], _getRichTextEditor_dec = [import_state.computed], _getHoveredShapeId_dec = [import_state.computed], _getHoveredShape_dec = [import_state.computed], _getHintingShapeIds_dec = [import_state.computed], _getHintingShape_dec = [import_state.computed], _getErasingShapeIds_dec = [import_state.computed], _getErasingShapes_dec = [import_state.computed], __unsafe_getCameraId_dec = [import_state.computed], _getCamera_dec = [import_state.computed], _getViewportPageBoundsForFollowing_dec = [import_state.computed], _getCameraForFollowing_dec = [import_state.computed], _getZoomLevel_dec = [import_state.computed], _getViewportScreenBounds_dec = [import_state.computed], _getViewportScreenCenter_dec = [import_state.computed], _getViewportPageBounds_dec = [import_state.computed], __getCollaboratorsQuery_dec = [import_state.computed], _getCollaborators_dec = [import_state.computed], _getCollaboratorsOnCurrentPage_dec = [import_state.computed], _getRenderingShapes_dec = [import_state.computed], __getAllPagesQuery_dec = [import_state.computed], _getPages_dec = [import_state.computed], _getCurrentPageId_dec = [import_state.computed], _getCurrentPageShapeIdsSorted_dec = [import_state.computed], __getAllAssetsQuery_dec = [import_state.computed], __getShapeHandlesCache_dec = [import_state.computed], __getShapePageTransformCache_dec = [import_state.computed], __getShapePageBoundsCache_dec = [import_state.computed], __getShapeClipPathCache_dec = [import_state.computed], __getShapeMaskCache_dec = [import_state.computed], __getShapeMaskedPageBoundsCache_dec = [import_state.computed], _getNotVisibleShapes_dec = [import_state.computed], _getCulledShapes_dec = [import_state.computed], _getCurrentPageBounds_dec = [import_state.computed], _getCurrentPageShapes_dec = [import_state.computed], _getCurrentPageShapesSorted_dec = [import_state.computed], _getCurrentPageRenderingShapesSorted_dec = [import_state.computed], __getBindingsIndexCache_dec = [import_state.computed], __getSelectionSharedStyles_dec = [import_state.computed], _getSharedStyles_dec = [(0, import_state.computed)({ isEqual: (a, b) => a.equals(b) })], _getSharedOpacity_dec = [import_state.computed], _getIsFocused_dec = [import_state.computed], _getIsReadonly_dec = [import_state.computed], __setShiftKeyTimeout_dec = [import_utils.bind], __setAltKeyTimeout_dec = [import_utils.bind], __setCtrlKeyTimeout_dec = [import_utils.bind], __setMetaKeyTimeout_dec = [import_utils.bind], _a) {
   constructor({
     store,
     user,
@@ -138,8 +137,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     autoFocus,
     inferDarkMode,
     options,
-    // eslint-disable-next-line @typescript-eslint/no-deprecated
-    isShapeHidden,
     getShapeVisibility,
     fontAssetUrls
   }) {
@@ -206,13 +203,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
      * @public
      */
     __publicField(this, "fonts");
-    /**
-     * A manager for the editor's environment.
-     *
-     * @deprecated This is deprecated and will be removed in a future version. Use the `tlenv` global export instead.
-     * @public
-     */
-    __publicField(this, "environment", import_environment.tlenv);
     /**
      * A manager for the editor's scribbles.
      *
@@ -415,14 +405,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     /** @internal */
     __publicField(this, "performanceTrackerTimeout", -1);
     __publicField(this, "_pendingEventsForNextTick", []);
-    (0, import_utils.assert)(
-      !(isShapeHidden && getShapeVisibility),
-      "Cannot use both isShapeHidden and getShapeVisibility"
-    );
-    this._getShapeVisibility = isShapeHidden ? (
-      // eslint-disable-next-line @typescript-eslint/no-deprecated
-      (shape, editor) => isShapeHidden(shape, editor) ? "hidden" : "inherit"
-    ) : getShapeVisibility;
+    this._getShapeVisibility = getShapeVisibility;
     this.options = { ...import_options.defaultTldrawOptions, ...options };
     this.store = store;
     this.history = new import_HistoryManager.HistoryManager({
@@ -902,34 +885,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
   getCanRedo() {
     return this.history.getNumRedos() > 0;
   }
-  /**
-   * Create a new "mark", or stopping point, in the undo redo history. Creating a mark will clear
-   * any redos.
-   *
-   * @example
-   * ```ts
-   * editor.mark()
-   * editor.mark('flip shapes')
-   * ```
-   *
-   * @param markId - The mark's id, usually the reason for adding the mark.
-   *
-   * @public
-   * @deprecated use {@link Editor.markHistoryStoppingPoint} instead
-   */
-  mark(markId) {
-    if (typeof markId === "string") {
-      console.warn(
-        `[tldraw] \`editor.history.mark("${markId}")\` is deprecated. Please use \`const myMarkId = editor.markHistoryStoppingPoint()\` instead.`
-      );
-    } else {
-      console.warn(
-        "[tldraw] `editor.mark()` is deprecated. Use `editor.markHistoryStoppingPoint()` instead."
-      );
-    }
-    this.history._mark(markId ?? (0, import_utils.uniqueId)());
-    return this;
-  }
   /**
    * Create a new "mark", or stopping point, in the undo redo history. Creating a mark will clear
    * any redos. You typically want to do this just before a user interaction begins or is handled.
@@ -1045,12 +1000,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     }
     return this;
   }
-  /**
-   * @deprecated Use `Editor.run` instead.
-   */
-  batch(fn, opts) {
-    return this.run(fn, opts);
-  }
   /* --------------------- Errors --------------------- */
   /** @internal */
   annotateError(error, {
@@ -1272,39 +1221,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       ]);
     }, opts);
   }
-  getOpenMenus() {
-    return this.menus.getOpenMenus();
-  }
-  /**
-   * @deprecated Use `editor.menus.addOpenMenu` instead.
-   *
-   * @public
-   */
-  addOpenMenu(id) {
-    this.menus.addOpenMenu(id);
-    return this;
-  }
-  /**
-   * @deprecated Use `editor.menus.deleteOpenMenu` instead.
-   *
-   * @public
-   */
-  deleteOpenMenu(id) {
-    this.menus.deleteOpenMenu(id);
-    return this;
-  }
-  /**
-   * @deprecated Use `editor.menus.clearOpenMenus` instead.
-   *
-   * @public
-   */
-  clearOpenMenus() {
-    this.menus.clearOpenMenus();
-    return this;
-  }
-  getIsMenuOpen() {
-    return this.menus.hasAnyOpenMenus();
-  }
   /* --------------------- Cursor --------------------- */
   /**
    * Set the cursor.
@@ -3612,8 +3528,9 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     return this.store.createComputedCache("pageBoundsCache", (shape) => {
       const pageTransform = this.getShapePageTransform(shape);
       if (!pageTransform) return void 0;
-      const geometry = this.getShapeGeometry(shape);
-      return import_Box.Box.FromPoints(pageTransform.applyToPoints(geometry.vertices));
+      return import_Box.Box.FromPoints(
+        pageTransform.applyToPoints(this.getShapeGeometry(shape).boundsVertices)
+      );
     });
   }
   /**
@@ -3666,16 +3583,17 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
   _getShapeMaskCache() {
     return this.store.createComputedCache("pageMaskCache", (shape) => {
       if ((0, import_tlschema.isPageId)(shape.parentId)) return void 0;
-      const frameAncestors = this.getShapeAncestors(shape.id).filter(
-        (shape2) => this.isShapeOfType(shape2, "frame")
-      );
-      if (frameAncestors.length === 0) return void 0;
-      const pageMask = frameAncestors.map((s) => {
-        const geometry = this.getShapeGeometry(s.id);
-        const pageTransform = this.getShapePageTransform(s.id);
-        return pageTransform.applyToPoints(geometry.vertices);
-      }).reduce((acc, b) => {
-        if (!(b && acc)) return void 0;
+      const clipPaths = [];
+      for (const ancestor of this.getShapeAncestors(shape.id)) {
+        const util = this.getShapeUtil(ancestor);
+        const clipPath = util.getClipPath?.(ancestor);
+        if (!clipPath) continue;
+        if (util.shouldClipChild?.(shape) === false) continue;
+        const pageTransform = this.getShapePageTransform(ancestor.id);
+        clipPaths.push(pageTransform.applyToPoints(clipPath));
+      }
+      if (clipPaths.length === 0) return void 0;
+      const pageMask = clipPaths.reduce((acc, b) => {
         const intersection = (0, import_intersect.intersectPolygonPolygon)(acc, b);
         if (intersection) {
           return intersection.map(import_Vec.Vec.Cast);
@@ -3910,6 +3828,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       hitInside = false,
       hitFrameInside = false
     } = opts;
+    const [innerMargin, outerMargin] = Array.isArray(margin) ? margin : [margin, margin];
     let inHollowSmallestArea = Infinity;
     let inHollowSmallestAreaHit = null;
     let inMarginClosestToEdgeDistance = Infinity;
@@ -3919,7 +3838,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         return false;
       const pageMask = this.getShapeMask(shape);
       if (pageMask && !(0, import_utils2.pointInPolygon)(point, pageMask)) return false;
-      if (filter) return filter(shape);
+      if (filter && !filter(shape)) return false;
       return true;
     });
     for (let i = shapesToCheck.length - 1; i >= 0; i--) {
@@ -3935,8 +3854,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         }
       }
       if (this.isShapeOfType(shape, "frame")) {
-        const distance2 = geometry.distanceToPoint(pointInShapeSpace, hitInside);
-        if (Math.abs(distance2) <= margin) {
+        const distance2 = geometry.distanceToPoint(pointInShapeSpace, hitFrameInside);
+        if (hitFrameInside ? distance2 > 0 && distance2 <= outerMargin || distance2 <= 0 && distance2 > -innerMargin : distance2 > 0 && distance2 <= outerMargin) {
           return inMarginClosestToEdgeHit || shape;
         }
         if (geometry.hitTestPoint(pointInShapeSpace, 0, true)) {
@@ -3956,10 +3875,10 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         }
         distance = minDistance;
       } else {
-        if (margin === 0 && (geometry.bounds.w < 1 || geometry.bounds.h < 1)) {
+        if (outerMargin === 0 && (geometry.bounds.w < 1 || geometry.bounds.h < 1)) {
           distance = geometry.distanceToPoint(pointInShapeSpace, hitInside);
         } else {
-          if (geometry.bounds.containsPoint(pointInShapeSpace, margin)) {
+          if (geometry.bounds.containsPoint(pointInShapeSpace, outerMargin)) {
             distance = geometry.distanceToPoint(pointInShapeSpace, hitInside);
           } else {
             distance = Infinity;
@@ -3967,12 +3886,22 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         }
       }
       if (geometry.isClosed) {
-        if (distance <= margin) {
+        if (distance <= outerMargin || hitInside && distance <= 0 && distance > -innerMargin) {
           if (geometry.isFilled || isGroup && geometry.children[0].isFilled) {
             return inMarginClosestToEdgeHit || shape;
           } else {
             if (this.getShapePageBounds(shape).contains(viewportPageBounds)) continue;
-            if (Math.abs(distance) < margin) {
+            if (hitInside ? (
+              // On hitInside, the distance will be negative for hits inside
+              // If the distance is positive, check against the outer margin
+              distance > 0 && distance <= outerMargin || // If the distance is negative, check against the inner margin
+              distance <= 0 && distance > -innerMargin
+            ) : (
+              // If hitInside is false, then sadly _we do not know_ whether the
+              // point is inside or outside of the shape, so we check against
+              // the max of the two margins
+              Math.abs(distance) <= Math.max(innerMargin, outerMargin)
+            )) {
               if (Math.abs(distance) < inMarginClosestToEdgeDistance) {
                 inMarginClosestToEdgeDistance = Math.abs(distance);
                 inMarginClosestToEdgeHit = shape;
@@ -4362,10 +4291,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     }
     return shapeIds;
   }
-  /** @deprecated Use {@link Editor.getDraggingOverShape} instead */
-  getDroppingOverShape(point, droppingShapes) {
-    return this.getDraggingOverShape(point, droppingShapes);
-  }
   /**
    * Get the shape that some shapes should be dropped on at a given point.
    *
@@ -4737,7 +4662,16 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       }
       this.createShapes(shapesToCreate);
       this.createBindings(bindingsToCreate);
-      this.setSelectedShapes((0, import_utils.compact)(ids.map((id) => shapeIds.get(id))));
+      this.setSelectedShapes(
+        (0, import_utils.compact)(
+          ids.map((oldId) => {
+            const newId = shapeIds.get(oldId);
+            if (!newId) return null;
+            if (!this.getShape(newId)) return null;
+            return newId;
+          })
+        )
+      );
       if (offset !== void 0) {
         const selectionPageBounds = this.getSelectionPageBounds();
         const viewportPageBounds = this.getViewportPageBounds();
@@ -5491,8 +5425,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       const shapesMovingTogether = [shape];
       const boundsOfShapesMovingTogether = [shapePageBounds];
       if (!this.getShapeUtil(shape).canBeLaidOut?.(shape, {
-        type: "stretch",
-        shapes: shapesToStretchFirstPass
+        type: "stretch"
       })) {
         continue;
       }
@@ -5817,21 +5750,24 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         }
         if (!partial.parentId || !(this.store.has(partial.parentId) || shapes.some((p) => p.id === partial.parentId))) {
           let parentId = this.getFocusedGroupId();
-          for (let i = currentPageShapesSorted.length - 1; i >= 0; i--) {
-            const parent = currentPageShapesSorted[i];
-            const util = this.getShapeUtil(parent);
-            if (util.canReceiveNewChildrenOfType(parent, partial.type) && !this.isShapeHidden(parent) && this.isPointInShape(
-              parent,
-              // If no parent is provided, then we can treat the
-              // shape's provided x/y as being in the page's space.
-              { x: partial.x ?? 0, y: partial.y ?? 0 },
-              {
-                margin: 0,
-                hitInside: true
+          const isPositioned = partial.x !== void 0 && partial.y !== void 0;
+          if (isPositioned) {
+            for (let i = currentPageShapesSorted.length - 1; i >= 0; i--) {
+              const parent = currentPageShapesSorted[i];
+              const util = this.getShapeUtil(parent);
+              if (util.canReceiveNewChildrenOfType(parent, partial.type) && !this.isShapeHidden(parent) && this.isPointInShape(
+                parent,
+                // If no parent is provided, then we can treat the
+                // shape's provided x/y as being in the page's space.
+                { x: partial.x ?? 0, y: partial.y ?? 0 },
+                {
+                  margin: 0,
+                  hitInside: true
+                }
+              )) {
+                parentId = parent.id;
+                break;
               }
-            )) {
-              parentId = parent.id;
-              break;
             }
           }
           const prevParentId = partial.parentId;
@@ -6865,12 +6801,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       height: result.height
     };
   }
-  /** @deprecated Use {@link Editor.getSvgString} or {@link Editor.getSvgElement} instead. */
-  async getSvg(shapes, opts = {}) {
-    const result = await this.getSvgElement(shapes, opts);
-    if (!result) return void 0;
-    return result.svg;
-  }
   /**
    * Get an exported image of the given shapes.
    *
@@ -6920,6 +6850,23 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       }
     }
   }
+  /**
+   * Get an exported image of the given shapes as a data URL.
+   *
+   * @param shapes - The shapes (or shape ids) to export.
+   * @param opts - Options for the export.
+   *
+   * @returns A data URL of the image.
+   * @public
+   */
+  async toImageDataUrl(shapes, opts = {}) {
+    const { blob, width, height } = await this.toImage(shapes, opts);
+    return {
+      url: await import_utils.FileHelpers.blobToDataUrl(blob),
+      width,
+      height
+    };
+  }
   /**
    * Update the input points from a pointer, pinch, or wheel event.
    *
@@ -7834,8 +7781,6 @@ __decorateElement(_init, 1, "getCurrentTool", _getCurrentTool_dec, Editor);
 __decorateElement(_init, 1, "getCurrentToolId", _getCurrentToolId_dec, Editor);
 __decorateElement(_init, 1, "getDocumentSettings", _getDocumentSettings_dec, Editor);
 __decorateElement(_init, 1, "getInstanceState", _getInstanceState_dec, Editor);
-__decorateElement(_init, 1, "getOpenMenus", _getOpenMenus_dec, Editor);
-__decorateElement(_init, 1, "getIsMenuOpen", _getIsMenuOpen_dec, Editor);
 __decorateElement(_init, 1, "getPageStates", _getPageStates_dec, Editor);
 __decorateElement(_init, 1, "_getPageStatesQuery", __getPageStatesQuery_dec, Editor);
 __decorateElement(_init, 1, "getCurrentPageState", _getCurrentPageState_dec, Editor);