@tldraw/editor 4.4.0-next.f181afb0ab39 → 4.4.0-next.f2df7e20ec7b

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

@@ -132,12 +132,16 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     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
   }) {
@@ -298,7 +302,6 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     // 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", (0, import_state.atom)("camera state", "idle"));
     __publicField(this, "_cameraStateTimeoutRemaining", 0);
     /* @internal */
     __publicField(this, "_currentPageShapeIds");
@@ -371,6 +374,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     __publicField(this, "handledEvents", /* @__PURE__ */ new WeakSet());
     __publicField(this, "_pendingEventsForNextTick", []);
     this._getShapeVisibility = getShapeVisibility;
+    const options = _textOptions ? { ..._options, text: _options?.text ?? _textOptions } : _options;
     this.options = { ...import_options.defaultTldrawOptions, ...options };
     this.store = store;
     this.history = new import_HistoryManager.HistoryManager({
@@ -384,8 +388,12 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     this._spatialIndex = new import_SpatialIndexManager.SpatialIndexManager(this);
     this.disposables.add(() => this._spatialIndex.dispose());
     this.disposables.add(this.timers.dispose);
-    this._cameraOptions.set({ ...import_constants.DEFAULT_CAMERA_OPTIONS, ...cameraOptions });
-    this._textOptions = (0, import_state.atom)("text options", textOptions ?? null);
+    this._cameraOptions.set({
+      ...import_constants.DEFAULT_CAMERA_OPTIONS,
+      ...cameraOptions,
+      ...options?.camera
+    });
+    this._textOptions = (0, import_state.atom)("text options", options?.text ?? null);
     this.user = new import_UserPreferencesManager.UserPreferencesManager(user ?? (0, import_createTLUser.createTLUser)(), inferDarkMode ?? false);
     this.disposables.add(() => this.user.dispose());
     this.getContainer = getContainer;
@@ -2389,7 +2397,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * @public
    */
   zoomToFit(opts) {
-    const ids = [...this.getCurrentPageShapeIds()];
+    const ids = [...this.getCurrentPageShapeIds()].filter((id) => !this.isShapeHidden(id));
     if (ids.length <= 0) return this;
     const pageBounds = import_Box.Box.Common((0, import_utils.compact)(ids.map((id) => this.getShapePageBounds(id))));
     this.zoomToBounds(pageBounds, opts);
@@ -3088,15 +3096,18 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     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((0, import_state.unsafe__withoutCapture)(() => this.getCamera().z));
     this.on("tick", this._decayCameraStateTimeout);
   }
+  _setCameraState(cameraState) {
+    this.updateInstanceState({ cameraState }, { history: "ignore" });
+  }
   /**
    * Whether the camera is moving or idle.
    *
@@ -3108,7 +3119,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * @public
    */
   getCameraState() {
-    return this._cameraState.get();
+    return this.getInstanceState().cameraState;
   }
   getRenderingShapes() {
     const renderingShapes = this.getUnorderedRenderingShapes(true);
@@ -3874,6 +3885,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
   getCurrentPageBounds() {
     let commonBounds;
     this.getCurrentPageShapeIdsSorted().forEach((shapeId) => {
+      if (this.isShapeHidden(shapeId)) return;
       const bounds = this.getShapeMaskedPageBounds(shapeId);
       if (!bounds) return;
       if (!commonBounds) {
@@ -4052,7 +4064,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
    * @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);
@@ -4595,7 +4607,13 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     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);
     }
@@ -5735,7 +5753,8 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
     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();
@@ -7215,7 +7234,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
   /**
    * Handles navigating to the content specified by the query param in the given URL.
    *
-   * Use {@link Editor#createDeepLink} to create a URL with a deep link query param.
+   * Use {@link Editor.createDeepLink} to create a URL with a deep link query param.
    *
    * If no URL is provided, it will look for the param in the current `window.location.href`.
    *
@@ -7566,9 +7585,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
           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();
@@ -7783,6 +7800,7 @@ class Editor extends (_a = import_eventemitter3.default, _getIsShapeHiddenCache_
                 this.setCurrentTool(this._restoreToolId);
               }
             }
+            this._selectedShapeIdsAtPointerDown = [];
             break;
           }
         }