@tldraw/editor 4.3.0 → 4.4.0-canary.15cff7ea86f8

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

@@ -118,6 +118,7 @@ var import_HistoryManager = require("./managers/HistoryManager/HistoryManager");
 var import_InputsManager = require("./managers/InputsManager/InputsManager");
 var import_ScribbleManager = require("./managers/ScribbleManager/ScribbleManager");
 var import_SnapManager = require("./managers/SnapManager/SnapManager");
+var import_SpatialIndexManager = require("./managers/SpatialIndexManager/SpatialIndexManager");
 var import_TextManager = require("./managers/TextManager/TextManager");
 var import_TickManager = require("./managers/TickManager/TickManager");
 var import_UserPreferencesManager = require("./managers/UserPreferencesManager/UserPreferencesManager");
@@ -187,6 +188,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
      * @public
      */
     __publicField(this, "snaps");
+    __publicField(this, "_spatialIndex");
     /**
      * A manager for the any asynchronous events and making sure they're
      * cleaned up upon disposal.
@@ -303,6 +305,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     /* --------------------- Shapes --------------------- */
     __publicField(this, "_shapeGeometryCaches", {});
     __publicField(this, "_notVisibleShapes", (0, import_notVisibleShapes.notVisibleShapes)(this));
+    __publicField(this, "_culledShapesCache", null);
     // Parents and children
     /**
      * A cache of parents to children.
@@ -378,6 +381,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       }
     });
     this.snaps = new import_SnapManager.SnapManager(this);
+    this._spatialIndex = new import_SpatialIndexManager.SpatialIndexManager(this);
+    this.disposables.add(() => this._spatialIndex.dispose());
     this.disposables.add(this.timers.dispose);
     this._cameraOptions.set({ ...import_constants.DEFAULT_CAMERA_OPTIONS, ...cameraOptions });
     this._textOptions = (0, import_state.atom)("text options", textOptions ?? null);
@@ -3842,14 +3847,29 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     const notVisibleShapes2 = this.getNotVisibleShapes();
     const selectedShapeIds = this.getSelectedShapeIds();
     const editingId = this.getEditingShapeId();
-    const culledShapes = new Set(notVisibleShapes2);
+    const nextValue = new Set(notVisibleShapes2);
     if (editingId) {
-      culledShapes.delete(editingId);
+      nextValue.delete(editingId);
     }
     selectedShapeIds.forEach((id) => {
-      culledShapes.delete(id);
+      nextValue.delete(id);
     });
-    return culledShapes;
+    const prevValue = this._culledShapesCache;
+    if (prevValue) {
+      if (prevValue.size !== nextValue.size) {
+        this._culledShapesCache = nextValue;
+        return nextValue;
+      }
+      for (const id of prevValue) {
+        if (!nextValue.has(id)) {
+          this._culledShapesCache = nextValue;
+          return nextValue;
+        }
+      }
+      return prevValue;
+    }
+    this._culledShapesCache = nextValue;
+    return nextValue;
   }
   getCurrentPageBounds() {
     let commonBounds;
@@ -3899,7 +3919,10 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     let inHollowSmallestAreaHit = null;
     let inMarginClosestToEdgeDistance = Infinity;
     let inMarginClosestToEdgeHit = null;
+    const searchMargin = Math.max(innerMargin, outerMargin, this.options.hitTestMargin / zoomLevel);
+    const candidateIds = this._spatialIndex.getShapeIdsAtPoint(point, searchMargin);
     const shapesToCheck = (opts.renderingOnly ? this.getCurrentPageRenderingShapesSorted() : this.getCurrentPageShapesSorted()).filter((shape) => {
+      if (!candidateIds.has(shape.id) && !this.isShapeOfType(shape, "frame")) return false;
       if (shape.isLocked && !hitLocked || this.isShapeHidden(shape) || this.isShapeOfType(shape, "group"))
         return false;
       const pageMask = this.getShapeMask(shape);
@@ -4006,7 +4029,33 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * @public
    */
   getShapesAtPoint(point, opts = {}) {
-    return this.getCurrentPageShapesSorted().filter((shape) => !this.isShapeHidden(shape) && this.isPointInShape(shape, point, opts)).reverse();
+    const margin = opts.margin ?? 0;
+    const candidateIds = this._spatialIndex.getShapeIdsAtPoint(point, margin);
+    return this.getCurrentPageShapesSorted().filter((shape) => {
+      if (this.isShapeHidden(shape)) return false;
+      if (!candidateIds.has(shape.id) && !this.isShapeOfType(shape, "frame")) return false;
+      return this.isPointInShape(shape, point, opts);
+    }).reverse();
+  }
+  /**
+   * Get shape IDs within the given bounds.
+   *
+   * Note: Uses shape page bounds only. Frames with labels outside their bounds
+   * may not be included even if the label is within the search bounds.
+   *
+   * Note: Results are unordered. If you need z-order, combine with sorted shapes:
+   * ```ts
+   * const candidates = editor.getShapeIdsInsideBounds(bounds)
+   * const sorted = editor.getCurrentPageShapesSorted().filter(s => candidates.has(s.id))
+   * ```
+   *
+   * @param bounds - The bounds to search within.
+   * @returns Unordered set of shape IDs within the given bounds.
+   *
+   * @internal
+   */
+  getShapeIdsInsideBounds(bounds) {
+    return this._spatialIndex.getShapeIdsInsideBounds(bounds);
   }
   /**
    * Test whether a point (in the current page space) will will a shape. This method takes into account masks,
@@ -7605,7 +7654,10 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
                   delta = dy / 100;
                 }
               }
-              const zoom = cz + (delta ?? 0) * zoomSpeed * cz;
+              const isZoomDirectionInverted = (this.user.getUserPreferences().isZoomDirectionInverted && inputMode === "mouse") ?? false;
+              const deltaValue = delta ?? 0;
+              const finalDelta = isZoomDirectionInverted ? -deltaValue : deltaValue;
+              const zoom = cz + finalDelta * zoomSpeed * cz;
               this._setCamera(new import_Vec.Vec(cx + x / zoom - x / cz, cy + y / zoom - y / cz, zoom), {
                 immediate: true
               });