@tldraw/editor 5.2.0-canary.ff23978d50f6 → 5.2.0-next.5d769d321393

package/dist-cjs/index.js

@@ -380,7 +380,7 @@ var import_uniq = require("./lib/utils/uniq");
 var import_defaultThemes2 = require("./lib/editor/managers/ThemeManager/defaultThemes");
 (0, import_utils.registerTldrawLibraryVersion)(
   "@tldraw/editor",
-  "5.2.0-canary.ff23978d50f6",
+  "5.2.0-next.5d769d321393",
   "cjs"
 );
 //# sourceMappingURL=index.js.map

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

@@ -2340,6 +2340,11 @@ class Editor extends import_eventemitter3.default {
   getConstrainedCamera(point, opts) {
     const currentCamera = this.getCamera();
     let { x, y, z = currentCamera.z } = point;
+    const preserveFocalPoint = (current, requested, rz, z2) => {
+      const cz = currentCamera.z;
+      if (rz === cz) return current;
+      return current + (requested - current) * (1 / z2 - 1 / cz) / (1 / rz - 1 / cz);
+    };
     if (!opts?.force) {
       const cameraOptions = this.getCameraOptions();
       const zoomMin = cameraOptions.zoomSteps[0];
@@ -2359,14 +2364,10 @@ class Editor extends import_eventemitter3.default {
           z = this.getInitialZoom();
         }
         if (z < minZ || z > maxZ) {
-          const { x: cx, y: cy, z: cz } = currentCamera;
-          const cxA = -cx + vsb.w / cz / 2;
-          const cyA = -cy + vsb.h / cz / 2;
+          const rz = z;
           z = (0, import_utils2.clamp)(z, minZ, maxZ);
-          const cxB = -cx + vsb.w / z / 2;
-          const cyB = -cy + vsb.h / z / 2;
-          x = cx + cxB - cxA;
-          y = cy + cyB - cyA;
+          x = preserveFocalPoint(currentCamera.x, x, rz, z);
+          y = preserveFocalPoint(currentCamera.y, y, rz, z);
         }
         const minX = px / z - bounds.x;
         const minY = py / z - bounds.y;
@@ -2435,10 +2436,10 @@ class Editor extends import_eventemitter3.default {
         }
       } else {
         if (z > zoomMax || z < zoomMin) {
-          const { x: cx, y: cy, z: cz } = currentCamera;
+          const rz = z;
           z = (0, import_utils2.clamp)(z, zoomMin, zoomMax);
-          x = cx + (-cx + vsb.w / z / 2) - (-cx + vsb.w / cz / 2);
-          y = cy + (-cy + vsb.h / z / 2) - (-cy + vsb.h / cz / 2);
+          x = preserveFocalPoint(currentCamera.x, x, rz, z);
+          y = preserveFocalPoint(currentCamera.y, y, rz, z);
         }
       }
     }