@tsdraw/core 0.8.1 → 0.8.3

package/dist/index.cjs

@@ -225,34 +225,25 @@ var StateNode = class {
 
 // src/canvas/viewport.ts
 function createViewport() {
-  return { x: 0, y: 0, zoom: 1, rotation: 0 };
+  return { x: 0, y: 0, zoom: 1 };
 }
 function screenToPage(viewport, screenX, screenY) {
-  const tx = screenX - viewport.x;
-  const ty = screenY - viewport.y;
-  const cos = Math.cos(viewport.rotation);
-  const sin = Math.sin(viewport.rotation);
   return {
-    x: (tx * cos + ty * sin) / viewport.zoom,
-    y: (-tx * sin + ty * cos) / viewport.zoom
+    x: (screenX - viewport.x) / viewport.zoom,
+    y: (screenY - viewport.y) / viewport.zoom
   };
 }
 function pageToScreen(viewport, pageX, pageY) {
-  const scaledX = pageX * viewport.zoom;
-  const scaledY = pageY * viewport.zoom;
-  const cos = Math.cos(viewport.rotation);
-  const sin = Math.sin(viewport.rotation);
   return {
-    x: scaledX * cos - scaledY * sin + viewport.x,
-    y: scaledX * sin + scaledY * cos + viewport.y
+    x: pageX * viewport.zoom + viewport.x,
+    y: pageY * viewport.zoom + viewport.y
   };
 }
 function setViewport(viewport, updater) {
   return {
     x: updater.x ?? viewport.x,
     y: updater.y ?? viewport.y,
-    zoom: updater.zoom ?? viewport.zoom,
-    rotation: updater.rotation ?? viewport.rotation
+    zoom: updater.zoom ?? viewport.zoom
   };
 }
 function panViewport(viewport, dx, dy) {
@@ -264,23 +255,9 @@ function zoomViewport(viewport, factor, centerX, centerY) {
     return { ...viewport, zoom };
   }
   const pageBefore = screenToPage(viewport, centerX, centerY);
-  const cos = Math.cos(viewport.rotation);
-  const sin = Math.sin(viewport.rotation);
-  const x = centerX - (pageBefore.x * zoom * cos - pageBefore.y * zoom * sin);
-  const y = centerY - (pageBefore.x * zoom * sin + pageBefore.y * zoom * cos);
-  return { x, y, zoom, rotation: viewport.rotation };
-}
-function rotateViewport(viewport, delta, centerX, centerY) {
-  const rotation = viewport.rotation + delta;
-  if (centerX == null || centerY == null) {
-    return { ...viewport, rotation };
-  }
-  const pageBefore = screenToPage(viewport, centerX, centerY);
-  const cos = Math.cos(rotation);
-  const sin = Math.sin(rotation);
-  const x = centerX - (pageBefore.x * viewport.zoom * cos - pageBefore.y * viewport.zoom * sin);
-  const y = centerY - (pageBefore.x * viewport.zoom * sin + pageBefore.y * viewport.zoom * cos);
-  return { x, y, zoom: viewport.zoom, rotation };
+  const x = centerX - pageBefore.x * zoom;
+  const y = centerY - pageBefore.y * zoom;
+  return { x, y, zoom };
 }
 
 // src/utils/colors.ts
@@ -313,7 +290,6 @@ var CanvasRenderer = class {
   render(ctx, viewport, shapes) {
     ctx.save();
     ctx.translate(viewport.x, viewport.y);
-    ctx.rotate(viewport.rotation);
     ctx.scale(viewport.zoom, viewport.zoom);
     for (const shape of shapes) {
       if (shape.type === "draw") {
@@ -806,7 +782,7 @@ var PenDrawingState = class extends StateNode {
     const z = this._startInfo?.point?.z ?? 0.5;
     this._isPenDevice = penActive;
     this._hasPressure = penActive || z !== 0.5;
-    const pressure = this._hasPressure ? toFixed(z) : 0.5;
+    const pressure = this._hasPressure ? toFixed(z * 1.25) : 0.5;
     this._phase = inputs.getShiftKey() ? "straight" : "free";
     this._extending = false;
     this._lastSample = { ...origin };
@@ -903,13 +879,12 @@ var PenDrawingState = class extends StateNode {
     const curPt = inputs.getCurrentPagePoint();
     if (!this._hasPressure) {
       const liveZ = curPt.z ?? 0.5;
-      if (liveZ !== 0.5 || inputs.getIsPen()) {
+      if (liveZ > 0 && liveZ !== 0.5 || inputs.getIsPen()) {
         this._hasPressure = true;
-        this.editor.updateShapes([{ id, type: "draw", props: { isPen: true } }]);
       }
     }
     const local = this.editor.getPointInShapeSpace(shape, curPt);
-    const pressure = this._hasPressure ? toFixed(curPt.z ?? 0.5) : 0.5;
+    const pressure = this._hasPressure ? toFixed((curPt.z ?? 0.5) * 1.25) : 0.5;
     const pt = { x: toFixed(local.x), y: toFixed(local.y), z: pressure };
     switch (this._phase) {
       case "starting_straight": {
@@ -1055,7 +1030,7 @@ var PenDrawingState = class extends StateNode {
           const firstPt = {
             x: 0,
             y: 0,
-            z: this._hasPressure ? toFixed(curPage.z ?? 0.5) : 0.5
+            z: this._hasPressure ? toFixed((curPage.z ?? 0.5) * 1.25) : 0.5
           };
           this._activePts = [firstPt];
           this.editor.createShape({
@@ -1087,7 +1062,7 @@ var PenDrawingState = class extends StateNode {
   endStroke() {
     if (!this._target) return;
     this.editor.updateShapes([
-      { id: this._target.id, type: "draw", props: { isComplete: true } }
+      { id: this._target.id, type: "draw", props: { isComplete: true, isPen: this._hasPressure } }
     ]);
     this.ctx.transition("pen_idle");
   }
@@ -1166,6 +1141,7 @@ var GeometricDrawingState = class extends StateNode {
   }
   // If user dragged, use the drag extents for the final shape
   // If they just clicked without dragging, use default-sized shape
+  // If they dragged just a bit (most likely a click), remove the shape and go back to idle
   completeShape() {
     const activeShape = this.getActiveShape();
     const config = this.getConfig();
@@ -1175,7 +1151,15 @@ var GeometricDrawingState = class extends StateNode {
     }
     const originPoint = this.editor.input.getOriginPagePoint();
     const cursorPoint = this.editor.input.getCurrentPagePoint();
-    const finalizedBounds = this.editor.input.getIsDragging() ? this.editor.input.getShiftKey() ? config.buildConstrainedBounds(originPoint.x, originPoint.y, cursorPoint.x, cursorPoint.y) : config.buildUnconstrainedBounds(originPoint.x, originPoint.y, cursorPoint.x, cursorPoint.y) : config.buildDefaultBounds(originPoint.x, originPoint.y);
+    const dx = cursorPoint.x - originPoint.x;
+    const dy = cursorPoint.y - originPoint.y;
+    const draggedFarEnough = dx * dx + dy * dy > this.editor.options.dragDistanceSquared;
+    if (!draggedFarEnough) {
+      this.removeCurrentShape();
+      this.ctx.transition(config.idleStateId, this.startedAt);
+      return;
+    }
+    const finalizedBounds = this.editor.input.getShiftKey() ? config.buildConstrainedBounds(originPoint.x, originPoint.y, cursorPoint.x, cursorPoint.y) : config.buildUnconstrainedBounds(originPoint.x, originPoint.y, cursorPoint.x, cursorPoint.y);
     this.editor.store.updateShape(activeShape.id, {
       x: finalizedBounds.x,
       y: finalizedBounds.y,
@@ -1205,10 +1189,6 @@ var GeometricDrawingState = class extends StateNode {
 
 // src/tools/geometric/geometricShapeHelpers.ts
 var MIN_SIDE_LENGTH = 1;
-var DEFAULT_RECTANGLE_WIDTH = 180;
-var DEFAULT_RECTANGLE_HEIGHT = 120;
-var DEFAULT_ELLIPSE_WIDTH = 180;
-var DEFAULT_ELLIPSE_HEIGHT = 120;
 function toSizedBounds(anchorX, anchorY, cursorX, cursorY, forceEqualSides) {
   const rawDeltaX = cursorX - anchorX;
   const rawDeltaY = cursorY - anchorY;
@@ -1233,16 +1213,6 @@ function buildSquareBounds(anchorX, anchorY, cursorX, cursorY) {
 function buildRectangleBounds(anchorX, anchorY, cursorX, cursorY) {
   return toSizedBounds(anchorX, anchorY, cursorX, cursorY, false);
 }
-function buildDefaultCenteredRectangleBounds(centerX, centerY) {
-  const halfWidth = DEFAULT_RECTANGLE_WIDTH / 2;
-  const halfHeight = DEFAULT_RECTANGLE_HEIGHT / 2;
-  return {
-    x: centerX - halfWidth,
-    y: centerY - halfHeight,
-    width: DEFAULT_RECTANGLE_WIDTH,
-    height: DEFAULT_RECTANGLE_HEIGHT
-  };
-}
 function buildRectangleSegments(width, height) {
   const topLeft = { x: 0, y: 0, z: 0.5 };
   const topRight = { x: width, y: 0, z: 0.5 };
@@ -1261,16 +1231,6 @@ function buildCircleBounds(anchorX, anchorY, cursorX, cursorY) {
 function buildEllipseBounds(anchorX, anchorY, cursorX, cursorY) {
   return toSizedBounds(anchorX, anchorY, cursorX, cursorY, false);
 }
-function buildDefaultCenteredEllipseBounds(centerX, centerY) {
-  const halfWidth = DEFAULT_ELLIPSE_WIDTH / 2;
-  const halfHeight = DEFAULT_ELLIPSE_HEIGHT / 2;
-  return {
-    x: centerX - halfWidth,
-    y: centerY - halfHeight,
-    width: DEFAULT_ELLIPSE_WIDTH,
-    height: DEFAULT_ELLIPSE_HEIGHT
-  };
-}
 function buildEllipseSegments(width, height) {
   const centerX = width / 2;
   const centerY = height / 2;
@@ -1298,7 +1258,6 @@ var SquareDrawingState = class extends GeometricDrawingState {
       idleStateId: "square_idle",
       buildConstrainedBounds: buildSquareBounds,
       buildUnconstrainedBounds: buildRectangleBounds,
-      buildDefaultBounds: buildDefaultCenteredRectangleBounds,
       buildSegments: buildRectangleSegments
     };
   }
@@ -1320,7 +1279,6 @@ var CircleDrawingState = class extends GeometricDrawingState {
       idleStateId: "circle_idle",
       buildConstrainedBounds: buildCircleBounds,
       buildUnconstrainedBounds: buildEllipseBounds,
-      buildDefaultBounds: buildDefaultCenteredEllipseBounds,
       buildSegments: buildEllipseSegments
     };
   }
@@ -1771,8 +1729,7 @@ var Editor = class {
     this.viewport = {
       x: partial.x ?? this.viewport.x,
       y: partial.y ?? this.viewport.y,
-      zoom: Math.max(0.1, Math.min(4, rawZoom)),
-      rotation: partial.rotation ?? this.viewport.rotation
+      zoom: Math.max(0.1, Math.min(4, rawZoom))
     };
     this.emitChange();
   }
@@ -1786,10 +1743,6 @@ var Editor = class {
     this.viewport = zoomViewport(this.viewport, factor, screenX, screenY);
     this.emitChange();
   }
-  rotateAt(delta, screenX, screenY) {
-    this.viewport = rotateViewport(this.viewport, delta, screenX, screenY);
-    this.emitChange();
-  }
   deleteShapes(ids) {
     if (ids.length === 0) return;
     this.store.deleteShapes(ids);
@@ -1812,8 +1765,7 @@ var Editor = class {
       viewport: {
         x: this.viewport.x,
         y: this.viewport.y,
-        zoom: this.viewport.zoom,
-        rotation: this.viewport.rotation
+        zoom: this.viewport.zoom
       },
       currentToolId: this.getCurrentToolId(),
       drawStyle: this.getCurrentDrawStyle(),
@@ -1821,10 +1773,7 @@ var Editor = class {
     };
   }
   loadSessionStateSnapshot(snapshot) {
-    this.setViewport({
-      ...snapshot.viewport,
-      rotation: snapshot.viewport.rotation ?? 0
-    });
+    this.setViewport(snapshot.viewport);
     this.setCurrentDrawStyle({
       color: snapshot.drawStyle.color,
       dash: snapshot.drawStyle.dash,
@@ -2265,7 +2214,6 @@ exports.pointHitsShape = pointHitsShape;
 exports.recordsToDocumentSnapshot = recordsToDocumentSnapshot;
 exports.resolveThemeColor = resolveThemeColor;
 exports.rotatePoint = rotatePoint;
-exports.rotateViewport = rotateViewport;
 exports.screenToPage = screenToPage;
 exports.segmentHitsShape = segmentHitsShape;
 exports.segmentTouchesPolyline = segmentTouchesPolyline;