@tldraw/editor 5.5.0-canary.d64d005dcf06 → 5.5.0-canary.d98ea50911fe

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

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

@@ -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;
@@ -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) {
@@ -5360,7 +5364,7 @@ class Editor extends import_eventemitter3.default {
       const shapesMovingTogether = [shape];
       const boundsOfShapesMovingTogether = [shapePageBounds];
       this.collectShapesViaArrowBindings({
-        bindings: this.getBindingsToShape(shape.id, "arrow"),
+        bindings: this.getBindingsInvolvingShape(shape.id, "arrow"),
         initialShapes: freshShapes,
         resultShapes: shapesMovingTogether,
         resultBounds: boundsOfShapesMovingTogether,
@@ -8297,8 +8301,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) {