@tldraw/editor 3.14.0-canary.fe38dba85730 → 3.14.0-canary.fea5990646e1

package/dist-esm/lib/editor/Editor.mjs

@@ -4165,7 +4165,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     if (!id) return void 0;
     const freshShape = this.getShape(id);
     if (freshShape === void 0 || !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
@@ -4297,9 +4297,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
           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,
@@ -4392,10 +4389,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     }
     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.
    *
@@ -4406,20 +4399,22 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    *
    * @public
    */
-  getDraggingOverShape(point, droppingShapes) {
-    const draggingShapes = 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;
       }
     }
   }
@@ -4761,7 +4756,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         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;
       }
@@ -5776,26 +5772,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
   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.
    *
@@ -5849,8 +5825,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
           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.
@@ -5925,8 +5900,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
           ...shape.meta
         };
       });
-      this.emit("created-shapes", shapeRecordsToCreate);
-      this.emit("edit");
       this.store.put(shapeRecordsToCreate);
     });
     return this;
@@ -6168,8 +6141,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         updated = this.getShapeUtil(shape).onBeforeUpdate?.(shape, updated) ?? updated;
         updates.push(updated);
       }
-      this.emit("edited-shapes", updates);
-      this.emit("edit");
       this.store.put(updates);
     });
   }
@@ -6191,8 +6162,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         allShapeIdsToDelete.add(childId);
       });
     }
-    this.emit("deleted-shapes", [...allShapeIdsToDelete]);
-    this.emit("edit");
     return this.run(() => this.store.remove([...allShapeIdsToDelete]));
   }
   deleteShape(_id) {
@@ -6961,9 +6930,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       previousScreenPoint,
       previousPagePoint,
       currentScreenPoint,
-      currentPagePoint,
-      originScreenPoint,
-      originPagePoint
+      currentPagePoint
     } = this.inputs;
     const { screenBounds } = this.store.unsafeGetWithoutCapture(TLINSTANCE_ID);
     const { x: cx, y: cy, z: cz } = unsafe__withoutCapture(() => this.getCamera());
@@ -6981,8 +6948,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     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(
       () => {