@tldraw/editor 3.14.0-canary.e0ab6f4c80f9 → 3.14.0-canary.e95fdc82a46a

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

@@ -112,19 +112,19 @@ var import_bindingsIndex = require("./derivations/bindingsIndex");
 var import_notVisibleShapes = require("./derivations/notVisibleShapes");
 var import_parentsToChildren = require("./derivations/parentsToChildren");
 var import_shapeIdsInCurrentPage = require("./derivations/shapeIdsInCurrentPage");
-var import_ClickManager = require("./managers/ClickManager");
-var import_EdgeScrollManager = require("./managers/EdgeScrollManager");
-var import_FocusManager = require("./managers/FocusManager");
-var import_FontManager = require("./managers/FontManager");
-var import_HistoryManager = require("./managers/HistoryManager");
-var import_ScribbleManager = require("./managers/ScribbleManager");
+var import_ClickManager = require("./managers/ClickManager/ClickManager");
+var import_EdgeScrollManager = require("./managers/EdgeScrollManager/EdgeScrollManager");
+var import_FocusManager = require("./managers/FocusManager/FocusManager");
+var import_FontManager = require("./managers/FontManager/FontManager");
+var import_HistoryManager = require("./managers/HistoryManager/HistoryManager");
+var import_ScribbleManager = require("./managers/ScribbleManager/ScribbleManager");
 var import_SnapManager = require("./managers/SnapManager/SnapManager");
-var import_TextManager = require("./managers/TextManager");
-var import_TickManager = require("./managers/TickManager");
-var import_UserPreferencesManager = require("./managers/UserPreferencesManager");
+var import_TextManager = require("./managers/TextManager/TextManager");
+var import_TickManager = require("./managers/TickManager/TickManager");
+var import_UserPreferencesManager = require("./managers/UserPreferencesManager/UserPreferencesManager");
 var import_RootState = require("./tools/RootState");
-var __setMetaKeyTimeout_dec, __setCtrlKeyTimeout_dec, __setAltKeyTimeout_dec, __setShiftKeyTimeout_dec, _getIsReadonly_dec, _getIsFocused_dec, _getSharedOpacity_dec, _getSharedStyles_dec, __getSelectionSharedStyles_dec, __getBindingsIndexCache_dec, _getCurrentPageRenderingShapesSorted_dec, _getCurrentPageShapesSorted_dec, _getCurrentPageShapes_dec, _getCurrentPageBounds_dec, _getCulledShapes_dec, __notVisibleShapes_dec, __getShapeMaskedPageBoundsCache_dec, __getShapeMaskCache_dec, __getShapeClipPathCache_dec, __getShapePageBoundsCache_dec, __getShapePageTransformCache_dec, __getShapeHandlesCache_dec, __getAllAssetsQuery_dec, _getCurrentPageShapeIdsSorted_dec, _getCurrentPageId_dec, _getPages_dec, __getAllPagesQuery_dec, _getRenderingShapes_dec, _getCollaboratorsOnCurrentPage_dec, _getCollaborators_dec, __getCollaboratorsQuery_dec, _getViewportPageBounds_dec, _getViewportScreenCenter_dec, _getViewportScreenBounds_dec, _getZoomLevel_dec, _getCameraForFollowing_dec, _getViewportPageBoundsForFollowing_dec, _getCamera_dec, __unsafe_getCameraId_dec, _getErasingShapes_dec, _getErasingShapeIds_dec, _getHintingShape_dec, _getHintingShapeIds_dec, _getHoveredShape_dec, _getHoveredShapeId_dec, _getRichTextEditor_dec, _getEditingShape_dec, _getEditingShapeId_dec, _getFocusedGroup_dec, _getFocusedGroupId_dec, _getSelectionRotatedScreenBounds_dec, _getSelectionRotatedPageBounds_dec, _getSelectionRotation_dec, _getSelectionPageBounds_dec, _getOnlySelectedShape_dec, _getOnlySelectedShapeId_dec, _getCurrentPageShapesInReadingOrder_dec, _getSelectedShapes_dec, _getSelectedShapeIds_dec, __getCurrentPageStateId_dec, _getCurrentPageState_dec, __getPageStatesQuery_dec, _getPageStates_dec, _getIsMenuOpen_dec, _getOpenMenus_dec, _getInstanceState_dec, _getDocumentSettings_dec, _getCurrentToolId_dec, _getCurrentTool_dec, _getPath_dec, _getCanRedo_dec, _getCanUndo_dec, _getIsShapeHiddenCache_dec, _a, _init;
-class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_dec = [import_state.computed], _getCanUndo_dec = [import_state.computed], _getCanRedo_dec = [import_state.computed], _getPath_dec = [import_state.computed], _getCurrentTool_dec = [import_state.computed], _getCurrentToolId_dec = [import_state.computed], _getDocumentSettings_dec = [import_state.computed], _getInstanceState_dec = [import_state.computed], _getOpenMenus_dec = [import_state.computed], _getIsMenuOpen_dec = [import_state.computed], _getPageStates_dec = [import_state.computed], __getPageStatesQuery_dec = [import_state.computed], _getCurrentPageState_dec = [import_state.computed], __getCurrentPageStateId_dec = [import_state.computed], _getSelectedShapeIds_dec = [import_state.computed], _getSelectedShapes_dec = [import_state.computed], _getCurrentPageShapesInReadingOrder_dec = [import_state.computed], _getOnlySelectedShapeId_dec = [import_state.computed], _getOnlySelectedShape_dec = [import_state.computed], _getSelectionPageBounds_dec = [import_state.computed], _getSelectionRotation_dec = [import_state.computed], _getSelectionRotatedPageBounds_dec = [import_state.computed], _getSelectionRotatedScreenBounds_dec = [import_state.computed], _getFocusedGroupId_dec = [import_state.computed], _getFocusedGroup_dec = [import_state.computed], _getEditingShapeId_dec = [import_state.computed], _getEditingShape_dec = [import_state.computed], _getRichTextEditor_dec = [import_state.computed], _getHoveredShapeId_dec = [import_state.computed], _getHoveredShape_dec = [import_state.computed], _getHintingShapeIds_dec = [import_state.computed], _getHintingShape_dec = [import_state.computed], _getErasingShapeIds_dec = [import_state.computed], _getErasingShapes_dec = [import_state.computed], __unsafe_getCameraId_dec = [import_state.computed], _getCamera_dec = [import_state.computed], _getViewportPageBoundsForFollowing_dec = [import_state.computed], _getCameraForFollowing_dec = [import_state.computed], _getZoomLevel_dec = [import_state.computed], _getViewportScreenBounds_dec = [import_state.computed], _getViewportScreenCenter_dec = [import_state.computed], _getViewportPageBounds_dec = [import_state.computed], __getCollaboratorsQuery_dec = [import_state.computed], _getCollaborators_dec = [import_state.computed], _getCollaboratorsOnCurrentPage_dec = [import_state.computed], _getRenderingShapes_dec = [import_state.computed], __getAllPagesQuery_dec = [import_state.computed], _getPages_dec = [import_state.computed], _getCurrentPageId_dec = [import_state.computed], _getCurrentPageShapeIdsSorted_dec = [import_state.computed], __getAllAssetsQuery_dec = [import_state.computed], __getShapeHandlesCache_dec = [import_state.computed], __getShapePageTransformCache_dec = [import_state.computed], __getShapePageBoundsCache_dec = [import_state.computed], __getShapeClipPathCache_dec = [import_state.computed], __getShapeMaskCache_dec = [import_state.computed], __getShapeMaskedPageBoundsCache_dec = [import_state.computed], __notVisibleShapes_dec = [import_state.computed], _getCulledShapes_dec = [import_state.computed], _getCurrentPageBounds_dec = [import_state.computed], _getCurrentPageShapes_dec = [import_state.computed], _getCurrentPageShapesSorted_dec = [import_state.computed], _getCurrentPageRenderingShapesSorted_dec = [import_state.computed], __getBindingsIndexCache_dec = [import_state.computed], __getSelectionSharedStyles_dec = [import_state.computed], _getSharedStyles_dec = [(0, import_state.computed)({ isEqual: (a, b) => a.equals(b) })], _getSharedOpacity_dec = [import_state.computed], _getIsFocused_dec = [import_state.computed], _getIsReadonly_dec = [import_state.computed], __setShiftKeyTimeout_dec = [import_utils.bind], __setAltKeyTimeout_dec = [import_utils.bind], __setCtrlKeyTimeout_dec = [import_utils.bind], __setMetaKeyTimeout_dec = [import_utils.bind], _a) {
+var __setMetaKeyTimeout_dec, __setCtrlKeyTimeout_dec, __setAltKeyTimeout_dec, __setShiftKeyTimeout_dec, _getIsReadonly_dec, _getIsFocused_dec, _getSharedOpacity_dec, _getSharedStyles_dec, __getSelectionSharedStyles_dec, __getBindingsIndexCache_dec, _getCurrentPageRenderingShapesSorted_dec, _getCurrentPageShapesSorted_dec, _getCurrentPageShapes_dec, _getCurrentPageBounds_dec, _getCulledShapes_dec, _getNotVisibleShapes_dec, __getShapeMaskedPageBoundsCache_dec, __getShapeMaskCache_dec, __getShapeClipPathCache_dec, __getShapePageBoundsCache_dec, __getShapePageTransformCache_dec, __getShapeHandlesCache_dec, __getAllAssetsQuery_dec, _getCurrentPageShapeIdsSorted_dec, _getCurrentPageId_dec, _getPages_dec, __getAllPagesQuery_dec, _getRenderingShapes_dec, _getCollaboratorsOnCurrentPage_dec, _getCollaborators_dec, __getCollaboratorsQuery_dec, _getViewportPageBounds_dec, _getViewportScreenCenter_dec, _getViewportScreenBounds_dec, _getZoomLevel_dec, _getCameraForFollowing_dec, _getViewportPageBoundsForFollowing_dec, _getCamera_dec, __unsafe_getCameraId_dec, _getErasingShapes_dec, _getErasingShapeIds_dec, _getHintingShape_dec, _getHintingShapeIds_dec, _getHoveredShape_dec, _getHoveredShapeId_dec, _getRichTextEditor_dec, _getEditingShape_dec, _getEditingShapeId_dec, _getFocusedGroup_dec, _getFocusedGroupId_dec, _getSelectionRotatedScreenBounds_dec, _getSelectionRotatedPageBounds_dec, _getSelectionRotation_dec, _getSelectionPageBounds_dec, _getOnlySelectedShape_dec, _getOnlySelectedShapeId_dec, _getCurrentPageShapesInReadingOrder_dec, _getSelectedShapes_dec, _getSelectedShapeIds_dec, __getCurrentPageStateId_dec, _getCurrentPageState_dec, __getPageStatesQuery_dec, _getPageStates_dec, _getIsMenuOpen_dec, _getOpenMenus_dec, _getInstanceState_dec, _getDocumentSettings_dec, _getCurrentToolId_dec, _getCurrentTool_dec, _getPath_dec, _getCanRedo_dec, _getCanUndo_dec, _getIsShapeHiddenCache_dec, _a, _init;
+class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_dec = [import_state.computed], _getCanUndo_dec = [import_state.computed], _getCanRedo_dec = [import_state.computed], _getPath_dec = [import_state.computed], _getCurrentTool_dec = [import_state.computed], _getCurrentToolId_dec = [import_state.computed], _getDocumentSettings_dec = [import_state.computed], _getInstanceState_dec = [import_state.computed], _getOpenMenus_dec = [import_state.computed], _getIsMenuOpen_dec = [import_state.computed], _getPageStates_dec = [import_state.computed], __getPageStatesQuery_dec = [import_state.computed], _getCurrentPageState_dec = [import_state.computed], __getCurrentPageStateId_dec = [import_state.computed], _getSelectedShapeIds_dec = [import_state.computed], _getSelectedShapes_dec = [import_state.computed], _getCurrentPageShapesInReadingOrder_dec = [import_state.computed], _getOnlySelectedShapeId_dec = [import_state.computed], _getOnlySelectedShape_dec = [import_state.computed], _getSelectionPageBounds_dec = [import_state.computed], _getSelectionRotation_dec = [import_state.computed], _getSelectionRotatedPageBounds_dec = [import_state.computed], _getSelectionRotatedScreenBounds_dec = [import_state.computed], _getFocusedGroupId_dec = [import_state.computed], _getFocusedGroup_dec = [import_state.computed], _getEditingShapeId_dec = [import_state.computed], _getEditingShape_dec = [import_state.computed], _getRichTextEditor_dec = [import_state.computed], _getHoveredShapeId_dec = [import_state.computed], _getHoveredShape_dec = [import_state.computed], _getHintingShapeIds_dec = [import_state.computed], _getHintingShape_dec = [import_state.computed], _getErasingShapeIds_dec = [import_state.computed], _getErasingShapes_dec = [import_state.computed], __unsafe_getCameraId_dec = [import_state.computed], _getCamera_dec = [import_state.computed], _getViewportPageBoundsForFollowing_dec = [import_state.computed], _getCameraForFollowing_dec = [import_state.computed], _getZoomLevel_dec = [import_state.computed], _getViewportScreenBounds_dec = [import_state.computed], _getViewportScreenCenter_dec = [import_state.computed], _getViewportPageBounds_dec = [import_state.computed], __getCollaboratorsQuery_dec = [import_state.computed], _getCollaborators_dec = [import_state.computed], _getCollaboratorsOnCurrentPage_dec = [import_state.computed], _getRenderingShapes_dec = [import_state.computed], __getAllPagesQuery_dec = [import_state.computed], _getPages_dec = [import_state.computed], _getCurrentPageId_dec = [import_state.computed], _getCurrentPageShapeIdsSorted_dec = [import_state.computed], __getAllAssetsQuery_dec = [import_state.computed], __getShapeHandlesCache_dec = [import_state.computed], __getShapePageTransformCache_dec = [import_state.computed], __getShapePageBoundsCache_dec = [import_state.computed], __getShapeClipPathCache_dec = [import_state.computed], __getShapeMaskCache_dec = [import_state.computed], __getShapeMaskedPageBoundsCache_dec = [import_state.computed], _getNotVisibleShapes_dec = [import_state.computed], _getCulledShapes_dec = [import_state.computed], _getCurrentPageBounds_dec = [import_state.computed], _getCurrentPageShapes_dec = [import_state.computed], _getCurrentPageShapesSorted_dec = [import_state.computed], _getCurrentPageRenderingShapesSorted_dec = [import_state.computed], __getBindingsIndexCache_dec = [import_state.computed], __getSelectionSharedStyles_dec = [import_state.computed], _getSharedStyles_dec = [(0, import_state.computed)({ isEqual: (a, b) => a.equals(b) })], _getSharedOpacity_dec = [import_state.computed], _getIsFocused_dec = [import_state.computed], _getIsReadonly_dec = [import_state.computed], __setShiftKeyTimeout_dec = [import_utils.bind], __setAltKeyTimeout_dec = [import_utils.bind], __setCtrlKeyTimeout_dec = [import_utils.bind], __setMetaKeyTimeout_dec = [import_utils.bind], _a) {
   constructor({
     store,
     user,
@@ -302,7 +302,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     __publicField(this, "_currentPageShapeIds");
     /* --------------------- Shapes --------------------- */
     __publicField(this, "_shapeGeometryCaches", {});
-    __publicField(this, "_shapePageGeometryCaches", {});
+    __publicField(this, "_notVisibleShapes", (0, import_notVisibleShapes.notVisibleShapes)(this));
     // Parents and children
     /**
      * A cache of parents to children.
@@ -559,6 +559,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         shape: {
           afterChange: (shapeBefore, shapeAfter) => {
             for (const binding of this.getBindingsInvolvingShape(shapeAfter)) {
+              if ((0, import_areShapesContentEqual.areShapesContentEqual)(shapeBefore, shapeAfter)) continue;
               invalidBindingTypes.add(binding.type);
               if (binding.fromId === shapeAfter.id) {
                 this.getBindingUtil(binding).onAfterChangeFromShape?.({
@@ -2819,10 +2820,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
   }
   getViewportScreenCenter() {
     const viewportScreenBounds = this.getViewportScreenBounds();
-    return new import_Vec.Vec(
-      viewportScreenBounds.midX - viewportScreenBounds.minX,
-      viewportScreenBounds.midY - viewportScreenBounds.minY
-    );
+    return new import_Vec.Vec(viewportScreenBounds.w / 2, viewportScreenBounds.h / 2);
   }
   getViewportPageBounds() {
     const { w, h } = this.getViewportScreenBounds();
@@ -3497,41 +3495,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       typeof shape === "string" ? shape : shape.id
     );
   }
-  /**
-   * Get the geometry of a shape in page-space.
-   *
-   * @example
-   * ```ts
-   * editor.getShapePageGeometry(myShape)
-   * editor.getShapePageGeometry(myShapeId)
-   * editor.getShapePageGeometry(myShapeId, { context: "arrow" })
-   * ```
-   *
-   * @param shape - The shape (or shape id) to get the geometry for.
-   * @param opts - Additional options about the request for geometry. Passed to {@link ShapeUtil.getGeometry}.
-   *
-   * @public
-   */
-  getShapePageGeometry(shape, opts) {
-    const context = opts?.context ?? "none";
-    if (!this._shapePageGeometryCaches[context]) {
-      this._shapePageGeometryCaches[context] = this.store.createComputedCache(
-        "bounds",
-        (shape2) => {
-          const geometry = this.getShapeGeometry(shape2.id, opts);
-          const pageTransform = this.getShapePageTransform(shape2.id);
-          return geometry.transform(pageTransform);
-        },
-        {
-          // we only depend directly on the shape id, and changing geometry/transform will update us anyway
-          areRecordsEqual: () => true
-        }
-      );
-    }
-    return this._shapePageGeometryCaches[context].get(
-      typeof shape === "string" ? shape : shape.id
-    );
-  }
   _getShapeHandlesCache() {
     return this.store.createComputedCache(
       "handles",
@@ -3625,7 +3588,10 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
   }
   _getShapePageBoundsCache() {
     return this.store.createComputedCache("pageBoundsCache", (shape) => {
-      return this.getShapePageGeometry(shape).bounds;
+      const pageTransform = this.getShapePageTransform(shape);
+      if (!pageTransform) return void 0;
+      const geometry = this.getShapeGeometry(shape);
+      return import_Box.Box.FromPoints(pageTransform.applyToPoints(geometry.vertices));
     });
   }
   /**
@@ -3682,12 +3648,11 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
         (shape2) => this.isShapeOfType(shape2, "frame")
       );
       if (frameAncestors.length === 0) return void 0;
-      const pageMask = frameAncestors.map(
-        (s) => (
-          // Apply the frame transform to the frame outline to get the frame outline in the current page space
-          this.getShapePageGeometry(s.id).vertices
-        )
-      ).reduce((acc, b) => {
+      const pageMask = frameAncestors.map((s) => {
+        const geometry = this.getShapeGeometry(s.id);
+        const pageTransform = this.getShapePageTransform(s.id);
+        return pageTransform.applyToPoints(geometry.vertices);
+      }).reduce((acc, b) => {
         if (!(b && acc)) return void 0;
         const intersection = (0, import_intersect.intersectPolygonPolygon)(acc, b);
         if (intersection) {
@@ -3851,17 +3816,24 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     }
     return void 0;
   }
-  isShapeOrAncestorLocked(arg) {
-    const shape = typeof arg === "string" ? this.getShape(arg) : arg;
-    if (shape === void 0) return false;
-    if (shape.isLocked) return true;
-    return this.isShapeOrAncestorLocked(this.getShapeParent(shape));
+  /**
+   * Check whether a shape or its parent is locked.
+   *
+   * @param shape - The shape (or shape id) to check.
+   *
+   * @public
+   */
+  isShapeOrAncestorLocked(shape) {
+    const _shape = shape && this.getShape(shape);
+    if (_shape === void 0) return false;
+    if (_shape.isLocked) return true;
+    return this.isShapeOrAncestorLocked(this.getShapeParent(_shape));
   }
-  _notVisibleShapes() {
-    return (0, import_notVisibleShapes.notVisibleShapes)(this);
+  getNotVisibleShapes() {
+    return this._notVisibleShapes.get();
   }
   getCulledShapes() {
-    const notVisibleShapes2 = this._notVisibleShapes().get();
+    const notVisibleShapes2 = this.getNotVisibleShapes();
     const selectedShapeIds = this.getSelectedShapeIds();
     const editingId = this.getEditingShapeId();
     const culledShapes = new Set(notVisibleShapes2);
@@ -4006,18 +3978,18 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * @example
    * ```ts
    * editor.getShapesAtPoint({ x: 100, y: 100 })
-   * editor.getShapesAtPoint({ x: 100, y: 100 }, { hitInside: true, exact: true })
+   * editor.getShapesAtPoint({ x: 100, y: 100 }, { hitInside: true, margin: 8 })
    * ```
    *
    * @param point - The page point to test.
    * @param opts - The options for the hit point testing.
    *
+   * @returns An array of shapes at the given point, sorted in reverse order of their absolute z-index (top-most shape first).
+   *
    * @public
    */
   getShapesAtPoint(point, opts = {}) {
-    return this.getCurrentPageShapes().filter(
-      (shape) => !this.isShapeHidden(shape) && this.isPointInShape(shape, point, opts)
-    );
+    return this.getCurrentPageShapesSorted().filter((shape) => !this.isShapeHidden(shape) && this.isPointInShape(shape, point, opts)).reverse();
   }
   /**
    * Test whether a point (in the current page space) will will a shape. This method takes into account masks,
@@ -4339,8 +4311,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * @public
    */
   visitDescendants(parent, visitor) {
-    const parentId = typeof parent === "string" ? parent : parent.id;
-    const children = this.getSortedChildIdsForParent(parentId);
+    const children = this.getSortedChildIdsForParent(parent);
     for (const id of children) {
       if (visitor(id) === false) continue;
       this.visitDescendants(id, visitor);
@@ -7807,7 +7778,7 @@ __decorateElement(_init, 1, "_getShapePageBoundsCache", __getShapePageBoundsCach
 __decorateElement(_init, 1, "_getShapeClipPathCache", __getShapeClipPathCache_dec, Editor);
 __decorateElement(_init, 1, "_getShapeMaskCache", __getShapeMaskCache_dec, Editor);
 __decorateElement(_init, 1, "_getShapeMaskedPageBoundsCache", __getShapeMaskedPageBoundsCache_dec, Editor);
-__decorateElement(_init, 1, "_notVisibleShapes", __notVisibleShapes_dec, Editor);
+__decorateElement(_init, 1, "getNotVisibleShapes", _getNotVisibleShapes_dec, Editor);
 __decorateElement(_init, 1, "getCulledShapes", _getCulledShapes_dec, Editor);
 __decorateElement(_init, 1, "getCurrentPageBounds", _getCurrentPageBounds_dec, Editor);
 __decorateElement(_init, 1, "getCurrentPageShapes", _getCurrentPageShapes_dec, Editor);