@tldraw/editor 3.16.0-internal.a478398270c6 → 3.16.0-internal.f8b97f0c414f

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.
@@ -1432,7 +1348,9 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     return this;
   }
   /**
-   * Select all direct children of the current page.
+   * Select all shapes. If the user has selected shapes that share a parent,
+   * select all shapes within that parent. If the user has not selected any shapes,
+   * or if the shapes shapes are only on select all shapes on the current page.
    *
    * @example
    * ```ts
@@ -1442,7 +1360,23 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * @public
    */
   selectAll() {
-    const ids = this.getSortedChildIdsForParent(this.getCurrentPageId());
+    let parentToSelectWithinId = null;
+    const selectedShapeIds = this.getSelectedShapeIds();
+    if (selectedShapeIds.length > 0) {
+      for (const id of selectedShapeIds) {
+        const shape = this.getShape(id);
+        if (!shape) continue;
+        if (parentToSelectWithinId === null) {
+          parentToSelectWithinId = shape.parentId;
+        } else if (parentToSelectWithinId !== shape.parentId) {
+          return this;
+        }
+      }
+    }
+    if (!parentToSelectWithinId) {
+      parentToSelectWithinId = this.getCurrentPageId();
+    }
+    const ids = this.getSortedChildIdsForParent(parentToSelectWithinId);
     if (ids.length <= 0) return this;
     this.setSelectedShapes(this._getUnlockedShapeIds(ids));
     return this;
@@ -1461,9 +1395,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     const selectedShapeIds = this.getSelectedShapeIds();
     const firstParentId = selectedShapeIds[0] ? this.getShape(selectedShapeIds[0])?.parentId : null;
     const isSelectedWithinContainer = firstParentId && selectedShapeIds.every((shapeId) => this.getShape(shapeId)?.parentId === firstParentId) && !(0, import_tlschema.isPageId)(firstParentId);
-    const readingOrderShapes = isSelectedWithinContainer ? this._getShapesInReadingOrder(
-      this.getCurrentPageShapes().filter((shape2) => shape2.parentId === firstParentId)
-    ) : this.getCurrentPageShapesInReadingOrder();
+    const filteredShapes = isSelectedWithinContainer ? this.getCurrentPageShapes().filter((shape2) => shape2.parentId === firstParentId) : this.getCurrentPageShapes().filter((shape2) => (0, import_tlschema.isPageId)(shape2.parentId));
+    const readingOrderShapes = isSelectedWithinContainer ? this._getShapesInReadingOrder(filteredShapes) : this.getCurrentPageShapesInReadingOrder();
     const currentShapeId = selectedShapeIds.length === 1 ? selectedShapeIds[0] : readingOrderShapes.find((shape2) => selectedShapeIds.includes(shape2.id))?.id;
     let adjacentShapeId;
     if (direction === "next" || direction === "prev") {
@@ -1473,7 +1406,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       adjacentShapeId = shapeIds[adjacentIndex];
     } else {
       if (!currentShapeId) return;
-      adjacentShapeId = this.getNearestAdjacentShape(currentShapeId, direction);
+      adjacentShapeId = this.getNearestAdjacentShape(filteredShapes, currentShapeId, direction);
     }
     const shape = this.getShape(adjacentShapeId);
     if (!shape) return;
@@ -1539,11 +1472,10 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    *
    * @public
    */
-  getNearestAdjacentShape(currentShapeId, direction) {
+  getNearestAdjacentShape(shapes, currentShapeId, direction) {
     const directionToAngle = { right: 0, left: 180, down: 90, up: 270 };
     const currentShape = this.getShape(currentShapeId);
     if (!currentShape) return currentShapeId;
-    const shapes = this.getCurrentPageShapes();
     const tabbableShapes = shapes.filter(
       (shape) => this.getShapeUtil(shape).canTabTo(shape) && shape.id !== currentShapeId
     );
@@ -2307,28 +2239,11 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         { history: "ignore" }
       );
       const { currentScreenPoint, currentPagePoint } = this.inputs;
-      const { screenBounds } = this.store.unsafeGetWithoutCapture(import_tlschema.TLINSTANCE_ID);
       if (currentScreenPoint.x / z - x !== currentPagePoint.x || currentScreenPoint.y / z - y !== currentPagePoint.y) {
-        const event = {
-          type: "pointer",
-          target: "canvas",
-          name: "pointer_move",
-          // weird but true: we need to put the screen point back into client space
-          point: import_Vec.Vec.AddXY(currentScreenPoint, screenBounds.x, screenBounds.y),
-          pointerId: import_constants.INTERNAL_POINTER_IDS.CAMERA_MOVE,
-          ctrlKey: this.inputs.ctrlKey,
-          altKey: this.inputs.altKey,
-          shiftKey: this.inputs.shiftKey,
-          metaKey: this.inputs.metaKey,
-          accelKey: (0, import_keyboard.isAccelKey)(this.inputs),
-          button: 0,
-          isPen: this.getInstanceState().isPenMode ?? false
-        };
-        if (opts?.immediate) {
-          this._flushEventForTick(event);
-        } else {
-          this.dispatch(event);
-        }
+        this.updatePointer({
+          immediate: opts?.immediate,
+          pointerId: import_constants.INTERNAL_POINTER_IDS.CAMERA_MOVE
+        });
       }
       this._tickCameraState();
     });
@@ -3297,19 +3212,24 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    */
   deletePage(page) {
     const id = typeof page === "string" ? page : page.id;
-    this.run(() => {
-      if (this.getIsReadonly()) return;
-      const pages = this.getPages();
-      if (pages.length === 1) return;
-      const deletedPage = this.getPage(id);
-      if (!deletedPage) return;
-      if (id === this.getCurrentPageId()) {
-        const index = pages.findIndex((page2) => page2.id === id);
-        const next = pages[index - 1] ?? pages[index + 1];
-        this.setCurrentPage(next.id);
-      }
-      this.store.remove([deletedPage.id]);
-    });
+    this.run(
+      () => {
+        if (this.getIsReadonly()) return;
+        const pages = this.getPages();
+        if (pages.length === 1) return;
+        const deletedPage = this.getPage(id);
+        if (!deletedPage) return;
+        if (id === this.getCurrentPageId()) {
+          const index = pages.findIndex((page2) => page2.id === id);
+          const next = pages[index - 1] ?? pages[index + 1];
+          this.setCurrentPage(next.id);
+        }
+        const shapes = this.getSortedChildIdsForParent(deletedPage.id);
+        this.deleteShapes(shapes);
+        this.store.remove([deletedPage.id]);
+      },
+      { ignoreShapeLock: true }
+    );
     return this;
   }
   /**
@@ -3608,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)
+      );
     });
   }
   /**
@@ -3662,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);
@@ -3906,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;
@@ -3915,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--) {
@@ -3923,7 +3846,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       const geometry = this.getShapeGeometry(shape);
       const isGroup = geometry instanceof import_Group2d.Group2d;
       const pointInShapeSpace = this.getPointInShapeSpace(shape, point);
-      if (this.isShapeOfType(shape, "frame") || this.isShapeOfType(shape, "arrow") && shape.props.text.trim() || (this.isShapeOfType(shape, "note") || this.isShapeOfType(shape, "geo") && shape.props.fill === "none") && this.getShapeUtil(shape).getText(shape)?.trim()) {
+      if (this.isShapeOfType(shape, "frame") || (this.isShapeOfType(shape, "note") || this.isShapeOfType(shape, "arrow") || this.isShapeOfType(shape, "geo") && shape.props.fill === "none") && this.getShapeUtil(shape).getText(shape)?.trim()) {
         for (const childGeometry of geometry.children) {
           if (childGeometry.isLabel && childGeometry.isPointInBounds(pointInShapeSpace)) {
             return shape;
@@ -3931,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)) {
@@ -3952,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;
@@ -3963,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;
@@ -4358,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.
    *
@@ -4733,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();
@@ -5487,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;
       }
@@ -5813,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;
@@ -6498,16 +6438,20 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * Handle external content, such as files, urls, embeds, or plain text which has been put into the app, for example by pasting external text or dropping external images onto canvas.
    *
    * @param info - Info about the external content.
+   * @param opts - Options for handling external content, including force flag to bypass readonly checks.
    */
-  async putExternalContent(info) {
+  async putExternalContent(info, opts = {}) {
+    if (!opts.force && this.getIsReadonly()) return;
     return this.externalContentHandlers[info.type]?.(info);
   }
   /**
    * Handle replacing external content.
    *
    * @param info - Info about the external content.
+   * @param opts - Options for handling external content, including force flag to bypass readonly checks.
    */
-  async replaceExternalContent(info) {
+  async replaceExternalContent(info, opts = {}) {
+    if (!opts.force && this.getIsReadonly()) return;
     return this.externalContentHandlers[info.type]?.(info);
   }
   /**
@@ -6861,12 +6805,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.
    *
@@ -6916,6 +6854,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.
    *
@@ -7012,6 +6967,47 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     this.dispatch({ type: "misc", name: "complete" });
     return this;
   }
+  /**
+   * Dispatch a pointer move event in the current position of the pointer. This is useful when
+   * external circumstances have changed (e.g. the camera moved or a shape was moved) and you want
+   * the current interaction to respond to that change.
+   *
+   * @example
+   * ```ts
+   * editor.updatePointer()
+   * ```
+   *
+   * @param options - The options for updating the pointer.
+   * @returns The editor instance.
+   * @public
+   */
+  updatePointer(options) {
+    const event = {
+      type: "pointer",
+      target: "canvas",
+      name: "pointer_move",
+      point: options?.point ?? // weird but true: what `inputs` calls screen-space is actually viewport space. so
+      // we need to convert back into true screen space first. we should fix this...
+      import_Vec.Vec.Add(
+        this.inputs.currentScreenPoint,
+        this.store.unsafeGetWithoutCapture(import_tlschema.TLINSTANCE_ID).screenBounds
+      ),
+      pointerId: options?.pointerId ?? 0,
+      button: options?.button ?? 0,
+      isPen: options?.isPen ?? this.inputs.isPen,
+      shiftKey: options?.shiftKey ?? this.inputs.shiftKey,
+      altKey: options?.altKey ?? this.inputs.altKey,
+      ctrlKey: options?.ctrlKey ?? this.inputs.ctrlKey,
+      metaKey: options?.metaKey ?? this.inputs.metaKey,
+      accelKey: options?.accelKey ?? (0, import_keyboard.isAccelKey)(this.inputs)
+    };
+    if (options?.immediate) {
+      this._flushEventForTick(event);
+    } else {
+      this.dispatch(event);
+    }
+    return this;
+  }
   /**
    * Puts the editor into focused mode.
    *
@@ -7789,8 +7785,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);