@tldraw/editor 5.5.0 → 5.6.0-canary.669b4c97f643

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.5.0",
+  "5.6.0-canary.669b4c97f643",
   "cjs"
 );
 //# sourceMappingURL=index.js.map

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

@@ -3657,7 +3657,9 @@ class Editor extends import_eventemitter3.default {
     const id = typeof page === "string" ? page : page.id;
     const freshPage = this.getPage(id);
     if (!freshPage) return this;
-    const prevCamera = { ...this.getCamera() };
+    const prevCamera = {
+      ...this.store.get(import_tlschema.CameraRecordType.createId(freshPage.id)) ?? this.getCamera()
+    };
     const content = this.getContentFromCurrentPage(this.getSortedChildIdsForParent(freshPage.id));
     this.run(() => {
       const pages = this.getPages();
@@ -3666,7 +3668,7 @@ class Editor extends import_eventemitter3.default {
       this.setCurrentPage(createId);
       this.setCamera(prevCamera);
       if (content) {
-        return this.putContentOntoCurrentPage(content);
+        return this.putContentOntoCurrentPage(content, { preservePosition: true });
       }
     });
     return this;
@@ -6030,11 +6032,20 @@ class Editor extends import_eventemitter3.default {
       initialShape: options.initialShape,
       initialBounds: options.initialBounds,
       isAspectRatioLocked: options.isAspectRatioLocked,
-      initialPageTransform: options.initialPageTransform
+      initialPageTransform: options.initialPageTransform,
+      dragHandle: options.dragHandle,
+      mode: options.mode,
+      // this is one frame of the same resize, not a new one, so don't fire start/end again
+      skipStartAndEndCallbacks: options.skipStartAndEndCallbacks
     });
     if (Math.sign(scale.x) * Math.sign(scale.y) < 0) {
       const parentRotation = this.getShapeParentTransform(id).rotation();
-      const rotation = -options.initialShape.rotation - 2 * parentRotation;
+      const parentDelta = (0, import_utils2.shortAngleDist)(
+        import_Mat.Mat.Cast(options.initialPageTransform).rotation() - options.initialShape.rotation,
+        parentRotation
+      );
+      const initialParentRotation = parentRotation - parentDelta;
+      const rotation = 2 * options.scaleAxisRotation - options.initialShape.rotation - 2 * initialParentRotation - parentDelta;
       this.updateShapes([{ id, type, rotation }]);
     }
     const preScaleShapePageCenter = import_Mat.Mat.applyToPoint(