@tldraw/editor 5.3.0 → 5.4.0-canary.074b19f2c11f

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

@@ -4298,17 +4298,16 @@ 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()).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;
-    });
+    const shapesToCheck = opts.renderingOnly ? this.getCurrentPageRenderingShapesSorted() : this.getCurrentPageShapesSorted();
     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);
@@ -4413,11 +4412,15 @@ class Editor extends import_eventemitter3.default {
   getShapesAtPoint(point, opts = {}) {
     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.isShapeFrameLike(shape)) return false;
-      return this.isPointInShape(shape, point, opts);
-    }).reverse();
+    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;
   }
   /**
    * Get shape IDs within the given bounds.
@@ -5713,6 +5716,9 @@ class Editor extends import_eventemitter3.default {
    */
   alignShapes(shapes, operation) {
     if (this.getIsReadonly()) return this;
+    if (operation === "center") {
+      return this.alignShapes(shapes, "center-horizontal").alignShapes(shapes, "center-vertical");
+    }
     const { clusters: shapeClustersToAlign, allBounds } = this.getShapeClusters(shapes, "align");
     if (shapeClustersToAlign.length < 2) return this;
     const commonBounds = import_Box.Box.Common(allBounds);
@@ -7858,7 +7864,8 @@ class Editor extends import_eventemitter3.default {
   _prevCursor = "default";
   /** @internal */
   _shiftKeyTimeout = -1;
-  _setShiftKeyTimeout() {
+  _releaseShiftKey() {
+    this._shiftKeyTimeout = -1;
     this.inputs.setShiftKey(false);
     this.dispatch({
       type: "keyboard",
@@ -7874,7 +7881,8 @@ class Editor extends import_eventemitter3.default {
   }
   /** @internal */
   _altKeyTimeout = -1;
-  _setAltKeyTimeout() {
+  _releaseAltKey() {
+    this._altKeyTimeout = -1;
     this.inputs.setAltKey(false);
     this.dispatch({
       type: "keyboard",
@@ -7890,7 +7898,8 @@ class Editor extends import_eventemitter3.default {
   }
   /** @internal */
   _ctrlKeyTimeout = -1;
-  _setCtrlKeyTimeout() {
+  _releaseCtrlKey() {
+    this._ctrlKeyTimeout = -1;
     this.inputs.setCtrlKey(false);
     this.dispatch({
       type: "keyboard",
@@ -7906,7 +7915,8 @@ class Editor extends import_eventemitter3.default {
   }
   /** @internal */
   _metaKeyTimeout = -1;
-  _setMetaKeyTimeout() {
+  _releaseMetaKey() {
+    this._metaKeyTimeout = -1;
     this.inputs.setMetaKey(false);
     this.dispatch({
       type: "keyboard",
@@ -7920,6 +7930,51 @@ class Editor extends import_eventemitter3.default {
       code: "MetaLeft"
     });
   }
+  /**
+   * Flush any modifier still sitting in its 150ms release-debounce window, so a new
+   * interaction (a pointer down) starts with correct modifier state instead of a
+   * just-released key still being counted as held. A pending timer is exactly
+   * "released but still counted as held"; a genuinely-held modifier has no timer
+   * (-1) and is left alone.
+   *
+   * Each modifier is released through the same path its timer would have taken
+   * (`_releaseShiftKey` and friends), which dispatches the synthetic `key_up` so
+   * stale codes (e.g. `ShiftLeft`) leave `inputs.keys` and tool `onKeyUp` handlers run.
+   * We clear every pending modifier atom and timer *first*, then dispatch: a synthetic
+   * `key_up` reports all currently-held modifiers, so releasing them one at a time
+   * would make each event re-confirm the not-yet-released ones and cancel their flush.
+   * @internal
+   */
+  _releaseDebouncedModifiers() {
+    const releaseShift = this._shiftKeyTimeout !== -1;
+    const releaseAlt = this._altKeyTimeout !== -1;
+    const releaseCtrl = this._ctrlKeyTimeout !== -1;
+    const releaseMeta = this._metaKeyTimeout !== -1;
+    if (releaseShift) {
+      clearTimeout(this._shiftKeyTimeout);
+      this._shiftKeyTimeout = -1;
+      this.inputs.setShiftKey(false);
+    }
+    if (releaseAlt) {
+      clearTimeout(this._altKeyTimeout);
+      this._altKeyTimeout = -1;
+      this.inputs.setAltKey(false);
+    }
+    if (releaseCtrl) {
+      clearTimeout(this._ctrlKeyTimeout);
+      this._ctrlKeyTimeout = -1;
+      this.inputs.setCtrlKey(false);
+    }
+    if (releaseMeta) {
+      clearTimeout(this._metaKeyTimeout);
+      this._metaKeyTimeout = -1;
+      this.inputs.setMetaKey(false);
+    }
+    if (releaseShift) this._releaseShiftKey();
+    if (releaseAlt) this._releaseAltKey();
+    if (releaseCtrl) this._releaseCtrlKey();
+    if (releaseMeta) this._releaseMetaKey();
+  }
   /** @internal */
   _restoreToolId = "select";
   /** @internal */
@@ -8029,28 +8084,28 @@ class Editor extends import_eventemitter3.default {
       this._shiftKeyTimeout = -1;
       inputs.setShiftKey(true);
     } else if (!info.shiftKey && inputs.getShiftKey() && this._shiftKeyTimeout === -1) {
-      this._shiftKeyTimeout = this.timers.setTimeout(this._setShiftKeyTimeout, 150);
+      this._shiftKeyTimeout = this.timers.setTimeout(this._releaseShiftKey, 150);
     }
     if (info.altKey) {
       clearTimeout(this._altKeyTimeout);
       this._altKeyTimeout = -1;
       inputs.setAltKey(true);
     } else if (!info.altKey && inputs.getAltKey() && this._altKeyTimeout === -1) {
-      this._altKeyTimeout = this.timers.setTimeout(this._setAltKeyTimeout, 150);
+      this._altKeyTimeout = this.timers.setTimeout(this._releaseAltKey, 150);
     }
     if (info.ctrlKey) {
       clearTimeout(this._ctrlKeyTimeout);
       this._ctrlKeyTimeout = -1;
       inputs.setCtrlKey(true);
     } else if (!info.ctrlKey && inputs.getCtrlKey() && this._ctrlKeyTimeout === -1) {
-      this._ctrlKeyTimeout = this.timers.setTimeout(this._setCtrlKeyTimeout, 150);
+      this._ctrlKeyTimeout = this.timers.setTimeout(this._releaseCtrlKey, 150);
     }
     if (info.metaKey && info.name !== "key_up") {
       clearTimeout(this._metaKeyTimeout);
       this._metaKeyTimeout = -1;
       inputs.setMetaKey(true);
     } else if (!info.metaKey && inputs.getMetaKey() && this._metaKeyTimeout === -1) {
-      this._metaKeyTimeout = this.timers.setTimeout(this._setMetaKeyTimeout, 150);
+      this._metaKeyTimeout = this.timers.setTimeout(this._releaseMetaKey, 150);
     }
     if (!inputs.getIsPointing()) {
       inputs.setIsDragging(false);
@@ -8195,6 +8250,7 @@ class Editor extends import_eventemitter3.default {
         switch (info.name) {
           case "pointer_down": {
             if (isPenMode && !isPen) return;
+            this._releaseDebouncedModifiers();
             if (!this.inputs.getIsPanning()) {
               this._longPressTimeout = this.timers.setTimeout(() => {
                 const vsb = this.getViewportScreenBounds();
@@ -8677,16 +8733,16 @@ __decorateClass([
 ], Editor.prototype, "getIsReadonly", 1);
 __decorateClass([
   import_utils.bind
-], Editor.prototype, "_setShiftKeyTimeout", 1);
+], Editor.prototype, "_releaseShiftKey", 1);
 __decorateClass([
   import_utils.bind
-], Editor.prototype, "_setAltKeyTimeout", 1);
+], Editor.prototype, "_releaseAltKey", 1);
 __decorateClass([
   import_utils.bind
-], Editor.prototype, "_setCtrlKeyTimeout", 1);
+], Editor.prototype, "_releaseCtrlKey", 1);
 __decorateClass([
   import_utils.bind
-], Editor.prototype, "_setMetaKeyTimeout", 1);
+], Editor.prototype, "_releaseMetaKey", 1);
 function alertMaxShapes(editor, pageId = editor.getCurrentPageId()) {
   const name = editor.getPage(pageId).name;
   editor.emit("max-shapes", { name, pageId, count: editor.options.maxShapesPerPage });