@tldraw/editor 3.15.0-canary.9cfe72490c8f → 3.15.0-canary.9d3e452295cd

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

@@ -1513,9 +1513,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     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) && !isPageId(firstParentId);
-    const readingOrderShapes = isSelectedWithinContainer ? this._getShapesInReadingOrder(
-      this.getCurrentPageShapes().filter((shape2) => shape2.parentId === firstParentId)
-    ) : this.getCurrentPageShapesInReadingOrder();
+    const filteredShapes = isSelectedWithinContainer ? this.getCurrentPageShapes().filter((shape2) => shape2.parentId === firstParentId) : this.getCurrentPageShapes().filter((shape2) => isPageId(shape2.parentId));
+    const readingOrderShapes = isSelectedWithinContainer ? this._getShapesInReadingOrder(filteredShapes) : this.getCurrentPageShapesInReadingOrder();
     const currentShapeId = selectedShapeIds.length === 1 ? selectedShapeIds[0] : readingOrderShapes.find((shape2) => selectedShapeIds.includes(shape2.id))?.id;
     let adjacentShapeId;
     if (direction === "next" || direction === "prev") {
@@ -1525,7 +1524,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       adjacentShapeId = shapeIds[adjacentIndex];
     } else {
       if (!currentShapeId) return;
-      adjacentShapeId = this.getNearestAdjacentShape(currentShapeId, direction);
+      adjacentShapeId = this.getNearestAdjacentShape(filteredShapes, currentShapeId, direction);
     }
     const shape = this.getShape(adjacentShapeId);
     if (!shape) return;
@@ -1591,11 +1590,10 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    *
    * @public
    */
-  getNearestAdjacentShape(currentShapeId, direction) {
+  getNearestAdjacentShape(shapes, currentShapeId, direction) {
     const directionToAngle = { right: 0, left: 180, down: 90, up: 270 };
     const currentShape = this.getShape(currentShapeId);
     if (!currentShape) return currentShapeId;
-    const shapes = this.getCurrentPageShapes();
     const tabbableShapes = shapes.filter(
       (shape) => this.getShapeUtil(shape).canTabTo(shape) && shape.id !== currentShapeId
     );
@@ -3349,19 +3347,24 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    */
   deletePage(page) {
     const id = typeof page === "string" ? page : page.id;
-    this.run(() => {
-      if (this.getIsReadonly()) return;
-      const pages = this.getPages();
-      if (pages.length === 1) return;
-      const deletedPage = this.getPage(id);
-      if (!deletedPage) return;
-      if (id === this.getCurrentPageId()) {
-        const index = pages.findIndex((page2) => page2.id === id);
-        const next = pages[index - 1] ?? pages[index + 1];
-        this.setCurrentPage(next.id);
-      }
-      this.store.remove([deletedPage.id]);
-    });
+    this.run(
+      () => {
+        if (this.getIsReadonly()) return;
+        const pages = this.getPages();
+        if (pages.length === 1) return;
+        const deletedPage = this.getPage(id);
+        if (!deletedPage) return;
+        if (id === this.getCurrentPageId()) {
+          const index = pages.findIndex((page2) => page2.id === id);
+          const next = pages[index - 1] ?? pages[index + 1];
+          this.setCurrentPage(next.id);
+        }
+        const shapes = this.getSortedChildIdsForParent(deletedPage.id);
+        this.deleteShapes(shapes);
+        this.store.remove([deletedPage.id]);
+      },
+      { ignoreShapeLock: true }
+    );
     return this;
   }
   /**