@fieldnotes/core 0.29.0 → 0.31.0

package/dist/index.d.cts

@@ -27,6 +27,8 @@ interface StrokeElement extends BaseElement {
     color: string;
     width: number;
     opacity: number;
+    /** Optional canvas blend mode (e.g. highlighter uses 'multiply'). */
+    blendMode?: 'multiply';
 }
 interface NoteElement extends BaseElement {
     type: 'note';
@@ -72,7 +74,7 @@ interface TextElement extends BaseElement {
     color: string;
     textAlign: 'left' | 'center' | 'right';
 }
-type ShapeKind = 'rectangle' | 'ellipse';
+type ShapeKind = 'rectangle' | 'ellipse' | 'line';
 interface ShapeElement extends BaseElement {
     type: 'shape';
     shape: ShapeKind;
@@ -80,6 +82,8 @@ interface ShapeElement extends BaseElement {
     strokeColor: string;
     strokeWidth: number;
     fillColor: string;
+    /** Line-only: which bbox diagonal the segment runs along. Absent/false = main diagonal. */
+    flip?: boolean;
 }
 type HexOrientation = 'pointy' | 'flat';
 interface GridElement extends BaseElement {
@@ -562,6 +566,7 @@ interface StrokeInput extends BaseDefaults {
     color?: string;
     width?: number;
     opacity?: number;
+    blendMode?: 'multiply';
 }
 interface NoteInput extends BaseDefaults {
     position: Point;
@@ -612,6 +617,7 @@ interface ShapeInput extends BaseDefaults {
     strokeColor?: string;
     strokeWidth?: number;
     fillColor?: string;
+    flip?: boolean;
 }
 declare function createShape(input: ShapeInput): ShapeElement;
 interface GridInput extends BaseDefaults {
@@ -669,14 +675,17 @@ declare class HandTool implements Tool {
 }
 
 interface PencilToolOptions {
+    name?: string;
     color?: string;
     width?: number;
     smoothing?: number;
     minPointDistance?: number;
     progressiveSimplifyThreshold?: number;
+    opacity?: number;
+    blendMode?: 'multiply';
 }
 declare class PencilTool implements Tool {
-    readonly name = "pencil";
+    readonly name: string;
     private drawing;
     private points;
     private color;
@@ -685,6 +694,8 @@ declare class PencilTool implements Tool {
     private minPointDistance;
     private progressiveThreshold;
     private nextSimplifyAt;
+    private opacity;
+    private blendMode;
     private optionListeners;
     constructor(options?: PencilToolOptions);
     onActivate(ctx: ToolContext): void;
@@ -752,6 +763,7 @@ declare class SelectTool implements Tool {
     private setHovered;
     private handleResize;
     private hitTestResizeHandle;
+    private hitTestLineHandles;
     private getHandlePositions;
     private renderMarquee;
     private renderSelectionBoxes;
@@ -960,6 +972,6 @@ declare class TemplateTool implements Tool {
     private notifyOptionsChange;
 }
 
-declare const VERSION = "0.29.0";
+declare const VERSION = "0.31.0";
 
 export { type ActiveFormats, type ArrowElement, ArrowTool, type ArrowToolOptions, AutoSave, type AutoSaveOptions, type BackgroundOptions, type BackgroundPattern, type Binding, type Bounds, Camera, type CameraChangeInfo, type CameraOptions, type CanvasElement, type CanvasState, type Command, DEFAULT_NOTE_FONT_SIZE, ElementStore, type ElementStyle, type ElementType, type ElementUpdateEvent, EraserTool, type EraserToolOptions, type ExportImageOptions, type FontSizePreset, type GridElement, type GridInfo, HandTool, type HexOrientation, HistoryStack, type HistoryStackOptions, type HtmlElement, type ImageElement, ImageTool, type ImageToolOptions, type Layer, LayerManager, MeasureTool, type MeasureToolOptions, type Measurement, type NoteElement, NoteTool, type NoteToolOptions, PencilTool, type PencilToolOptions, type Point, type PointerState, type RenderStatsSnapshot, SelectTool, type ShapeElement, type ShapeKind, ShapeTool, type ShapeToolOptions, type ShortcutBindings, type ShortcutOptions, type ShortcutsApi, type Size, type StrokeElement, type StrokePoint, type TemplateElement, type TemplateShape, TemplateTool, type TemplateToolOptions, type TextElement, TextTool, type TextToolOptions, type Tool, type ToolContext, ToolManager, type ToolName, VERSION, Viewport, type ViewportOptions, boundsIntersect, createArrow, createGrid, createHtmlElement, createImage, createNote, createShape, createStroke, createTemplate, createText, drawHexPath, exportImage, getActiveFormats, getArrowBounds, getArrowControlPoint, getArrowMidpoint, getArrowTangentAngle, getBendFromPoint, getElementBounds, getElementStyle, getElementsBoundingBox, getHexCellsInCone, getHexCellsInLine, getHexCellsInRadius, getHexCellsInSquare, getHexDistance, isNearBezier, setFontSize, smartSnap, snapPoint, snapToHexCenter, styleToPatch, toggleBold, toggleItalic, toggleStrikethrough, toggleUnderline };

package/dist/index.d.ts

@@ -27,6 +27,8 @@ interface StrokeElement extends BaseElement {
     color: string;
     width: number;
     opacity: number;
+    /** Optional canvas blend mode (e.g. highlighter uses 'multiply'). */
+    blendMode?: 'multiply';
 }
 interface NoteElement extends BaseElement {
     type: 'note';
@@ -72,7 +74,7 @@ interface TextElement extends BaseElement {
     color: string;
     textAlign: 'left' | 'center' | 'right';
 }
-type ShapeKind = 'rectangle' | 'ellipse';
+type ShapeKind = 'rectangle' | 'ellipse' | 'line';
 interface ShapeElement extends BaseElement {
     type: 'shape';
     shape: ShapeKind;
@@ -80,6 +82,8 @@ interface ShapeElement extends BaseElement {
     strokeColor: string;
     strokeWidth: number;
     fillColor: string;
+    /** Line-only: which bbox diagonal the segment runs along. Absent/false = main diagonal. */
+    flip?: boolean;
 }
 type HexOrientation = 'pointy' | 'flat';
 interface GridElement extends BaseElement {
@@ -562,6 +566,7 @@ interface StrokeInput extends BaseDefaults {
     color?: string;
     width?: number;
     opacity?: number;
+    blendMode?: 'multiply';
 }
 interface NoteInput extends BaseDefaults {
     position: Point;
@@ -612,6 +617,7 @@ interface ShapeInput extends BaseDefaults {
     strokeColor?: string;
     strokeWidth?: number;
     fillColor?: string;
+    flip?: boolean;
 }
 declare function createShape(input: ShapeInput): ShapeElement;
 interface GridInput extends BaseDefaults {
@@ -669,14 +675,17 @@ declare class HandTool implements Tool {
 }
 
 interface PencilToolOptions {
+    name?: string;
     color?: string;
     width?: number;
     smoothing?: number;
     minPointDistance?: number;
     progressiveSimplifyThreshold?: number;
+    opacity?: number;
+    blendMode?: 'multiply';
 }
 declare class PencilTool implements Tool {
-    readonly name = "pencil";
+    readonly name: string;
     private drawing;
     private points;
     private color;
@@ -685,6 +694,8 @@ declare class PencilTool implements Tool {
     private minPointDistance;
     private progressiveThreshold;
     private nextSimplifyAt;
+    private opacity;
+    private blendMode;
     private optionListeners;
     constructor(options?: PencilToolOptions);
     onActivate(ctx: ToolContext): void;
@@ -752,6 +763,7 @@ declare class SelectTool implements Tool {
     private setHovered;
     private handleResize;
     private hitTestResizeHandle;
+    private hitTestLineHandles;
     private getHandlePositions;
     private renderMarquee;
     private renderSelectionBoxes;
@@ -960,6 +972,6 @@ declare class TemplateTool implements Tool {
     private notifyOptionsChange;
 }
 
-declare const VERSION = "0.29.0";
+declare const VERSION = "0.31.0";
 
 export { type ActiveFormats, type ArrowElement, ArrowTool, type ArrowToolOptions, AutoSave, type AutoSaveOptions, type BackgroundOptions, type BackgroundPattern, type Binding, type Bounds, Camera, type CameraChangeInfo, type CameraOptions, type CanvasElement, type CanvasState, type Command, DEFAULT_NOTE_FONT_SIZE, ElementStore, type ElementStyle, type ElementType, type ElementUpdateEvent, EraserTool, type EraserToolOptions, type ExportImageOptions, type FontSizePreset, type GridElement, type GridInfo, HandTool, type HexOrientation, HistoryStack, type HistoryStackOptions, type HtmlElement, type ImageElement, ImageTool, type ImageToolOptions, type Layer, LayerManager, MeasureTool, type MeasureToolOptions, type Measurement, type NoteElement, NoteTool, type NoteToolOptions, PencilTool, type PencilToolOptions, type Point, type PointerState, type RenderStatsSnapshot, SelectTool, type ShapeElement, type ShapeKind, ShapeTool, type ShapeToolOptions, type ShortcutBindings, type ShortcutOptions, type ShortcutsApi, type Size, type StrokeElement, type StrokePoint, type TemplateElement, type TemplateShape, TemplateTool, type TemplateToolOptions, type TextElement, TextTool, type TextToolOptions, type Tool, type ToolContext, ToolManager, type ToolName, VERSION, Viewport, type ViewportOptions, boundsIntersect, createArrow, createGrid, createHtmlElement, createImage, createNote, createShape, createStroke, createTemplate, createText, drawHexPath, exportImage, getActiveFormats, getArrowBounds, getArrowControlPoint, getArrowMidpoint, getArrowTangentAngle, getBendFromPoint, getElementBounds, getElementStyle, getElementsBoundingBox, getHexCellsInCone, getHexCellsInLine, getHexCellsInRadius, getHexCellsInSquare, getHexDistance, isNearBezier, setFontSize, smartSnap, snapPoint, snapToHexCenter, styleToPatch, toggleBold, toggleItalic, toggleStrikethrough, toggleUnderline };

package/dist/index.js

@@ -2195,6 +2195,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) {
@@ -2719,6 +2739,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";
@@ -2841,7 +2862,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);
     }
@@ -2880,6 +2901,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) {
@@ -3153,7 +3183,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 },
@@ -3165,6 +3195,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 {
@@ -3229,7 +3261,7 @@ function createHtmlElement(input) {
   return el;
 }
 function createShape(input) {
-  return {
+  const result = {
     id: createId("shape"),
     type: "shape",
     position: input.position,
@@ -3242,6 +3274,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 {
@@ -6072,7 +6106,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;
@@ -6081,14 +6115,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");
@@ -6102,7 +6141,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) {
@@ -6116,6 +6157,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) {
@@ -6157,7 +6200,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);
@@ -6173,7 +6218,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;
@@ -6562,6 +6608,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 };
@@ -6617,6 +6669,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);
@@ -6785,6 +6846,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");
@@ -6872,6 +6937,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);
@@ -6883,6 +6949,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 }],
@@ -6920,6 +7000,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;
@@ -7063,6 +7156,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;
@@ -7376,6 +7474,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;
@@ -7433,13 +7540,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,
@@ -7447,6 +7558,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);
@@ -7480,6 +7592,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();
   }
@@ -7488,7 +7607,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;
@@ -7904,7 +8023,7 @@ var TemplateTool = class {
 };
 
 // src/index.ts
-var VERSION = "0.29.0";
+var VERSION = "0.31.0";
 export {
   ArrowTool,
   AutoSave,