@tldraw/editor 4.3.0-canary.bf87ebaf143a → 4.3.0-canary.c08047039e53

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

@@ -46,7 +46,7 @@ var __privateIn = (member, obj) => Object(obj) !== obj ? __typeError('Cannot use
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
-var __setMetaKeyTimeout_dec, __setCtrlKeyTimeout_dec, __setAltKeyTimeout_dec, __setShiftKeyTimeout_dec, _getIsReadonly_dec, _getIsFocused_dec, _getSharedOpacity_dec, _getSharedStyles_dec, __getSelectionSharedStyles_dec, __getBindingsIndexCache_dec, _getCurrentPageRenderingShapesSorted_dec, _getCurrentPageShapesSorted_dec, _getCurrentPageShapes_dec, _getCurrentPageBounds_dec, _getCulledShapes_dec, _getNotVisibleShapes_dec, __getShapeMaskedPageBoundsCache_dec, __getShapeMaskCache_dec, __getShapeClipPathCache_dec, __getShapePageBoundsCache_dec, __getShapePageTransformCache_dec, __getShapeHandlesCache_dec, __getAllAssetsQuery_dec, _getCurrentPageShapeIdsSorted_dec, _getCurrentPageId_dec, _getPages_dec, __getAllPagesQuery_dec, _getRenderingShapes_dec, _getCollaboratorsOnCurrentPage_dec, _getCollaborators_dec, __getCollaboratorsQuery_dec, _getViewportPageBounds_dec, _getViewportScreenCenter_dec, _getViewportScreenBounds_dec, _getEfficientZoomLevel_dec, __getAboveDebouncedZoomThreshold_dec, _getDebouncedZoomLevel_dec, _getZoomLevel_dec, _getCameraForFollowing_dec, _getViewportPageBoundsForFollowing_dec, _getCamera_dec, __unsafe_getCameraId_dec, _getErasingShapes_dec, _getErasingShapeIds_dec, _getHintingShape_dec, _getHintingShapeIds_dec, _getHoveredShape_dec, _getHoveredShapeId_dec, _getRichTextEditor_dec, _getEditingShape_dec, _getEditingShapeId_dec, _getFocusedGroup_dec, _getFocusedGroupId_dec, _getSelectionRotatedScreenBounds_dec, _getSelectionRotatedPageBounds_dec, _getSelectionRotation_dec, _getSelectionPageBounds_dec, _getOnlySelectedShape_dec, _getOnlySelectedShapeId_dec, _getCurrentPageShapesInReadingOrder_dec, _getSelectedShapes_dec, _getSelectedShapeIds_dec, __getCurrentPageStateId_dec, _getCurrentPageState_dec, __getPageStatesQuery_dec, _getPageStates_dec, _getInstanceState_dec, _getDocumentSettings_dec, _getCurrentToolId_dec, _getCurrentTool_dec, _getPath_dec, _getCanRedo_dec, _getCanUndo_dec, _getIsShapeHiddenCache_dec, _a, _init;
+var __setMetaKeyTimeout_dec, __setCtrlKeyTimeout_dec, __setAltKeyTimeout_dec, __setShiftKeyTimeout_dec, _getIsReadonly_dec, _getIsFocused_dec, _getSharedOpacity_dec, _getSharedStyles_dec, __getSelectionSharedStyles_dec, __getBindingsIndexCache_dec, _getCurrentPageRenderingShapesSorted_dec, _getCurrentPageShapesSorted_dec, _getCurrentPageShapes_dec, _getCurrentPageBounds_dec, _getCulledShapes_dec, _getNotVisibleShapes_dec, __getShapeMaskedPageBoundsCache_dec, __getShapeMaskCache_dec, __getShapeClipPathCache_dec, __getShapePageBoundsCache_dec, __getShapePageTransformCache_dec, __getShapeHandlesCache_dec, __getAllAssetsQuery_dec, _getCurrentPageShapeIdsSorted_dec, _getCurrentPageId_dec, _getPages_dec, __getAllPagesQuery_dec, _getRenderingShapes_dec, _getCollaboratorsOnCurrentPage_dec, _getCollaborators_dec, __getCollaboratorsQuery_dec, _getViewportPageBounds_dec, _getViewportScreenCenter_dec, _getViewportScreenBounds_dec, _getEfficientZoomLevel_dec, __getAboveDebouncedZoomThreshold_dec, _getDebouncedZoomLevel_dec, _getZoomLevel_dec, _getCameraForFollowing_dec, _getViewportPageBoundsForFollowing_dec, _getCamera_dec, __unsafe_getCameraId_dec, _getErasingShapes_dec, _getErasingShapeIds_dec, _getHintingShape_dec, _getHintingShapeIds_dec, _getHoveredShape_dec, _getHoveredShapeId_dec, _getRichTextEditor_dec, _getEditingShape_dec, _getEditingShapeId_dec, _getFocusedGroup_dec, _getFocusedGroupId_dec, _getSelectionRotatedScreenBounds_dec, _getSelectionRotatedPageBounds_dec, _getSelectionRotation_dec, _getSelectionPageBounds_dec, _getOnlySelectedShape_dec, _getOnlySelectedShapeId_dec, _getCurrentPageShapesInReadingOrder_dec, _getSelectedShapes_dec, _getSelectedShapeIds_dec, __getCurrentPageStateId_dec, _getCurrentPageState_dec, __getPageStatesQuery_dec, _getPageStates_dec, _getInstanceState_dec, _getDocumentSettings_dec, _getCurrentToolId_dec, _getCurrentTool_dec, _getPath_dec, _canRedo_dec, _canUndo_dec, _getIsShapeHiddenCache_dec, _a, _init;
 import {
   EMPTY_ARRAY,
   atom,
@@ -64,7 +64,6 @@ import {
   PageRecordType,
   TLDOCUMENT_ID,
   TLINSTANCE_ID,
-  TLPOINTER_ID,
   createBindingId,
   createShapeId,
   getShapePropKeysByStyle,
@@ -116,8 +115,7 @@ import {
   LEFT_MOUSE_BUTTON,
   MIDDLE_MOUSE_BUTTON,
   RIGHT_MOUSE_BUTTON,
-  STYLUS_ERASER_BUTTON,
-  ZOOM_TO_FIT_PADDING
+  STYLUS_ERASER_BUTTON
 } from "../constants.mjs";
 import { exportToSvg } from "../exports/exportToSvg.mjs";
 import { getSvgAsImage } from "../exports/getSvgAsImage.mjs";
@@ -140,7 +138,6 @@ import {
   parseDeepLinkString
 } from "../utils/deepLinks.mjs";
 import { getIncrementedName } from "../utils/getIncrementedName.mjs";
-import { isAccelKey } from "../utils/keyboard.mjs";
 import { getReorderingShapesChanges } from "../utils/reorderShapes.mjs";
 import { applyRotationToSnapshotShapes, getRotationSnapshot } from "../utils/rotation.mjs";
 import { bindingsIndex } from "./derivations/bindingsIndex.mjs";
@@ -152,13 +149,15 @@ import { EdgeScrollManager } from "./managers/EdgeScrollManager/EdgeScrollManage
 import { FocusManager } from "./managers/FocusManager/FocusManager.mjs";
 import { FontManager } from "./managers/FontManager/FontManager.mjs";
 import { HistoryManager } from "./managers/HistoryManager/HistoryManager.mjs";
+import { InputsManager } from "./managers/InputsManager/InputsManager.mjs";
 import { ScribbleManager } from "./managers/ScribbleManager/ScribbleManager.mjs";
 import { SnapManager } from "./managers/SnapManager/SnapManager.mjs";
+import { SpatialIndexManager } from "./managers/SpatialIndexManager/SpatialIndexManager.mjs";
 import { TextManager } from "./managers/TextManager/TextManager.mjs";
 import { TickManager } from "./managers/TickManager/TickManager.mjs";
 import { UserPreferencesManager } from "./managers/UserPreferencesManager/UserPreferencesManager.mjs";
 import { RootState } from "./tools/RootState.mjs";
-class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed], _getCanUndo_dec = [computed], _getCanRedo_dec = [computed], _getPath_dec = [computed], _getCurrentTool_dec = [computed], _getCurrentToolId_dec = [computed], _getDocumentSettings_dec = [computed], _getInstanceState_dec = [computed], _getPageStates_dec = [computed], __getPageStatesQuery_dec = [computed], _getCurrentPageState_dec = [computed], __getCurrentPageStateId_dec = [computed], _getSelectedShapeIds_dec = [computed], _getSelectedShapes_dec = [computed], _getCurrentPageShapesInReadingOrder_dec = [computed], _getOnlySelectedShapeId_dec = [computed], _getOnlySelectedShape_dec = [computed], _getSelectionPageBounds_dec = [computed], _getSelectionRotation_dec = [computed], _getSelectionRotatedPageBounds_dec = [computed], _getSelectionRotatedScreenBounds_dec = [computed], _getFocusedGroupId_dec = [computed], _getFocusedGroup_dec = [computed], _getEditingShapeId_dec = [computed], _getEditingShape_dec = [computed], _getRichTextEditor_dec = [computed], _getHoveredShapeId_dec = [computed], _getHoveredShape_dec = [computed], _getHintingShapeIds_dec = [computed], _getHintingShape_dec = [computed], _getErasingShapeIds_dec = [computed], _getErasingShapes_dec = [computed], __unsafe_getCameraId_dec = [computed], _getCamera_dec = [computed], _getViewportPageBoundsForFollowing_dec = [computed], _getCameraForFollowing_dec = [computed], _getZoomLevel_dec = [computed], _getDebouncedZoomLevel_dec = [computed], __getAboveDebouncedZoomThreshold_dec = [computed], _getEfficientZoomLevel_dec = [computed], _getViewportScreenBounds_dec = [computed], _getViewportScreenCenter_dec = [computed], _getViewportPageBounds_dec = [computed], __getCollaboratorsQuery_dec = [computed], _getCollaborators_dec = [computed], _getCollaboratorsOnCurrentPage_dec = [computed], _getRenderingShapes_dec = [computed], __getAllPagesQuery_dec = [computed], _getPages_dec = [computed], _getCurrentPageId_dec = [computed], _getCurrentPageShapeIdsSorted_dec = [computed], __getAllAssetsQuery_dec = [computed], __getShapeHandlesCache_dec = [computed], __getShapePageTransformCache_dec = [computed], __getShapePageBoundsCache_dec = [computed], __getShapeClipPathCache_dec = [computed], __getShapeMaskCache_dec = [computed], __getShapeMaskedPageBoundsCache_dec = [computed], _getNotVisibleShapes_dec = [computed], _getCulledShapes_dec = [computed], _getCurrentPageBounds_dec = [computed], _getCurrentPageShapes_dec = [computed], _getCurrentPageShapesSorted_dec = [computed], _getCurrentPageRenderingShapesSorted_dec = [computed], __getBindingsIndexCache_dec = [computed], __getSelectionSharedStyles_dec = [computed], _getSharedStyles_dec = [computed({ isEqual: (a, b) => a.equals(b) })], _getSharedOpacity_dec = [computed], _getIsFocused_dec = [computed], _getIsReadonly_dec = [computed], __setShiftKeyTimeout_dec = [bind], __setAltKeyTimeout_dec = [bind], __setCtrlKeyTimeout_dec = [bind], __setMetaKeyTimeout_dec = [bind], _a) {
+class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed], _canUndo_dec = [computed], _canRedo_dec = [computed], _getPath_dec = [computed], _getCurrentTool_dec = [computed], _getCurrentToolId_dec = [computed], _getDocumentSettings_dec = [computed], _getInstanceState_dec = [computed], _getPageStates_dec = [computed], __getPageStatesQuery_dec = [computed], _getCurrentPageState_dec = [computed], __getCurrentPageStateId_dec = [computed], _getSelectedShapeIds_dec = [computed], _getSelectedShapes_dec = [computed], _getCurrentPageShapesInReadingOrder_dec = [computed], _getOnlySelectedShapeId_dec = [computed], _getOnlySelectedShape_dec = [computed], _getSelectionPageBounds_dec = [computed], _getSelectionRotation_dec = [computed], _getSelectionRotatedPageBounds_dec = [computed], _getSelectionRotatedScreenBounds_dec = [computed], _getFocusedGroupId_dec = [computed], _getFocusedGroup_dec = [computed], _getEditingShapeId_dec = [computed], _getEditingShape_dec = [computed], _getRichTextEditor_dec = [computed], _getHoveredShapeId_dec = [computed], _getHoveredShape_dec = [computed], _getHintingShapeIds_dec = [computed], _getHintingShape_dec = [computed], _getErasingShapeIds_dec = [computed], _getErasingShapes_dec = [computed], __unsafe_getCameraId_dec = [computed], _getCamera_dec = [computed], _getViewportPageBoundsForFollowing_dec = [computed], _getCameraForFollowing_dec = [computed], _getZoomLevel_dec = [computed], _getDebouncedZoomLevel_dec = [computed], __getAboveDebouncedZoomThreshold_dec = [computed], _getEfficientZoomLevel_dec = [computed], _getViewportScreenBounds_dec = [computed], _getViewportScreenCenter_dec = [computed], _getViewportPageBounds_dec = [computed], __getCollaboratorsQuery_dec = [computed], _getCollaborators_dec = [computed], _getCollaboratorsOnCurrentPage_dec = [computed], _getRenderingShapes_dec = [computed], __getAllPagesQuery_dec = [computed], _getPages_dec = [computed], _getCurrentPageId_dec = [computed], _getCurrentPageShapeIdsSorted_dec = [computed], __getAllAssetsQuery_dec = [computed], __getShapeHandlesCache_dec = [computed], __getShapePageTransformCache_dec = [computed], __getShapePageBoundsCache_dec = [computed], __getShapeClipPathCache_dec = [computed], __getShapeMaskCache_dec = [computed], __getShapeMaskedPageBoundsCache_dec = [computed], _getNotVisibleShapes_dec = [computed], _getCulledShapes_dec = [computed], _getCurrentPageBounds_dec = [computed], _getCurrentPageShapes_dec = [computed], _getCurrentPageShapesSorted_dec = [computed], _getCurrentPageRenderingShapesSorted_dec = [computed], __getBindingsIndexCache_dec = [computed], __getSelectionSharedStyles_dec = [computed], _getSharedStyles_dec = [computed({ isEqual: (a, b) => a.equals(b) })], _getSharedOpacity_dec = [computed], _getIsFocused_dec = [computed], _getIsReadonly_dec = [computed], __setShiftKeyTimeout_dec = [bind], __setAltKeyTimeout_dec = [bind], __setCtrlKeyTimeout_dec = [bind], __setMetaKeyTimeout_dec = [bind], _a) {
   constructor({
     store,
     user,
@@ -194,7 +193,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
      */
     __publicField(this, "root");
     /**
-     * A set of functions to call when the app is disposed.
+     * A set of functions to call when the editor is disposed.
      *
      * @public
      */
@@ -205,14 +204,24 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
      * @public
      */
     __publicField(this, "isDisposed", false);
-    /** @internal */
+    /**
+     * A manager for the editor's tick events.
+     *
+     * @internal */
     __publicField(this, "_tickManager");
     /**
-     * A manager for the app's snapping feature.
+     * A manager for the editor's input state.
+     *
+     * @public
+     */
+    __publicField(this, "inputs");
+    /**
+     * A manager for the editor's snapping feature.
      *
      * @public
      */
     __publicField(this, "snaps");
+    __publicField(this, "_spatialIndex");
     /**
      * A manager for the any asynchronous events and making sure they're
      * cleaned up upon disposal.
@@ -290,7 +299,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     __publicField(this, "bindingUtils");
     /* --------------------- History -------------------- */
     /**
-     * A manager for the app's history.
+     * A manager for the editor's history.
      *
      * @readonly
      */
@@ -329,6 +338,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     /* --------------------- Shapes --------------------- */
     __publicField(this, "_shapeGeometryCaches", {});
     __publicField(this, "_notVisibleShapes", notVisibleShapes(this));
+    __publicField(this, "_culledShapesCache", null);
     // Parents and children
     /**
      * A cache of parents to children.
@@ -356,54 +366,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       tldraw: null,
       excalidraw: null
     });
-    /* --------------------- Events --------------------- */
-    /**
-     * The app's current input state.
-     *
-     * @public
-     */
-    __publicField(this, "inputs", {
-      /** The most recent pointer down's position in the current page space. */
-      originPagePoint: new Vec(),
-      /** The most recent pointer down's position in screen space. */
-      originScreenPoint: new Vec(),
-      /** The previous pointer position in the current page space. */
-      previousPagePoint: new Vec(),
-      /** The previous pointer position in screen space. */
-      previousScreenPoint: new Vec(),
-      /** The most recent pointer position in the current page space. */
-      currentPagePoint: new Vec(),
-      /** The most recent pointer position in screen space. */
-      currentScreenPoint: new Vec(),
-      /** A set containing the currently pressed keys. */
-      keys: /* @__PURE__ */ new Set(),
-      /** A set containing the currently pressed buttons. */
-      buttons: /* @__PURE__ */ new Set(),
-      /** Whether the input is from a pe. */
-      isPen: false,
-      /** Whether the shift key is currently pressed. */
-      shiftKey: false,
-      /** Whether the meta key is currently pressed. */
-      metaKey: false,
-      /** Whether the control or command key is currently pressed. */
-      ctrlKey: false,
-      /** Whether the alt or option key is currently pressed. */
-      altKey: false,
-      /** Whether the user is dragging. */
-      isDragging: false,
-      /** Whether the user is pointing. */
-      isPointing: false,
-      /** Whether the user is pinching. */
-      isPinching: false,
-      /** Whether the user is editing. */
-      isEditing: false,
-      /** Whether the user is panning. */
-      isPanning: false,
-      /** Whether the user is spacebar panning. */
-      isSpacebarPanning: false,
-      /** Velocity of mouse pointer, in pixels per millisecond */
-      pointerVelocity: new Vec()
-    });
     /**
      * A manager for recording multiple click events.
      *
@@ -427,8 +389,6 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     /** @internal */
     __publicField(this, "_restoreToolId", "select");
     /** @internal */
-    __publicField(this, "_pinchStart", 1);
-    /** @internal */
     __publicField(this, "_didPinch", false);
     /** @internal */
     __publicField(this, "_selectedShapeIdsAtPointerDown", []);
@@ -454,6 +414,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       }
     });
     this.snaps = new SnapManager(this);
+    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);
@@ -464,6 +426,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     this.disposables.add(() => this.textMeasure.dispose());
     this.fonts = new FontManager(this, fontAssetUrls);
     this._tickManager = new TickManager(this);
+    this.inputs = new InputsManager(this);
     class NewRoot extends RootState {
       static initial = initialState ?? "";
     }
@@ -930,9 +893,12 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     this.history.undo();
     return this;
   }
-  getCanUndo() {
+  canUndo() {
     return this.history.getNumUndos() > 0;
   }
+  getCanUndo() {
+    return this.canUndo();
+  }
   /**
    * Redo to the next mark.
    *
@@ -949,13 +915,16 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     this.history.redo();
     return this;
   }
+  canRedo() {
+    return this.history.getNumRedos() > 0;
+  }
+  getCanRedo() {
+    return this.canRedo();
+  }
   clearHistory() {
     this.history.clear();
     return this;
   }
-  getCanRedo() {
-    return this.history.getNumRedos() > 0;
-  }
   /**
    * Create a new "mark", or stopping point, in the undo redo history. Creating a mark will clear
    * any redos. You typically want to do this just before a user interaction begins or is handled.
@@ -1110,7 +1079,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
           }),
           selectionCount: this.getSelectedShapes().length,
           editingShape: editingShapeId ? this.getShape(editingShapeId) : void 0,
-          inputs: this.inputs,
+          inputs: this.inputs.toJson(),
           pageState: this.getCurrentPageState(),
           instanceState: this.getInstanceState(),
           collaboratorCount: this.getCollaboratorsOnCurrentPage().length
@@ -1131,7 +1100,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    * we're in a transaction that's about to be rolled back due to the same error we're currently
    * reporting.
    *
-   * Instead, to listen to changes to this value, you need to listen to app's `crash` event.
+   * Instead, to listen to changes to this value, you need to listen to editor's `crash` event.
    *
    * @internal
    */
@@ -1782,6 +1751,28 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     const editingShapeId = this.getEditingShapeId();
     return editingShapeId ? this.getShape(editingShapeId) : void 0;
   }
+  /**
+   * Whether the shape can be edited.
+   *
+   * @param shape - The shape (or shape id) to check if it can be edited.
+   * @param info - The info about the edit start.
+   *
+   * @public
+   * @returns true if the shape can be edited, false otherwise.
+   */
+  canEditShape(shape, info) {
+    const id = typeof shape === "string" ? shape : shape?.id ?? null;
+    if (!id) return false;
+    if (id === this.getEditingShapeId()) return false;
+    const _shape = this.getShape(id);
+    if (!_shape) return false;
+    const util = this.getShapeUtil(_shape);
+    const _info = info ?? { type: "unknown" };
+    if (!util.canEdit(_shape, _info)) return false;
+    if (this.getIsReadonly() && !util.canEditInReadonly(_shape)) return false;
+    if (this.isShapeOrAncestorLocked(_shape) && !util.canEditWhileLocked(_shape)) return false;
+    return true;
+  }
   /**
    * Set the current editing shape.
    *
@@ -1797,42 +1788,42 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    */
   setEditingShape(shape) {
     const id = typeof shape === "string" ? shape : shape?.id ?? null;
-    this.setRichTextEditor(null);
-    const prevEditingShapeId = this.getEditingShapeId();
-    if (id !== prevEditingShapeId) {
-      if (id) {
-        const shape2 = this.getShape(id);
-        if (shape2 && this.getShapeUtil(shape2).canEdit(shape2)) {
-          this.run(
-            () => {
-              this._updateCurrentPageState({ editingShapeId: id });
-              if (prevEditingShapeId) {
-                const prevEditingShape = this.getShape(prevEditingShapeId);
-                if (prevEditingShape) {
-                  this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
-                }
-              }
-              this.getShapeUtil(shape2).onEditStart?.(shape2);
-            },
-            { history: "ignore" }
-          );
-          return this;
-        }
-      }
+    if (!id) {
       this.run(
         () => {
-          this._updateCurrentPageState({ editingShapeId: null });
-          this._currentRichTextEditor.set(null);
+          const prevEditingShapeId = this.getEditingShapeId();
           if (prevEditingShapeId) {
             const prevEditingShape = this.getShape(prevEditingShapeId);
             if (prevEditingShape) {
               this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
             }
           }
+          this._updateCurrentPageState({ editingShapeId: null });
+          this._currentRichTextEditor.set(null);
         },
         { history: "ignore" }
       );
+      return this;
     }
+    if (!this.canEditShape(id)) return this;
+    this.run(
+      () => {
+        const prevEditingShapeId = this.getEditingShapeId();
+        if (prevEditingShapeId) {
+          const prevEditingShape = this.getShape(prevEditingShapeId);
+          if (prevEditingShape) {
+            this.getShapeUtil(prevEditingShape).onEditEnd?.(prevEditingShape);
+          }
+        }
+        this._updateCurrentPageState({ editingShapeId: null });
+        this._currentRichTextEditor.set(null);
+        this.select(id);
+        this._updateCurrentPageState({ editingShapeId: id });
+        const nextEditingShape = this.getShape(id);
+        this.getShapeUtil(nextEditingShape).onEditStart?.(nextEditingShape);
+      },
+      { history: "ignore" }
+    );
     return this;
   }
   getRichTextEditor() {
@@ -1965,6 +1956,25 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
   getCroppingShapeId() {
     return this.getCurrentPageState().croppingShapeId;
   }
+  /**
+   * Whether the shape can be cropped.
+   *
+   * @param shape - The shape (or shape id) to check if it can be cropped.
+   *
+   * @public
+   * @returns true if the shape can be cropped, false otherwise.
+   */
+  canCropShape(shape) {
+    if (!shape) return false;
+    const id = typeof shape === "string" ? shape : shape?.id ?? null;
+    if (!id) return false;
+    const _shape = this.getShape(id);
+    if (!_shape) return false;
+    const util = this.getShapeUtil(_shape);
+    if (!util.canCrop(_shape)) return false;
+    if (this.isShapeOrAncestorLocked(_shape)) return false;
+    return true;
+  }
   /**
    * Set the current cropping shape.
    *
@@ -1986,12 +1996,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         () => {
           if (!id) {
             this.updateCurrentPageState({ croppingShapeId: null });
-          } else {
-            const shape2 = this.getShape(id);
-            const util = this.getShapeUtil(shape2);
-            if (shape2 && util.canCrop(shape2)) {
-              this.updateCurrentPageState({ croppingShapeId: id });
-            }
+          } else if (this.canCropShape(id)) {
+            this.updateCurrentPageState({ croppingShapeId: id });
           }
         },
         { history: "ignore" }
@@ -2327,7 +2333,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         },
         { history: "ignore" }
       );
-      const { currentScreenPoint, currentPagePoint } = this.inputs;
+      const currentScreenPoint = this.inputs.getCurrentScreenPoint();
+      const currentPagePoint = this.inputs.getCurrentPagePoint();
       if (currentScreenPoint.x / z - x !== currentPagePoint.x || currentScreenPoint.y / z - y !== currentPagePoint.y) {
         this.updatePointer({
           immediate: opts?.immediate,
@@ -2462,7 +2469,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    * ```ts
    * editor.zoomIn()
    * editor.zoomIn(editor.getViewportScreenCenter(), { animation: { duration: 200 } })
-   * editor.zoomIn(editor.inputs.currentScreenPoint, { animation: { duration: 200 } })
+   * editor.zoomIn(editor.inputs.getCurrentScreenPoint(), { animation: { duration: 200 } })
    * ```
    *
    * @param point - The screen point to zoom in on. Defaults to the screen center
@@ -2503,7 +2510,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    * ```ts
    * editor.zoomOut()
    * editor.zoomOut(editor.getViewportScreenCenter(), { animation: { duration: 120 } })
-   * editor.zoomOut(editor.inputs.currentScreenPoint, { animation: { duration: 120 } })
+   * editor.zoomOut(editor.inputs.getCurrentScreenPoint(), { animation: { duration: 120 } })
    * ```
    *
    * @param point - The point to zoom out on. Defaults to the viewport screen center.
@@ -2555,10 +2562,15 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     if (isLocked && !opts?.force) return this;
     const selectionPageBounds = this.getSelectionPageBounds();
     if (selectionPageBounds) {
-      this.zoomToBounds(selectionPageBounds, {
-        targetZoom: Math.max(1, this.getZoomLevel()),
-        ...opts
-      });
+      const currentZoom = this.getZoomLevel();
+      if (Math.abs(currentZoom - 1) < 0.01) {
+        this.zoomToBounds(selectionPageBounds, opts);
+      } else {
+        this.zoomToBounds(selectionPageBounds, {
+          targetZoom: 1,
+          ...opts
+        });
+      }
     }
     return this;
   }
@@ -2598,7 +2610,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     const cameraOptions = this._cameraOptions.__unsafe__getWithoutCapture();
     if (cameraOptions.isLocked && !opts?.force) return this;
     const viewportScreenBounds = this.getViewportScreenBounds();
-    const inset = opts?.inset ?? Math.min(ZOOM_TO_FIT_PADDING, viewportScreenBounds.width * 0.28);
+    const inset = opts?.inset ?? Math.min(this.options.zoomToFitPadding, viewportScreenBounds.width * 0.28);
     const baseZoom = this.getBaseZoom();
     const zoomMin = cameraOptions.zoomSteps[0];
     const zoomMax = last(cameraOptions.zoomSteps);
@@ -3868,14 +3880,29 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     const notVisibleShapes2 = this.getNotVisibleShapes();
     const selectedShapeIds = this.getSelectedShapeIds();
     const editingId = this.getEditingShapeId();
-    const culledShapes = new Set(notVisibleShapes2);
+    const nextValue = new Set(notVisibleShapes2);
     if (editingId) {
-      culledShapes.delete(editingId);
+      nextValue.delete(editingId);
     }
     selectedShapeIds.forEach((id) => {
-      culledShapes.delete(id);
+      nextValue.delete(id);
     });
-    return culledShapes;
+    const prevValue = this._culledShapesCache;
+    if (prevValue) {
+      if (prevValue.size !== nextValue.size) {
+        this._culledShapesCache = nextValue;
+        return nextValue;
+      }
+      for (const id of prevValue) {
+        if (!nextValue.has(id)) {
+          this._culledShapesCache = nextValue;
+          return nextValue;
+        }
+      }
+      return prevValue;
+    }
+    this._culledShapesCache = nextValue;
+    return nextValue;
   }
   getCurrentPageBounds() {
     let commonBounds;
@@ -3925,7 +3952,10 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     let inHollowSmallestAreaHit = null;
     let inMarginClosestToEdgeDistance = Infinity;
     let inMarginClosestToEdgeHit = null;
+    const searchMargin = Math.max(innerMargin, outerMargin, this.options.hitTestMargin / zoomLevel);
+    const candidateIds = this._spatialIndex.getShapeIdsAtPoint(point, searchMargin);
     const shapesToCheck = (opts.renderingOnly ? this.getCurrentPageRenderingShapesSorted() : this.getCurrentPageShapesSorted()).filter((shape) => {
+      if (!candidateIds.has(shape.id) && !this.isShapeOfType(shape, "frame")) return false;
       if (shape.isLocked && !hitLocked || this.isShapeHidden(shape) || this.isShapeOfType(shape, "group"))
         return false;
       const pageMask = this.getShapeMask(shape);
@@ -4032,7 +4062,33 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
    * @public
    */
   getShapesAtPoint(point, opts = {}) {
-    return this.getCurrentPageShapesSorted().filter((shape) => !this.isShapeHidden(shape) && this.isPointInShape(shape, point, opts)).reverse();
+    const margin = opts.margin ?? 0;
+    const candidateIds = this._spatialIndex.getShapeIdsAtPoint(point, margin);
+    return this.getCurrentPageShapesSorted().filter((shape) => {
+      if (this.isShapeHidden(shape)) return false;
+      if (!candidateIds.has(shape.id) && !this.isShapeOfType(shape, "frame")) return false;
+      return this.isPointInShape(shape, point, opts);
+    }).reverse();
+  }
+  /**
+   * Get shape IDs within the given bounds.
+   *
+   * Note: Uses shape page bounds only. Frames with labels outside their bounds
+   * may not be included even if the label is within the search bounds.
+   *
+   * Note: Results are unordered. If you need z-order, combine with sorted shapes:
+   * ```ts
+   * const candidates = editor.getShapeIdsInsideBounds(bounds)
+   * const sorted = editor.getCurrentPageShapesSorted().filter(s => candidates.has(s.id))
+   * ```
+   *
+   * @param bounds - The bounds to search within.
+   * @returns Unordered set of shape IDs within the given bounds.
+   *
+   * @internal
+   */
+  getShapeIdsInsideBounds(bounds) {
+    return this._spatialIndex.getShapeIdsInsideBounds(bounds);
   }
   /**
    * Test whether a point (in the current page space) will will a shape. This method takes into account masks,
@@ -5715,8 +5771,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       isAspectRatioLocked: options.isAspectRatioLocked
     });
     if (Math.sign(scale.x) * Math.sign(scale.y) < 0) {
-      let { rotation } = Mat.Decompose(options.initialPageTransform);
-      rotation -= 2 * rotation;
+      const parentRotation = this.getShapeParentTransform(id).rotation();
+      const rotation = -options.initialShape.rotation - 2 * parentRotation;
       this.updateShapes([{ id, type, rotation }]);
     }
     const preScaleShapePageCenter = Mat.applyToPoint(
@@ -5729,9 +5785,9 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       scale,
       options.scaleAxisRotation
     );
-    const pageBounds = this.getShapePageBounds(id);
     const pageTransform = this.getShapePageTransform(id);
-    const currentPageCenter = pageBounds.center;
+    const currentLocalBounds = this.getShapeGeometry(id).bounds;
+    const currentPageCenter = Mat.applyToPoint(pageTransform, currentLocalBounds.center);
     const shapePageTransformOrigin = pageTransform.point();
     if (!currentPageCenter || !shapePageTransformOrigin) return this;
     const pageDelta = Vec.Sub(postScaleShapePageCenter, currentPageCenter);
@@ -6017,7 +6073,11 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       )
     );
     const sortedShapeIds = shapesToGroup.sort(sortByIndex).map((s) => s.id);
-    const pageBounds = Box.Common(compact(shapesToGroup.map((id) => this.getShapePageBounds(id))));
+    const childBounds = compact(shapesToGroup.map((shape) => this.getShapePageBounds(shape)));
+    const pageBounds = Box.Common(childBounds);
+    if (!pageBounds.isValid()) {
+      throw Error(`Editor.groupShapes: group bounds are invalid (NaN).`);
+    }
     const { x, y } = pageBounds.point;
     const parentId = this.findCommonAncestor(shapesToGroup) ?? this.getCurrentPageId();
     if (this.getCurrentToolId() !== "select") return this;
@@ -6970,60 +7030,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       height
     };
   }
-  /**
-   * Update the input points from a pointer, pinch, or wheel event.
-   *
-   * @param info - The event info.
-   */
-  _updateInputsFromEvent(info) {
-    const {
-      pointerVelocity,
-      previousScreenPoint,
-      previousPagePoint,
-      currentScreenPoint,
-      currentPagePoint,
-      originScreenPoint,
-      originPagePoint
-    } = this.inputs;
-    const { screenBounds } = this.store.unsafeGetWithoutCapture(TLINSTANCE_ID);
-    const { x: cx, y: cy, z: cz } = unsafe__withoutCapture(() => this.getCamera());
-    const sx = info.point.x - screenBounds.x;
-    const sy = info.point.y - screenBounds.y;
-    const sz = info.point.z ?? 0.5;
-    previousScreenPoint.setTo(currentScreenPoint);
-    previousPagePoint.setTo(currentPagePoint);
-    currentScreenPoint.set(sx, sy);
-    const nx = sx / cz - cx;
-    const ny = sy / cz - cy;
-    if (isFinite(nx) && isFinite(ny)) {
-      currentPagePoint.set(nx, ny, sz);
-    }
-    this.inputs.isPen = info.type === "pointer" && info.isPen;
-    if (info.name === "pointer_down" || this.inputs.isPinching) {
-      pointerVelocity.set(0, 0);
-      originScreenPoint.setTo(currentScreenPoint);
-      originPagePoint.setTo(currentPagePoint);
-    }
-    this.run(
-      () => {
-        this.store.put([
-          {
-            id: TLPOINTER_ID,
-            typeName: "pointer",
-            x: currentPagePoint.x,
-            y: currentPagePoint.y,
-            lastActivityTimestamp: (
-              // If our pointer moved only because we're following some other user, then don't
-              // update our last activity timestamp; otherwise, update it to the current timestamp.
-              (info.type === "pointer" && info.pointerId === INTERNAL_POINTER_IDS.CAMERA_MOVE ? this.store.unsafeGetWithoutCapture(TLPOINTER_ID)?.lastActivityTimestamp ?? this._tickManager.now : this._tickManager.now)
-            ),
-            meta: {}
-          }
-        ]);
-      },
-      { history: "ignore" }
-    );
-  }
+  /* --------------------- Events --------------------- */
   /**
    * Dispatch a cancel event.
    *
@@ -7088,18 +7095,19 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       point: options?.point ?? // weird but true: what `inputs` calls screen-space is actually viewport space. so
       // we need to convert back into true screen space first. we should fix this...
       Vec.Add(
-        this.inputs.currentScreenPoint,
+        this.inputs.getCurrentScreenPoint(),
         this.store.unsafeGetWithoutCapture(TLINSTANCE_ID).screenBounds
       ),
       pointerId: options?.pointerId ?? 0,
       button: options?.button ?? 0,
-      isPen: options?.isPen ?? this.inputs.isPen,
-      shiftKey: options?.shiftKey ?? this.inputs.shiftKey,
-      altKey: options?.altKey ?? this.inputs.altKey,
-      ctrlKey: options?.ctrlKey ?? this.inputs.ctrlKey,
-      metaKey: options?.metaKey ?? this.inputs.metaKey,
-      accelKey: options?.accelKey ?? isAccelKey(this.inputs)
+      isPen: options?.isPen ?? this.inputs.getIsPen(),
+      shiftKey: options?.shiftKey ?? this.inputs.getShiftKey(),
+      altKey: options?.altKey ?? this.inputs.getAltKey(),
+      ctrlKey: options?.ctrlKey ?? this.inputs.getCtrlKey(),
+      metaKey: options?.metaKey ?? this.inputs.getMetaKey(),
+      accelKey: false
     };
+    event.accelKey = options?.accelKey ?? this.inputs.getAccelKey();
     if (options?.immediate) {
       this._flushEventForTick(event);
     } else {
@@ -7415,58 +7423,58 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     this._clickManager.cancelDoubleClickTimeout();
   }
   _setShiftKeyTimeout() {
-    this.inputs.shiftKey = false;
+    this.inputs.setShiftKey(false);
     this.dispatch({
       type: "keyboard",
       name: "key_up",
       key: "Shift",
-      shiftKey: this.inputs.shiftKey,
-      ctrlKey: this.inputs.ctrlKey,
-      altKey: this.inputs.altKey,
-      metaKey: this.inputs.metaKey,
-      accelKey: isAccelKey(this.inputs),
+      shiftKey: this.inputs.getShiftKey(),
+      ctrlKey: this.inputs.getCtrlKey(),
+      altKey: this.inputs.getAltKey(),
+      metaKey: this.inputs.getMetaKey(),
+      accelKey: this.inputs.getAccelKey(),
       code: "ShiftLeft"
     });
   }
   _setAltKeyTimeout() {
-    this.inputs.altKey = false;
+    this.inputs.setAltKey(false);
     this.dispatch({
       type: "keyboard",
       name: "key_up",
       key: "Alt",
-      shiftKey: this.inputs.shiftKey,
-      ctrlKey: this.inputs.ctrlKey,
-      altKey: this.inputs.altKey,
-      metaKey: this.inputs.metaKey,
-      accelKey: isAccelKey(this.inputs),
+      shiftKey: this.inputs.getShiftKey(),
+      ctrlKey: this.inputs.getCtrlKey(),
+      altKey: this.inputs.getAltKey(),
+      metaKey: this.inputs.getMetaKey(),
+      accelKey: this.inputs.getAccelKey(),
       code: "AltLeft"
     });
   }
   _setCtrlKeyTimeout() {
-    this.inputs.ctrlKey = false;
+    this.inputs.setCtrlKey(false);
     this.dispatch({
       type: "keyboard",
       name: "key_up",
       key: "Ctrl",
-      shiftKey: this.inputs.shiftKey,
-      ctrlKey: this.inputs.ctrlKey,
-      altKey: this.inputs.altKey,
-      metaKey: this.inputs.metaKey,
-      accelKey: isAccelKey(this.inputs),
+      shiftKey: this.inputs.getShiftKey(),
+      ctrlKey: this.inputs.getCtrlKey(),
+      altKey: this.inputs.getAltKey(),
+      metaKey: this.inputs.getMetaKey(),
+      accelKey: this.inputs.getAccelKey(),
       code: "ControlLeft"
     });
   }
   _setMetaKeyTimeout() {
-    this.inputs.metaKey = false;
+    this.inputs.setMetaKey(false);
     this.dispatch({
       type: "keyboard",
       name: "key_up",
       key: "Meta",
-      shiftKey: this.inputs.shiftKey,
-      ctrlKey: this.inputs.ctrlKey,
-      altKey: this.inputs.altKey,
-      metaKey: this.inputs.metaKey,
-      accelKey: isAccelKey(this.inputs),
+      shiftKey: this.inputs.getShiftKey(),
+      ctrlKey: this.inputs.getCtrlKey(),
+      altKey: this.inputs.getAltKey(),
+      metaKey: this.inputs.getMetaKey(),
+      accelKey: this.inputs.getAccelKey(),
       code: "MetaLeft"
     });
   }
@@ -7537,10 +7545,10 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     const { type } = info;
     if (info.type === "misc") {
       if (info.name === "cancel" || info.name === "complete") {
-        this.inputs.isDragging = false;
-        if (this.inputs.isPanning) {
-          this.inputs.isPanning = false;
-          this.inputs.isSpacebarPanning = false;
+        this.inputs.setIsDragging(false);
+        if (this.inputs.getIsPanning()) {
+          this.inputs.setIsPanning(false);
+          this.inputs.setIsSpacebarPanning(false);
           this.setCursor({ type: this._prevCursor, rotation: 0 });
         }
       }
@@ -7551,34 +7559,33 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
     if (info.shiftKey) {
       clearTimeout(this._shiftKeyTimeout);
       this._shiftKeyTimeout = -1;
-      inputs.shiftKey = true;
-    } else if (!info.shiftKey && inputs.shiftKey && this._shiftKeyTimeout === -1) {
+      inputs.setShiftKey(true);
+    } else if (!info.shiftKey && inputs.getShiftKey() && this._shiftKeyTimeout === -1) {
       this._shiftKeyTimeout = this.timers.setTimeout(this._setShiftKeyTimeout, 150);
     }
     if (info.altKey) {
       clearTimeout(this._altKeyTimeout);
       this._altKeyTimeout = -1;
-      inputs.altKey = true;
-    } else if (!info.altKey && inputs.altKey && this._altKeyTimeout === -1) {
+      inputs.setAltKey(true);
+    } else if (!info.altKey && inputs.getAltKey() && this._altKeyTimeout === -1) {
       this._altKeyTimeout = this.timers.setTimeout(this._setAltKeyTimeout, 150);
     }
     if (info.ctrlKey) {
       clearTimeout(this._ctrlKeyTimeout);
       this._ctrlKeyTimeout = -1;
-      inputs.ctrlKey = true;
-    } else if (!info.ctrlKey && inputs.ctrlKey && this._ctrlKeyTimeout === -1) {
+      inputs.setCtrlKey(true);
+    } else if (!info.ctrlKey && inputs.getCtrlKey() && this._ctrlKeyTimeout === -1) {
       this._ctrlKeyTimeout = this.timers.setTimeout(this._setCtrlKeyTimeout, 150);
     }
     if (info.metaKey) {
       clearTimeout(this._metaKeyTimeout);
       this._metaKeyTimeout = -1;
-      inputs.metaKey = true;
-    } else if (!info.metaKey && inputs.metaKey && this._metaKeyTimeout === -1) {
+      inputs.setMetaKey(true);
+    } else if (!info.metaKey && inputs.getMetaKey() && this._metaKeyTimeout === -1) {
       this._metaKeyTimeout = this.timers.setTimeout(this._setMetaKeyTimeout, 150);
     }
-    const { originPagePoint, currentPagePoint } = inputs;
-    if (!inputs.isPointing) {
-      inputs.isDragging = false;
+    if (!inputs.getIsPointing()) {
+      inputs.setIsDragging(false);
     }
     const instanceState = this.store.unsafeGetWithoutCapture(TLINSTANCE_ID);
     const pageState = this.store.get(this._getCurrentPageStateId());
@@ -7587,23 +7594,23 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
       case "pinch": {
         if (cameraOptions.isLocked) return;
         clearTimeout(this._longPressTimeout);
-        this._updateInputsFromEvent(info);
+        this.inputs.updateFromEvent(info);
         switch (info.name) {
           case "pinch_start": {
-            if (inputs.isPinching) return;
-            if (!inputs.isEditing) {
-              this._pinchStart = this.getCamera().z;
+            if (inputs.getIsPinching()) return;
+            if (!inputs.getIsEditing()) {
               if (!this._selectedShapeIdsAtPointerDown.length) {
                 this._selectedShapeIdsAtPointerDown = [...pageState.selectedShapeIds];
               }
               this._didPinch = true;
-              inputs.isPinching = true;
+              inputs.setIsPinching(true);
               this.interrupt();
             }
+            this.emit("event", info);
             return;
           }
           case "pinch": {
-            if (!inputs.isPinching) return;
+            if (!inputs.getIsPinching()) return;
             const {
               point: { z = 1 },
               delta: { x: dx, y: dy }
@@ -7627,11 +7634,12 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
               ),
               { immediate: true }
             );
+            this.emit("event", info);
             return;
           }
           case "pinch_end": {
-            if (!inputs.isPinching) return this;
-            inputs.isPinching = false;
+            if (!inputs.getIsPinching()) return this;
+            inputs.setIsPinching(false);
             const { _selectedShapeIdsAtPointerDown: shapesToReselect } = this;
             this.setSelectedShapes(this._selectedShapeIdsAtPointerDown);
             this._selectedShapeIdsAtPointerDown = [];
@@ -7645,13 +7653,14 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
                 });
               }
             }
+            this.emit("event", info);
             return;
           }
         }
       }
       case "wheel": {
         if (cameraOptions.isLocked) return;
-        this._updateInputsFromEvent(info);
+        this.inputs.updateFromEvent(info);
         const { panSpeed, zoomSpeed } = cameraOptions;
         let wheelBehavior = cameraOptions.wheelBehavior;
         const inputMode = this.user.getUserPreferences().inputMode;
@@ -7669,7 +7678,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
           if (info.ctrlKey) behavior = wheelBehavior === "pan" ? "zoom" : "pan";
           switch (behavior) {
             case "zoom": {
-              const { x, y } = this.inputs.currentScreenPoint;
+              const { x, y } = this.inputs.getCurrentScreenPoint();
               let delta = dz;
               if (wheelBehavior === "zoom") {
                 if (Math.abs(dy) > 10) {
@@ -7683,6 +7692,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
                 immediate: true
               });
               this.maybeTrackPerformance("Zooming");
+              this.root.handleEvent(info);
+              this.emit("event", info);
               return;
             }
             case "pan": {
@@ -7690,6 +7701,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
                 immediate: true
               });
               this.maybeTrackPerformance("Panning");
+              this.root.handleEvent(info);
+              this.emit("event", info);
               return;
             }
           }
@@ -7697,14 +7710,14 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         break;
       }
       case "pointer": {
-        if (inputs.isPinching) return;
-        this._updateInputsFromEvent(info);
+        if (inputs.getIsPinching()) return;
+        this.inputs.updateFromEvent(info);
         const { isPen } = info;
         const { isPenMode } = instanceState;
         switch (info.name) {
           case "pointer_down": {
             if (isPenMode && !isPen) return;
-            if (!this.inputs.isPanning) {
+            if (!this.inputs.getIsPanning()) {
               this._longPressTimeout = this.timers.setTimeout(() => {
                 const vsb = this.getViewportScreenBounds();
                 this.dispatch({
@@ -7713,7 +7726,7 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
                   // viewport bounds, and will be again when this event is handled...
                   // so we need to counter-adjust from the stored value so that the
                   // new value is set correctly.
-                  point: this.inputs.originScreenPoint.clone().addXY(vsb.x, vsb.y),
+                  point: this.inputs.getOriginScreenPoint().clone().addXY(vsb.x, vsb.y),
                   name: "long_press"
                 });
               }, this.options.longPressDurationMs);
@@ -7721,21 +7734,21 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
             this._selectedShapeIdsAtPointerDown = this.getSelectedShapeIds();
             if (info.button === LEFT_MOUSE_BUTTON) this.capturedPointerId = info.pointerId;
             inputs.buttons.add(info.button);
-            inputs.isPointing = true;
-            inputs.isDragging = false;
+            inputs.setIsPointing(true);
+            inputs.setIsDragging(false);
             if (!isPenMode && isPen) this.updateInstanceState({ isPenMode: true });
             if (info.button === STYLUS_ERASER_BUTTON) {
               this._restoreToolId = this.getCurrentToolId();
               this.complete();
               this.setCurrentTool("eraser");
             } else if (info.button === MIDDLE_MOUSE_BUTTON) {
-              if (!this.inputs.isPanning) {
+              if (!this.inputs.getIsPanning()) {
                 this._prevCursor = this.getInstanceState().cursor.type;
               }
-              this.inputs.isPanning = true;
+              this.inputs.setIsPanning(true);
               clearTimeout(this._longPressTimeout);
             }
-            if (this.inputs.isPanning) {
+            if (this.inputs.getIsPanning()) {
               this.stopCameraAnimation();
               this.setCursor({ type: "grabbing", rotation: 0 });
               return this;
@@ -7745,8 +7758,9 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
           case "pointer_move": {
             if (!isPen && isPenMode) return;
             const { x: cx, y: cy, z: cz } = unsafe__withoutCapture(() => this.getCamera());
-            if (this.inputs.isPanning && this.inputs.isPointing) {
-              const { currentScreenPoint, previousScreenPoint } = this.inputs;
+            if (this.inputs.getIsPanning() && this.inputs.getIsPointing()) {
+              const currentScreenPoint = this.inputs.getCurrentScreenPoint();
+              const previousScreenPoint = this.inputs.getPreviousScreenPoint();
               const offset = Vec.Sub(currentScreenPoint, previousScreenPoint);
               this.setCamera(new Vec(cx + offset.x / cz, cy + offset.y / cz, cz), {
                 immediate: true
@@ -7754,15 +7768,15 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
               this.maybeTrackPerformance("Panning");
               return;
             }
-            if (inputs.isPointing && !inputs.isDragging && Vec.Dist2(originPagePoint, currentPagePoint) * this.getZoomLevel() > (instanceState.isCoarsePointer ? this.options.coarseDragDistanceSquared : this.options.dragDistanceSquared) / cz) {
-              inputs.isDragging = true;
+            if (inputs.getIsPointing() && !inputs.getIsDragging() && Vec.Dist2(inputs.getOriginPagePoint(), inputs.getCurrentPagePoint()) * this.getZoomLevel() > (instanceState.isCoarsePointer ? this.options.coarseDragDistanceSquared : this.options.dragDistanceSquared) / cz) {
+              inputs.setIsDragging(true);
               clearTimeout(this._longPressTimeout);
             }
             break;
           }
           case "pointer_up": {
-            inputs.isDragging = false;
-            inputs.isPointing = false;
+            inputs.setIsDragging(false);
+            inputs.setIsPointing(false);
             clearTimeout(this._longPressTimeout);
             inputs.buttons.delete(info.button);
             if (instanceState.isPenMode && !isPen) return;
@@ -7770,12 +7784,12 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
               this.capturedPointerId = null;
               info.button = 0;
             }
-            if (inputs.isPanning) {
+            if (inputs.getIsPanning()) {
               if (!inputs.keys.has("Space")) {
-                inputs.isPanning = false;
-                inputs.isSpacebarPanning = false;
+                inputs.setIsPanning(false);
+                inputs.setIsSpacebarPanning(false);
               }
-              const slideDirection = this.inputs.pointerVelocity;
+              const slideDirection = this.inputs.getPointerVelocity();
               const slideSpeed = Math.min(2, slideDirection.len());
               switch (info.button) {
                 case LEFT_MOUSE_BUTTON: {
@@ -7812,51 +7826,58 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
         switch (info.name) {
           case "key_down": {
             inputs.keys.add(info.code);
-            if (info.code === "Space" && !info.ctrlKey) {
-              if (!this.inputs.isPanning) {
-                this._prevCursor = instanceState.cursor.type;
-              }
-              this.inputs.isPanning = true;
-              this.inputs.isSpacebarPanning = true;
-              clearTimeout(this._longPressTimeout);
-              this.setCursor({ type: this.inputs.isPointing ? "grabbing" : "grab", rotation: 0 });
-            }
-            if (this.inputs.isSpacebarPanning) {
-              let offset;
-              switch (info.code) {
-                case "ArrowUp": {
-                  offset = new Vec(0, -1);
-                  break;
+            if (this.options.spacebarPanning) {
+              if (info.code === "Space" && !info.ctrlKey) {
+                if (!this.inputs.getIsPanning()) {
+                  this._prevCursor = instanceState.cursor.type;
                 }
-                case "ArrowRight": {
-                  offset = new Vec(1, 0);
-                  break;
-                }
-                case "ArrowDown": {
-                  offset = new Vec(0, 1);
-                  break;
+                this.inputs.setIsPanning(true);
+                this.inputs.setIsSpacebarPanning(true);
+                clearTimeout(this._longPressTimeout);
+                this.setCursor({
+                  type: this.inputs.getIsPointing() ? "grabbing" : "grab",
+                  rotation: 0
+                });
+              }
+              if (this.inputs.getIsSpacebarPanning()) {
+                let offset;
+                switch (info.code) {
+                  case "ArrowUp": {
+                    offset = new Vec(0, -1);
+                    break;
+                  }
+                  case "ArrowRight": {
+                    offset = new Vec(1, 0);
+                    break;
+                  }
+                  case "ArrowDown": {
+                    offset = new Vec(0, 1);
+                    break;
+                  }
+                  case "ArrowLeft": {
+                    offset = new Vec(-1, 0);
+                    break;
+                  }
                 }
-                case "ArrowLeft": {
-                  offset = new Vec(-1, 0);
-                  break;
+                if (offset) {
+                  const bounds = this.getViewportPageBounds();
+                  const next = bounds.clone().translate(offset.mulV({ x: bounds.w, y: bounds.h }));
+                  this._animateToViewport(next, { animation: { duration: 320 } });
                 }
               }
-              if (offset) {
-                const bounds = this.getViewportPageBounds();
-                const next = bounds.clone().translate(offset.mulV({ x: bounds.w, y: bounds.h }));
-                this._animateToViewport(next, { animation: { duration: 320 } });
-              }
             }
             break;
           }
           case "key_up": {
             inputs.keys.delete(info.code);
-            if (info.code === "Space") {
-              if (this.inputs.buttons.has(MIDDLE_MOUSE_BUTTON)) {
-              } else {
-                this.inputs.isPanning = false;
-                this.inputs.isSpacebarPanning = false;
-                this.setCursor({ type: this._prevCursor, rotation: 0 });
+            if (this.options.spacebarPanning) {
+              if (info.code === "Space") {
+                if (this.inputs.buttons.has(MIDDLE_MOUSE_BUTTON)) {
+                } else {
+                  this.inputs.setIsPanning(false);
+                  this.inputs.setIsSpacebarPanning(false);
+                  this.setCursor({ type: this._prevCursor, rotation: 0 });
+                }
               }
             }
             break;
@@ -7909,8 +7930,8 @@ class Editor extends (_a = EventEmitter, _getIsShapeHiddenCache_dec = [computed]
 }
 _init = __decoratorStart(_a);
 __decorateElement(_init, 1, "getIsShapeHiddenCache", _getIsShapeHiddenCache_dec, Editor);
-__decorateElement(_init, 1, "getCanUndo", _getCanUndo_dec, Editor);
-__decorateElement(_init, 1, "getCanRedo", _getCanRedo_dec, Editor);
+__decorateElement(_init, 1, "canUndo", _canUndo_dec, Editor);
+__decorateElement(_init, 1, "canRedo", _canRedo_dec, Editor);
 __decorateElement(_init, 1, "getPath", _getPath_dec, Editor);
 __decorateElement(_init, 1, "getCurrentTool", _getCurrentTool_dec, Editor);
 __decorateElement(_init, 1, "getCurrentToolId", _getCurrentToolId_dec, Editor);