@tldraw/editor 5.5.0-next.f9308d324e1c → 5.6.0-canary.5bfc37740468

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

@@ -95,6 +95,10 @@ var import_UserPreferencesManager = require("./managers/UserPreferencesManager/U
 var import_OverlayManager = require("./overlays/OverlayManager");
 var import_RootState = require("./tools/RootState");
 const RENDERING_SHAPES_SORT_CACHE_THRESHOLD = 100;
+const AXIS = {
+  horizontal: { val: "x", min: "minX", max: "maxX", dim: "width" },
+  vertical: { val: "y", min: "minY", max: "maxY", dim: "height" }
+};
 class Editor extends import_eventemitter3.default {
   id = (0, import_utils.uniqueId)();
   constructor({
@@ -421,7 +425,7 @@ class Editor extends import_eventemitter3.default {
               }
             }
             if (deleteBindingIds.length) {
-              this.deleteBindings(deleteBindingIds);
+              this.store.remove(deleteBindingIds);
             }
           }
         },
@@ -1381,6 +1385,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    **/
   updateDocumentSettings(settings) {
+    if (this.getIsReadonly()) return this;
     this.run(
       () => {
         this.store.put([{ ...this.getDocumentSettings(), ...settings }]);
@@ -1403,7 +1408,7 @@ class Editor extends import_eventemitter3.default {
   updateInstanceState(partial, historyOptions) {
     this._updateInstanceState(partial, { history: "ignore", ...historyOptions });
     if (partial.isChangingStyle !== void 0) {
-      clearTimeout(this._isChangingStyleTimeout);
+      this.timers.clearTimeout(this._isChangingStyleTimeout);
       if (partial.isChangingStyle === true) {
         this._isChangingStyleTimeout = this.timers.setTimeout(() => {
           this._updateInstanceState({ isChangingStyle: false }, { history: "ignore" });
@@ -1540,7 +1545,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   select(...shapes) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((shape) => shape.id);
+    const ids = toShapeIds(shapes);
     this.setSelectedShapes(ids);
     return this;
   }
@@ -1555,7 +1560,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   deselect(...shapes) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((shape) => shape.id);
+    const ids = toShapeIds(shapes);
     const selectedShapeIds = this.getSelectedShapeIds();
     if (selectedShapeIds.length > 0 && ids.length > 0) {
       this.setSelectedShapes(selectedShapeIds.filter((id) => !ids.includes(id)));
@@ -1593,7 +1598,7 @@ class Editor extends import_eventemitter3.default {
     }
     const ids = this.getSortedChildIdsForParent(parentToSelectWithinId);
     if (ids.length <= 0) return this;
-    this.setSelectedShapes(this._getUnlockedShapeIds(ids));
+    this.setSelectedShapes(ids.filter((id) => !this.getShape(id)?.isLocked));
     return this;
   }
   /**
@@ -1610,12 +1615,15 @@ class Editor extends import_eventemitter3.default {
     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 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 filteredShapes = this.getCurrentPageShapes().filter(
+      (shape2) => !this.isShapeOrAncestorLocked(shape2) && (isSelectedWithinContainer ? shape2.parentId === firstParentId : (0, import_tlschema.isPageId)(shape2.parentId))
+    );
+    const readingOrderShapes = this._getShapesInReadingOrder(filteredShapes);
     const currentShapeId = selectedShapeIds.length === 1 ? selectedShapeIds[0] : readingOrderShapes.find((shape2) => selectedShapeIds.includes(shape2.id))?.id;
     let adjacentShapeId;
     if (direction === "next" || direction === "prev") {
       const shapeIds = readingOrderShapes.map((shape2) => shape2.id);
+      if (shapeIds.length === 0) return;
       const currentIndex = currentShapeId ? shapeIds.indexOf(currentShapeId) : -1;
       const startIndex = currentIndex === -1 && direction === "prev" ? 0 : currentIndex;
       const adjacentIndex = (startIndex + (direction === "next" ? 1 : -1) + shapeIds.length) % shapeIds.length;
@@ -1717,13 +1725,14 @@ class Editor extends import_eventemitter3.default {
     });
     if (shapesInDirection.length === 0) return currentShapeId;
     const lowestScoringShape = (0, import_utils.minBy)(shapesInDirection, ({ center }) => {
-      const distance = import_Vec.Vec.Dist2(currentCenter, center);
+      const distance = import_Vec.Vec.Dist(currentCenter, center);
       const dirProp = ["left", "right"].includes(direction) ? "x" : "y";
       const directionalDistance = Math.abs(center[dirProp] - currentCenter[dirProp]);
       const offProp = ["left", "right"].includes(direction) ? "y" : "x";
       const offAxisDeviation = Math.abs(center[offProp] - currentCenter[offProp]);
-      const angle = Math.abs(import_Vec.Vec.Angle(currentCenter, center) * (180 / Math.PI));
-      const angleDeviation = Math.abs(angle - directionToAngle[direction]);
+      const angle = (import_Vec.Vec.Angle(currentCenter, center) * (180 / Math.PI) + 360) % 360;
+      const rawAngleDeviation = Math.abs(angle - directionToAngle[direction]);
+      const angleDeviation = Math.min(rawAngleDeviation, 360 - rawAngleDeviation);
       return distance * 1 + // Base distance
       offAxisDeviation * 2 + // Heavy penalty for off-axis deviation
       (distance - directionalDistance) * 1.5 + // Penalty for diagonal distance
@@ -2061,7 +2070,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   setHintingShapes(shapes) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((shape) => shape.id);
+    const ids = toShapeIds(shapes);
     this.run(
       () => {
         this._updateCurrentPageState({ hintingShapeIds: (0, import_utils.dedupe)(ids) });
@@ -2091,7 +2100,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   setErasingShapes(shapes) {
-    const ids = typeof shapes[0] === "string" ? shapes.slice() : shapes.map((shape) => shape.id);
+    const ids = toShapeIds(shapes).slice();
     ids.sort();
     const erasingShapeIds = this.getErasingShapeIds();
     this.run(
@@ -2498,14 +2507,16 @@ class Editor extends import_eventemitter3.default {
   setCamera(point, opts) {
     const { isLocked } = this._cameraOptions.__unsafe__getWithoutCapture();
     if (isLocked && !opts?.force) return this;
+    const _point = new import_Vec.Vec(point.x, point.y, point.z ?? this.getZoomLevel());
+    if (!Number.isFinite(_point.x) || !Number.isFinite(_point.y) || !Number.isFinite(_point.z)) {
+      throw Error(
+        `Editor.setCamera: expected finite values, got (${_point.x}, ${_point.y}, ${_point.z}).`
+      );
+    }
     this.stopCameraAnimation();
     if (this.getInstanceState().followingUserId) {
       this.stopFollowingUser();
     }
-    const _point = import_Vec.Vec.Cast(point);
-    if (!Number.isFinite(_point.x)) _point.x = 0;
-    if (!Number.isFinite(_point.y)) _point.y = 0;
-    if (_point.z === void 0 || !Number.isFinite(_point.z)) point.z = this.getZoomLevel();
     const camera = this.getConstrainedCamera(_point, opts);
     if (opts?.animation) {
       const { width, height } = this.getViewportScreenBounds();
@@ -2790,11 +2801,14 @@ class Editor extends import_eventemitter3.default {
   _animateViewport(ms) {
     if (!this._viewportAnimation) return;
     this._viewportAnimation.elapsed += ms;
-    const { elapsed, easing, duration, start, end } = this._viewportAnimation;
+    const { elapsed, easing, duration, start, end, opts } = this._viewportAnimation;
     if (elapsed > duration) {
       this.off("tick", this._animateViewport);
       this._viewportAnimation = null;
-      this._setCamera(new import_Vec.Vec(-end.x, -end.y, this.getViewportScreenBounds().width / end.width));
+      this._setCamera(
+        new import_Vec.Vec(-end.x, -end.y, this.getViewportScreenBounds().width / end.width),
+        opts
+      );
       return;
     }
     const remaining = duration - elapsed;
@@ -2832,7 +2846,8 @@ class Editor extends import_eventemitter3.default {
       duration: duration / animationSpeed,
       easing,
       start: viewportPageBounds.clone(),
-      end: targetViewportPage.clone()
+      end: targetViewportPage.clone(),
+      opts: rest
     };
     this.once("stop-camera-animation", () => {
       this.off("tick", this._animateViewport);
@@ -2918,6 +2933,7 @@ class Editor extends import_eventemitter3.default {
       }
       const isOnSamePage = presence.currentPageId === this.getCurrentPageId();
       if (!isOnSamePage) {
+        this.markHistoryStoppingPoint("change-page");
         this.setCurrentPage(presence.currentPageId);
       }
       if (opts && opts.animation && !isOnSamePage) {
@@ -3641,7 +3657,9 @@ class Editor extends import_eventemitter3.default {
     const id = typeof page === "string" ? page : page.id;
     const freshPage = this.getPage(id);
     if (!freshPage) return this;
-    const prevCamera = { ...this.getCamera() };
+    const prevCamera = {
+      ...this.store.get(import_tlschema.CameraRecordType.createId(freshPage.id)) ?? this.getCamera()
+    };
     const content = this.getContentFromCurrentPage(this.getSortedChildIdsForParent(freshPage.id));
     this.run(() => {
       const pages = this.getPages();
@@ -3650,7 +3668,7 @@ class Editor extends import_eventemitter3.default {
       this.setCurrentPage(createId);
       this.setCamera(prevCamera);
       if (content) {
-        return this.putContentOntoCurrentPage(content);
+        return this.putContentOntoCurrentPage(content, { preservePosition: true });
       }
     });
     return this;
@@ -3749,7 +3767,9 @@ class Editor extends import_eventemitter3.default {
     if (ids.length <= 0) return this;
     this.run(
       () => {
-        this.store.props.assets.remove?.(ids);
+        Promise.resolve(this.store.props.assets.remove?.(ids)).catch(
+          (err) => console.error("Error while removing assets from the asset store:", err)
+        );
         this.store.remove(ids);
       },
       { history: "ignore" }
@@ -4131,7 +4151,7 @@ class Editor extends import_eventemitter3.default {
     if (shapes.length === 0) {
       return;
     }
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     const freshShapes = (0, import_utils.compact)(ids.map((id) => this.getShape(id)));
     if (freshShapes.length === 1) {
       const parentId = freshShapes[0].parentId;
@@ -4228,12 +4248,14 @@ class Editor extends import_eventemitter3.default {
    */
   getSelectedShapeAtPoint(point) {
     const selectedShapeIds = this.getSelectedShapeIds();
-    const margin = this.options.hitTestMargin / this.getZoomLevel();
+    if (selectedShapeIds.length === 0) return void 0;
+    const selectedShapeIdSet = new Set(selectedShapeIds);
+    const margin = this.getHitTestMargin();
     const sortedShapes = this.getCurrentPageShapesSorted();
     for (let i = sortedShapes.length - 1; i >= 0; i--) {
       const shape = sortedShapes[i];
       if (shape.type === "group") continue;
-      if (!selectedShapeIds.includes(shape.id)) continue;
+      if (!selectedShapeIdSet.has(shape.id)) continue;
       if (this.getShapeGeometry(shape).hitTestPoint(
         this.getPointInShapeSpace(shape, point),
         margin,
@@ -4331,7 +4353,6 @@ class Editor extends import_eventemitter3.default {
             }
             return inMarginClosestToEdgeHit || shape;
           } else {
-            if (this.getShapePageBounds(shape).contains(viewportPageBounds)) continue;
             if (hitInside ? (
               // On hitInside, the distance will be negative for hits inside
               // If the distance is positive, check against the outer margin
@@ -4348,6 +4369,7 @@ class Editor extends import_eventemitter3.default {
                 inMarginClosestToEdgeHit = shape;
               }
             } else if (!inMarginClosestToEdgeHit) {
+              if (this.getShapePageBounds(shape).contains(viewportPageBounds)) continue;
               const { area } = geometry;
               if (area < inHollowSmallestArea) {
                 inHollowSmallestArea = area;
@@ -4358,6 +4380,9 @@ class Editor extends import_eventemitter3.default {
         }
       } else {
         if (distance < this.getHitTestMargin()) {
+          if (inMarginClosestToEdgeHit && inMarginClosestToEdgeDistance <= distance) {
+            return inMarginClosestToEdgeHit;
+          }
           return shape;
         }
       }
@@ -4634,7 +4659,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   reparentShapes(shapes, parentId, insertIndex) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     if (ids.length === 0) return this;
     const changes = [];
     const parentTransform = (0, import_tlschema.isPageId)(parentId) ? import_Mat.Mat.Identity() : this.getShapePageTransform(parentId);
@@ -4863,6 +4888,7 @@ class Editor extends import_eventemitter3.default {
    * binding, but the `type`, `toId`, and `fromId` must all be provided.
    */
   createBindings(partials) {
+    if (this.getIsReadonly()) return this;
     const bindings = [];
     for (const partial of partials) {
       const fromShape = this.getShape(partial.fromId);
@@ -4897,6 +4923,7 @@ class Editor extends import_eventemitter3.default {
    * binding is skipped. The changes from the partial are merged into the existing record.
    */
   updateBindings(partials) {
+    if (this.getIsReadonly()) return this;
     const updated = [];
     for (const partial of partials) {
       if (!partial) continue;
@@ -4925,6 +4952,16 @@ class Editor extends import_eventemitter3.default {
    * Delete several bindings by their IDs. If a binding ID doesn't exist, it's ignored.
    */
   deleteBindings(bindings, { isolateShapes = false } = {}) {
+    if (this.getIsReadonly()) return this;
+    return this._deleteBindings(bindings, { isolateShapes });
+  }
+  /**
+   * Unguarded so that withIsolatedShapes can transiently isolate shapes for copy and export in
+   * readonly mode; the public deleteBindings is what readonly blocks.
+   *
+   * @internal
+   */
+  _deleteBindings(bindings, { isolateShapes = false } = {}) {
     const ids = bindings.map((binding) => typeof binding === "string" ? binding : binding.id);
     if (isolateShapes) {
       this.store.atomic(() => {
@@ -4983,7 +5020,7 @@ class Editor extends import_eventemitter3.default {
    * @param opts - The options for the rotation.
    */
   rotateShapesBy(shapes, delta, opts) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     if (ids.length <= 0) return this;
     const snapshot = (0, import_rotation.getRotationSnapshot)({ editor: this, ids });
     if (!snapshot) return this;
@@ -5020,6 +5057,14 @@ class Editor extends import_eventemitter3.default {
     }
     return workingShape;
   }
+  // Counter-rotates the page-space delta into the parent's space; without that a child of a rotated
+  // frame or group would move along its parent's axes instead of the page's.
+  // todo: a shape laid out together with its own parent moves twice, once with the parent and once
+  // on its own; the layout commands should skip shapes whose ancestors are also being laid out
+  getChangesToTranslateShapeByPageDelta(shape, pageDelta) {
+    const localDelta = import_Vec.Vec.From(pageDelta).rot(-this.getShapeParentTransform(shape).rotation());
+    return this.getChangesToTranslateShape(shape, localDelta.add(shape));
+  }
   /**
    * Move shapes by a delta.
    *
@@ -5032,14 +5077,12 @@ class Editor extends import_eventemitter3.default {
    * @param offset - The offset to apply to the shapes.
    */
   nudgeShapes(shapes, offset) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     if (ids.length <= 0) return this;
     const changes = [];
     for (const id of ids) {
       const shape = this.getShape(id);
-      const localDelta = import_Vec.Vec.From(offset);
-      localDelta.rot(-this.getShapeParentTransform(shape).rotation());
-      changes.push(this.getChangesToTranslateShape(shape, localDelta.add(shape)));
+      changes.push(this.getChangesToTranslateShapeByPageDelta(shape, offset));
     }
     this.updateShapes(changes);
     return this;
@@ -5060,7 +5103,7 @@ class Editor extends import_eventemitter3.default {
    */
   duplicateShapes(shapes, offset) {
     this.run(() => {
-      const _ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+      const _ids = toShapeIds(shapes);
       const ids = this._shouldIgnoreShapeLock ? _ids : this._getUnlockedShapeIds(_ids);
       if (ids.length <= 0) return this;
       const initialIds = new Set(ids);
@@ -5169,7 +5212,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   moveShapesToPage(shapes, pageId) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     if (ids.length === 0) return this;
     if (this.getIsReadonly()) return this;
     const currentPageId = this.getCurrentPageId();
@@ -5205,7 +5248,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   toggleLock(shapes) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     if (this.getIsReadonly() || ids.length === 0) return this;
     let allLocked = true;
     const shapesToToggle = [];
@@ -5244,7 +5287,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   sendToBack(shapes) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     const changes = (0, import_reorderShapes.getReorderingShapesChanges)(this, "toBack", ids, {
       considerAllShapes: true
     });
@@ -5274,7 +5317,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   sendBackward(shapes, opts = {}) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     const changes = (0, import_reorderShapes.getReorderingShapesChanges)(this, "backward", ids, opts);
     if (changes) this.updateShapes(changes);
     return this;
@@ -5302,7 +5345,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   bringForward(shapes, opts = {}) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     const changes = (0, import_reorderShapes.getReorderingShapesChanges)(this, "forward", ids, opts);
     if (changes) this.updateShapes(changes);
     return this;
@@ -5321,7 +5364,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   bringToFront(shapes) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     const changes = (0, import_reorderShapes.getReorderingShapesChanges)(this, "toFront", ids);
     if (changes) this.updateShapes(changes);
     return this;
@@ -5333,7 +5376,7 @@ class Editor extends import_eventemitter3.default {
    * @internal
    */
   getShapeClusters(shapes, type, opts) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     let freshShapes = (0, import_utils.compact)(ids.map((id) => this.getShape(id)));
     if (opts?.filterAxisAligned) {
       freshShapes = freshShapes.filter((s) => {
@@ -5358,7 +5401,7 @@ class Editor extends import_eventemitter3.default {
       const shapesMovingTogether = [shape];
       const boundsOfShapesMovingTogether = [shapePageBounds];
       this.collectShapesViaArrowBindings({
-        bindings: this.getBindingsToShape(shape.id, "arrow"),
+        bindings: this.getBindingsInvolvingShape(shape.id, "arrow"),
         initialShapes: freshShapes,
         resultShapes: shapesMovingTogether,
         resultBounds: boundsOfShapesMovingTogether,
@@ -5414,7 +5457,7 @@ class Editor extends import_eventemitter3.default {
    */
   flipShapes(shapes, operation) {
     if (this.getIsReadonly()) return this;
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     const shapesToFlipFirstPass = (0, import_utils.compact)(ids.map((id) => this.getShape(id)));
     for (const shape of shapesToFlipFirstPass) {
       if (this.isShapeOfType(shape, "group")) {
@@ -5488,21 +5531,7 @@ class Editor extends import_eventemitter3.default {
     const { clusters: shapeClustersToStack } = this.getShapeClusters(shapes, "stack");
     const len = shapeClustersToStack.length;
     if (_gap === 0 && len < 3 || len < 2) return this;
-    let val;
-    let min;
-    let max;
-    let dim;
-    if (operation === "horizontal") {
-      val = "x";
-      min = "minX";
-      max = "maxX";
-      dim = "width";
-    } else {
-      val = "y";
-      min = "minY";
-      max = "maxY";
-      dim = "height";
-    }
+    const { val, min, max, dim } = AXIS[operation];
     let shapeGap = 0;
     shapeClustersToStack.sort((a, b) => a.pageBounds[min] - b.pageBounds[min]);
     if (_gap === 0) {
@@ -5541,13 +5570,7 @@ class Editor extends import_eventemitter3.default {
       const delta = new import_Vec.Vec();
       delta[val] = v + shapeGap - pageBounds[val];
       for (const shape of shapes2) {
-        const shapeDelta = delta.clone();
-        const parent = this.getShapeParent(shape);
-        if (parent) {
-          shapeDelta.rot(-this.getShapePageTransform(parent).rotation());
-        }
-        shapeDelta.add(shape);
-        changes.push(this.getChangesToTranslateShape(shape, shapeDelta));
+        changes.push(this.getChangesToTranslateShapeByPageDelta(shape, delta));
       }
       v += pageBounds[dim] + shapeGap;
     }
@@ -5627,13 +5650,7 @@ class Editor extends import_eventemitter3.default {
     for (const { shapes: shapes2, pageBounds, nextPageBounds } of shapeClustersToPack) {
       const delta = import_Vec.Vec.Sub(nextPageBounds.point, pageBounds.point).add(centerDelta);
       for (const shape of shapes2) {
-        const shapeDelta = delta.clone();
-        const parent = this.getShapeParent(shape);
-        if (parent) {
-          shapeDelta.rot(-this.getShapeParentTransform(shape).rotation());
-        }
-        shapeDelta.add(shape);
-        changes.push(this.getChangesToTranslateShape(shape, shapeDelta));
+        changes.push(this.getChangesToTranslateShapeByPageDelta(shape, delta));
       }
     }
     if (changes.length) {
@@ -5693,13 +5710,7 @@ class Editor extends import_eventemitter3.default {
         }
       }
       for (const shape of shapes2) {
-        const shapeDelta = delta.clone();
-        const parent = this.getShapeParent(shape);
-        if (parent) {
-          shapeDelta.rot(-this.getShapePageTransform(parent).rotation());
-        }
-        shapeDelta.add(shape);
-        changes.push(this.getChangesToTranslateShape(shape, shapeDelta));
+        changes.push(this.getChangesToTranslateShapeByPageDelta(shape, delta));
       }
     });
     this.updateShapes(changes);
@@ -5723,27 +5734,13 @@ class Editor extends import_eventemitter3.default {
     if (this.getIsReadonly()) return this;
     const { clusters: shapeClustersToDistribute } = this.getShapeClusters(shapes, "distribute");
     if (shapeClustersToDistribute.length < 3) return this;
-    let val;
-    let min;
-    let max;
-    let dim;
-    if (operation === "horizontal") {
-      val = "x";
-      min = "minX";
-      max = "maxX";
-      dim = "width";
-    } else {
-      val = "y";
-      min = "minY";
-      max = "maxY";
-      dim = "height";
-    }
+    const { val, min, max, dim } = AXIS[operation];
     const changes = [];
     const first = shapeClustersToDistribute.sort((a, b) => a.pageBounds[min] - b.pageBounds[min])[0];
     const last2 = shapeClustersToDistribute.sort((a, b) => b.pageBounds[max] - a.pageBounds[max])[0];
     if (first === last2) {
       const excludedShapeIds = new Set(first.shapes.map((s) => s.id));
-      const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+      const ids = toShapeIds(shapes);
       return this.distributeShapes(
         ids.filter((id) => !excludedShapeIds.has(id)),
         operation
@@ -5767,13 +5764,7 @@ class Editor extends import_eventemitter3.default {
         delta[val] = last2.pageBounds[max] - pageBounds[max] - 1;
       }
       for (const shape of shapes2) {
-        const shapeDelta = delta.clone();
-        const parent = this.getShapeParent(shape);
-        if (parent) {
-          shapeDelta.rot(-this.getShapePageTransform(parent).rotation());
-        }
-        shapeDelta.add(shape);
-        changes.push(this.getChangesToTranslateShape(shape, shapeDelta));
+        changes.push(this.getChangesToTranslateShapeByPageDelta(shape, delta));
       }
       v += pageBounds[dim] + gap;
     }
@@ -5803,32 +5794,17 @@ class Editor extends import_eventemitter3.default {
     );
     if (shapeClustersToStretch.length < 2) return this;
     const commonBounds = import_Box.Box.Common(allBounds);
-    let val;
-    let min;
-    let dim;
-    if (operation === "horizontal") {
-      val = "x";
-      min = "minX";
-      dim = "width";
-    } else {
-      val = "y";
-      min = "minY";
-      dim = "height";
-    }
+    const { val, min, dim } = AXIS[operation];
     this.run(() => {
       shapeClustersToStretch.forEach(({ shapes: shapes2, pageBounds }) => {
-        const localOffset = new import_Vec.Vec();
-        localOffset[val] = commonBounds[min] - pageBounds[min];
+        const pageOffset = new import_Vec.Vec();
+        pageOffset[val] = commonBounds[min] - pageBounds[min];
         const scaleOrigin = pageBounds.center.clone();
         scaleOrigin[val] = commonBounds[min];
         const scale = new import_Vec.Vec(1, 1);
         scale[val] = commonBounds[dim] / pageBounds[dim];
         for (const shape of shapes2) {
-          const shapeLocalOffset = localOffset.clone();
-          shapeLocalOffset.rot(-this.getShapeParentTransform(shape).rotation());
-          shapeLocalOffset.add(shape);
-          const changes = this.getChangesToTranslateShape(shape, shapeLocalOffset);
-          this.updateShape(changes);
+          this.updateShape(this.getChangesToTranslateShapeByPageDelta(shape, pageOffset));
           this.resizeShape(shape.id, scale, {
             initialBounds: this.getShapeGeometry(shape).bounds,
             scaleOrigin,
@@ -5871,7 +5847,7 @@ class Editor extends import_eventemitter3.default {
     const scaleY = targetBounds.height / commonBounds.height;
     const scale = new import_Vec.Vec(scaleX, scaleY);
     shapeClusters.forEach(({ shapes: shapes2, pageBounds }) => {
-      const localOffset = new import_Vec.Vec(
+      const pageOffset = new import_Vec.Vec(
         targetBounds.minX - commonBounds.minX + (pageBounds.minX - commonBounds.minX) * (scaleX - 1),
         targetBounds.minY - commonBounds.minY + (pageBounds.minY - commonBounds.minY) * (scaleY - 1)
       );
@@ -5880,11 +5856,7 @@ class Editor extends import_eventemitter3.default {
         targetBounds.minY + (pageBounds.minY - commonBounds.minY) * scaleY
       );
       for (const shape of shapes2) {
-        const shapeLocalOffset = localOffset.clone();
-        shapeLocalOffset.rot(-this.getShapeParentTransform(shape).rotation());
-        shapeLocalOffset.add(shape);
-        const changes = this.getChangesToTranslateShape(shape, shapeLocalOffset);
-        this.updateShape(changes);
+        this.updateShape(this.getChangesToTranslateShapeByPageDelta(shape, pageOffset));
         this.resizeShape(shape.id, scale, {
           initialBounds: this.getShapeGeometry(shape).bounds,
           scaleOrigin,
@@ -6060,11 +6032,20 @@ class Editor extends import_eventemitter3.default {
       initialShape: options.initialShape,
       initialBounds: options.initialBounds,
       isAspectRatioLocked: options.isAspectRatioLocked,
-      initialPageTransform: options.initialPageTransform
+      initialPageTransform: options.initialPageTransform,
+      dragHandle: options.dragHandle,
+      mode: options.mode,
+      // this is one frame of the same resize, not a new one, so don't fire start/end again
+      skipStartAndEndCallbacks: options.skipStartAndEndCallbacks
     });
     if (Math.sign(scale.x) * Math.sign(scale.y) < 0) {
       const parentRotation = this.getShapeParentTransform(id).rotation();
-      const rotation = -options.initialShape.rotation - 2 * parentRotation;
+      const parentDelta = (0, import_utils2.shortAngleDist)(
+        import_Mat.Mat.Cast(options.initialPageTransform).rotation() - options.initialShape.rotation,
+        parentRotation
+      );
+      const initialParentRotation = parentRotation - parentDelta;
+      const rotation = 2 * options.scaleAxisRotation - options.initialShape.rotation - 2 * initialParentRotation - parentDelta;
       this.updateShapes([{ id, type, rotation }]);
     }
     const preScaleShapePageCenter = import_Mat.Mat.applyToPoint(
@@ -6303,12 +6284,17 @@ class Editor extends import_eventemitter3.default {
     let remaining = duration;
     let t;
     const animations = [];
+    const ignoreShapeLock = this._shouldIgnoreShapeLock;
     let partial, result;
     for (let i = 0, n = partials.length; i < n; i++) {
       partial = partials[i];
       if (!partial) continue;
       const shape = this.getShape(partial.id);
       if (!shape) continue;
+      const unlocks = shape.isLocked && Object.hasOwn(partial, "isLocked") && !partial.isLocked;
+      if (!ignoreShapeLock && !unlocks && this.isShapeOrAncestorLocked(shape)) {
+        continue;
+      }
       result = {
         start: (0, import_utils.structuredClone)(shape),
         end: applyPartialToRecordWithProps((0, import_utils.structuredClone)(shape), partial)
@@ -6324,7 +6310,7 @@ class Editor extends import_eventemitter3.default {
           (p) => p && animatingShapes2.get(p.id) === animationId
         );
         if (partialsToUpdate.length) {
-          this.updateShapes(partialsToUpdate);
+          this.run(() => this.updateShapes(partialsToUpdate), { ignoreShapeLock });
         }
         this.off("tick", handleTick);
         return;
@@ -6357,13 +6343,13 @@ class Editor extends import_eventemitter3.default {
       throw Error("Editor.groupShapes: must provide an array of shapes or shape ids");
     }
     if (this.getIsReadonly()) return this;
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
-    if (ids.length <= 1) return this;
+    const ids = toShapeIds(shapes);
     const shapesToGroup = (0, import_utils.compact)(
       (this._shouldIgnoreShapeLock ? ids : this._getUnlockedShapeIds(ids)).map(
         (id) => this.getShape(id)
       )
     );
+    if (shapesToGroup.length <= 1) return this;
     const sortedShapeIds = shapesToGroup.sort(import_utils.sortByIndex).map((s) => s.id);
     const childBounds = (0, import_utils.compact)(shapesToGroup.map((shape) => this.getShapePageBounds(shape)));
     const pageBounds = import_Box.Box.Common(childBounds);
@@ -6372,8 +6358,11 @@ class Editor extends import_eventemitter3.default {
     }
     const { x, y } = pageBounds.point;
     const parentId = this.findCommonAncestor(shapesToGroup) ?? this.getCurrentPageId();
-    if (this.getCurrentToolId() !== "select") return this;
-    if (!this.isIn("select.idle")) {
+    if (!this.canCreateShapes([groupId])) {
+      alertMaxShapes(this);
+      return this;
+    }
+    if (this.isIn("select") && !this.isIn("select.idle")) {
       this.cancel();
     }
     const shapesWithRootParent = shapesToGroup.filter((shape) => shape.parentId === parentId).sort(import_utils.sortByIndex);
@@ -6401,15 +6390,14 @@ class Editor extends import_eventemitter3.default {
   ungroupShapes(shapes, opts = {}) {
     if (this.getIsReadonly()) return this;
     const { select = true } = opts;
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     const shapesToUngroup = (0, import_utils.compact)(
       (this._shouldIgnoreShapeLock ? ids : this._getUnlockedShapeIds(ids)).map(
         (id) => this.getShape(id)
       )
     );
     if (shapesToUngroup.length === 0) return this;
-    if (this.getCurrentToolId() !== "select") return this;
-    if (!this.isIn("select.idle")) {
+    if (this.isIn("select") && !this.isIn("select.idle")) {
       this.cancel();
     }
     const idsToSelect = /* @__PURE__ */ new Set();
@@ -6423,16 +6411,16 @@ class Editor extends import_eventemitter3.default {
     });
     if (groups.length === 0) return this;
     this.run(() => {
-      let group;
       for (let i = 0, n = groups.length; i < n; i++) {
-        group = groups[i];
+        const group = this.getShape(groups[i].id);
+        if (!group) continue;
         const childIds = this.getSortedChildIdsForParent(group.id);
         for (let j = 0, n2 = childIds.length; j < n2; j++) {
           idsToSelect.add(childIds[j]);
         }
         this.reparentShapes(childIds, group.parentId, group.index);
       }
-      this.deleteShapes(groups.map((group2) => group2.id));
+      this.deleteShapes(groups.map((group) => group.id));
       if (select) {
         this.select(...idsToSelect);
       }
@@ -6513,14 +6501,14 @@ class Editor extends import_eventemitter3.default {
   }
   /** @internal */
   _getUnlockedShapeIds(ids) {
-    return ids.filter((id) => !this.getShape(id)?.isLocked);
+    return ids.filter((id) => !this.isShapeOrAncestorLocked(id));
   }
   deleteShapes(_ids) {
     if (this.getIsReadonly()) return this;
     if (!Array.isArray(_ids)) {
       throw Error("Editor.deleteShapes: must provide an array of shapes or shapeIds");
     }
-    const shapeIds = typeof _ids[0] === "string" ? _ids : _ids.map((s) => s.id);
+    const shapeIds = toShapeIds(_ids);
     const shapeIdsToDelete = this._shouldIgnoreShapeLock ? shapeIds : this._getUnlockedShapeIds(shapeIds);
     if (shapeIdsToDelete.length === 0) return this;
     const allShapeIdsToDelete = new Set(shapeIdsToDelete);
@@ -6865,7 +6853,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   getContentFromCurrentPage(shapes) {
-    const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = toShapeIds(shapes);
     if (!ids) return;
     if (ids.length === 0) return;
     const shapeIds = this.getShapeAndDescendantIds(ids);
@@ -6933,21 +6921,29 @@ class Editor extends import_eventemitter3.default {
     await Promise.allSettled(
       content.assets.map(async (asset) => {
         if ((asset.type === "image" || asset.type === "video") && !asset.props.src?.startsWith("data:image") && !asset.props.src?.startsWith("data:video") && !asset.props.src?.startsWith("http")) {
-          const assetWithDataUrl = (0, import_utils.structuredClone)(asset);
-          const objectUrl = await this.store.props.assets.resolve(asset, {
-            screenScale: 1,
-            steppedScreenScale: 1,
-            dpr: 1,
-            networkEffectiveType: null,
-            shouldResolveToOriginal: true
-          });
-          assetWithDataUrl.props.src = await import_utils.FileHelpers.blobToDataUrl(
-            await (0, import_utils.fetch)(objectUrl).then((r) => r.blob())
-          );
-          assets.push(assetWithDataUrl);
-        } else {
-          assets.push(asset);
+          try {
+            const objectUrl = await this.store.props.assets.resolve(asset, {
+              screenScale: 1,
+              steppedScreenScale: 1,
+              dpr: 1,
+              networkEffectiveType: null,
+              shouldResolveToOriginal: true
+            });
+            if (objectUrl) {
+              const response = await (0, import_utils.fetch)(objectUrl);
+              if (response.ok) {
+                const assetWithDataUrl = (0, import_utils.structuredClone)(asset);
+                assetWithDataUrl.props.src = await import_utils.FileHelpers.blobToDataUrl(await response.blob());
+                assets.push(assetWithDataUrl);
+                return;
+              }
+              console.warn(`Could not inline asset ${asset.id}: fetch returned ${response.status}`);
+            }
+          } catch (err) {
+            console.warn(`Could not inline asset ${asset.id}`, err);
+          }
         }
+        assets.push(asset);
       })
     );
     content.assets = assets;
@@ -7241,7 +7237,7 @@ class Editor extends import_eventemitter3.default {
    * @public
    */
   async getSvgElement(shapes, opts = {}) {
-    const ids = shapes.length === 0 ? this.getCurrentPageShapeIdsSorted() : typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
+    const ids = shapes.length === 0 ? this.getCurrentPageShapeIdsSorted() : toShapeIds(shapes);
     if (ids.length === 0) return void 0;
     await this.fonts.loadRequiredFontsForCurrentPage(this.options.maxFontsToLoadBeforeRender);
     return (0, import_exportToSvg.exportToSvg)(this, ids, opts);
@@ -7837,22 +7833,22 @@ class Editor extends import_eventemitter3.default {
     const releaseCtrl = this._ctrlKeyTimeout !== -1;
     const releaseMeta = this._metaKeyTimeout !== -1;
     if (releaseShift) {
-      clearTimeout(this._shiftKeyTimeout);
+      this.timers.clearTimeout(this._shiftKeyTimeout);
       this._shiftKeyTimeout = -1;
       this.inputs.setShiftKey(false);
     }
     if (releaseAlt) {
-      clearTimeout(this._altKeyTimeout);
+      this.timers.clearTimeout(this._altKeyTimeout);
       this._altKeyTimeout = -1;
       this.inputs.setAltKey(false);
     }
     if (releaseCtrl) {
-      clearTimeout(this._ctrlKeyTimeout);
+      this.timers.clearTimeout(this._ctrlKeyTimeout);
       this._ctrlKeyTimeout = -1;
       this.inputs.setCtrlKey(false);
     }
     if (releaseMeta) {
-      clearTimeout(this._metaKeyTimeout);
+      this.timers.clearTimeout(this._metaKeyTimeout);
       this._metaKeyTimeout = -1;
       this.inputs.setMetaKey(false);
     }
@@ -7966,28 +7962,28 @@ class Editor extends import_eventemitter3.default {
       return;
     }
     if (info.shiftKey) {
-      clearTimeout(this._shiftKeyTimeout);
+      this.timers.clearTimeout(this._shiftKeyTimeout);
       this._shiftKeyTimeout = -1;
       inputs.setShiftKey(true);
     } else if (!info.shiftKey && inputs.getShiftKey() && this._shiftKeyTimeout === -1) {
       this._shiftKeyTimeout = this.timers.setTimeout(this._releaseShiftKey, 150);
     }
     if (info.altKey) {
-      clearTimeout(this._altKeyTimeout);
+      this.timers.clearTimeout(this._altKeyTimeout);
       this._altKeyTimeout = -1;
       inputs.setAltKey(true);
     } else if (!info.altKey && inputs.getAltKey() && this._altKeyTimeout === -1) {
       this._altKeyTimeout = this.timers.setTimeout(this._releaseAltKey, 150);
     }
     if (info.ctrlKey) {
-      clearTimeout(this._ctrlKeyTimeout);
+      this.timers.clearTimeout(this._ctrlKeyTimeout);
       this._ctrlKeyTimeout = -1;
       inputs.setCtrlKey(true);
     } else if (!info.ctrlKey && inputs.getCtrlKey() && this._ctrlKeyTimeout === -1) {
       this._ctrlKeyTimeout = this.timers.setTimeout(this._releaseCtrlKey, 150);
     }
     if (info.metaKey && info.name !== "key_up") {
-      clearTimeout(this._metaKeyTimeout);
+      this.timers.clearTimeout(this._metaKeyTimeout);
       this._metaKeyTimeout = -1;
       inputs.setMetaKey(true);
     } else if (!info.metaKey && inputs.getMetaKey() && this._metaKeyTimeout === -1) {
@@ -8001,8 +7997,7 @@ class Editor extends import_eventemitter3.default {
     const cameraOptions = this._cameraOptions.__unsafe__getWithoutCapture();
     switch (type) {
       case "pinch": {
-        if (cameraOptions.isLocked) return;
-        clearTimeout(this._longPressTimeout);
+        this.timers.clearTimeout(this._longPressTimeout);
         this.inputs.updateFromEvent(info);
         switch (info.name) {
           case "pinch_start": {
@@ -8023,6 +8018,7 @@ class Editor extends import_eventemitter3.default {
           }
           case "pinch": {
             if (!inputs.getIsPinching()) return;
+            if (cameraOptions.isLocked) return;
             const {
               point: { z = 1 },
               delta: { x: dx, y: dy }
@@ -8078,7 +8074,7 @@ class Editor extends import_eventemitter3.default {
         const { panSpeed, zoomSpeed } = cameraOptions;
         let wheelBehavior = cameraOptions.wheelBehavior;
         const inputMode = this.user.getUserPreferences().inputMode;
-        if (inputMode !== null) {
+        if (inputMode !== null && wheelBehavior !== "none") {
           wheelBehavior = inputMode === "trackpad" ? "pan" : "zoom";
         }
         if (wheelBehavior !== "none") {
@@ -8130,12 +8126,12 @@ class Editor extends import_eventemitter3.default {
       }
       case "pointer": {
         if (inputs.getIsPinching()) return;
-        this.inputs.updateFromEvent(info);
         const { isPen } = info;
         const { isPenMode } = instanceState;
+        if (isPenMode && !isPen) return;
+        this.inputs.updateFromEvent(info);
         switch (info.name) {
           case "pointer_down": {
-            if (isPenMode && !isPen) return;
             this._releaseDebouncedModifiers();
             if (!this.inputs.getIsPanning()) {
               this._longPressTimeout = this.timers.setTimeout(() => {
@@ -8159,11 +8155,12 @@ class Editor extends import_eventemitter3.default {
             inputs.buttons.add(info.button);
             inputs.setIsPointing(true);
             inputs.setIsDragging(false);
+            this.stopCameraAnimation();
             if (!isPenMode && info.isPenDirect) {
               this.updateInstanceState({ isPenMode: true });
               this.interrupt();
             }
-            if (info.button === import_constants.STYLUS_ERASER_BUTTON) {
+            if (info.button === import_constants.STYLUS_ERASER_BUTTON && this.getStateDescendant("eraser")) {
               this._restoreToolId = this.getCurrentToolId();
               this.complete();
               this.setCurrentTool("eraser");
@@ -8172,10 +8169,10 @@ class Editor extends import_eventemitter3.default {
                 this._prevCursor = this.getInstanceState().cursor.type;
               }
               this.inputs.setIsPanning(true);
-              clearTimeout(this._longPressTimeout);
+              this.timers.clearTimeout(this._longPressTimeout);
             } else if (info.button === import_constants.RIGHT_MOUSE_BUTTON && this.options.rightClickPanning) {
               this.inputs.setIsRightPointing(true);
-              clearTimeout(this._longPressTimeout);
+              this.timers.clearTimeout(this._longPressTimeout);
               return this;
             }
             if (this.inputs.getIsPanning()) {
@@ -8186,7 +8183,6 @@ class Editor extends import_eventemitter3.default {
             break;
           }
           case "pointer_move": {
-            if (!isPen && isPenMode) return;
             const { x: cx, y: cy, z: cz } = (0, import_state.unsafe__withoutCapture)(() => this.getCamera());
             if (this.inputs.getIsRightPointing() && !this.inputs.getIsPanning()) {
               const currentScreenPoint = this.inputs.getCurrentScreenPoint();
@@ -8217,16 +8213,15 @@ class Editor extends import_eventemitter3.default {
             }
             if (inputs.getIsPointing() && !inputs.getIsDragging() && import_Vec.Vec.Dist2(inputs.getOriginPagePoint(), inputs.getCurrentPagePoint()) * this.getZoomLevel() > (instanceState.isCoarsePointer ? this.options.coarseDragDistanceSquared : this.options.dragDistanceSquared) / cz) {
               inputs.setIsDragging(true);
-              clearTimeout(this._longPressTimeout);
+              this.timers.clearTimeout(this._longPressTimeout);
             }
             break;
           }
           case "pointer_up": {
             inputs.setIsDragging(false);
             inputs.setIsPointing(false);
-            clearTimeout(this._longPressTimeout);
+            this.timers.clearTimeout(this._longPressTimeout);
             inputs.buttons.delete(info.button);
-            if (instanceState.isPenMode && !isPen) return;
             if (this.inputs.getIsRightPointing() && !this.inputs.getIsPanning()) {
               this.inputs.setIsRightPointing(false);
               this._selectedShapeIdsAtPointerDown = [];
@@ -8282,7 +8277,7 @@ class Editor extends import_eventemitter3.default {
                 });
               }
             } else {
-              if (info.button === import_constants.STYLUS_ERASER_BUTTON) {
+              if (info.button === import_constants.STYLUS_ERASER_BUTTON && this.getStateDescendant("eraser")) {
                 this.complete();
                 this.setCurrentTool(this._restoreToolId);
               }
@@ -8295,8 +8290,8 @@ class Editor extends import_eventemitter3.default {
         break;
       }
       case "keyboard": {
-        if (info.key === "ShiftRight") info.key = "ShiftLeft";
-        if (info.key === "AltRight") info.key = "AltLeft";
+        if (info.code === "ShiftRight") info.code = "ShiftLeft";
+        if (info.code === "AltRight") info.code = "AltLeft";
         if (info.code === "ControlRight") info.code = "ControlLeft";
         if (info.code === "MetaRight") info.code = "MetaLeft";
         switch (info.name) {
@@ -8309,7 +8304,7 @@ class Editor extends import_eventemitter3.default {
                 }
                 this.inputs.setIsPanning(true);
                 this.inputs.setIsSpacebarPanning(true);
-                clearTimeout(this._longPressTimeout);
+                this.timers.clearTimeout(this._longPressTimeout);
                 this.setCursor({
                   type: this.inputs.getIsPointing() ? "grabbing" : "grab",
                   rotation: 0
@@ -8335,7 +8330,7 @@ class Editor extends import_eventemitter3.default {
                     break;
                   }
                 }
-                if (offset) {
+                if (offset && !cameraOptions.isLocked) {
                   const bounds = this.getViewportPageBounds();
                   const next = bounds.clone().translate(offset.mulV({ x: bounds.w, y: bounds.h }));
                   this._animateToViewport(next, { animation: { duration: 320 } });
@@ -8375,7 +8370,7 @@ class Editor extends import_eventemitter3.default {
         this.setCurrentTool("select");
       }
       const { isPenMode } = this.store.unsafeGetWithoutCapture(import_tlschema.TLINSTANCE_ID);
-      if (info.isPen === isPenMode) {
+      if (!isPenMode || info.isPen) {
         const clickInfo = this._clickManager.handlePointerEvent(info);
         if (info.name !== clickInfo.name) {
           this.root.handleEvent(info);
@@ -8397,7 +8392,7 @@ class Editor extends import_eventemitter3.default {
   maybeTrackPerformance(name) {
     if (import_debug_flags.debugFlags.measurePerformance.get()) {
       if (this.performanceTracker.isStarted()) {
-        clearTimeout(this.performanceTrackerTimeout);
+        this.timers.clearTimeout(this.performanceTrackerTimeout);
       } else {
         this.performanceTracker.start(name);
       }
@@ -8666,6 +8661,9 @@ function pushShapeWithDescendants(editor, id, result) {
     pushShapeWithDescendants(editor, childIds[i], result);
   }
 }
+function toShapeIds(shapes) {
+  return typeof shapes[0] === "string" ? shapes : shapes.map((shape) => shape.id);
+}
 function withIsolatedShapes(editor, shapeIds, callback) {
   let result;
   editor.run(
@@ -8688,7 +8686,7 @@ function withIsolatedShapes(editor, shapeIds, callback) {
             }
           }
         }
-        editor.deleteBindings([...bindingsToRemove], { isolateShapes: true });
+        editor._deleteBindings([...bindingsToRemove], { isolateShapes: true });
         try {
           result = import_utils.Result.ok(callback(bindingsWithBoth));
         } catch (error) {