@tldraw/editor 4.4.0-canary.afdcafe834b3 → 4.4.0-canary.b56b70f6a630

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

@@ -139,6 +139,7 @@ import {
 } from "../utils/deepLinks.mjs";
 import { getIncrementedName } from "../utils/getIncrementedName.mjs";
 import { getReorderingShapesChanges } from "../utils/reorderShapes.mjs";
+import { getDroppedShapesToNewParents } from "../utils/reparenting.mjs";
 import { applyRotationToSnapshotShapes, getRotationSnapshot } from "../utils/rotation.mjs";
 import { bindingsIndex } from "./derivations/bindingsIndex.mjs";
 import { notVisibleShapes } from "./derivations/notVisibleShapes.mjs";
@@ -165,12 +166,16 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     bindingUtils,
     tools,
     getContainer,
+    // needs to be here for backwards compatibility with TldrawEditor
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
     cameraOptions,
-    textOptions,
     initialState,
     autoFocus,
     inferDarkMode,
-    options,
+    options: _options,
+    // needs to be here for backwards compatibility with TldrawEditor
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    textOptions: _textOptions,
     getShapeVisibility,
     fontAssetUrls
   }) {
@@ -331,7 +336,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     // unmount / remount in the DOM, which is expensive; and computing visibility is
     // also expensive in large projects. For this reason, we use a second bounding
     // box just for rendering, and we only update after the camera stops moving.
-    __publicField(this, "_cameraState", atom("camera state", "idle"));
     __publicField(this, "_cameraStateTimeoutRemaining", 0);
     /* @internal */
     __publicField(this, "_currentPageShapeIds");
@@ -404,6 +408,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     __publicField(this, "handledEvents", /* @__PURE__ */ new WeakSet());
     __publicField(this, "_pendingEventsForNextTick", []);
     this._getShapeVisibility = getShapeVisibility;
+    const options = _textOptions ? { ..._options, text: _options?.text ?? _textOptions } : _options;
     this.options = { ...defaultTldrawOptions, ...options };
     this.store = store;
     this.history = new HistoryManager({
@@ -417,8 +422,12 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     this._spatialIndex = new SpatialIndexManager(this);
     this.disposables.add(() => this._spatialIndex.dispose());
     this.disposables.add(this.timers.dispose);
-    this._cameraOptions.set({ ...DEFAULT_CAMERA_OPTIONS, ...cameraOptions });
-    this._textOptions = atom("text options", textOptions ?? null);
+    this._cameraOptions.set({
+      ...DEFAULT_CAMERA_OPTIONS,
+      ...cameraOptions,
+      ...options?.camera
+    });
+    this._textOptions = atom("text options", options?.text ?? null);
     this.user = new UserPreferencesManager(user ?? createTLUser(), inferDarkMode ?? false);
     this.disposables.add(() => this.user.dispose());
     this.getContainer = getContainer;
@@ -3121,15 +3130,18 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     this._cameraStateTimeoutRemaining -= elapsed;
     if (this._cameraStateTimeoutRemaining > 0) return;
     this.off("tick", this._decayCameraStateTimeout);
-    this._cameraState.set("idle");
+    this._setCameraState("idle");
   }
   _tickCameraState() {
     this._cameraStateTimeoutRemaining = this.options.cameraMovingTimeoutMs;
-    if (this._cameraState.__unsafe__getWithoutCapture() !== "idle") return;
-    this._cameraState.set("moving");
+    if (this.getInstanceState().cameraState !== "idle") return;
+    this._setCameraState("moving");
     this._debouncedZoomLevel.set(unsafe__withoutCapture(() => this.getCamera().z));
     this.on("tick", this._decayCameraStateTimeout);
   }
+  _setCameraState(cameraState) {
+    this.updateInstanceState({ cameraState }, { history: "ignore" });
+  }
   /**
    * Whether the camera is moving or idle.
    *
@@ -3141,7 +3153,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    * @public
    */
   getCameraState() {
-    return this._cameraState.get();
+    return this.getInstanceState().cameraState;
   }
   getRenderingShapes() {
     const renderingShapes = this.getUnorderedRenderingShapes(true);
@@ -4086,7 +4098,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    * @param bounds - The bounds to search within.
    * @returns Unordered set of shape IDs within the given bounds.
    *
-   * @internal
+   * @public
    */
   getShapeIdsInsideBounds(bounds) {
     return this._spatialIndex.getShapeIdsInsideBounds(bounds);
@@ -4629,7 +4641,13 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     const fromShapeType = typeof fromShape === "string" ? fromShape : fromShape.type;
     const toShapeType = typeof toShape === "string" ? toShape : toShape.type;
     const bindingType = typeof binding === "string" ? binding : binding.type;
-    const canBindOpts = { fromShapeType, toShapeType, bindingType };
+    const canBindOpts = {
+      fromShape: typeof fromShape === "string" ? { type: fromShape } : fromShape,
+      toShape: typeof toShape === "string" ? { type: toShape } : toShape,
+      bindingType,
+      fromShapeType,
+      toShapeType
+    };
     if (fromShapeType === toShapeType) {
       return this.getShapeUtil(fromShapeType).canBind(canBindOpts);
     }
@@ -5769,7 +5787,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     this.resizeShape(id, shapeScale, {
       initialShape: options.initialShape,
       initialBounds: options.initialBounds,
-      isAspectRatioLocked: options.isAspectRatioLocked
+      isAspectRatioLocked: options.isAspectRatioLocked,
+      initialPageTransform: options.initialPageTransform
     });
     if (Math.sign(scale.x) * Math.sign(scale.y) < 0) {
       const parentRotation = this.getShapeParentTransform(id).rotation();
@@ -6927,6 +6946,17 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
           return { id: s.id, type: s.type, x: s.x + localDelta.x, y: s.y + localDelta.y };
         })
       );
+      if (isPageId(pasteParentId)) {
+        const currentRootShapes = compact(rootShapes.map((s) => this.getShape(s.id)));
+        const { reparenting } = getDroppedShapesToNewParents(this, currentRootShapes);
+        reparenting.forEach((childrenToReparent, newParentId) => {
+          if (childrenToReparent.length === 0) return;
+          this.reparentShapes(
+            childrenToReparent.map((s) => s.id),
+            newParentId
+          );
+        });
+      }
     });
     return this;
   }
@@ -7600,9 +7630,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
           case "pinch_start": {
             if (inputs.getIsPinching()) return;
             if (!inputs.getIsEditing()) {
-              if (!this._selectedShapeIdsAtPointerDown.length) {
-                this._selectedShapeIdsAtPointerDown = [...pageState.selectedShapeIds];
-              }
+              this._selectedShapeIdsAtPointerDown = [...pageState.selectedShapeIds];
               this._didPinch = true;
               inputs.setIsPinching(true);
               this.interrupt();
@@ -7817,6 +7845,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
                 this.setCurrentTool(this._restoreToolId);
               }
             }
+            this._selectedShapeIdsAtPointerDown = [];
             break;
           }
         }