@tldraw/editor 5.5.0-canary.d8bde7cf0e8d → 5.5.0-canary.d97e6960f142

package/dist-cjs/index.js

@@ -392,7 +392,7 @@ var import_uniq = require("./lib/utils/uniq");
 var import_defaultThemes2 = require("./lib/editor/managers/ThemeManager/defaultThemes");
 (0, import_utils.registerTldrawLibraryVersion)(
   "@tldraw/editor",
-  "5.5.0-canary.d8bde7cf0e8d",
+  "5.5.0-canary.d97e6960f142",
   "cjs"
 );
 //# sourceMappingURL=index.js.map

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

@@ -7986,7 +7986,6 @@ class Editor extends import_eventemitter3.default {
     const cameraOptions = this._cameraOptions.__unsafe__getWithoutCapture();
     switch (type) {
       case "pinch": {
-        if (cameraOptions.isLocked) return;
         clearTimeout(this._longPressTimeout);
         this.inputs.updateFromEvent(info);
         switch (info.name) {
@@ -8008,6 +8007,7 @@ class Editor extends import_eventemitter3.default {
           }
           case "pinch": {
             if (!inputs.getIsPinching()) return;
+            if (cameraOptions.isLocked) return;
             const {
               point: { z = 1 },
               delta: { x: dx, y: dy }
@@ -8063,7 +8063,7 @@ class Editor extends import_eventemitter3.default {
         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") {
@@ -8115,12 +8115,12 @@ class Editor extends import_eventemitter3.default {
       }
       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(() => {
@@ -8149,7 +8149,7 @@ class Editor extends import_eventemitter3.default {
               this.updateInstanceState({ isPenMode: true });
               this.interrupt();
             }
-            if (info.button === import_constants.STYLUS_ERASER_BUTTON) {
+            if (info.button === import_constants.STYLUS_ERASER_BUTTON && this.getStateDescendant("eraser")) {
               this._restoreToolId = this.getCurrentToolId();
               this.complete();
               this.setCurrentTool("eraser");
@@ -8172,7 +8172,6 @@ class Editor extends import_eventemitter3.default {
             break;
           }
           case "pointer_move": {
-            if (!isPen && isPenMode) return;
             const { x: cx, y: cy, z: cz } = (0, import_state.unsafe__withoutCapture)(() => this.getCamera());
             if (this.inputs.getIsRightPointing() && !this.inputs.getIsPanning()) {
               const currentScreenPoint = this.inputs.getCurrentScreenPoint();
@@ -8212,7 +8211,6 @@ class Editor extends import_eventemitter3.default {
             inputs.setIsPointing(false);
             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 = [];
@@ -8268,7 +8266,7 @@ class Editor extends import_eventemitter3.default {
                 });
               }
             } else {
-              if (info.button === import_constants.STYLUS_ERASER_BUTTON) {
+              if (info.button === import_constants.STYLUS_ERASER_BUTTON && this.getStateDescendant("eraser")) {
                 this.complete();
                 this.setCurrentTool(this._restoreToolId);
               }
@@ -8321,7 +8319,7 @@ class Editor extends import_eventemitter3.default {
                     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 } });
@@ -8361,7 +8359,7 @@ class Editor extends import_eventemitter3.default {
         this.setCurrentTool("select");
       }
       const { isPenMode } = this.store.unsafeGetWithoutCapture(import_tlschema.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);