@tldraw/editor 3.12.0-canary.3ab62f1ff84a → 3.12.0-canary.3e2ed74b5e86

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

@@ -137,13 +137,15 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     autoFocus,
     inferDarkMode,
     options,
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
     isShapeHidden,
+    getShapeVisibility,
     fontAssetUrls
   }) {
     super();
     __runInitializers(_init, 5, this);
     __publicField(this, "id", (0, import_utils.uniqueId)());
-    __publicField(this, "_isShapeHiddenPredicate");
+    __publicField(this, "_getShapeVisibility");
     __publicField(this, "options");
     __publicField(this, "contextId", (0, import_utils.uniqueId)());
     /**
@@ -299,6 +301,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     __publicField(this, "_currentPageShapeIds");
     /* --------------------- Shapes --------------------- */
     __publicField(this, "_shapeGeometryCaches", {});
+    __publicField(this, "_shapePageGeometryCaches", {});
     // Parents and children
     /**
      * A cache of parents to children.
@@ -410,7 +413,14 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     /** @internal */
     __publicField(this, "performanceTrackerTimeout", -1);
     __publicField(this, "_pendingEventsForNextTick", []);
-    this._isShapeHiddenPredicate = isShapeHidden;
+    (0, import_utils.assert)(
+      !(isShapeHidden && getShapeVisibility),
+      "Cannot use both isShapeHidden and getShapeVisibility"
+    );
+    this._getShapeVisibility = isShapeHidden ? (
+      // eslint-disable-next-line @typescript-eslint/no-deprecated
+      (shape, editor) => isShapeHidden(shape, editor) ? "hidden" : "inherit"
+    ) : getShapeVisibility;
     this.options = { ...import_options.defaultTldrawOptions, ...options };
     this.store = store;
     this.disposables.add(this.store.dispose.bind(this.store));
@@ -803,15 +813,16 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     }
   }
   getIsShapeHiddenCache() {
-    if (!this._isShapeHiddenPredicate) return null;
+    if (!this._getShapeVisibility) return null;
     return this.store.createComputedCache("isShapeHidden", (shape) => {
-      const hiddenParent = this.findShapeAncestor(shape, (p) => this.isShapeHidden(p));
-      if (hiddenParent) return true;
-      return this._isShapeHiddenPredicate(shape, this) ?? false;
+      const visibility = this._getShapeVisibility(shape, this);
+      const isParentHidden = import_tlschema.PageRecordType.isId(shape.parentId) ? false : this.isShapeHidden(shape.parentId);
+      if (isParentHidden) return visibility !== "visible";
+      return visibility === "hidden";
     });
   }
   isShapeHidden(shapeOrId) {
-    if (!this._isShapeHiddenPredicate) return false;
+    if (!this._getShapeVisibility) return false;
     return !!this.getIsShapeHiddenCache().get(
       typeof shapeOrId === "string" ? shapeOrId : shapeOrId.id
     );
@@ -2825,7 +2836,13 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     const addShapeById = (id, opacity, isAncestorErasing) => {
       const shape = this.getShape(id);
       if (!shape) return;
-      if (this.isShapeHidden(shape)) return;
+      if (this.isShapeHidden(shape)) {
+        const isErasing = isAncestorErasing || erasingShapeIds.includes(id);
+        for (const childId of this.getSortedChildIdsForParent(id)) {
+          addShapeById(childId, opacity, isErasing);
+        }
+        return;
+      }
       opacity *= shape.opacity;
       let isShapeErasing = false;
       const util = this.getShapeUtil(shape);
@@ -3252,7 +3269,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     return await this.store.props.assets.upload(asset, file, abortSignal);
   }
   /**
-   * Get the geometry of a shape.
+   * Get the geometry of a shape in shape-space.
    *
    * @example
    * ```ts
@@ -3282,6 +3299,41 @@ 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", (shape) => {
       return this.getShapeUtil(shape).getHandles?.(shape);
@@ -3369,12 +3421,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
   }
   _getShapePageBoundsCache() {
     return this.store.createComputedCache("pageBoundsCache", (shape) => {
-      const pageTransform = this._getShapePageTransformCache().get(shape.id);
-      if (!pageTransform) return new import_Box.Box();
-      const result = import_Box.Box.FromPoints(
-        import_Mat.Mat.applyToPoints(pageTransform, this.getShapeGeometry(shape).vertices)
-      );
-      return result;
+      return this.getShapePageGeometry(shape).bounds;
     });
   }
   /**
@@ -3434,7 +3481,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
       const pageMask = frameAncestors.map(
         (s) => (
           // Apply the frame transform to the frame outline to get the frame outline in the current page space
-          this._getShapePageTransformCache().get(s.id).applyToPoints(this.getShapeGeometry(s).vertices)
+          this.getShapePageGeometry(s.id).vertices
         )
       ).reduce((acc, b) => {
         if (!(b && acc)) return void 0;