@tldraw/editor 5.1.0 → 5.2.0-canary.5e29f4eb77b9

package/dist-esm/lib/components/default-components/DefaultSvgDefs.mjs.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/lib/components/default-components/DefaultSvgDefs.tsx"],
-  "sourcesContent": ["/** @public @react */\nexport const DefaultSvgDefs = () => {\n\treturn null\n}\n"],
-  "mappings": "AACO,MAAM,iBAAiB,MAAM;AACnC,SAAO;AACR;",
+  "sourcesContent": ["/** @public @react */\nexport function DefaultSvgDefs() {\n\treturn null\n}\n"],
+  "mappings": "AACO,SAAS,iBAAiB;AAChC,SAAO;AACR;",
   "names": []
 }

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

@@ -7867,6 +7867,15 @@ class Editor extends EventEmitter {
   _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 */
@@ -7999,10 +8008,15 @@ class Editor extends EventEmitter {
           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;
@@ -8042,6 +8056,7 @@ class Editor extends EventEmitter {
             const { _selectedShapeIdsAtPointerDown: shapesToReselect } = this;
             this.setSelectedShapes(this._selectedShapeIdsAtPointerDown);
             this._selectedShapeIdsAtPointerDown = [];
+            this._didCaptureSelectionAtPointerDown = false;
             if (this._didPinch) {
               this._didPinch = false;
               if (shapesToReselect.length > 0) {
@@ -8135,7 +8150,10 @@ class Editor extends EventEmitter {
                 });
               }, this.options.longPressDurationMs);
             }
-            this._selectedShapeIdsAtPointerDown = this.getSelectedShapeIds();
+            if (!this._didCaptureSelectionAtPointerDown) {
+              this._selectedShapeIdsAtPointerDown = this.getSelectedShapeIds();
+              this._didCaptureSelectionAtPointerDown = true;
+            }
             if (info.button === LEFT_MOUSE_BUTTON) this.capturedPointerId = info.pointerId;
             inputs.buttons.add(info.button);
             inputs.setIsPointing(true);
@@ -8208,6 +8226,7 @@ class Editor extends EventEmitter {
             if (this.inputs.getIsRightPointing() && !this.inputs.getIsPanning()) {
               this.inputs.setIsRightPointing(false);
               this._selectedShapeIdsAtPointerDown = [];
+              this._didCaptureSelectionAtPointerDown = false;
               break;
             }
             this.inputs.setIsRightPointing(false);
@@ -8245,6 +8264,7 @@ class Editor extends EventEmitter {
                     this.slideCamera({ speed: slideSpeed, direction: slideDirection });
                   }
                   this._selectedShapeIdsAtPointerDown = [];
+                  this._didCaptureSelectionAtPointerDown = false;
                   return this;
                 }
               }
@@ -8258,6 +8278,7 @@ class Editor extends EventEmitter {
               }
             }
             this._selectedShapeIdsAtPointerDown = [];
+            this._didCaptureSelectionAtPointerDown = false;
             break;
           }
         }