@tldraw/editor 3.15.0 → 3.16.0-canary.03deb7f8fe34

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

@@ -2323,28 +2323,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();
     });
@@ -3313,19 +3296,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;
   }
   /**
@@ -3922,6 +3910,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;
@@ -3931,7 +3920,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--) {
@@ -3939,7 +3928,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;
@@ -3947,8 +3936,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)) {
@@ -3968,10 +3957,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;
@@ -3979,12 +3968,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;
@@ -5503,8 +5502,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;
       }
@@ -5829,21 +5827,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;
@@ -7028,6 +7029,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.
    *