@tldraw/editor 5.5.0-canary.f39b241e2c26 → 5.5.0-canary.f54aa36cb385

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.f39b241e2c26",
+  "5.5.0-canary.f54aa36cb385",
   "cjs"
 );
 //# sourceMappingURL=index.js.map

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

@@ -1593,7 +1593,7 @@ class Editor extends import_eventemitter3.default {
     }
     const ids = this.getSortedChildIdsForParent(parentToSelectWithinId);
     if (ids.length <= 0) return this;
-    this.setSelectedShapes(this._getUnlockedShapeIds(ids));
+    this.setSelectedShapes(ids.filter((id) => !this.getShape(id)?.isLocked));
     return this;
   }
   /**
@@ -1610,12 +1610,15 @@ class Editor extends import_eventemitter3.default {
     const selectedShapeIds = this.getSelectedShapeIds();
     const firstParentId = selectedShapeIds[0] ? this.getShape(selectedShapeIds[0])?.parentId : null;
     const isSelectedWithinContainer = firstParentId && selectedShapeIds.every((shapeId) => this.getShape(shapeId)?.parentId === firstParentId) && !(0, import_tlschema.isPageId)(firstParentId);
-    const filteredShapes = isSelectedWithinContainer ? this.getCurrentPageShapes().filter((shape2) => shape2.parentId === firstParentId) : this.getCurrentPageShapes().filter((shape2) => (0, import_tlschema.isPageId)(shape2.parentId));
-    const readingOrderShapes = isSelectedWithinContainer ? this._getShapesInReadingOrder(filteredShapes) : this.getCurrentPageShapesInReadingOrder();
+    const filteredShapes = this.getCurrentPageShapes().filter(
+      (shape2) => !this.isShapeOrAncestorLocked(shape2) && (isSelectedWithinContainer ? shape2.parentId === firstParentId : (0, import_tlschema.isPageId)(shape2.parentId))
+    );
+    const readingOrderShapes = this._getShapesInReadingOrder(filteredShapes);
     const currentShapeId = selectedShapeIds.length === 1 ? selectedShapeIds[0] : readingOrderShapes.find((shape2) => selectedShapeIds.includes(shape2.id))?.id;
     let adjacentShapeId;
     if (direction === "next" || direction === "prev") {
       const shapeIds = readingOrderShapes.map((shape2) => shape2.id);
+      if (shapeIds.length === 0) return;
       const currentIndex = currentShapeId ? shapeIds.indexOf(currentShapeId) : -1;
       const startIndex = currentIndex === -1 && direction === "prev" ? 0 : currentIndex;
       const adjacentIndex = (startIndex + (direction === "next" ? 1 : -1) + shapeIds.length) % shapeIds.length;
@@ -2498,7 +2501,7 @@ class Editor extends import_eventemitter3.default {
   setCamera(point, opts) {
     const { isLocked } = this._cameraOptions.__unsafe__getWithoutCapture();
     if (isLocked && !opts?.force) return this;
-    const _point = import_Vec.Vec.Cast(point);
+    const _point = new import_Vec.Vec(point.x, point.y, point.z ?? this.getZoomLevel());
     if (!Number.isFinite(_point.x) || !Number.isFinite(_point.y) || !Number.isFinite(_point.z)) {
       throw Error(
         `Editor.setCamera: expected finite values, got (${_point.x}, ${_point.y}, ${_point.z}).`
@@ -2920,6 +2923,7 @@ class Editor extends import_eventemitter3.default {
       }
       const isOnSamePage = presence.currentPageId === this.getCurrentPageId();
       if (!isOnSamePage) {
+        this.markHistoryStoppingPoint("change-page");
         this.setCurrentPage(presence.currentPageId);
       }
       if (opts && opts.animation && !isOnSamePage) {
@@ -3751,7 +3755,9 @@ class Editor extends import_eventemitter3.default {
     if (ids.length <= 0) return this;
     this.run(
       () => {
-        this.store.props.assets.remove?.(ids);
+        Promise.resolve(this.store.props.assets.remove?.(ids)).catch(
+          (err) => console.error("Error while removing assets from the asset store:", err)
+        );
         this.store.remove(ids);
       },
       { history: "ignore" }
@@ -6305,12 +6311,17 @@ class Editor extends import_eventemitter3.default {
     let remaining = duration;
     let t;
     const animations = [];
+    const ignoreShapeLock = this._shouldIgnoreShapeLock;
     let partial, result;
     for (let i = 0, n = partials.length; i < n; i++) {
       partial = partials[i];
       if (!partial) continue;
       const shape = this.getShape(partial.id);
       if (!shape) continue;
+      const unlocks = shape.isLocked && Object.hasOwn(partial, "isLocked") && !partial.isLocked;
+      if (!ignoreShapeLock && !unlocks && this.isShapeOrAncestorLocked(shape)) {
+        continue;
+      }
       result = {
         start: (0, import_utils.structuredClone)(shape),
         end: applyPartialToRecordWithProps((0, import_utils.structuredClone)(shape), partial)
@@ -6326,7 +6337,7 @@ class Editor extends import_eventemitter3.default {
           (p) => p && animatingShapes2.get(p.id) === animationId
         );
         if (partialsToUpdate.length) {
-          this.updateShapes(partialsToUpdate);
+          this.run(() => this.updateShapes(partialsToUpdate), { ignoreShapeLock });
         }
         this.off("tick", handleTick);
         return;
@@ -6366,6 +6377,7 @@ class Editor extends import_eventemitter3.default {
         (id) => this.getShape(id)
       )
     );
+    if (shapesToGroup.length <= 1) return this;
     const sortedShapeIds = shapesToGroup.sort(import_utils.sortByIndex).map((s) => s.id);
     const childBounds = (0, import_utils.compact)(shapesToGroup.map((shape) => this.getShapePageBounds(shape)));
     const pageBounds = import_Box.Box.Common(childBounds);
@@ -6515,7 +6527,7 @@ class Editor extends import_eventemitter3.default {
   }
   /** @internal */
   _getUnlockedShapeIds(ids) {
-    return ids.filter((id) => !this.getShape(id)?.isLocked);
+    return ids.filter((id) => !this.isShapeOrAncestorLocked(id));
   }
   deleteShapes(_ids) {
     if (this.getIsReadonly()) return this;
@@ -6935,21 +6947,29 @@ class Editor extends import_eventemitter3.default {
     await Promise.allSettled(
       content.assets.map(async (asset) => {
         if ((asset.type === "image" || asset.type === "video") && !asset.props.src?.startsWith("data:image") && !asset.props.src?.startsWith("data:video") && !asset.props.src?.startsWith("http")) {
-          const assetWithDataUrl = (0, import_utils.structuredClone)(asset);
-          const objectUrl = await this.store.props.assets.resolve(asset, {
-            screenScale: 1,
-            steppedScreenScale: 1,
-            dpr: 1,
-            networkEffectiveType: null,
-            shouldResolveToOriginal: true
-          });
-          assetWithDataUrl.props.src = await import_utils.FileHelpers.blobToDataUrl(
-            await (0, import_utils.fetch)(objectUrl).then((r) => r.blob())
-          );
-          assets.push(assetWithDataUrl);
-        } else {
-          assets.push(asset);
+          try {
+            const objectUrl = await this.store.props.assets.resolve(asset, {
+              screenScale: 1,
+              steppedScreenScale: 1,
+              dpr: 1,
+              networkEffectiveType: null,
+              shouldResolveToOriginal: true
+            });
+            if (objectUrl) {
+              const response = await (0, import_utils.fetch)(objectUrl);
+              if (response.ok) {
+                const assetWithDataUrl = (0, import_utils.structuredClone)(asset);
+                assetWithDataUrl.props.src = await import_utils.FileHelpers.blobToDataUrl(await response.blob());
+                assets.push(assetWithDataUrl);
+                return;
+              }
+              console.warn(`Could not inline asset ${asset.id}: fetch returned ${response.status}`);
+            }
+          } catch (err) {
+            console.warn(`Could not inline asset ${asset.id}`, err);
+          }
         }
+        assets.push(asset);
       })
     );
     content.assets = assets;
@@ -8297,8 +8317,8 @@ class Editor extends import_eventemitter3.default {
         break;
       }
       case "keyboard": {
-        if (info.key === "ShiftRight") info.key = "ShiftLeft";
-        if (info.key === "AltRight") info.key = "AltLeft";
+        if (info.code === "ShiftRight") info.code = "ShiftLeft";
+        if (info.code === "AltRight") info.code = "AltLeft";
         if (info.code === "ControlRight") info.code = "ControlLeft";
         if (info.code === "MetaRight") info.code = "MetaLeft";
         switch (info.name) {