@fieldnotes/core 0.29.0 → 0.31.0

package/dist/index.cjs

@@ -2276,6 +2276,26 @@ function getArrowRenderGeometry(arrow) {
   return geometry;
 }
 
+// src/elements/shape-geometry.ts
+function lineFromEndpoints(a, b) {
+  return {
+    position: { x: Math.min(a.x, b.x), y: Math.min(a.y, b.y) },
+    size: { w: Math.abs(b.x - a.x), h: Math.abs(b.y - a.y) },
+    flip: b.x > a.x !== b.y > a.y
+  };
+}
+function lineEndpoints(shape) {
+  const { x, y } = shape.position;
+  const { w, h } = shape.size;
+  return shape.flip ? [
+    { x, y: y + h },
+    { x: x + w, y }
+  ] : [
+    { x, y },
+    { x: x + w, y: y + h }
+  ];
+}
+
 // src/elements/arrow-binding.ts
 var BINDABLE_TYPES = /* @__PURE__ */ new Set(["note", "text", "image", "html", "shape"]);
 function isBindable(element) {
@@ -2800,6 +2820,7 @@ var ElementRenderer = class {
   renderStroke(ctx, stroke) {
     if (stroke.points.length < 2) return;
     ctx.save();
+    if (stroke.blendMode) ctx.globalCompositeOperation = stroke.blendMode;
     ctx.translate(stroke.position.x, stroke.position.y);
     ctx.strokeStyle = stroke.color;
     ctx.lineCap = "round";
@@ -2922,7 +2943,7 @@ var ElementRenderer = class {
   }
   renderShape(ctx, shape) {
     ctx.save();
-    if (shape.fillColor !== "none") {
+    if (shape.fillColor !== "none" && shape.shape !== "line") {
       ctx.fillStyle = shape.fillColor;
       this.fillShapePath(ctx, shape);
     }
@@ -2961,6 +2982,15 @@ var ElementRenderer = class {
         ctx.stroke();
         break;
       }
+      case "line": {
+        const [a, b] = lineEndpoints(shape);
+        ctx.lineCap = "round";
+        ctx.beginPath();
+        ctx.moveTo(a.x, a.y);
+        ctx.lineTo(b.x, b.y);
+        ctx.stroke();
+        break;
+      }
     }
   }
   renderGrid(ctx, grid) {
@@ -3234,7 +3264,7 @@ var ElementRenderer = class {
 // src/elements/element-factory.ts
 var DEFAULT_NOTE_FONT_SIZE = 18;
 function createStroke(input) {
-  return {
+  const result = {
     id: createId("stroke"),
     type: "stroke",
     position: input.position ?? { x: 0, y: 0 },
@@ -3246,6 +3276,8 @@ function createStroke(input) {
     width: input.width ?? 2,
     opacity: input.opacity ?? 1
   };
+  if (input.blendMode) result.blendMode = input.blendMode;
+  return result;
 }
 function createNote(input) {
   return {
@@ -3310,7 +3342,7 @@ function createHtmlElement(input) {
   return el;
 }
 function createShape(input) {
-  return {
+  const result = {
     id: createId("shape"),
     type: "shape",
     position: input.position,
@@ -3323,6 +3355,8 @@ function createShape(input) {
     strokeWidth: input.strokeWidth ?? 2,
     fillColor: input.fillColor ?? "none"
   };
+  if (input.flip) result.flip = input.flip;
+  return result;
 }
 function createGrid(input) {
   return {
@@ -6153,7 +6187,7 @@ var DEFAULT_MIN_POINT_DISTANCE = 3;
 var DEFAULT_PROGRESSIVE_THRESHOLD = 200;
 var PROGRESSIVE_HOT_ZONE = 30;
 var PencilTool = class {
-  name = "pencil";
+  name;
   drawing = false;
   points = [];
   color;
@@ -6162,14 +6196,19 @@ var PencilTool = class {
   minPointDistance;
   progressiveThreshold;
   nextSimplifyAt;
+  opacity;
+  blendMode;
   optionListeners = /* @__PURE__ */ new Set();
   constructor(options = {}) {
+    this.name = options.name ?? "pencil";
     this.color = options.color ?? "#000000";
     this.width = options.width ?? 2;
     this.smoothing = options.smoothing ?? DEFAULT_SMOOTHING;
     this.minPointDistance = options.minPointDistance ?? DEFAULT_MIN_POINT_DISTANCE;
     this.progressiveThreshold = options.progressiveSimplifyThreshold ?? DEFAULT_PROGRESSIVE_THRESHOLD;
     this.nextSimplifyAt = this.progressiveThreshold;
+    this.opacity = options.opacity ?? 1;
+    this.blendMode = options.blendMode;
   }
   onActivate(ctx) {
     ctx.setCursor?.("crosshair");
@@ -6183,7 +6222,9 @@ var PencilTool = class {
       width: this.width,
       smoothing: this.smoothing,
       minPointDistance: this.minPointDistance,
-      progressiveSimplifyThreshold: this.progressiveThreshold
+      progressiveSimplifyThreshold: this.progressiveThreshold,
+      opacity: this.opacity,
+      blendMode: this.blendMode
     };
   }
   onOptionsChange(listener) {
@@ -6197,6 +6238,8 @@ var PencilTool = class {
     if (options.minPointDistance !== void 0) this.minPointDistance = options.minPointDistance;
     if (options.progressiveSimplifyThreshold !== void 0)
       this.progressiveThreshold = options.progressiveSimplifyThreshold;
+    if (options.opacity !== void 0) this.opacity = options.opacity;
+    if (options.blendMode !== void 0) this.blendMode = options.blendMode;
     this.notifyOptionsChange();
   }
   onPointerDown(state, ctx) {
@@ -6238,7 +6281,9 @@ var PencilTool = class {
       points: simplified,
       color: this.color,
       width: this.width,
-      layerId: ctx.activeLayerId ?? ""
+      layerId: ctx.activeLayerId ?? "",
+      opacity: this.opacity,
+      blendMode: this.blendMode
     });
     ctx.store.add(stroke);
     computeStrokeSegments(stroke);
@@ -6254,7 +6299,8 @@ var PencilTool = class {
     ctx.strokeStyle = this.color;
     ctx.lineCap = "round";
     ctx.lineJoin = "round";
-    ctx.globalAlpha = 0.8;
+    ctx.globalAlpha = this.blendMode ? this.opacity : 0.8;
+    if (this.blendMode) ctx.globalCompositeOperation = this.blendMode;
     const segments = smoothToSegments(this.points);
     for (const seg of segments) {
       const w = (pressureToWidth(seg.start.pressure, this.width) + pressureToWidth(seg.end.pressure, this.width)) / 2;
@@ -6643,6 +6689,12 @@ var SelectTool = class {
       ctx.requestRender();
       return;
     }
+    const lineHit = this.hitTestLineHandles(world, ctx);
+    if (lineHit) {
+      this.mode = { type: "line-handle", elementId: lineHit.elementId, fixed: lineHit.fixed };
+      ctx.requestRender();
+      return;
+    }
     const templateResizeHit = this.hitTestTemplateResizeHandle(world, ctx);
     if (templateResizeHit) {
       this.mode = { type: "resizing-template", elementId: templateResizeHit };
@@ -6698,6 +6750,15 @@ var SelectTool = class {
       applyArrowHandleDrag(this.mode.handle, this.mode.elementId, world, ctx);
       return;
     }
+    if (this.mode.type === "line-handle") {
+      ctx.setCursor?.("grabbing");
+      const el = ctx.store.getById(this.mode.elementId);
+      if (el && el.type === "shape") {
+        ctx.store.update(el.id, lineFromEndpoints(this.mode.fixed, world));
+      }
+      ctx.requestRender();
+      return;
+    }
     if (this.mode.type === "resizing-template") {
       ctx.setCursor?.("nwse-resize");
       this.handleTemplateResize(world, ctx);
@@ -6866,6 +6927,10 @@ var SelectTool = class {
       ctx.setCursor?.(getArrowHandleCursor(arrowHit.handle, false));
       return null;
     }
+    if (this.hitTestLineHandles(world, ctx)) {
+      ctx.setCursor?.("grab");
+      return null;
+    }
     const templateResizeHit = this.hitTestTemplateResizeHandle(world, ctx);
     if (templateResizeHit) {
       ctx.setCursor?.("nwse-resize");
@@ -6953,6 +7018,7 @@ var SelectTool = class {
     for (const id of this._selectedIds) {
       const el = ctx.store.getById(id);
       if (!el || !("size" in el)) continue;
+      if (el.type === "shape" && el.shape === "line") continue;
       const bounds = getElementBounds(el);
       if (!bounds) continue;
       const corners = this.getHandlePositions(bounds);
@@ -6964,6 +7030,20 @@ var SelectTool = class {
     }
     return null;
   }
+  hitTestLineHandles(world, ctx) {
+    if (this._selectedIds.length === 0) return null;
+    const zoom = ctx.camera.zoom;
+    const r = (HANDLE_SIZE / 2 + HANDLE_HIT_PADDING2) / zoom;
+    const r2 = r * r;
+    for (const id of this._selectedIds) {
+      const el = ctx.store.getById(id);
+      if (!el || el.type !== "shape" || el.shape !== "line") continue;
+      const [a, b] = lineEndpoints(el);
+      if ((world.x - a.x) ** 2 + (world.y - a.y) ** 2 <= r2) return { elementId: id, fixed: b };
+      if ((world.x - b.x) ** 2 + (world.y - b.y) ** 2 <= r2) return { elementId: id, fixed: a };
+    }
+    return null;
+  }
   getHandlePositions(bounds) {
     return [
       ["nw", { x: bounds.x, y: bounds.y }],
@@ -7001,6 +7081,19 @@ var SelectTool = class {
         this.renderBindingHighlights(canvasCtx, el, zoom);
         continue;
       }
+      if (el.type === "shape" && el.shape === "line") {
+        canvasCtx.setLineDash([]);
+        canvasCtx.fillStyle = "#ffffff";
+        const r = handleWorldSize / 2;
+        for (const p of lineEndpoints(el)) {
+          canvasCtx.beginPath();
+          canvasCtx.arc(p.x, p.y, r, 0, Math.PI * 2);
+          canvasCtx.fill();
+          canvasCtx.stroke();
+        }
+        canvasCtx.setLineDash([4 / zoom, 4 / zoom]);
+        continue;
+      }
       const bounds = getElementBounds(el);
       if (!bounds) continue;
       const pad = SELECTION_PAD / zoom;
@@ -7144,6 +7237,11 @@ var SelectTool = class {
   }
   isInsideBounds(point, el) {
     if (el.type === "grid") return false;
+    if (el.type === "shape" && el.shape === "line") {
+      const [a, b] = lineEndpoints(el);
+      const threshold = Math.max(el.strokeWidth / 2, 6);
+      return distSqToSegment(point, a, b) <= threshold * threshold;
+    }
     if ("size" in el) {
       const s = el.size;
       return point.x >= el.position.x && point.x <= el.position.x + s.w && point.y >= el.position.y && point.y <= el.position.y + s.h;
@@ -7457,6 +7555,15 @@ var ImageTool = class {
 };
 
 // src/tools/shape-tool.ts
+function snapTo45(start, end) {
+  const dx = end.x - start.x;
+  const dy = end.y - start.y;
+  const len = Math.hypot(dx, dy);
+  if (len === 0) return { ...end };
+  const step = Math.PI / 4;
+  const angle = Math.round(Math.atan2(dy, dx) / step) * step;
+  return { x: start.x + Math.cos(angle) * len, y: start.y + Math.sin(angle) * len };
+}
 var ShapeTool = class {
   name = "shape";
   drawing = false;
@@ -7514,13 +7621,17 @@ var ShapeTool = class {
   onPointerMove(state, ctx) {
     if (!this.drawing) return;
     this.end = this.snap(ctx.camera.screenToWorld({ x: state.x, y: state.y }), ctx);
+    if (this.shape === "line" && this.shiftHeld) {
+      this.end = snapTo45(this.start, this.end);
+    }
     ctx.requestRender();
   }
   onPointerUp(_state, ctx) {
     if (!this.drawing) return;
     this.drawing = false;
     const { position, size } = this.computeRect();
-    if (size.w === 0 || size.h === 0) return;
+    const isLine = this.shape === "line";
+    if (isLine ? size.w === 0 && size.h === 0 : size.w === 0 || size.h === 0) return;
     const shape = createShape({
       position,
       size,
@@ -7528,6 +7639,7 @@ var ShapeTool = class {
       strokeColor: this.strokeColor,
       strokeWidth: this.strokeWidth,
       fillColor: this.fillColor,
+      ...isLine ? { flip: this.end.x > this.start.x !== this.end.y > this.start.y } : {},
       layerId: ctx.activeLayerId ?? ""
     });
     ctx.store.add(shape);
@@ -7561,6 +7673,13 @@ var ShapeTool = class {
         ctx.stroke();
         break;
       }
+      case "line":
+        ctx.lineCap = "round";
+        ctx.beginPath();
+        ctx.moveTo(this.start.x, this.start.y);
+        ctx.lineTo(this.end.x, this.end.y);
+        ctx.stroke();
+        break;
     }
     ctx.restore();
   }
@@ -7569,7 +7688,7 @@ var ShapeTool = class {
     let y = Math.min(this.start.y, this.end.y);
     let w = Math.abs(this.end.x - this.start.x);
     let h = Math.abs(this.end.y - this.start.y);
-    if (this.shiftHeld) {
+    if (this.shiftHeld && this.shape !== "line") {
       const side = Math.max(w, h);
       w = side;
       h = side;
@@ -7985,7 +8104,7 @@ var TemplateTool = class {
 };
 
 // src/index.ts
-var VERSION = "0.29.0";
+var VERSION = "0.31.0";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ArrowTool,