@tldraw/editor 3.16.0-canary.ca347c5375a5 → 3.16.0-canary.cf24aedcd577

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

@@ -3944,6 +3944,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       hitInside = false,
       hitFrameInside = false
     } = opts;
+    const [innerMargin, outerMargin] = Array.isArray(margin) ? margin : [margin, margin];
     let inHollowSmallestArea = Infinity;
     let inHollowSmallestAreaHit = null;
     let inMarginClosestToEdgeDistance = Infinity;
@@ -3953,7 +3954,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         return false;
       const pageMask = this.getShapeMask(shape);
       if (pageMask && !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--) {
@@ -3969,8 +3970,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         }
       }
       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)) {
@@ -3990,10 +3991,10 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         }
         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;
@@ -4001,12 +4002,22 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         }
       }
       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
+              (// If the distance is negative, check against the inner margin
+              distance > 0 && distance <= outerMargin || 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;
@@ -5525,8 +5536,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       const shapesMovingTogether = [shape];
       const boundsOfShapesMovingTogether = [shapePageBounds];
       if (!this.getShapeUtil(shape).canBeLaidOut?.(shape, {
-        type: "stretch",
-        shapes: shapesToStretchFirstPass
+        type: "stretch"
       })) {
         continue;
       }
@@ -5851,21 +5861,24 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         }
         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;