@tldraw/editor 5.4.0-canary.dc9b1f2c03ff → 5.4.0-canary.dd16e831634d

package/dist-cjs/index.js

@@ -392,7 +392,7 @@ var import_uniq = require("./lib/utils/uniq");
 var import_defaultThemes2 = require("./lib/editor/managers/ThemeManager/defaultThemes");
 (0, import_utils.registerTldrawLibraryVersion)(
   "@tldraw/editor",
-  "5.4.0-canary.dc9b1f2c03ff",
+  "5.4.0-canary.dd16e831634d",
   "cjs"
 );
 //# sourceMappingURL=index.js.map

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

@@ -2359,8 +2359,8 @@ class Editor extends import_eventemitter3.default {
       const vsb = this.getViewportScreenBounds();
       if (cameraOptions.constraints) {
         const { constraints } = cameraOptions;
-        const py = Math.min(constraints.padding.y, vsb.w / 2);
-        const px = Math.min(constraints.padding.x, vsb.h / 2);
+        const px = Math.min(constraints.padding.x, vsb.w / 2);
+        const py = Math.min(constraints.padding.y, vsb.h / 2);
         const bounds = import_Box.Box.From(cameraOptions.constraints.bounds);
         const zx = (vsb.w - px * 2) / bounds.w;
         const zy = (vsb.h - py * 2) / bounds.h;
@@ -2399,12 +2399,12 @@ class Editor extends import_eventemitter3.default {
               break;
             }
             case "inside": {
-              if (z < zx) x = (0, import_utils2.clamp)(x, minX, (vsb.w - px) / z - bounds.w);
+              if (z < zx) x = (0, import_utils2.clamp)(x, minX, (vsb.w - px) / z - bounds.w - bounds.x);
               else x = (0, import_utils2.clamp)(x, minX + freeW, minX);
               break;
             }
             case "outside": {
-              x = (0, import_utils2.clamp)(x, px / z - bounds.w, (vsb.w - px) / z);
+              x = (0, import_utils2.clamp)(x, px / z - bounds.w - bounds.x, (vsb.w - px) / z - bounds.x);
               break;
             }
             case "free": {
@@ -2425,12 +2425,12 @@ class Editor extends import_eventemitter3.default {
               break;
             }
             case "inside": {
-              if (z < zy) y = (0, import_utils2.clamp)(y, minY, (vsb.h - py) / z - bounds.h);
+              if (z < zy) y = (0, import_utils2.clamp)(y, minY, (vsb.h - py) / z - bounds.h - bounds.y);
               else y = (0, import_utils2.clamp)(y, minY + freeH, minY);
               break;
             }
             case "outside": {
-              y = (0, import_utils2.clamp)(y, py / z - bounds.h, (vsb.h - py) / z);
+              y = (0, import_utils2.clamp)(y, py / z - bounds.h - bounds.y, (vsb.h - py) / z - bounds.y);
               break;
             }
             case "free": {
@@ -4042,7 +4042,9 @@ class Editor extends import_eventemitter3.default {
       if (pageMask) {
         if (pageMask.length === 0) return void 0;
         const { corners } = pageBounds;
-        if (corners.every((p, i) => p && import_Vec.Vec.Equals(p, pageMask[i]))) return pageBounds.clone();
+        if (pageMask.length === corners.length && corners.every((p, i) => import_Vec.Vec.Equals(p, pageMask[i]))) {
+          return pageBounds.clone();
+        }
         const intersection = (0, import_intersect.intersectPolygonPolygon)(pageMask, corners);
         if (!intersection) return;
         return import_Box.Box.FromPoints(intersection);
@@ -4281,7 +4283,7 @@ class Editor extends import_eventemitter3.default {
       const pointInShapeSpace = this.getPointInShapeSpace(shape, point);
       const shapeUtil = this.getShapeUtil(shape);
       const isShapeFrameLike = this.isShapeFrameLike(shape);
-      if (isShapeFrameLike || (this.isShapeOfType(shape, "note") || this.isShapeOfType(shape, "arrow") || this.isShapeOfType(shape, "geo") && shape.props.fill === "none") && shapeUtil.getText(shape)?.trim()) {
+      if (isGroup && (isShapeFrameLike || (this.isShapeOfType(shape, "note") || this.isShapeOfType(shape, "arrow") || this.isShapeOfType(shape, "geo") && shape.props.fill === "none") && shapeUtil.getText(shape)?.trim())) {
         for (const childGeometry of geometry.children) {
           if (childGeometry.isLabel && childGeometry.isPointInBounds(pointInShapeSpace)) {
             return shape;
@@ -8704,10 +8706,9 @@ function withIsolatedShapes(editor, shapeIds, callback) {
 }
 function getCameraFitXFitY(editor, cameraOptions) {
   if (!cameraOptions.constraints) throw Error("Should have constraints here");
-  const {
-    padding: { x: px, y: py }
-  } = cameraOptions.constraints;
   const vsb = editor.getViewportScreenBounds();
+  const px = Math.min(cameraOptions.constraints.padding.x, vsb.w / 2);
+  const py = Math.min(cameraOptions.constraints.padding.y, vsb.h / 2);
   const bounds = import_Box.Box.From(cameraOptions.constraints.bounds);
   const zx = (vsb.w - px * 2) / bounds.w;
   const zy = (vsb.h - py * 2) / bounds.h;