@reekon-tools/boldr-utils 1.6.31 → 1.6.32

package/dist/annotation/canvas/tools/measurementTool.d.ts

@@ -1,4 +1,4 @@
-import type { PlacedMeasurementRef } from '../../../types/annotation.js';
+import type { PlacedMeasurementRef, StrokeCap } from '../../../types/annotation.js';
 import type { Tool } from '../Tool.js';
 export type MeasurementToolPlacement = 'line' | 'rectangle' | 'none';
 export interface MeasurementToolOptions {
@@ -11,5 +11,10 @@ export interface MeasurementToolOptions {
     selectToolId?: string;
     onAutoSwitch?: (toToolId: string) => void;
     onPlaced?: (measurement: PlacedMeasurementRef) => void;
+    color?: string;
+    width?: number;
+    cap?: StrokeCap;
+    startCap?: StrokeCap;
+    dash?: boolean;
 }
 export declare const createMeasurementTool: (options?: MeasurementToolOptions) => Tool;

package/dist/annotation/canvas/tools/measurementTool.js

@@ -1,5 +1,27 @@
 import { DEFAULT_LAYER_ID } from '../../../types/annotation.js';
 import { DEFAULT_LINE_POS, recomputeAnchor, rectCenter, } from '../measurementGeometry.js';
+// The `line*` style fields for a placed measurement, built from the tool's
+// style options. Undefined fields are dropped (never emitted) so the render
+// defaults apply and Firestore never sees an `undefined` value.
+const lineStyleFields = (placement, style) => {
+    if (placement === 'none')
+        return {};
+    const out = {};
+    if (style.color !== undefined)
+        out.lineColor = style.color;
+    if (style.width !== undefined)
+        out.lineWidth = style.width;
+    if (style.dash !== undefined)
+        out.lineDash = style.dash;
+    // End/start caps are only meaningful on the open `line` path.
+    if (placement === 'line') {
+        if (style.cap !== undefined)
+            out.lineCap = style.cap;
+        if (style.startCap !== undefined)
+            out.lineStartCap = style.startCap;
+    }
+    return out;
+};
 let counter = 0;
 const makeId = () => `annotation-${Date.now().toString(36)}-${(counter++).toString(36)}`;
 const firstLayerId = (doc) => doc.layers[0]?.id ?? DEFAULT_LAYER_ID;
@@ -8,13 +30,14 @@ const firstLayerId = (doc) => doc.layers[0]?.id ?? DEFAULT_LAYER_ID;
 // placeAnnotationAtCenter so a drawn annotation is identical to a (legacy)
 // center-placed one once committed.
 const buildMeasurement = (opts) => {
-    const { id, layerId, placement, linePos, a, b } = opts;
+    const { id, layerId, placement, linePos, a, b, style } = opts;
     const base = {
         id,
         layerId,
         showLabel: true,
         showValue: true,
         createdAt: Date.now(),
+        ...lineStyleFields(placement, style),
     };
     if (placement === 'rectangle') {
         const rect = { a, b };
@@ -51,6 +74,13 @@ export const createMeasurementTool = (options = {}) => {
     const minDragPx = options.minDragPx ?? 4;
     const autoSwitchToSelect = options.autoSwitchToSelect ?? true;
     const selectToolId = options.selectToolId ?? 'select';
+    const style = {
+        color: options.color,
+        width: options.width,
+        cap: options.cap,
+        startCap: options.startCap,
+        dash: options.dash,
+    };
     const place = (ctx, measurement) => {
         ctx.commit({ ops: [{ op: 'addMeasurement', measurement }] });
         options.onPlaced?.(measurement);
@@ -78,6 +108,7 @@ export const createMeasurementTool = (options = {}) => {
                     linePos,
                     a: event.world,
                     b: event.world,
+                    style,
                 }));
             },
         };
@@ -108,6 +139,7 @@ export const createMeasurementTool = (options = {}) => {
                 linePos,
                 a: s.startWorld,
                 b: event.world,
+                style,
             });
             ctx.preview({ ops: [{ op: 'addMeasurement', measurement }] });
             return { ...s, moved: true };
@@ -130,6 +162,7 @@ export const createMeasurementTool = (options = {}) => {
                 linePos,
                 a: s.startWorld,
                 b: event.world,
+                style,
             }));
         },
         onCancel(_state, ctx) {

package/dist/annotation/canvas/useAnnotationCanvasState.d.ts

@@ -16,6 +16,7 @@ export interface AnnotationCanvasHandle {
     }): void;
     setAnnotationType(id: AnnotationElementId, type: MeasurementPlacement): void;
     centerOnLine(id: AnnotationElementId): void;
+    setLinePos(id: AnnotationElementId, linePos: number): void;
     removeMeasurementValue(id: AnnotationElementId): void;
     associateMeasurement(id: AnnotationElementId, ref: MeasurementRef): void;
     bindColumn(id: AnnotationElementId, binding: {

package/dist/annotation/canvas/useAnnotationCanvasState.js

@@ -195,6 +195,37 @@ export const useAnnotationCanvasState = (props) => {
     useEffect(() => {
         if (!imperativeRef)
             return;
+        // Shared body for centerOnLine / setLinePos: ensure the annotation is a
+        // 'line' (synthesizing a default horizontal line around the anchor if it
+        // has none) and pin its tile at `linePos` along that line.
+        const applyLinePos = (id, linePos) => {
+            const c = ctxRef.current;
+            const m = c.document.placedMeasurements.find((x) => x.id === id);
+            if (!m)
+                return;
+            let line = m.line;
+            if (!line) {
+                const len = Math.min(400, Math.max(120, canvas.viewport.width * 0.25));
+                line = {
+                    a: { x: m.anchor.x - len / 2, y: m.anchor.y },
+                    b: { x: m.anchor.x + len / 2, y: m.anchor.y },
+                };
+            }
+            c.commit({
+                ops: [
+                    {
+                        op: 'updateMeasurement',
+                        id,
+                        patch: {
+                            placement: 'line',
+                            line,
+                            linePos,
+                            anchor: recomputeAnchor(line, 'line', linePos, m.anchor),
+                        },
+                    },
+                ],
+            });
+        };
         imperativeRef.current = {
             undo() {
                 const entry = undoStackRef.current.pop();
@@ -340,34 +371,10 @@ export const useAnnotationCanvasState = (props) => {
                 });
             },
             centerOnLine(id) {
-                const c = ctxRef.current;
-                const m = c.document.placedMeasurements.find((x) => x.id === id);
-                if (!m)
-                    return;
-                // Same default-line synthesis as setAnnotationType('line') so centering
-                // a floating tile also gives it a line to sit on.
-                let line = m.line;
-                if (!line) {
-                    const len = Math.min(400, Math.max(120, canvas.viewport.width * 0.25));
-                    line = {
-                        a: { x: m.anchor.x - len / 2, y: m.anchor.y },
-                        b: { x: m.anchor.x + len / 2, y: m.anchor.y },
-                    };
-                }
-                c.commit({
-                    ops: [
-                        {
-                            op: 'updateMeasurement',
-                            id,
-                            patch: {
-                                placement: 'line',
-                                line,
-                                linePos: 0.5,
-                                anchor: recomputeAnchor(line, 'line', 0.5, m.anchor),
-                            },
-                        },
-                    ],
-                });
+                applyLinePos(id, 0.5);
+            },
+            setLinePos(id, linePos) {
+                applyLinePos(id, linePos);
             },
             removeMeasurementValue(id) {
                 const c = ctxRef.current;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reekon-tools/boldr-utils",
-  "version": "1.6.31",
+  "version": "1.6.32",
   "description": "Shared utilities for formulas and measurement conversion used in Reekon apps",
   "author": "REEKON Tools",
   "license": "MIT",