@tldraw/editor 5.4.0-canary.ccab4e96c56e → 5.4.0-canary.ce2194838da7

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.4.0-canary.ccab4e96c56e",
+  "5.4.0-canary.ce2194838da7",
   "cjs"
 );
 //# sourceMappingURL=index.js.map

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

@@ -1963,42 +1963,28 @@ class Editor extends import_eventemitter3.default {
    */
   setEditingShape(shape) {
     const id = typeof shape === "string" ? shape : shape?.id ?? null;
-    if (!id) {
+    if (id && !this.canEditShape(id)) return this;
+    this.run(() => {
+      const prevEditingShapeId = this.getEditingShapeId();
+      if (prevEditingShapeId) {
+        const prevEditingShape = this.getShape(prevEditingShapeId);
+        if (prevEditingShape) {
+          this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
+        }
+      }
       this.run(
         () => {
-          const prevEditingShapeId = this.getEditingShapeId();
-          if (prevEditingShapeId) {
-            const prevEditingShape = this.getShape(prevEditingShapeId);
-            if (prevEditingShape) {
-              this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
-            }
-          }
           this._updateCurrentPageState({ editingShapeId: null });
           this._currentRichTextEditor.set(null);
+          if (!id) return;
+          this.select(id);
+          this._updateCurrentPageState({ editingShapeId: id });
+          const nextEditingShape = this.getShape(id);
+          this.getShapeUtil(nextEditingShape).onEditStart?.(nextEditingShape);
         },
         { history: "ignore" }
       );
-      return this;
-    }
-    if (!this.canEditShape(id)) return this;
-    this.run(
-      () => {
-        const prevEditingShapeId = this.getEditingShapeId();
-        if (prevEditingShapeId) {
-          const prevEditingShape = this.getShape(prevEditingShapeId);
-          if (prevEditingShape) {
-            this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
-          }
-        }
-        this._updateCurrentPageState({ editingShapeId: null });
-        this._currentRichTextEditor.set(null);
-        this.select(id);
-        this._updateCurrentPageState({ editingShapeId: id });
-        const nextEditingShape = this.getShape(id);
-        this.getShapeUtil(nextEditingShape).onEditStart?.(nextEditingShape);
-      },
-      { history: "ignore" }
-    );
+    });
     return this;
   }
   // Rich text editor
@@ -2142,6 +2128,7 @@ class Editor extends import_eventemitter3.default {
     if (!_shape) return false;
     const util = this.getShapeUtil(_shape);
     if (!util.canCrop(_shape)) return false;
+    if (this.getIsReadonly()) return false;
     if (this.isShapeOrAncestorLocked(_shape)) return false;
     return true;
   }
@@ -2351,7 +2338,7 @@ class Editor extends import_eventemitter3.default {
       ...this._cameraOptions.__unsafe__getWithoutCapture(),
       ...opts
     });
-    if (next.zoomSteps?.length < 1) next.zoomSteps = [1];
+    if (!next.zoomSteps || next.zoomSteps.length < 1) next.zoomSteps = [1];
     this._cameraOptions.set(next);
     this.setCamera(this.getCamera());
     return this;
@@ -5217,26 +5204,17 @@ class Editor extends import_eventemitter3.default {
   toggleLock(shapes) {
     const ids = typeof shapes[0] === "string" ? shapes : shapes.map((s) => s.id);
     if (this.getIsReadonly() || ids.length === 0) return this;
-    let allLocked = true, allUnlocked = true;
+    let allLocked = true;
     const shapesToToggle = [];
     for (const id of ids) {
       const shape = this.getShape(id);
       if (shape) {
         shapesToToggle.push(shape);
-        if (shape.isLocked) {
-          allUnlocked = false;
-        } else {
-          allLocked = false;
-        }
+        if (!shape.isLocked) allLocked = false;
       }
     }
     this.run(() => {
-      if (allUnlocked) {
-        this.updateShapes(
-          shapesToToggle.map((shape) => ({ id: shape.id, type: shape.type, isLocked: true }))
-        );
-        this.setSelectedShapes([]);
-      } else if (allLocked) {
+      if (allLocked) {
         this.updateShapes(
           shapesToToggle.map((shape) => ({ id: shape.id, type: shape.type, isLocked: false }))
         );
@@ -5244,6 +5222,7 @@ class Editor extends import_eventemitter3.default {
         this.updateShapes(
           shapesToToggle.map((shape) => ({ id: shape.id, type: shape.type, isLocked: true }))
         );
+        this.setSelectedShapes([]);
       }
     });
     return this;