@tldraw/editor 3.16.0-internal.51e99e128bd4 → 3.16.0-internal.a478398270c6

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

@@ -1432,9 +1432,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     return this;
   }
   /**
-   * 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.
+   * Select all direct children of the current page.
    *
    * @example
    * ```ts
@@ -1444,23 +1442,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * @public
    */
   selectAll() {
-    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);
+    const ids = this.getSortedChildIdsForParent(this.getCurrentPageId());
     if (ids.length <= 0) return this;
     this.setSelectedShapes(this._getUnlockedShapeIds(ids));
     return this;
@@ -1479,8 +1461,9 @@ 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 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 readingOrderShapes = isSelectedWithinContainer ? this._getShapesInReadingOrder(
+      this.getCurrentPageShapes().filter((shape2) => shape2.parentId === firstParentId)
+    ) : this.getCurrentPageShapesInReadingOrder();
     const currentShapeId = selectedShapeIds.length === 1 ? selectedShapeIds[0] : readingOrderShapes.find((shape2) => selectedShapeIds.includes(shape2.id))?.id;
     let adjacentShapeId;
     if (direction === "next" || direction === "prev") {
@@ -1490,7 +1473,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       adjacentShapeId = shapeIds[adjacentIndex];
     } else {
       if (!currentShapeId) return;
-      adjacentShapeId = this.getNearestAdjacentShape(filteredShapes, currentShapeId, direction);
+      adjacentShapeId = this.getNearestAdjacentShape(currentShapeId, direction);
     }
     const shape = this.getShape(adjacentShapeId);
     if (!shape) return;
@@ -1556,10 +1539,11 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    *
    * @public
    */
-  getNearestAdjacentShape(shapes, currentShapeId, direction) {
+  getNearestAdjacentShape(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
     );
@@ -2323,11 +2307,28 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         { history: "ignore" }
       );
       const { currentScreenPoint, currentPagePoint } = this.inputs;
+      const { screenBounds } = this.store.unsafeGetWithoutCapture(import_tlschema.TLINSTANCE_ID);
       if (currentScreenPoint.x / z - x !== currentPagePoint.x || currentScreenPoint.y / z - y !== currentPagePoint.y) {
-        this.updatePointer({
-          immediate: opts?.immediate,
-          pointerId: import_constants.INTERNAL_POINTER_IDS.CAMERA_MOVE
-        });
+        const event = {
+          type: "pointer",
+          target: "canvas",
+          name: "pointer_move",
+          // weird but true: we need to put the screen point back into client space
+          point: import_Vec.Vec.AddXY(currentScreenPoint, screenBounds.x, screenBounds.y),
+          pointerId: import_constants.INTERNAL_POINTER_IDS.CAMERA_MOVE,
+          ctrlKey: this.inputs.ctrlKey,
+          altKey: this.inputs.altKey,
+          shiftKey: this.inputs.shiftKey,
+          metaKey: this.inputs.metaKey,
+          accelKey: (0, import_keyboard.isAccelKey)(this.inputs),
+          button: 0,
+          isPen: this.getInstanceState().isPenMode ?? false
+        };
+        if (opts?.immediate) {
+          this._flushEventForTick(event);
+        } else {
+          this.dispatch(event);
+        }
       }
       this._tickCameraState();
     });
@@ -3296,24 +3297,19 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    */
   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);
-        }
-        const shapes = this.getSortedChildIdsForParent(deletedPage.id);
-        this.deleteShapes(shapes);
-        this.store.remove([deletedPage.id]);
-      },
-      { ignoreShapeLock: true }
-    );
+    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]);
+    });
     return this;
   }
   /**
@@ -3910,7 +3906,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       hitInside = false,
       hitFrameInside = false
     } = opts;
-    const [innerMargin, outerMargin] = Array.isArray(margin) ? margin : [margin, margin];
     let inHollowSmallestArea = Infinity;
     let inHollowSmallestAreaHit = null;
     let inMarginClosestToEdgeDistance = Infinity;
@@ -3920,7 +3915,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         return false;
       const pageMask = this.getShapeMask(shape);
       if (pageMask && !(0, import_utils2.pointInPolygon)(point, pageMask)) return false;
-      if (filter && !filter(shape)) return false;
+      if (filter) return filter(shape);
       return true;
     });
     for (let i = shapesToCheck.length - 1; i >= 0; i--) {
@@ -3928,7 +3923,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       const geometry = this.getShapeGeometry(shape);
       const isGroup = geometry instanceof import_Group2d.Group2d;
       const pointInShapeSpace = this.getPointInShapeSpace(shape, point);
-      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()) {
+      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()) {
         for (const childGeometry of geometry.children) {
           if (childGeometry.isLabel && childGeometry.isPointInBounds(pointInShapeSpace)) {
             return shape;
@@ -3936,8 +3931,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         }
       }
       if (this.isShapeOfType(shape, "frame")) {
-        const distance2 = geometry.distanceToPoint(pointInShapeSpace, hitFrameInside);
-        if (hitFrameInside ? distance2 > 0 && distance2 <= outerMargin || distance2 <= 0 && distance2 > -innerMargin : distance2 > 0 && distance2 <= outerMargin) {
+        const distance2 = geometry.distanceToPoint(pointInShapeSpace, hitInside);
+        if (Math.abs(distance2) <= margin) {
           return inMarginClosestToEdgeHit || shape;
         }
         if (geometry.hitTestPoint(pointInShapeSpace, 0, true)) {
@@ -3957,10 +3952,10 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         }
         distance = minDistance;
       } else {
-        if (outerMargin === 0 && (geometry.bounds.w < 1 || geometry.bounds.h < 1)) {
+        if (margin === 0 && (geometry.bounds.w < 1 || geometry.bounds.h < 1)) {
           distance = geometry.distanceToPoint(pointInShapeSpace, hitInside);
         } else {
-          if (geometry.bounds.containsPoint(pointInShapeSpace, outerMargin)) {
+          if (geometry.bounds.containsPoint(pointInShapeSpace, margin)) {
             distance = geometry.distanceToPoint(pointInShapeSpace, hitInside);
           } else {
             distance = Infinity;
@@ -3968,22 +3963,12 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         }
       }
       if (geometry.isClosed) {
-        if (distance <= outerMargin || hitInside && distance <= 0 && distance > -innerMargin) {
+        if (distance <= margin) {
           if (geometry.isFilled || isGroup && geometry.children[0].isFilled) {
             return inMarginClosestToEdgeHit || shape;
           } else {
             if (this.getShapePageBounds(shape).contains(viewportPageBounds)) continue;
-            if (hitInside ? (
-              // On hitInside, the distance will be negative for hits inside
-              // If the distance is positive, check against the outer margin
-              distance > 0 && distance <= outerMargin || // If the distance is negative, check against the inner margin
-              distance <= 0 && distance > -innerMargin
-            ) : (
-              // If hitInside is false, then sadly _we do not know_ whether the
-              // point is inside or outside of the shape, so we check against
-              // the max of the two margins
-              Math.abs(distance) <= Math.max(innerMargin, outerMargin)
-            )) {
+            if (Math.abs(distance) < margin) {
               if (Math.abs(distance) < inMarginClosestToEdgeDistance) {
                 inMarginClosestToEdgeDistance = Math.abs(distance);
                 inMarginClosestToEdgeHit = shape;
@@ -4748,16 +4733,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       }
       this.createShapes(shapesToCreate);
       this.createBindings(bindingsToCreate);
-      this.setSelectedShapes(
-        (0, import_utils.compact)(
-          ids.map((oldId) => {
-            const newId = shapeIds.get(oldId);
-            if (!newId) return null;
-            if (!this.getShape(newId)) return null;
-            return newId;
-          })
-        )
-      );
+      this.setSelectedShapes((0, import_utils.compact)(ids.map((id) => shapeIds.get(id))));
       if (offset !== void 0) {
         const selectionPageBounds = this.getSelectionPageBounds();
         const viewportPageBounds = this.getViewportPageBounds();
@@ -5511,7 +5487,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       const shapesMovingTogether = [shape];
       const boundsOfShapesMovingTogether = [shapePageBounds];
       if (!this.getShapeUtil(shape).canBeLaidOut?.(shape, {
-        type: "stretch"
+        type: "stretch",
+        shapes: shapesToStretchFirstPass
       })) {
         continue;
       }
@@ -5836,24 +5813,21 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         }
         if (!partial.parentId || !(this.store.has(partial.parentId) || shapes.some((p) => p.id === partial.parentId))) {
           let parentId = this.getFocusedGroupId();
-          const isPositioned = partial.x !== void 0 && partial.y !== void 0;
-          if (isPositioned) {
-            for (let i = currentPageShapesSorted.length - 1; i >= 0; i--) {
-              const parent = currentPageShapesSorted[i];
-              const util = this.getShapeUtil(parent);
-              if (util.canReceiveNewChildrenOfType(parent, partial.type) && !this.isShapeHidden(parent) && this.isPointInShape(
-                parent,
-                // If no parent is provided, then we can treat the
-                // shape's provided x/y as being in the page's space.
-                { x: partial.x ?? 0, y: partial.y ?? 0 },
-                {
-                  margin: 0,
-                  hitInside: true
-                }
-              )) {
-                parentId = parent.id;
-                break;
+          for (let i = currentPageShapesSorted.length - 1; i >= 0; i--) {
+            const parent = currentPageShapesSorted[i];
+            const util = this.getShapeUtil(parent);
+            if (util.canReceiveNewChildrenOfType(parent, partial.type) && !this.isShapeHidden(parent) && this.isPointInShape(
+              parent,
+              // If no parent is provided, then we can treat the
+              // shape's provided x/y as being in the page's space.
+              { x: partial.x ?? 0, y: partial.y ?? 0 },
+              {
+                margin: 0,
+                hitInside: true
               }
+            )) {
+              parentId = parent.id;
+              break;
             }
           }
           const prevParentId = partial.parentId;
@@ -7038,47 +7012,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     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...
-      import_Vec.Vec.Add(
-        this.inputs.currentScreenPoint,
-        this.store.unsafeGetWithoutCapture(import_tlschema.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 ?? (0, import_keyboard.isAccelKey)(this.inputs)
-    };
-    if (options?.immediate) {
-      this._flushEventForTick(event);
-    } else {
-      this.dispatch(event);
-    }
-    return this;
-  }
   /**
    * Puts the editor into focused mode.
    *