@reekon-tools/boldr-utils 1.6.12 → 1.6.13

package/dist/annotation/canvas/useAnnotationCanvasState.js

@@ -1,12 +1,12 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { applyPatch, invertPatch, DEFAULT_LAYER_ID, } from '../../types/annotation.js';
 import { createViewportApi, panBy, zoomAt, DEFAULT_VIEWPORT, } from './viewport.js';
-import { recomputeAnchor, DEFAULT_LINE_POS } from './measurementGeometry.js';
+import { recomputeAnchor, rectCenter, DEFAULT_LINE_POS, } from './measurementGeometry.js';
 // Platform-agnostic state machine for the annotation canvas. Web and native
 // inners share this hook; each wraps it with platform-specific event
 // capture and JSX (div + DOM events vs. GestureDetector + RN Views).
 export const useAnnotationCanvasState = (props) => {
-    const { canvas, onCommit, tools, activeToolId, selection, onSelectionChange, measurements, pickMeasurement, width, height, initialViewport, imperativeRef, } = props;
+    const { canvas, onCommit, tools, activeToolId, selection, onSelectionChange, measurements, pickMeasurement, requestTextInput, width, height, initialViewport, imperativeRef, } = props;
     const [viewport, setViewport] = useState(initialViewport ?? DEFAULT_VIEWPORT);
     const [toolState, setToolState] = useState(undefined);
     const [previewPatch, setPreviewPatch] = useState(null);
@@ -41,6 +41,9 @@ export const useAnnotationCanvasState = (props) => {
         requestPickMeasurement() {
             return pickMeasurement ? pickMeasurement() : Promise.resolve(null);
         },
+        requestTextInput(options) {
+            return requestTextInput ? requestTextInput(options) : Promise.resolve(null);
+        },
         applyPan(deltaScreen) {
             setViewport((v) => panBy(v, deltaScreen));
         },
@@ -54,6 +57,7 @@ export const useAnnotationCanvasState = (props) => {
         onCommit,
         onSelectionChange,
         pickMeasurement,
+        requestTextInput,
     ]);
     // Live ctx for imperative handle methods (which are created in an effect and
     // would otherwise capture a stale ctx/viewport).
@@ -199,8 +203,30 @@ export const useAnnotationCanvasState = (props) => {
                 const m = c.document.placedMeasurements.find((x) => x.id === id);
                 if (!m)
                     return;
-                if (type === 'rectangle')
-                    return; // not supported in v1
+                if (type === 'rectangle') {
+                    // Reuse the existing rect if the annotation had one; otherwise
+                    // synthesize a square centered on the anchor (same size clamp as
+                    // the default line) so the tile doesn't jump.
+                    const side = Math.min(400, Math.max(120, canvas.viewport.width * 0.25));
+                    const rect = m.rect ?? {
+                        a: { x: m.anchor.x - side / 2, y: m.anchor.y - side / 2 },
+                        b: { x: m.anchor.x + side / 2, y: m.anchor.y + side / 2 },
+                    };
+                    c.commit({
+                        ops: [
+                            {
+                                op: 'updateMeasurement',
+                                id,
+                                patch: {
+                                    placement: 'rectangle',
+                                    rect,
+                                    anchor: rectCenter(rect),
+                                },
+                            },
+                        ],
+                    });
+                    return;
+                }
                 if (type === 'line') {
                     let line = m.line;
                     if (!line) {

package/dist/annotation/data/coalescedRunner.d.ts

@@ -0,0 +1 @@
+export declare const createCoalescedRunner: (task: () => Promise<void>) => (() => Promise<void>);

package/dist/annotation/data/coalescedRunner.js

@@ -0,0 +1,48 @@
+// A single-flight async runner with trailing coalescing.
+//
+// Wraps an async `task` so that overlapping callers don't run it concurrently
+// and don't drop work:
+//   • While a run is in flight, every additional call returns that same
+//     in-flight promise (single-flight) instead of starting a second run.
+//   • If any call arrives during a run, exactly ONE trailing run is scheduled
+//     after the current one finishes — so work that arrived mid-run is never
+//     lost. The trailing run re-invokes `task`, which is expected to re-read the
+//     latest state each time (it takes no arguments by design).
+//   • The returned promise resolves only once the chain is fully drained, so an
+//     `await`-ing caller can rely on all queued work having completed.
+//   • A task rejection is propagated to the awaiting callers of that run but
+//     does NOT wedge the runner: `inFlight` is always cleared, and a pending
+//     trailing run still fires, so the runner self-heals after a transient
+//     failure.
+//
+// This is the concurrency primitive behind the annotation autosave/flush: it
+// guarantees a create-on-first-save can't race a concurrent flush (the old
+// boolean-guard approach silently dropped the second writer).
+export const createCoalescedRunner = (task) => {
+    let inFlight = null;
+    let pending = false;
+    const run = () => {
+        if (inFlight) {
+            // A run is already underway — remember that more work arrived and join
+            // the in-flight promise rather than starting a second concurrent run.
+            pending = true;
+            return inFlight;
+        }
+        inFlight = (async () => {
+            try {
+                await task();
+            }
+            finally {
+                inFlight = null;
+                if (pending) {
+                    // Work arrived mid-run: drain it with a single trailing run, which
+                    // re-reads the latest state. Recurses until quiescent.
+                    pending = false;
+                    await run();
+                }
+            }
+        })();
+        return inFlight;
+    };
+    return run;
+};

package/dist/annotation/data/hooks/useAnnotationCanvasDoc.js

@@ -3,6 +3,7 @@ import { applyPatch, createEmptyCanvasState, } from '../../../types/annotation.j
 import { FileUploadType } from '../../../types/firestore.js';
 import { useAnnotationDoc } from './useAnnotationDoc.js';
 import { useAnnotationMutations } from './useAnnotationMutations.js';
+import { createCoalescedRunner } from '../coalescedRunner.js';
 import { hydrateCanvasState } from '../canvasPersistence.js';
 // Stable placeholder so useAnnotationMutations (which requires a non-null
 // scope) can be called unconditionally. Never used to write — flushes are
@@ -55,8 +56,6 @@ export const useAnnotationCanvasDoc = (options) => {
     // JSON of the canvas we last wrote, to recognize (and ignore) the snapshot
     // echo of our own write when reconciling incoming remote changes.
     const lastSavedJsonRef = useRef(null);
-    // Guards against two creates racing if flushes overlap.
-    const creatingRef = useRef(false);
     workingRef.current = working;
     dataRef.current = data;
     statusRef.current = saveStatus;
@@ -137,17 +136,17 @@ export const useAnnotationCanvasDoc = (options) => {
         setWorking(hydrateCanvasState(data, fallbackViewport));
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [data]);
-    const flush = useCallback(async () => {
-        if (timerRef.current) {
-            clearTimeout(timerRef.current);
-            timerRef.current = null;
-        }
+    // One pass of the persist logic: snapshots the latest working state and
+    // creates-or-updates the doc. NOT called directly — it runs through the
+    // single-flight `flush` below, which guarantees two passes never overlap (so
+    // a create-on-first-save can't race a concurrent flush) and re-invokes this
+    // to drain any work that arrived mid-pass. Because it re-reads `workingRef`
+    // each call, a trailing pass always persists the newest canvas.
+    const runFlush = useCallback(async () => {
         const canvas = workingRef.current;
         // Nothing to persist, or no real target scope yet.
         if (!canvas || !scope)
             return;
-        if (creatingRef.current)
-            return;
         const json = JSON.stringify(canvas);
         const id = fileIdRef.current ?? createdIdRef.current;
         const mode = id ? 'update' : 'create';
@@ -171,14 +170,12 @@ export const useAnnotationCanvasDoc = (options) => {
         try {
             if (!id) {
                 // First save with no file — create the doc seeded with the canvas.
-                creatingRef.current = true;
                 const seed = createSeedRef.current;
                 const newId = await createRef.current({
                     type: FileUploadType.Canvas,
                     ...(seed?.name !== undefined ? { name: seed.name } : {}),
                     fileData: buildFileData(seed?.fileType ?? 'sketch', seed?.isLabel, canvasPayload),
                 });
-                creatingRef.current = false;
                 createdIdRef.current = newId;
                 if (debug) {
                     console.log('[useAnnotationCanvasDoc] created file', newId);
@@ -213,14 +210,34 @@ export const useAnnotationCanvasDoc = (options) => {
             }
         }
         catch (e) {
-            creatingRef.current = false;
             // Always log save failures with context — these are otherwise invisible
             // (the canvas keeps working from local state).
             console.error(`[useAnnotationCanvasDoc] ${mode} failed`, { fileId: id, scope, bytes: json.length }, e);
             onSaveErrorRef.current?.(e);
             setStatus('error');
+            // Swallowed (not re-thrown): autosave/unmount call this fire-and-forget,
+            // and the canvas keeps working from local state. Callers that need to know
+            // a create succeeded (ensureFileId) detect it via the absence of an id
+            // after the flush drains, not via a rejection.
         }
     }, [scope, setStatus, saveThumbnail]);
+    // Stable indirection so the coalesced runner (created once) always calls the
+    // latest `runFlush` without being re-created when its deps change.
+    const runFlushRef = useRef(runFlush);
+    runFlushRef.current = runFlush;
+    // Single-flight runner: concurrent callers join the in-flight pass; work that
+    // arrives mid-pass triggers exactly one trailing pass. Created once.
+    const flushRunner = useMemo(() => createCoalescedRunner(() => runFlushRef.current()), []);
+    // Public flush: cancel any pending debounce, then run (or join) a persist
+    // pass. Resolves once the chain is fully drained, so `await flush()` is safe
+    // for create-before-upload and explicit Save.
+    const flush = useCallback(() => {
+        if (timerRef.current) {
+            clearTimeout(timerRef.current);
+            timerRef.current = null;
+        }
+        return flushRunner();
+    }, [flushRunner]);
     const onCommit = useCallback((patch) => {
         setWorking((prev) => (prev ? applyPatch(prev, patch) : prev));
         setStatus('dirty');
@@ -235,8 +252,12 @@ export const useAnnotationCanvasDoc = (options) => {
         const existing = fileIdRef.current ?? createdIdRef.current;
         if (existing)
             return existing;
-        // No file yet — seed an empty canvas if nothing has hydrated, then flush
-        // so the existing create branch mints the doc.
+        // No file yet — seed an empty canvas if nothing has hydrated, then flush so
+        // the create branch mints the doc. `flush` is single-flight: if the
+        // debounced autosave is already creating, this call JOINS that create and
+        // waits for it to drain (rather than racing it and dropping the upload, the
+        // old bug). After the drain, the id is present unless the create truly
+        // failed — so the throw below is now a genuine error, not a race.
         if (!workingRef.current) {
             const seeded = createEmptyCanvasState(fallbackViewport);
             workingRef.current = seeded;

package/dist/exports.d.ts

@@ -18,7 +18,7 @@ export { hydrateCanvasState } from './annotation/data/canvasPersistence.js';
 export { InMemoryAnnotationProvider } from './annotation/data/InMemoryAnnotationProvider.js';
 export type { AnnotationCanvasHandle } from './annotation/canvas/useAnnotationCanvasState.js';
 export type { GestureConfig, PanTrigger, AnnotationCanvasInnerProps, } from './annotation/canvas/AnnotationCanvasInner.js';
-export type { CanvasPointerEvent, Tool, ToolContext, ToolState, } from './annotation/canvas/Tool.js';
+export type { CanvasPointerEvent, RequestTextInput, Tool, ToolContext, ToolState, } from './annotation/canvas/Tool.js';
 export type { MeasurementRef, PickMeasurement, } from './annotation/canvas/measurementPicker.js';
 export type { MeasurementStampRenderArgs, RenderMeasurementStamp, } from './annotation/canvas/measurementStampOverlay.js';
 export { createViewportApi, fitToScreen, panBy, zoomAt, DEFAULT_VIEWPORT, type ViewportApi, type ViewportState, } from './annotation/canvas/viewport.js';
@@ -26,5 +26,7 @@ export { createPenTool, type PenToolOptions } from './annotation/canvas/tools/pe
 export { createSelectTool } from './annotation/canvas/tools/selectTool.js';
 export { createMeasurementStampTool, type MeasurementStampToolOptions, } from './annotation/canvas/tools/measurementStampTool.js';
 export { createPanTool, type PanToolOptions } from './annotation/canvas/tools/panTool.js';
-export { recomputeAnchor, projectToLinePos, snapLinePos, lerp, lineLength, placementOf, linePosOf, DEFAULT_LINE_POS, } from './annotation/canvas/measurementGeometry.js';
+export { createTextTool, type TextToolOptions, } from './annotation/canvas/tools/textTool.js';
+export { DEFAULT_TEXT_FONT_SIZE, MIN_TEXT_FONT_SIZE, MAX_TEXT_FONT_SIZE, textShapeBounds, textResizeGeometry, type ResizeGeometry, type TextBounds, } from './annotation/canvas/textGeometry.js';
+export { recomputeAnchor, projectToLinePos, snapLinePos, lerp, lineLength, placementOf, linePosOf, normalizeRect, rectCenter, rectCornerPoint, oppositeRectCorner, DEFAULT_LINE_POS, type NormalizedRect, type RectCorner, } from './annotation/canvas/measurementGeometry.js';
 export { toSkiaStrokeCap, arrowheadTriangle, arrowheadLength, } from './annotation/canvas/strokeGeometry.js';

package/dist/exports.js

@@ -26,5 +26,7 @@ export { createPenTool } from './annotation/canvas/tools/penTool.js';
 export { createSelectTool } from './annotation/canvas/tools/selectTool.js';
 export { createMeasurementStampTool, } from './annotation/canvas/tools/measurementStampTool.js';
 export { createPanTool } from './annotation/canvas/tools/panTool.js';
-export { recomputeAnchor, projectToLinePos, snapLinePos, lerp, lineLength, placementOf, linePosOf, DEFAULT_LINE_POS, } from './annotation/canvas/measurementGeometry.js';
+export { createTextTool, } from './annotation/canvas/tools/textTool.js';
+export { DEFAULT_TEXT_FONT_SIZE, MIN_TEXT_FONT_SIZE, MAX_TEXT_FONT_SIZE, textShapeBounds, textResizeGeometry, } from './annotation/canvas/textGeometry.js';
+export { recomputeAnchor, projectToLinePos, snapLinePos, lerp, lineLength, placementOf, linePosOf, normalizeRect, rectCenter, rectCornerPoint, oppositeRectCorner, DEFAULT_LINE_POS, } from './annotation/canvas/measurementGeometry.js';
 export { toSkiaStrokeCap, arrowheadTriangle, arrowheadLength, } from './annotation/canvas/strokeGeometry.js';

package/dist/types/annotation.d.ts

@@ -13,6 +13,7 @@ export interface AnnotationStroke {
     color: string;
     width: number;
     cap?: StrokeCap;
+    dash?: boolean;
     points: number[];
     pressure?: number[];
     createdAt: number;
@@ -24,6 +25,7 @@ export interface AnnotationShapeStyle {
     strokeWidth?: number;
     fontSize?: number;
     fontFamily?: string;
+    dash?: boolean;
 }
 export interface AnnotationShape {
     id: AnnotationElementId;
@@ -51,9 +53,14 @@ export interface PlacedMeasurementRef {
         b: Vec2;
     };
     linePos?: number;
+    rect?: {
+        a: Vec2;
+        b: Vec2;
+    };
     lineColor?: string;
     lineWidth?: number;
     lineCap?: StrokeCap;
+    lineDash?: boolean;
     leader?: {
         from: Vec2;
         to: Vec2;

package/package.json

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