@tldraw/editor 3.15.0-next.f1dfcef63951 → 3.16.0-next.c30b1b5e551a

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

@@ -1466,7 +1466,9 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     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
@@ -1476,7 +1478,23 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    * @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;
@@ -1495,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") {
@@ -1507,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;
@@ -1573,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
     );
@@ -2341,28 +2357,11 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         { history: "ignore" }
       );
       const { currentScreenPoint, currentPagePoint } = this.inputs;
-      const { screenBounds } = this.store.unsafeGetWithoutCapture(TLINSTANCE_ID);
       if (currentScreenPoint.x / z - x !== currentPagePoint.x || currentScreenPoint.y / z - y !== currentPagePoint.y) {
-        const event = {
-          type: "pointer",
-          target: "canvas",
-          name: "pointer_move",
-          // weird but true: we need to put the screen point back into client space
-          point: Vec.AddXY(currentScreenPoint, screenBounds.x, screenBounds.y),
-          pointerId: INTERNAL_POINTER_IDS.CAMERA_MOVE,
-          ctrlKey: this.inputs.ctrlKey,
-          altKey: this.inputs.altKey,
-          shiftKey: this.inputs.shiftKey,
-          metaKey: this.inputs.metaKey,
-          accelKey: isAccelKey(this.inputs),
-          button: 0,
-          isPen: this.getInstanceState().isPenMode ?? false
-        };
-        if (opts?.immediate) {
-          this._flushEventForTick(event);
-        } else {
-          this.dispatch(event);
-        }
+        this.updatePointer({
+          immediate: opts?.immediate,
+          pointerId: INTERNAL_POINTER_IDS.CAMERA_MOVE
+        });
       }
       this._tickCameraState();
     });
@@ -3331,19 +3330,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;
   }
   /**
@@ -3957,7 +3961,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       const geometry = this.getShapeGeometry(shape);
       const isGroup = geometry instanceof Group2d;
       const pointInShapeSpace = this.getPointInShapeSpace(shape, point);
-      if (this.isShapeOfType(shape, "frame") || this.isShapeOfType(shape, "arrow") && shape.props.text.trim() || (this.isShapeOfType(shape, "note") || this.isShapeOfType(shape, "geo") && shape.props.fill === "none") && this.getShapeUtil(shape).getText(shape)?.trim()) {
+      if (this.isShapeOfType(shape, "frame") || (this.isShapeOfType(shape, "note") || this.isShapeOfType(shape, "arrow") || this.isShapeOfType(shape, "geo") && shape.props.fill === "none") && this.getShapeUtil(shape).getText(shape)?.trim()) {
         for (const childGeometry of geometry.children) {
           if (childGeometry.isLabel && childGeometry.isPointInBounds(pointInShapeSpace)) {
             return shape;
@@ -7046,6 +7050,47 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     this.dispatch({ type: "misc", name: "complete" });
     return this;
   }
+  /**
+   * Dispatch a pointer move event in the current position of the pointer. This is useful when
+   * external circumstances have changed (e.g. the camera moved or a shape was moved) and you want
+   * the current interaction to respond to that change.
+   *
+   * @example
+   * ```ts
+   * editor.updatePointer()
+   * ```
+   *
+   * @param options - The options for updating the pointer.
+   * @returns The editor instance.
+   * @public
+   */
+  updatePointer(options) {
+    const event = {
+      type: "pointer",
+      target: "canvas",
+      name: "pointer_move",
+      point: options?.point ?? // weird but true: what `inputs` calls screen-space is actually viewport space. so
+      // we need to convert back into true screen space first. we should fix this...
+      Vec.Add(
+        this.inputs.currentScreenPoint,
+        this.store.unsafeGetWithoutCapture(TLINSTANCE_ID).screenBounds
+      ),
+      pointerId: options?.pointerId ?? 0,
+      button: options?.button ?? 0,
+      isPen: options?.isPen ?? this.inputs.isPen,
+      shiftKey: options?.shiftKey ?? this.inputs.shiftKey,
+      altKey: options?.altKey ?? this.inputs.altKey,
+      ctrlKey: options?.ctrlKey ?? this.inputs.ctrlKey,
+      metaKey: options?.metaKey ?? this.inputs.metaKey,
+      accelKey: options?.accelKey ?? isAccelKey(this.inputs)
+    };
+    if (options?.immediate) {
+      this._flushEventForTick(event);
+    } else {
+      this.dispatch(event);
+    }
+    return this;
+  }
   /**
    * Puts the editor into focused mode.
    *