@tldraw/editor 5.6.0-canary.41de65b8a92d → 5.6.0-canary.4e8f62261c4b

package/dist-cjs/index.d.ts

@@ -1059,7 +1059,7 @@ export declare const defaultTldrawOptions: {
         readonly step: 1;
     }];
     readonly handleRadius: 12;
-    readonly hitTestMargin: 3;
+    readonly hitTestMargin: 4.5;
     readonly laserDelayMs: 1200;
     readonly laserFadeoutMs: 500;
     readonly longPressDurationMs: 500;
@@ -1922,10 +1922,13 @@ export declare class Editor extends EventEmitter<TLEventMap> {
     /**
      * Generates a reading order for shapes based on rows grouping.
      * Tries to keep a natural reading order (left-to-right, top-to-bottom).
+     * Shapes whose util returns `false` from {@link ShapeUtil.canTabTo} are left out, as are
+     * locked shapes unless the `selectLockedShapes` option is enabled.
      *
      * @public
      */
     getCurrentPageShapesInReadingOrder(): TLShape[];
+    private _canTabToShape;
     private _getShapesInReadingOrder;
     /**
      * Find the nearest adjacent shape in a specific direction.
@@ -4734,6 +4737,10 @@ export declare class FontManager {
     loadRequiredFontsForCurrentPage(limit?: number): Promise<void>;
     private readonly fontStates;
     private getFontState;
+    private readonly fontLoadEpoch;
+    /* Excluded from this release type: getFontLoadEpoch */
+    private isFontLoadEpochBumpPending;
+    private setFontState;
     ensureFontIsLoaded(font: TLFontFace): Promise<void>;
     private fontsToLoad;
     requestFonts(fonts: TLFontFace[]): void;

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.6.0-canary.41de65b8a92d",
+  "5.6.0-canary.4e8f62261c4b",
   "cjs"
 );
 //# sourceMappingURL=index.js.map

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

@@ -1616,7 +1616,7 @@ class Editor extends import_eventemitter3.default {
     const firstParentId = selectedShapeIds[0] ? this.getShape(selectedShapeIds[0])?.parentId : null;
     const isSelectedWithinContainer = firstParentId && selectedShapeIds.every((shapeId) => this.getShape(shapeId)?.parentId === firstParentId) && !(0, import_tlschema.isPageId)(firstParentId);
     const filteredShapes = this.getCurrentPageShapes().filter(
-      (shape2) => !this.isShapeOrAncestorLocked(shape2) && (isSelectedWithinContainer ? shape2.parentId === firstParentId : (0, import_tlschema.isPageId)(shape2.parentId))
+      (shape2) => isSelectedWithinContainer ? shape2.parentId === firstParentId : (0, import_tlschema.isPageId)(shape2.parentId)
     );
     const readingOrderShapes = this._getShapesInReadingOrder(filteredShapes);
     const currentShapeId = selectedShapeIds.length === 1 ? selectedShapeIds[0] : readingOrderShapes.find((shape2) => selectedShapeIds.includes(shape2.id))?.id;
@@ -1640,10 +1640,16 @@ class Editor extends import_eventemitter3.default {
     const shapes = this.getCurrentPageShapes().filter((shape) => (0, import_tlschema.isPageId)(shape.parentId));
     return this._getShapesInReadingOrder(shapes);
   }
+  // Locked shapes (and children of locked containers) can't be selected by clicking or
+  // select all, so the reading order and keyboard traversal leave them out too (#10421),
+  // except when selectLockedShapes makes them clickable again
+  _canTabToShape(shape) {
+    return this.getShapeUtil(shape).canTabTo(shape) && (this.options.selectLockedShapes || !this.isShapeOrAncestorLocked(shape));
+  }
   _getShapesInReadingOrder(shapes) {
     const SHALLOW_ANGLE = 20;
     const ROW_THRESHOLD = 100;
-    const tabbableShapes = shapes.filter((shape) => this.getShapeUtil(shape).canTabTo(shape));
+    const tabbableShapes = shapes.filter((shape) => this._canTabToShape(shape));
     if (tabbableShapes.length <= 1) return tabbableShapes;
     const shapesWithCenters = tabbableShapes.map((shape) => ({
       shape,
@@ -1701,7 +1707,7 @@ class Editor extends import_eventemitter3.default {
     const currentShape = this.getShape(currentShapeId);
     if (!currentShape) return currentShapeId;
     const tabbableShapes = shapes.filter(
-      (shape) => this.getShapeUtil(shape).canTabTo(shape) && shape.id !== currentShapeId
+      (shape) => this._canTabToShape(shape) && shape.id !== currentShapeId
     );
     if (!tabbableShapes.length) return currentShapeId;
     const currentCenter = this.getShapePageBounds(currentShape).center;
@@ -1759,6 +1765,11 @@ class Editor extends import_eventemitter3.default {
     this._selectShapesAndZoom([sortedChildren[0].id]);
   }
   _selectShapesAndZoom(ids) {
+    const selectedShapeIds = this.getSelectedShapeIds();
+    const isSelectionChanging = ids.length !== selectedShapeIds.length || ids.some((id) => !selectedShapeIds.includes(id));
+    if (isSelectionChanging) {
+      this.markHistoryStoppingPoint("selecting adjacent shape");
+    }
     this.setSelectedShapes(ids);
     this.zoomToSelectionIfOffscreen(256, {
       animation: {
@@ -5928,9 +5939,10 @@ class Editor extends import_eventemitter3.default {
       }
     }
     let workingShape = null;
+    const initialPagePoint = import_Mat.Mat.applyToPoint(pageTransform, new import_Vec.Vec());
     if (util.onResize && util.canResize(initialShape)) {
       const newPagePoint = this._scalePagePoint(
-        import_Mat.Mat.applyToPoint(pageTransform, new import_Vec.Vec(0, 0)),
+        initialPagePoint,
         scaleOrigin,
         scale,
         scaleAxisRotation
@@ -5943,7 +5955,6 @@ class Editor extends import_eventemitter3.default {
       );
       myScale.x = areWidthAndHeightAlignedWithCorrectAxis ? scale.x : scale.y;
       myScale.y = areWidthAndHeightAlignedWithCorrectAxis ? scale.y : scale.x;
-      const initialPagePoint = import_Mat.Mat.applyToPoint(pageTransform, new import_Vec.Vec());
       const { x, y } = this.getPointInParentSpace(initialShape.id, initialPagePoint);
       workingShape = initialShape;
       if (!opts.skipStartAndEndCallbacks) {
@@ -5989,24 +6000,26 @@ class Editor extends import_eventemitter3.default {
       scale,
       scaleAxisRotation
     );
-    const initialPageCenterInParentSpace = this.getPointInParentSpace(
+    const repositionedPagePoint = import_Vec.Vec.Add(
+      newPageCenter,
+      import_Vec.Vec.Sub(initialPagePoint, initialPageCenter)
+    );
+    const repositionedLocalPoint = this.getPointInParentSpace(
       initialShape.id,
-      initialPageCenter
+      repositionedPagePoint
     );
-    const newPageCenterInParentSpace = this.getPointInParentSpace(initialShape.id, newPageCenter);
-    const delta = import_Vec.Vec.Sub(newPageCenterInParentSpace, initialPageCenterInParentSpace);
     if (workingShape) {
       return {
         ...workingShape,
-        x: initialShape.x + delta.x,
-        y: initialShape.y + delta.y
+        x: repositionedLocalPoint.x,
+        y: repositionedLocalPoint.y
       };
     }
     return {
       id,
       type: initialShape.type,
-      x: initialShape.x + delta.x,
-      y: initialShape.y + delta.y
+      x: repositionedLocalPoint.x,
+      y: repositionedLocalPoint.y
     };
   }
   /** @internal */
@@ -8354,6 +8367,7 @@ class Editor extends import_eventemitter3.default {
             break;
           }
           case "key_repeat": {
+            inputs.keys.add(info.code);
             break;
           }
         }