@tldraw/editor 3.14.0-canary.4255c71c8c87 → 3.14.0-canary.468bf700c42b

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

@@ -323,7 +323,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     __publicField(this, "externalContentHandlers", {
       text: null,
       files: null,
-      "file-replace": null,
       embed: null,
       "svg-text": null,
       url: null,
@@ -440,7 +439,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     this.disposables.add(() => this.user.dispose());
     this.getContainer = getContainer;
     this.textMeasure = new import_TextManager.TextManager(this);
-    this.disposables.add(() => this.textMeasure.dispose());
     this.fonts = new import_FontManager.FontManager(this, fontAssetUrls);
     this._tickManager = new import_TickManager.TickManager(this);
     class NewRoot extends import_RootState.RootState {
@@ -1642,19 +1640,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
   getSelectionPageBounds() {
     return this.getShapesPageBounds(this.getSelectedShapeIds());
   }
-  /**
-   * The bounds of the selection bounding box in the current page space.
-   *
-   * @readonly
-   * @public
-   */
-  getSelectionScreenBounds() {
-    const bounds = this.getSelectionPageBounds();
-    if (!bounds) return void 0;
-    const { x, y } = this.pageToScreen(bounds.point);
-    const zoom = this.getZoomLevel();
-    return new import_Box.Box(x, y, bounds.width * zoom, bounds.height * zoom);
-  }
   /**
    * @internal
    */
@@ -2788,7 +2773,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * @public
    */
   updateViewportScreenBounds(screenBounds, center = false) {
-    if (!(screenBounds instanceof import_Box.Box)) {
+    if (screenBounds instanceof HTMLElement) {
       const rect = screenBounds.getBoundingClientRect();
       screenBounds = new import_Box.Box(
         rect.left || rect.x,
@@ -4131,7 +4116,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     if (!id) return void 0;
     const freshShape = this.getShape(id);
     if (freshShape === void 0 || !(0, import_tlschema.isShapeId)(freshShape.parentId)) return void 0;
-    return this.getShape(freshShape.parentId);
+    return this.store.get(freshShape.parentId);
   }
   /**
    * If siblingShape and targetShape are siblings, this returns targetShape. If targetShape has an
@@ -4263,9 +4248,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
           if (!pagePoint) continue;
           const newPoint = invertedParentTransform.applyToPoint(pagePoint);
           const newRotation = pageTransform.rotation() - parentPageRotation;
-          if (shape.id === parentId) {
-            throw Error("Attempted to reparent a shape to itself!");
-          }
           changes.push({
             id: shape.id,
             type: shape.type,
@@ -4358,10 +4340,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.
    *
@@ -4372,20 +4350,22 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    *
    * @public
    */
-  getDraggingOverShape(point, droppingShapes) {
-    const draggingShapes = (0, import_utils.compact)(droppingShapes.map((s) => this.getShape(s))).filter(
-      (s) => !s.isLocked && !this.isShapeHidden(s)
-    );
-    const maybeDraggingOverShapes = this.getShapesAtPoint(point, {
-      hitInside: true,
-      margin: 0
-    }).filter(
-      (s) => !droppingShapes.includes(s) && !s.isLocked && !this.isShapeHidden(s) && !draggingShapes.includes(s)
-    );
-    for (const maybeDraggingOverShape of maybeDraggingOverShapes) {
-      const shapeUtil = this.getShapeUtil(maybeDraggingOverShape);
-      if (shapeUtil.onDragShapesOver || shapeUtil.onDragShapesIn || shapeUtil.onDragShapesOut || shapeUtil.onDropShapesOver) {
-        return maybeDraggingOverShape;
+  getDroppingOverShape(point, droppingShapes = []) {
+    const currentPageShapesSorted = this.getCurrentPageShapesSorted();
+    for (let i = currentPageShapesSorted.length - 1; i >= 0; i--) {
+      const shape = currentPageShapesSorted[i];
+      if (
+        // ignore hidden shapes
+        this.isShapeHidden(shape) || // don't allow dropping on selected shapes
+        this.getSelectedShapeIds().includes(shape.id) || // only allow shapes that can receive children
+        !this.getShapeUtil(shape).canDropShapes(shape, droppingShapes) || // don't allow dropping a shape on itself or one of it's children
+        droppingShapes.find((s) => s.id === shape.id || this.hasAncestor(shape, s.id))
+      ) {
+        continue;
+      }
+      const maskedPageBounds = this.getShapeMaskedPageBounds(shape.id);
+      if (maskedPageBounds && maskedPageBounds.containsPoint(point) && this.getShapeGeometry(shape).hitTestPoint(this.getPointInShapeSpace(shape, point), 0, true)) {
+        return shape;
       }
     }
   }
@@ -4662,8 +4642,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    */
   duplicateShapes(shapes, offset) {
     this.run(() => {
-      const _ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
-      const ids = this._shouldIgnoreShapeLock ? _ids : this._getUnlockedShapeIds(_ids);
+      const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
       if (ids.length <= 0) return this;
       const initialIds = new Set(ids);
       const shapeIdSet = this.getShapeAndDescendantIds(ids);
@@ -4727,7 +4706,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         shape.index = index;
       });
       const shapesToCreate = shapesToCreateWithOriginals.map(({ shape }) => shape);
-      if (!this.canCreateShapes(shapesToCreate)) {
+      const maxShapesReached = shapesToCreate.length + this.getCurrentPageShapeIds().size > this.options.maxShapesPerPage;
+      if (maxShapesReached) {
         alertMaxShapes(this);
         return;
       }
@@ -5742,26 +5722,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
   getInitialMetaForShape(_shape) {
     return {};
   }
-  /**
-   * Get whether the provided shape can be created.
-   *
-   * @param shape - The shape or shape IDs to check.
-   *
-   * @public
-   */
-  canCreateShape(shape) {
-    return this.canCreateShapes([shape]);
-  }
-  /**
-   * Get whether the provided shapes can be created.
-   *
-   * @param shapes - The shapes or shape IDs to create.
-   *
-   * @public
-   */
-  canCreateShapes(shapes) {
-    return shapes.length + this.getCurrentPageShapeIds().size <= this.options.maxShapesPerPage;
-  }
   /**
    * Create a single shape.
    *
@@ -5815,8 +5775,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
           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(
+            if (!this.isShapeHidden(parent) && this.getShapeUtil(parent).canReceiveNewChildrenOfType(parent, partial.type) && 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.
@@ -5891,8 +5850,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
           ...shape.meta
         };
       });
-      this.emit("created-shapes", shapeRecordsToCreate);
-      this.emit("edit");
       this.store.put(shapeRecordsToCreate);
     });
     return this;
@@ -6134,8 +6091,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         updated = this.getShapeUtil(shape).onBeforeUpdate?.(shape, updated) ?? updated;
         updates.push(updated);
       }
-      this.emit("edited-shapes", updates);
-      this.emit("edit");
       this.store.put(updates);
     });
   }
@@ -6157,8 +6112,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         allShapeIdsToDelete.add(childId);
       });
     }
-    this.emit("deleted-shapes", [...allShapeIdsToDelete]);
-    this.emit("edit");
     return this.run(() => this.store.remove([...allShapeIdsToDelete]));
   }
   deleteShape(_id) {
@@ -6502,14 +6455,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
   async putExternalContent(info) {
     return this.externalContentHandlers[info.type]?.(info);
   }
-  /**
-   * Handle replacing external content.
-   *
-   * @param info - Info about the external content.
-   */
-  async replaceExternalContent(info) {
-    return this.externalContentHandlers[info.type]?.(info);
-  }
   /**
    * Get content that can be exported for the given shape ids.
    *
@@ -6927,9 +6872,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       previousScreenPoint,
       previousPagePoint,
       currentScreenPoint,
-      currentPagePoint,
-      originScreenPoint,
-      originPagePoint
+      currentPagePoint
     } = this.inputs;
     const { screenBounds } = this.store.unsafeGetWithoutCapture(import_tlschema.TLINSTANCE_ID);
     const { x: cx, y: cy, z: cz } = (0, import_state.unsafe__withoutCapture)(() => this.getCamera());
@@ -6947,8 +6890,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     this.inputs.isPen = info.type === "pointer" && info.isPen;
     if (info.name === "pointer_down" || this.inputs.isPinching) {
       pointerVelocity.set(0, 0);
-      originScreenPoint.setTo(currentScreenPoint);
-      originPagePoint.setTo(currentPagePoint);
+      this.inputs.originScreenPoint.setTo(currentScreenPoint);
+      this.inputs.originPagePoint.setTo(currentPagePoint);
     }
     this.run(
       () => {