@tldraw/editor 5.2.0-canary.e22474d279fb → 5.2.0-canary.fe03bcdddf34

package/dist-cjs/index.d.ts

@@ -4444,6 +4444,7 @@ export declare class Editor extends EventEmitter<TLEventMap> {
     /* Excluded from this release type: _restoreToolId */
     /* Excluded from this release type: _didPinch */
     /* Excluded from this release type: _selectedShapeIdsAtPointerDown */
+    /* Excluded from this release type: _didCaptureSelectionAtPointerDown */
     /* Excluded from this release type: _longPressTimeout */
     /* Excluded from this release type: capturedPointerId */
     /* Excluded from this release type: performanceTracker */

package/dist-cjs/index.js

@@ -380,7 +380,7 @@ var import_uniq = require("./lib/utils/uniq");
 var import_defaultThemes2 = require("./lib/editor/managers/ThemeManager/defaultThemes");
 (0, import_utils.registerTldrawLibraryVersion)(
   "@tldraw/editor",
-  "5.2.0-canary.e22474d279fb",
+  "5.2.0-canary.fe03bcdddf34",
   "cjs"
 );
 //# sourceMappingURL=index.js.map

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

@@ -7834,6 +7834,15 @@ class Editor extends import_eventemitter3.default {
   _didPinch = false;
   /** @internal */
   _selectedShapeIdsAtPointerDown = [];
+  /**
+   * Whether `_selectedShapeIdsAtPointerDown` holds a pre-gesture selection
+   * captured by a `pointer_down` (the touch path) that a following pinch
+   * should restore. False when no pointer_down preceded the pinch (the
+   * Safari trackpad path uses gesture events), in which case `pinch_start`
+   * captures the live selection instead.
+   * @internal
+   */
+  _didCaptureSelectionAtPointerDown = false;
   /** @internal */
   _longPressTimeout = -1;
   /** @internal */
@@ -7966,10 +7975,15 @@ class Editor extends import_eventemitter3.default {
           case "pinch_start": {
             if (inputs.getIsPinching()) return;
             if (!inputs.getIsEditing()) {
-              this._selectedShapeIdsAtPointerDown = [...pageState.selectedShapeIds];
+              if (!this._didCaptureSelectionAtPointerDown) {
+                this._selectedShapeIdsAtPointerDown = [...pageState.selectedShapeIds];
+              }
               this._didPinch = true;
               inputs.setIsPinching(true);
               this.interrupt();
+              if (this._didCaptureSelectionAtPointerDown) {
+                this.setSelectedShapes(this._selectedShapeIdsAtPointerDown);
+              }
             }
             this.emit("event", info);
             return;
@@ -8009,6 +8023,7 @@ class Editor extends import_eventemitter3.default {
             const { _selectedShapeIdsAtPointerDown: shapesToReselect } = this;
             this.setSelectedShapes(this._selectedShapeIdsAtPointerDown);
             this._selectedShapeIdsAtPointerDown = [];
+            this._didCaptureSelectionAtPointerDown = false;
             if (this._didPinch) {
               this._didPinch = false;
               if (shapesToReselect.length > 0) {
@@ -8102,7 +8117,10 @@ class Editor extends import_eventemitter3.default {
                 });
               }, this.options.longPressDurationMs);
             }
-            this._selectedShapeIdsAtPointerDown = this.getSelectedShapeIds();
+            if (!this._didCaptureSelectionAtPointerDown) {
+              this._selectedShapeIdsAtPointerDown = this.getSelectedShapeIds();
+              this._didCaptureSelectionAtPointerDown = true;
+            }
             if (info.button === import_constants.LEFT_MOUSE_BUTTON) this.capturedPointerId = info.pointerId;
             inputs.buttons.add(info.button);
             inputs.setIsPointing(true);
@@ -8175,6 +8193,7 @@ class Editor extends import_eventemitter3.default {
             if (this.inputs.getIsRightPointing() && !this.inputs.getIsPanning()) {
               this.inputs.setIsRightPointing(false);
               this._selectedShapeIdsAtPointerDown = [];
+              this._didCaptureSelectionAtPointerDown = false;
               break;
             }
             this.inputs.setIsRightPointing(false);
@@ -8212,6 +8231,7 @@ class Editor extends import_eventemitter3.default {
                     this.slideCamera({ speed: slideSpeed, direction: slideDirection });
                   }
                   this._selectedShapeIdsAtPointerDown = [];
+                  this._didCaptureSelectionAtPointerDown = false;
                   return this;
                 }
               }
@@ -8225,6 +8245,7 @@ class Editor extends import_eventemitter3.default {
               }
             }
             this._selectedShapeIdsAtPointerDown = [];
+            this._didCaptureSelectionAtPointerDown = false;
             break;
           }
         }