@tldraw/editor 5.4.0-canary.e10ff229bb14 → 5.4.0-next.0d6e67d72615

package/dist-cjs/index.js

@@ -389,7 +389,7 @@ var import_uniq = require("./lib/utils/uniq");
 var import_defaultThemes2 = require("./lib/editor/managers/ThemeManager/defaultThemes");
 (0, import_utils.registerTldrawLibraryVersion)(
   "@tldraw/editor",
-  "5.4.0-canary.e10ff229bb14",
+  "5.4.0-next.0d6e67d72615",
   "cjs"
 );
 //# sourceMappingURL=index.js.map

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

@@ -4298,16 +4298,17 @@ class Editor extends import_eventemitter3.default {
     let inMarginClosestToEdgeHit = null;
     const searchMargin = Math.max(innerMargin, outerMargin, this.getHitTestMargin());
     const candidateIds = this._spatialIndex.getShapeIdsAtPoint(point, searchMargin);
-    const shapesToCheck = opts.renderingOnly ? this.getCurrentPageRenderingShapesSorted() : this.getCurrentPageShapesSorted();
+    const shapesToCheck = (opts.renderingOnly ? this.getCurrentPageRenderingShapesSorted() : this.getCurrentPageShapesSorted()).filter((shape) => {
+      if (!candidateIds.has(shape.id) && !this.isShapeFrameLike(shape)) return false;
+      if (shape.isLocked && !hitLocked || this.isShapeHidden(shape) || this.isShapeOfType(shape, "group"))
+        return false;
+      const pageMask = this.getShapeMask(shape);
+      if (pageMask && !(0, import_utils2.pointInPolygon)(point, pageMask)) return false;
+      if (filter && !filter(shape)) return false;
+      return true;
+    });
     for (let i = shapesToCheck.length - 1; i >= 0; i--) {
       const shape = shapesToCheck[i];
-      if (!candidateIds.has(shape.id) && !this.isShapeFrameLike(shape)) continue;
-      if (shape.isLocked && !hitLocked || this.isShapeHidden(shape) || this.isShapeOfType(shape, "group")) {
-        continue;
-      }
-      const pageMask = this.getShapeMask(shape);
-      if (pageMask && !(0, import_utils2.pointInPolygon)(point, pageMask)) continue;
-      if (filter && !filter(shape)) continue;
       const geometry = this.getShapeGeometry(shape);
       const isGroup = geometry instanceof import_Group2d.Group2d;
       const pointInShapeSpace = this.getPointInShapeSpace(shape, point);
@@ -4412,15 +4413,11 @@ class Editor extends import_eventemitter3.default {
   getShapesAtPoint(point, opts = {}) {
     const margin = opts.margin ?? 0;
     const candidateIds = this._spatialIndex.getShapeIdsAtPoint(point, margin);
-    const sorted = this.getCurrentPageShapesSorted();
-    const result = [];
-    for (let i = sorted.length - 1; i >= 0; i--) {
-      const shape = sorted[i];
-      if (this.isShapeHidden(shape)) continue;
-      if (!candidateIds.has(shape.id) && !this.isShapeFrameLike(shape)) continue;
-      if (this.isPointInShape(shape, point, opts)) result.push(shape);
-    }
-    return result;
+    return this.getCurrentPageShapesSorted().filter((shape) => {
+      if (this.isShapeHidden(shape)) return false;
+      if (!candidateIds.has(shape.id) && !this.isShapeFrameLike(shape)) return false;
+      return this.isPointInShape(shape, point, opts);
+    }).reverse();
   }
   /**
    * Get shape IDs within the given bounds.