@tldraw/editor 5.4.0 → 5.5.0-canary.02c40fdfa655

package/dist-esm/lib/editor/Editor.mjs

@@ -75,6 +75,7 @@ import {
 import {
   DEFAULT_ANIMATION_OPTIONS,
   DEFAULT_CAMERA_OPTIONS,
+  FRAME_MS_60HZ,
   INTERNAL_POINTER_IDS,
   LEFT_MOUSE_BUTTON,
   MIDDLE_MOUSE_BUTTON,
@@ -1657,7 +1658,8 @@ class Editor extends EventEmitter {
     if (direction === "next" || direction === "prev") {
       const shapeIds = readingOrderShapes.map((shape2) => shape2.id);
       const currentIndex = currentShapeId ? shapeIds.indexOf(currentShapeId) : -1;
-      const adjacentIndex = (currentIndex + (direction === "next" ? 1 : -1) + shapeIds.length) % shapeIds.length;
+      const startIndex = currentIndex === -1 && direction === "prev" ? 0 : currentIndex;
+      const adjacentIndex = (startIndex + (direction === "next" ? 1 : -1) + shapeIds.length) % shapeIds.length;
       adjacentShapeId = shapeIds[adjacentIndex];
     } else {
       if (!currentShapeId) return;
@@ -2537,14 +2539,16 @@ class Editor extends EventEmitter {
   setCamera(point, opts) {
     const { isLocked } = this._cameraOptions.__unsafe__getWithoutCapture();
     if (isLocked && !opts?.force) return this;
+    const _point = Vec.Cast(point);
+    if (!Number.isFinite(_point.x) || !Number.isFinite(_point.y) || !Number.isFinite(_point.z)) {
+      throw Error(
+        `Editor.setCamera: expected finite values, got (${_point.x}, ${_point.y}, ${_point.z}).`
+      );
+    }
     this.stopCameraAnimation();
     if (this.getInstanceState().followingUserId) {
       this.stopFollowingUser();
     }
-    const _point = Vec.Cast(point);
-    if (!Number.isFinite(_point.x)) _point.x = 0;
-    if (!Number.isFinite(_point.y)) _point.y = 0;
-    if (_point.z === void 0 || !Number.isFinite(_point.z)) point.z = this.getZoomLevel();
     const camera = this.getConstrainedCamera(_point, opts);
     if (opts?.animation) {
       const { width, height } = this.getViewportScreenBounds();
@@ -2923,7 +2927,7 @@ class Editor extends EventEmitter {
         newCx += center.x / newCz - center.x / cz;
         newCy += center.y / newCz - center.y / cz;
       }
-      currentSpeed *= 1 - friction;
+      currentSpeed *= (1 - friction) ** (elapsed / FRAME_MS_60HZ);
       if (currentSpeed < speedThreshold) {
         cancel();
       } else {