@tldraw/editor 3.15.0-canary.51c2773438c3 → 3.15.0-canary.5e9b85d814e1

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

@@ -1432,7 +1432,9 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     return this;
   }
   /**
-   * Select all direct children of the current page.
+   * Select all shapes. If the user has selected shapes that share a parent,
+   * select all shapes within that parent. If the user has not selected any shapes,
+   * or if the shapes shapes are only on select all shapes on the current page.
    *
    * @example
    * ```ts
@@ -1442,7 +1444,23 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * @public
    */
   selectAll() {
-    const ids = this.getSortedChildIdsForParent(this.getCurrentPageId());
+    let parentToSelectWithinId = null;
+    const selectedShapeIds = this.getSelectedShapeIds();
+    if (selectedShapeIds.length > 0) {
+      for (const id of selectedShapeIds) {
+        const shape = this.getShape(id);
+        if (!shape) continue;
+        if (parentToSelectWithinId === null) {
+          parentToSelectWithinId = shape.parentId;
+        } else if (parentToSelectWithinId !== shape.parentId) {
+          return this;
+        }
+      }
+    }
+    if (!parentToSelectWithinId) {
+      parentToSelectWithinId = this.getCurrentPageId();
+    }
+    const ids = this.getSortedChildIdsForParent(parentToSelectWithinId);
     if (ids.length <= 0) return this;
     this.setSelectedShapes(this._getUnlockedShapeIds(ids));
     return this;
@@ -1461,9 +1479,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     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 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) => (0, import_tlschema.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") {
@@ -1473,7 +1490,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       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;
@@ -1539,11 +1556,10 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    *
    * @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
     );