@reekon-tools/boldr-utils 1.6.18 → 1.6.19

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

@@ -37,11 +37,11 @@ const segmentDistanceSq = (px, py, ax, ay, bx, by) => {
     const dy = py - cy;
     return dx * dx + dy * dy;
 };
-const findHit = (doc, world, zoom) => {
+const findHit = (doc, world, zoom, viewportTileScale = 1) => {
     // Hit-test in z-order (top first): measurements > shapes > strokes.
     for (let i = doc.placedMeasurements.length - 1; i >= 0; i--) {
         const m = doc.placedMeasurements[i];
-        if (hitPlacedMeasurement(m, world, zoom)) {
+        if (hitPlacedMeasurement(m, world, zoom, doc.tileScaleFactor, viewportTileScale)) {
             return { id: m.id, kind: 'measurement' };
         }
     }
@@ -128,12 +128,16 @@ const translatePatch = (elementKind, id, doc, delta) => {
 // via DragSelectionConfig AND the web pointer handlers — one source of truth) ---
 // Grabbing the tile of a line annotation slides it along the line; everything
 // else (bare stamps, grabs on the line body) is a group move.
-const classifyGrab = (doc, id, world, zoom) => {
+const classifyGrab = (doc, id, world, zoom, viewportTileScale = 1) => {
     const m = doc.placedMeasurements.find((x) => x.id === id);
     if (!m)
         return 'move';
-    // Same footprint the tile is drawn at (smaller for unassociated inputs, #6).
-    const half = (stampTileSize(m) / 2 + HIT_PADDING) / zoom;
+    // Same footprint the tile is drawn at (smaller for unassociated inputs, #6;
+    // folds in the document-wide tile scale + viewport scale so slide-grab
+    // matches the draw).
+    const half = (stampTileSize(m, doc.tileScaleFactor, viewportTileScale) / 2 +
+        HIT_PADDING) /
+        zoom;
     const onTile = Math.abs(world.x - m.anchor.x) <= half &&
         Math.abs(world.y - m.anchor.y) <= half;
     return onTile && placementOf(m) === 'line' && m.line ? 'slide' : 'move';
@@ -190,6 +194,48 @@ const endpointPatch = (doc, id, handle, delta) => {
     const anchor = recomputeAnchor(line, 'line', linePosOf(m), m.anchor);
     return { ops: [{ op: 'updateMeasurement', id, patch: { line, anchor } }] };
 };
+// Which endpoint handle of a (selected) line/arrow SHAPE is under `world`.
+// Shape lines store their endpoints as geometry.points[0]/[1] (unlike
+// measurement lines, which carry them on `line.a/b` alongside a tile). Prefers
+// the nearer endpoint when both are within range.
+const findShapeHandleHit = (doc, id, world, zoom) => {
+    const s = doc.shapes.find((x) => x.id === id);
+    if (!s || (s.kind !== 'line' && s.kind !== 'arrow'))
+        return null;
+    const [a, b] = s.geometry.points;
+    if (!a || !b)
+        return null;
+    const r2 = (HANDLE_GRAB_PX / zoom) ** 2;
+    const da = (world.x - a.x) ** 2 + (world.y - a.y) ** 2;
+    const db = (world.x - b.x) ** 2 + (world.y - b.y) ** 2;
+    if (da <= r2 && da <= db)
+        return 'a';
+    if (db <= r2)
+        return 'b';
+    return null;
+};
+// Move one endpoint of a line/arrow shape by a world delta (resize/rotate).
+// Rewrites the whole geometry (updateShape merges shallowly at the top level,
+// so `closed` and any other geometry fields must be carried through).
+const shapeEndpointPatch = (doc, id, handle, delta) => {
+    const s = doc.shapes.find((x) => x.id === id);
+    if (!s || (s.kind !== 'line' && s.kind !== 'arrow'))
+        return null;
+    const [a, b] = s.geometry.points;
+    if (!a || !b)
+        return null;
+    const na = handle === 'a' ? { x: a.x + delta.x, y: a.y + delta.y } : a;
+    const nb = handle === 'b' ? { x: b.x + delta.x, y: b.y + delta.y } : b;
+    return {
+        ops: [
+            {
+                op: 'updateShape',
+                id,
+                patch: { geometry: { ...s.geometry, points: [na, nb] } },
+            },
+        ],
+    };
+};
 // Which corner handle of a (selected) rectangle annotation is under `world`.
 // Prefers the nearest corner when several are within range (small rects).
 const findRectCornerHit = (doc, id, world, zoom) => {
@@ -272,7 +318,11 @@ const resizePatch = (doc, id, delta) => {
 // Patch for the current drag mode (web pointer path), from a world-space delta.
 const dragPatch = (s, doc, delta, zoom) => {
     if (s.mode === 'endpoint' && s.handle) {
-        return endpointPatch(doc, s.id, s.handle, delta);
+        // Shape lines and measurement lines store endpoints differently, so the
+        // patch builder is keyed on which kind is being dragged.
+        return s.elementKind === 'shape'
+            ? shapeEndpointPatch(doc, s.id, s.handle, delta)
+            : endpointPatch(doc, s.id, s.handle, delta);
     }
     if (s.mode === 'slide')
         return slidePatch(doc, s.id, delta, zoom);
@@ -292,7 +342,7 @@ export const createSelectTool = () => ({
     // reusing the same hit-test and translate logic the pointer handlers below
     // use for web — one source of truth.
     dragSelection: {
-        hitTest: (doc, world, zoom) => findHit(doc, world, zoom),
+        hitTest: (doc, world, zoom, viewportTileScale) => findHit(doc, world, zoom, viewportTileScale),
         buildTranslatePatch: (doc, id, kind, delta) => {
             const op = translatePatch(kind, id, doc, delta);
             return op ? { ops: [op] } : null;
@@ -301,6 +351,8 @@ export const createSelectTool = () => ({
         buildSlidePatch: slidePatch,
         hitTestHandle: findHandleHit,
         buildEndpointPatch: endpointPatch,
+        hitTestShapeHandle: findShapeHandleHit,
+        buildShapeEndpointPatch: shapeEndpointPatch,
         hitTestResizeHandle: findResizeHandleHit,
         buildResizePatch: resizePatch,
         hitTestRectCorner: findRectCornerHit,
@@ -328,6 +380,19 @@ export const createSelectTool = () => ({
                     delta: { x: 0, y: 0 },
                 };
             }
+            const shapeHandle = findShapeHandleHit(ctx.document, selId, world, zoom);
+            if (shapeHandle) {
+                ctx.setSelection({ ids: [selId] });
+                return {
+                    kind: 'dragging',
+                    id: selId,
+                    elementKind: 'shape',
+                    mode: 'endpoint',
+                    handle: shapeHandle,
+                    start: world,
+                    delta: { x: 0, y: 0 },
+                };
+            }
             if (findResizeHandleHit(ctx.document, selId, world, zoom)) {
                 return {
                     kind: 'dragging',
@@ -352,14 +417,15 @@ export const createSelectTool = () => ({
                 };
             }
         }
-        const hit = findHit(ctx.document, world, zoom);
+        const hit = findHit(ctx.document, world, zoom, ctx.tileViewportScale);
         if (!hit) {
             ctx.setSelection(null);
             return { kind: 'idle' };
         }
         ctx.setSelection({ ids: [hit.id] });
         const mode = hit.kind === 'measurement' &&
-            classifyGrab(ctx.document, hit.id, world, zoom) === 'slide'
+            classifyGrab(ctx.document, hit.id, world, zoom, ctx.tileViewportScale) ===
+                'slide'
             ? 'slide'
             : 'move';
         return {

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

@@ -49,6 +49,7 @@ export interface AnnotationCanvasStateApi {
     activeTool: Tool | null;
     toolState: ToolState;
     ctx: ToolContext;
+    tileViewportScale: number;
     penDrawingStroke: AnnotationStroke | null;
     customPreviewState: ToolState;
     dispatchPointerDown(event: CanvasPointerEvent): void;

package/dist/annotation/canvas/useAnnotationCanvasState.js

@@ -2,6 +2,7 @@ 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, rectCenter, DEFAULT_LINE_POS, } from './measurementGeometry.js';
+import { viewportTileScale } from './stampLayout.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).
@@ -21,10 +22,16 @@ export const useAnnotationCanvasState = (props) => {
         return map;
     }, [measurements]);
     const viewportApi = useMemo(() => createViewportApi(viewport), [viewport]);
+    // How large the document renders when fit to this canvas, as a tile-footprint
+    // multiplier (zoom-independent). Keeps tiles a consistent fraction of the
+    // drawing on a phone vs a desktop pane. Used by the overlays (drawn size) and
+    // the tools (hit box) so both agree.
+    const tileViewportScale = useMemo(() => viewportTileScale(width, height, canvas.viewport.width, canvas.viewport.height), [width, height, canvas.viewport.width, canvas.viewport.height]);
     const ctx = useMemo(() => ({
         document: canvas,
         selection,
         viewport: viewportApi,
+        tileViewportScale,
         preview(patch) {
             setPreviewPatch(patch);
         },
@@ -56,6 +63,7 @@ export const useAnnotationCanvasState = (props) => {
         canvas,
         selection,
         viewportApi,
+        tileViewportScale,
         onCommit,
         onSelectionChange,
         pickMeasurement,
@@ -361,6 +369,7 @@ export const useAnnotationCanvasState = (props) => {
         activeTool,
         toolState,
         ctx,
+        tileViewportScale,
         penDrawingStroke,
         customPreviewState: toolState,
         dispatchPointerDown,

package/dist/exports.d.ts

@@ -21,6 +21,7 @@ export type { GestureConfig, PanTrigger, AnnotationCanvasInnerProps, } from './a
 export type { CanvasPointerEvent, RequestTextInput, ShapeDrawConfig, 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 { STAMP_TILE_SIZE, STAMP_INPUT_TILE_SIZE, DEFAULT_TILE_SCALE, TILE_SCALE_MIN, TILE_SCALE_MAX, clampTileScale, stampTileSize, isUnassociatedStamp, } from './annotation/canvas/stampLayout.js';
 export { createViewportApi, fitToScreen, panBy, zoomAt, DEFAULT_VIEWPORT, type ViewportApi, type ViewportState, } from './annotation/canvas/viewport.js';
 export { createPenTool, type PenToolOptions, } from './annotation/canvas/tools/penTool.js';
 export { createSelectTool } from './annotation/canvas/tools/selectTool.js';

package/dist/exports.js

@@ -21,6 +21,7 @@ export { useAnnotationMutations, } from './annotation/data/hooks/useAnnotationMu
 export { useAnnotationCanvasDoc, } from './annotation/data/hooks/useAnnotationCanvasDoc.js';
 export { hydrateCanvasState } from './annotation/data/canvasPersistence.js';
 export { InMemoryAnnotationProvider } from './annotation/data/InMemoryAnnotationProvider.js';
+export { STAMP_TILE_SIZE, STAMP_INPUT_TILE_SIZE, DEFAULT_TILE_SCALE, TILE_SCALE_MIN, TILE_SCALE_MAX, clampTileScale, stampTileSize, isUnassociatedStamp, } from './annotation/canvas/stampLayout.js';
 export { createViewportApi, fitToScreen, panBy, zoomAt, DEFAULT_VIEWPORT, } from './annotation/canvas/viewport.js';
 export { createPenTool, } from './annotation/canvas/tools/penTool.js';
 export { createSelectTool } from './annotation/canvas/tools/selectTool.js';

package/dist/types/annotation.d.ts

@@ -103,6 +103,7 @@ export interface AnnotationCanvasState {
     strokes: AnnotationStroke[];
     shapes: AnnotationShape[];
     placedMeasurements: PlacedMeasurementRef[];
+    tileScaleFactor?: number;
     externalPayloadPath?: string;
 }
 export type AnnotationElement = (AnnotationStroke & {
@@ -148,6 +149,9 @@ export type AnnotationPatchOp = {
 } | {
     op: 'setViewport';
     patch: Partial<AnnotationViewport>;
+} | {
+    op: 'setTileScaleFactor';
+    value: number;
 } | {
     op: 'setLayers';
     layers: AnnotationLayer[];

package/dist/types/annotation.js

@@ -67,6 +67,8 @@ const applyOp = (state, op) => {
             };
         case 'setViewport':
             return { ...state, viewport: { ...state.viewport, ...op.patch } };
+        case 'setTileScaleFactor':
+            return { ...state, tileScaleFactor: op.value };
         case 'setLayers':
             return { ...state, layers: op.layers };
     }
@@ -141,6 +143,10 @@ const invertOp = (before, op) => {
             }
             return { op: 'setViewport', patch: inversePatch };
         }
+        case 'setTileScaleFactor':
+            // Restore the prior factor; absent → an explicit 1 (visually identical to
+            // absent), keeping the op's `value: number` contract.
+            return { op: 'setTileScaleFactor', value: before.tileScaleFactor ?? 1 };
         case 'setLayers':
             return { op: 'setLayers', layers: before.layers };
     }

package/dist/types/firestore.d.ts

@@ -427,6 +427,53 @@ export declare enum DecimalTolerance {
     Hundredth = "0.01",
     Thousandth = "0.001"
 }
+/**
+ * Trade/industry a user works in. Collected during registration to personalize
+ * the experience. String values are stable identifiers safe for persistence and
+ * analytics; they double as i18n key suffixes (e.g. `trades.iron_worker`).
+ */
+export declare enum UserTrades {
+    Woodworking = "woodworking",
+    Plumbing = "plumbing",
+    Electrical = "electrical",
+    Structural = "structural",
+    Framing = "framing",
+    Carpenter = "carpenter",
+    IronWorker = "iron_worker",
+    Joiners = "joiners",
+    HVAC = "hvac",
+    Painting = "painting",
+    GC = "gc",
+    IT = "it",
+    Surveying = "surveying",
+    Pipefitter = "pipe_fitter",
+    Drywall = "drywall",
+    Welding = "welding",
+    Flooring = "flooring",
+    Decking = "decking",
+    Tile = "tile",
+    DIY = "diy",
+    Other = "other"
+}
+/**
+ * Role a user holds within their trade. Collected during registration. String
+ * values double as i18n key suffixes (e.g. `roles.project_manager`).
+ */
+export declare enum UserRoles {
+    Apprentice = "apprentice",
+    Journeyman = "journeyman",
+    Owner = "owner",
+    ProjectManager = "project_manager",
+    Supervisor = "supervisor",
+    Foreman = "foreman",
+    Superintendent = "superintendent",
+    Estimator = "estimator",
+    OfficeManager = "office_manager",
+    Operator = "operator",
+    Laborer = "laborer",
+    Engineer = "engineer",
+    Safety = "safety"
+}
 export interface UserDocument extends FirestoreDoc, Timestamps {
     defaultOrganization: string;
     displayName: string;
@@ -440,6 +487,12 @@ export interface UserDocument extends FirestoreDoc, Timestamps {
     printLabelSize: string;
     printLogoFileId: string;
     devices?: Record<string, string>;
+    /** Four-digit birth year. Optional — not required during registration. */
+    birthYear?: number;
+    /** The trade/industry the user works in. Captured during registration. */
+    industry?: UserTrades;
+    /** The user's role within their trade. Optional. */
+    role?: UserRoles;
 }
 export interface UserComment extends FirestoreDoc, Timestamps {
     comment: string;

package/dist/types/firestore.js

@@ -123,3 +123,52 @@ export var DecimalTolerance;
     DecimalTolerance["Hundredth"] = "0.01";
     DecimalTolerance["Thousandth"] = "0.001";
 })(DecimalTolerance || (DecimalTolerance = {}));
+/**
+ * Trade/industry a user works in. Collected during registration to personalize
+ * the experience. String values are stable identifiers safe for persistence and
+ * analytics; they double as i18n key suffixes (e.g. `trades.iron_worker`).
+ */
+export var UserTrades;
+(function (UserTrades) {
+    UserTrades["Woodworking"] = "woodworking";
+    UserTrades["Plumbing"] = "plumbing";
+    UserTrades["Electrical"] = "electrical";
+    UserTrades["Structural"] = "structural";
+    UserTrades["Framing"] = "framing";
+    UserTrades["Carpenter"] = "carpenter";
+    UserTrades["IronWorker"] = "iron_worker";
+    UserTrades["Joiners"] = "joiners";
+    UserTrades["HVAC"] = "hvac";
+    UserTrades["Painting"] = "painting";
+    UserTrades["GC"] = "gc";
+    UserTrades["IT"] = "it";
+    UserTrades["Surveying"] = "surveying";
+    UserTrades["Pipefitter"] = "pipe_fitter";
+    UserTrades["Drywall"] = "drywall";
+    UserTrades["Welding"] = "welding";
+    UserTrades["Flooring"] = "flooring";
+    UserTrades["Decking"] = "decking";
+    UserTrades["Tile"] = "tile";
+    UserTrades["DIY"] = "diy";
+    UserTrades["Other"] = "other";
+})(UserTrades || (UserTrades = {}));
+/**
+ * Role a user holds within their trade. Collected during registration. String
+ * values double as i18n key suffixes (e.g. `roles.project_manager`).
+ */
+export var UserRoles;
+(function (UserRoles) {
+    UserRoles["Apprentice"] = "apprentice";
+    UserRoles["Journeyman"] = "journeyman";
+    UserRoles["Owner"] = "owner";
+    UserRoles["ProjectManager"] = "project_manager";
+    UserRoles["Supervisor"] = "supervisor";
+    UserRoles["Foreman"] = "foreman";
+    UserRoles["Superintendent"] = "superintendent";
+    UserRoles["Estimator"] = "estimator";
+    UserRoles["OfficeManager"] = "office_manager";
+    UserRoles["Operator"] = "operator";
+    UserRoles["Laborer"] = "laborer";
+    UserRoles["Engineer"] = "engineer";
+    UserRoles["Safety"] = "safety";
+})(UserRoles || (UserRoles = {}));

package/package.json

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

package/dist/canvas/AnnotationCanvas.d.ts

@@ -1,11 +0,0 @@
-import { type ReactNode } from 'react';
-import type { AnnotationCanvasInnerProps } from './AnnotationCanvasInner.js';
-export type { AnnotationCanvasHandle, GestureConfig, PanTrigger, } from './AnnotationCanvasInner.js';
-export interface CanvasKitOpts {
-    locateFile?: (file: string) => string;
-}
-export type AnnotationCanvasProps = AnnotationCanvasInnerProps & {
-    fallback?: ReactNode;
-    canvasKitOpts?: CanvasKitOpts;
-};
-export declare const AnnotationCanvas: ({ fallback, canvasKitOpts, ...rest }: AnnotationCanvasProps) => import("react/jsx-runtime").JSX.Element;

package/dist/canvas/AnnotationCanvas.js

@@ -1,10 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { WithSkiaWeb } from '@shopify/react-native-skia/lib/module/web/index.js';
-// Web-only entry point: lazy-loads CanvasKit wasm via WithSkiaWeb. Imperative
-// API (undo/redo/zoom) is exposed through the `imperativeRef` prop rather
-// than React refs, since WithSkiaWeb can't forward refs through its lazy
-// component boundary. The native build sits in `AnnotationCanvas.native.tsx`
-// and skips WithSkiaWeb entirely (no wasm to load).
-export const AnnotationCanvas = ({ fallback, canvasKitOpts, ...rest }) => (_jsx(WithSkiaWeb, { getComponent: () => import('./AnnotationCanvasInner.js').then((m) => ({
-        default: m.AnnotationCanvasInner,
-    })), fallback: fallback ?? null, componentProps: rest, opts: canvasKitOpts }));

package/dist/canvas/AnnotationCanvas.native.d.ts

@@ -1,8 +0,0 @@
-import type { AnnotationCanvasInnerProps } from './AnnotationCanvasInner.native.js';
-export type { AnnotationCanvasHandle, } from './useAnnotationCanvasState.js';
-export type { GestureConfig, PanTrigger, } from './AnnotationCanvasInner.js';
-export type AnnotationCanvasProps = AnnotationCanvasInnerProps & {
-    fallback?: unknown;
-    canvasKitOpts?: unknown;
-};
-export declare const AnnotationCanvas: (props: AnnotationCanvasProps) => import("react/jsx-runtime").JSX.Element;

package/dist/canvas/AnnotationCanvas.native.js

@@ -1,6 +0,0 @@
-import { jsx as _jsx } from "react/jsx-runtime";
-import { AnnotationCanvasInner } from './AnnotationCanvasInner.native.js';
-export const AnnotationCanvas = (props) => {
-    const { fallback: _f, canvasKitOpts: _o, ...rest } = props;
-    return _jsx(AnnotationCanvasInner, { ...rest });
-};

package/dist/canvas/AnnotationCanvasInner.d.ts

@@ -1,39 +0,0 @@
-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 { MeasurementRef } from './measurementPicker.js';
-import type { Tool } from './Tool.js';
-import { type AnnotationCanvasHandle } from './useAnnotationCanvasState.js';
-import { type ViewportState } from './viewport.js';
-import type { RenderMeasurementStamp } from './measurementStampOverlay.js';
-export type { AnnotationCanvasHandle };
-export interface AnnotationCanvasInnerProps {
-    canvas: AnnotationCanvasState;
-    onCommit(patch: AnnotationDocumentPatch): void;
-    tools: Tool[];
-    activeToolId: string;
-    selection: Selection | null;
-    onSelectionChange(selection: Selection | null): void;
-    measurements?: Measurement[];
-    fallbackUnit?: Units;
-    fractionalTolerance?: FractionalTolerance;
-    decimalTolerance?: DecimalTolerance;
-    resolveImageUrl?: (storagePath: string) => Promise<string>;
-    pickMeasurement?: () => Promise<MeasurementRef | null>;
-    renderMeasurementStamp?: RenderMeasurementStamp;
-    stampFontSource?: unknown;
-    stampValueFontSize?: number;
-    stampLabelFontSize?: number;
-    gestures?: GestureConfig;
-    width: number;
-    height: number;
-    initialViewport?: ViewportState;
-    style?: CSSProperties;
-    imperativeRef?: MutableRefObject<AnnotationCanvasHandle | null>;
-}
-export type PanTrigger = 'middleMouse' | 'rightMouse' | 'space';
-export interface GestureConfig {
-    wheel?: 'zoom' | 'pan' | 'auto';
-    panTriggers?: PanTrigger[];
-}
-export declare const AnnotationCanvasInner: (props: AnnotationCanvasInnerProps) => import("react/jsx-runtime").JSX.Element;