@reekon-tools/boldr-utils 1.6.11 → 1.6.13

package/dist/{canvas → annotation/canvas}/AnnotationCanvasInner.d.ts

@@ -1,8 +1,8 @@
 import { type CSSProperties, type MutableRefObject } from 'react';
-import type { DecimalTolerance, FractionalTolerance, Measurement, Units } from '../types/firestore.js';
-import type { AnnotationCanvasState, AnnotationDocumentPatch, Selection } from '../types/annotation.js';
+import type { DecimalTolerance, FractionalTolerance, Measurement, Units } from '../../types/firestore.js';
+import type { AnnotationCanvasState, AnnotationDocumentPatch, PlacedMeasurementRef, Selection } from '../../types/annotation.js';
 import type { MeasurementRef } from './measurementPicker.js';
-import type { Tool } from './Tool.js';
+import type { RequestTextInput, Tool } from './Tool.js';
 import { type AnnotationCanvasHandle } from './useAnnotationCanvasState.js';
 import { type ViewportState } from './viewport.js';
 import type { RenderMeasurementStamp } from './measurementStampOverlay.js';
@@ -20,7 +20,9 @@ export interface AnnotationCanvasInnerProps {
     decimalTolerance?: DecimalTolerance;
     resolveImageUrl?: (storagePath: string) => Promise<string>;
     pickMeasurement?: () => Promise<MeasurementRef | null>;
+    requestTextInput?: RequestTextInput;
     renderMeasurementStamp?: RenderMeasurementStamp;
+    onMeasurementStampPress?: (placed: PlacedMeasurementRef) => void;
     stampFontSource?: unknown;
     stampValueFontSize?: number;
     stampLabelFontSize?: number;

package/dist/{canvas → annotation/canvas}/AnnotationCanvasInner.js

@@ -2,18 +2,21 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useFont } from '@shopify/react-native-skia';
 import { useCallback, useEffect, useRef, } from 'react';
 import { AnnotationCanvasSkia } from './AnnotationCanvasSkia.js';
+import { buildRemoveMeasurementOps } from './measurementGeometry.js';
 import { useAnnotationCanvasState, } from './useAnnotationCanvasState.js';
 import { STAMP_TILE_SIZE } from './stampLayout.js';
+// Screen-px radius of a measurement-annotation endpoint handle (matches the
+// native HANDLE_RADIUS_PX). Divided by zoom for a constant on-screen size.
+const HANDLE_PX = 7;
 const DEFAULT_PAN_TRIGGERS = ['middleMouse', 'space'];
 export const AnnotationCanvasInner = (props) => {
-    const { fallbackUnit, fractionalTolerance, decimalTolerance, resolveImageUrl, stampFontSource, stampValueFontSize = 14, stampLabelFontSize = 11, gestures, width, height, style, activeToolId, tools, } = props;
+    const { resolveImageUrl, stampFontSource, stampValueFontSize = 14, gestures, width, height, style, activeToolId, tools, } = props;
     const wheelMode = gestures?.wheel ?? 'auto';
     const panTriggers = gestures?.panTriggers ?? DEFAULT_PAN_TRIGGERS;
     const allowSpacePan = panTriggers.includes('space');
     const allowMiddlePan = panTriggers.includes('middleMouse');
     const allowRightPan = panTriggers.includes('rightMouse');
     const valueFont = useFont(stampFontSource, stampValueFontSize);
-    const labelFont = useFont(stampFontSource, stampLabelFontSize);
     const state = useAnnotationCanvasState(props);
     const containerRef = useRef(null);
     const panGestureRef = useRef(null);
@@ -52,7 +55,10 @@ export const AnnotationCanvasInner = (props) => {
             y: event.clientY - (rect?.top ?? 0),
         };
         if (isPanTriggerDown(event)) {
-            panGestureRef.current = { pointerId: event.pointerId, lastScreen: screen };
+            panGestureRef.current = {
+                pointerId: event.pointerId,
+                lastScreen: screen,
+            };
             event.currentTarget.setPointerCapture(event.pointerId);
             event.preventDefault();
             return;
@@ -72,7 +78,10 @@ export const AnnotationCanvasInner = (props) => {
                 x: screen.x - pan.lastScreen.x,
                 y: screen.y - pan.lastScreen.y,
             });
-            panGestureRef.current = { pointerId: pan.pointerId, lastScreen: screen };
+            panGestureRef.current = {
+                pointerId: pan.pointerId,
+                lastScreen: screen,
+            };
             return;
         }
         state.dispatchPointerMove(toCanvasPointer(event));
@@ -162,21 +171,20 @@ export const AnnotationCanvasInner = (props) => {
         ...style,
     };
     const customPreview = activeTool?.renderPreview?.(state.customPreviewState, state.ctx);
-    const { renderMeasurementStamp, selection } = props;
+    const { renderMeasurementStamp, onMeasurementStampPress, selection } = props;
     return (_jsxs("div", { ref: containerRef, style: containerStyle, onPointerDown: handlePointerDown, onPointerMove: handlePointerMove, onPointerUp: handlePointerUp, onPointerCancel: handlePointerCancel, onWheel: handleWheel, onContextMenu: handleContextMenu, children: [AnnotationCanvasSkia({
                 width,
                 height,
                 effectiveCanvas: state.effectiveCanvas,
                 worldTransform: state.worldTransform,
-                measurementsById: state.measurementsById,
-                fallbackUnit,
-                fractionalTolerance,
-                decimalTolerance,
                 resolveImageUrl,
                 valueFont,
-                labelFont,
-                hideMeasurementStamps: !!renderMeasurementStamp,
                 penDrawingStroke: state.penDrawingStroke,
+                // Endpoint handles on the selected line annotation. Web drives endpoint
+                // drag through selectTool's pointer handlers (preview patches update the
+                // line, so the handles follow via re-render); no live geometry needed.
+                selectedId: selection?.ids[0] ?? null,
+                handleRadius: HANDLE_PX / state.viewport.zoom,
                 customPreview,
             }), renderMeasurementStamp && (_jsx("div", { style: {
                     position: 'absolute',
@@ -187,6 +195,9 @@ export const AnnotationCanvasInner = (props) => {
                     const cx = (placed.anchor.x - state.viewport.pan.x) * state.viewport.zoom;
                     const cy = (placed.anchor.y - state.viewport.pan.y) * state.viewport.zoom;
                     const isSelected = selection?.ids.includes(placed.id) ?? false;
+                    const measurement = placed.measurementId
+                        ? (state.measurementsById.get(placed.measurementId) ?? null)
+                        : null;
                     return (_jsxs("div", { style: {
                             position: 'absolute',
                             left: 0,
@@ -196,16 +207,24 @@ export const AnnotationCanvasInner = (props) => {
                             transform: `translate(${cx - size / 2}px, ${cy - size / 2}px)`,
                         }, children: [renderMeasurementStamp({
                                 placed,
-                                measurement: state.measurementsById.get(placed.measurementId) ?? null,
+                                measurement,
                                 selected: isSelected,
                                 size,
                                 zoom: state.viewport.zoom,
-                            }), isSelected && (_jsx("div", { role: "button", "aria-label": "Remove measurement", onPointerDown: (e) => {
+                            }), onMeasurementStampPress && (_jsx("button", { "aria-label": "Open measurement", onPointerDown: (e) => e.stopPropagation(), onClick: () => onMeasurementStampPress(placed), style: {
+                                    position: 'absolute',
+                                    inset: 0,
+                                    pointerEvents: 'auto',
+                                    cursor: 'pointer',
+                                    background: 'transparent',
+                                    border: 'none',
+                                    padding: 0,
+                                } })), isSelected && measurement && (_jsx("div", { role: "button", "aria-label": "Remove measurement", onPointerDown: (e) => {
                                     e.stopPropagation();
-                                    state.ctx.commit({
-                                        ops: [{ op: 'removeMeasurement', id: placed.id }],
-                                    });
-                                    state.ctx.setSelection(null);
+                                    const { ops, keepSelection } = buildRemoveMeasurementOps(placed);
+                                    state.ctx.commit({ ops });
+                                    if (!keepSelection)
+                                        state.ctx.setSelection(null);
                                 }, style: {
                                     position: 'absolute',
                                     top: -10,

package/dist/{canvas → annotation/canvas}/AnnotationCanvasInner.native.d.ts

@@ -1,10 +1,10 @@
 import { type MutableRefObject } from 'react';
 import { type ViewStyle } from 'react-native';
 import type { RenderMeasurementStamp } from './measurementStampOverlay.js';
-import type { DecimalTolerance, FractionalTolerance, Measurement, Units } from '../types/firestore.js';
-import type { AnnotationCanvasState, AnnotationDocumentPatch, Selection } from '../types/annotation.js';
+import type { DecimalTolerance, FractionalTolerance, Measurement, Units } from '../../types/firestore.js';
+import { type AnnotationCanvasState, type AnnotationDocumentPatch, type PlacedMeasurementRef, type Selection } from '../../types/annotation.js';
 import type { MeasurementRef } from './measurementPicker.js';
-import type { Tool } from './Tool.js';
+import type { RequestTextInput, Tool } from './Tool.js';
 import { type AnnotationCanvasHandle } from './useAnnotationCanvasState.js';
 import type { ViewportState } from './viewport.js';
 export type { AnnotationCanvasHandle };
@@ -21,7 +21,9 @@ export interface AnnotationCanvasInnerProps {
     decimalTolerance?: DecimalTolerance;
     resolveImageUrl?: (storagePath: string) => Promise<string>;
     pickMeasurement?: () => Promise<MeasurementRef | null>;
+    requestTextInput?: RequestTextInput;
     renderMeasurementStamp?: RenderMeasurementStamp;
+    onMeasurementStampPress?: (placed: PlacedMeasurementRef) => void;
     stampFontSource?: unknown;
     stampValueFontSize?: number;
     stampLabelFontSize?: number;