@tldraw/editor 5.5.0-next.b6a9f7cd7be2 → 5.5.0-next.c91b2de0a423

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

@@ -1449,7 +1449,7 @@ class Editor extends EventEmitter {
   updateInstanceState(partial, historyOptions) {
     this._updateInstanceState(partial, { history: "ignore", ...historyOptions });
     if (partial.isChangingStyle !== void 0) {
-      clearTimeout(this._isChangingStyleTimeout);
+      this.timers.clearTimeout(this._isChangingStyleTimeout);
       if (partial.isChangingStyle === true) {
         this._isChangingStyleTimeout = this.timers.setTimeout(() => {
           this._updateInstanceState({ isChangingStyle: false }, { history: "ignore" });
@@ -7863,22 +7863,22 @@ class Editor extends EventEmitter {
     const releaseCtrl = this._ctrlKeyTimeout !== -1;
     const releaseMeta = this._metaKeyTimeout !== -1;
     if (releaseShift) {
-      clearTimeout(this._shiftKeyTimeout);
+      this.timers.clearTimeout(this._shiftKeyTimeout);
       this._shiftKeyTimeout = -1;
       this.inputs.setShiftKey(false);
     }
     if (releaseAlt) {
-      clearTimeout(this._altKeyTimeout);
+      this.timers.clearTimeout(this._altKeyTimeout);
       this._altKeyTimeout = -1;
       this.inputs.setAltKey(false);
     }
     if (releaseCtrl) {
-      clearTimeout(this._ctrlKeyTimeout);
+      this.timers.clearTimeout(this._ctrlKeyTimeout);
       this._ctrlKeyTimeout = -1;
       this.inputs.setCtrlKey(false);
     }
     if (releaseMeta) {
-      clearTimeout(this._metaKeyTimeout);
+      this.timers.clearTimeout(this._metaKeyTimeout);
       this._metaKeyTimeout = -1;
       this.inputs.setMetaKey(false);
     }
@@ -7992,28 +7992,28 @@ class Editor extends EventEmitter {
       return;
     }
     if (info.shiftKey) {
-      clearTimeout(this._shiftKeyTimeout);
+      this.timers.clearTimeout(this._shiftKeyTimeout);
       this._shiftKeyTimeout = -1;
       inputs.setShiftKey(true);
     } else if (!info.shiftKey && inputs.getShiftKey() && this._shiftKeyTimeout === -1) {
       this._shiftKeyTimeout = this.timers.setTimeout(this._releaseShiftKey, 150);
     }
     if (info.altKey) {
-      clearTimeout(this._altKeyTimeout);
+      this.timers.clearTimeout(this._altKeyTimeout);
       this._altKeyTimeout = -1;
       inputs.setAltKey(true);
     } else if (!info.altKey && inputs.getAltKey() && this._altKeyTimeout === -1) {
       this._altKeyTimeout = this.timers.setTimeout(this._releaseAltKey, 150);
     }
     if (info.ctrlKey) {
-      clearTimeout(this._ctrlKeyTimeout);
+      this.timers.clearTimeout(this._ctrlKeyTimeout);
       this._ctrlKeyTimeout = -1;
       inputs.setCtrlKey(true);
     } else if (!info.ctrlKey && inputs.getCtrlKey() && this._ctrlKeyTimeout === -1) {
       this._ctrlKeyTimeout = this.timers.setTimeout(this._releaseCtrlKey, 150);
     }
     if (info.metaKey && info.name !== "key_up") {
-      clearTimeout(this._metaKeyTimeout);
+      this.timers.clearTimeout(this._metaKeyTimeout);
       this._metaKeyTimeout = -1;
       inputs.setMetaKey(true);
     } else if (!info.metaKey && inputs.getMetaKey() && this._metaKeyTimeout === -1) {
@@ -8027,8 +8027,7 @@ class Editor extends EventEmitter {
     const cameraOptions = this._cameraOptions.__unsafe__getWithoutCapture();
     switch (type) {
       case "pinch": {
-        if (cameraOptions.isLocked) return;
-        clearTimeout(this._longPressTimeout);
+        this.timers.clearTimeout(this._longPressTimeout);
         this.inputs.updateFromEvent(info);
         switch (info.name) {
           case "pinch_start": {
@@ -8049,6 +8048,7 @@ class Editor extends EventEmitter {
           }
           case "pinch": {
             if (!inputs.getIsPinching()) return;
+            if (cameraOptions.isLocked) return;
             const {
               point: { z = 1 },
               delta: { x: dx, y: dy }
@@ -8104,7 +8104,7 @@ class Editor extends EventEmitter {
         const { panSpeed, zoomSpeed } = cameraOptions;
         let wheelBehavior = cameraOptions.wheelBehavior;
         const inputMode = this.user.getUserPreferences().inputMode;
-        if (inputMode !== null) {
+        if (inputMode !== null && wheelBehavior !== "none") {
           wheelBehavior = inputMode === "trackpad" ? "pan" : "zoom";
         }
         if (wheelBehavior !== "none") {
@@ -8156,12 +8156,12 @@ class Editor extends EventEmitter {
       }
       case "pointer": {
         if (inputs.getIsPinching()) return;
-        this.inputs.updateFromEvent(info);
         const { isPen } = info;
         const { isPenMode } = instanceState;
+        if (isPenMode && !isPen) return;
+        this.inputs.updateFromEvent(info);
         switch (info.name) {
           case "pointer_down": {
-            if (isPenMode && !isPen) return;
             this._releaseDebouncedModifiers();
             if (!this.inputs.getIsPanning()) {
               this._longPressTimeout = this.timers.setTimeout(() => {
@@ -8190,7 +8190,7 @@ class Editor extends EventEmitter {
               this.updateInstanceState({ isPenMode: true });
               this.interrupt();
             }
-            if (info.button === STYLUS_ERASER_BUTTON) {
+            if (info.button === STYLUS_ERASER_BUTTON && this.getStateDescendant("eraser")) {
               this._restoreToolId = this.getCurrentToolId();
               this.complete();
               this.setCurrentTool("eraser");
@@ -8199,10 +8199,10 @@ class Editor extends EventEmitter {
                 this._prevCursor = this.getInstanceState().cursor.type;
               }
               this.inputs.setIsPanning(true);
-              clearTimeout(this._longPressTimeout);
+              this.timers.clearTimeout(this._longPressTimeout);
             } else if (info.button === RIGHT_MOUSE_BUTTON && this.options.rightClickPanning) {
               this.inputs.setIsRightPointing(true);
-              clearTimeout(this._longPressTimeout);
+              this.timers.clearTimeout(this._longPressTimeout);
               return this;
             }
             if (this.inputs.getIsPanning()) {
@@ -8213,7 +8213,6 @@ class Editor extends EventEmitter {
             break;
           }
           case "pointer_move": {
-            if (!isPen && isPenMode) return;
             const { x: cx, y: cy, z: cz } = unsafe__withoutCapture(() => this.getCamera());
             if (this.inputs.getIsRightPointing() && !this.inputs.getIsPanning()) {
               const currentScreenPoint = this.inputs.getCurrentScreenPoint();
@@ -8244,16 +8243,15 @@ class Editor extends EventEmitter {
             }
             if (inputs.getIsPointing() && !inputs.getIsDragging() && Vec.Dist2(inputs.getOriginPagePoint(), inputs.getCurrentPagePoint()) * this.getZoomLevel() > (instanceState.isCoarsePointer ? this.options.coarseDragDistanceSquared : this.options.dragDistanceSquared) / cz) {
               inputs.setIsDragging(true);
-              clearTimeout(this._longPressTimeout);
+              this.timers.clearTimeout(this._longPressTimeout);
             }
             break;
           }
           case "pointer_up": {
             inputs.setIsDragging(false);
             inputs.setIsPointing(false);
-            clearTimeout(this._longPressTimeout);
+            this.timers.clearTimeout(this._longPressTimeout);
             inputs.buttons.delete(info.button);
-            if (instanceState.isPenMode && !isPen) return;
             if (this.inputs.getIsRightPointing() && !this.inputs.getIsPanning()) {
               this.inputs.setIsRightPointing(false);
               this._selectedShapeIdsAtPointerDown = [];
@@ -8309,7 +8307,7 @@ class Editor extends EventEmitter {
                 });
               }
             } else {
-              if (info.button === STYLUS_ERASER_BUTTON) {
+              if (info.button === STYLUS_ERASER_BUTTON && this.getStateDescendant("eraser")) {
                 this.complete();
                 this.setCurrentTool(this._restoreToolId);
               }
@@ -8336,7 +8334,7 @@ class Editor extends EventEmitter {
                 }
                 this.inputs.setIsPanning(true);
                 this.inputs.setIsSpacebarPanning(true);
-                clearTimeout(this._longPressTimeout);
+                this.timers.clearTimeout(this._longPressTimeout);
                 this.setCursor({
                   type: this.inputs.getIsPointing() ? "grabbing" : "grab",
                   rotation: 0
@@ -8362,7 +8360,7 @@ class Editor extends EventEmitter {
                     break;
                   }
                 }
-                if (offset) {
+                if (offset && !cameraOptions.isLocked) {
                   const bounds = this.getViewportPageBounds();
                   const next = bounds.clone().translate(offset.mulV({ x: bounds.w, y: bounds.h }));
                   this._animateToViewport(next, { animation: { duration: 320 } });
@@ -8402,7 +8400,7 @@ class Editor extends EventEmitter {
         this.setCurrentTool("select");
       }
       const { isPenMode } = this.store.unsafeGetWithoutCapture(TLINSTANCE_ID);
-      if (info.isPen === isPenMode) {
+      if (!isPenMode || info.isPen) {
         const clickInfo = this._clickManager.handlePointerEvent(info);
         if (info.name !== clickInfo.name) {
           this.root.handleEvent(info);
@@ -8424,7 +8422,7 @@ class Editor extends EventEmitter {
   maybeTrackPerformance(name) {
     if (debugFlags.measurePerformance.get()) {
       if (this.performanceTracker.isStarted()) {
-        clearTimeout(this.performanceTrackerTimeout);
+        this.timers.clearTimeout(this.performanceTrackerTimeout);
       } else {
         this.performanceTracker.start(name);
       }