@reekon-tools/boldr-utils 1.20.2 → 1.20.3

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

@@ -41,6 +41,7 @@ export interface AnnotationCanvasInnerProps {
     initialViewport?: ViewportState;
     style?: CSSProperties;
     magnifierTopOffset?: number;
+    onInteractingChange?: (interacting: boolean) => void;
     imperativeRef?: MutableRefObject<AnnotationCanvasHandle | null>;
     snapshotRef?: MutableRefObject<(() => Uint8Array | null) | null>;
 }

package/dist/annotation/canvas/AnnotationCanvasInner.native.d.ts

@@ -42,6 +42,7 @@ export interface AnnotationCanvasInnerProps {
     initialViewport?: ViewportState;
     style?: ViewStyle;
     magnifierTopOffset?: number;
+    onInteractingChange?: (interacting: boolean) => void;
     imperativeRef?: MutableRefObject<AnnotationCanvasHandle | null>;
     snapshotRef?: MutableRefObject<(() => Uint8Array | null) | null>;
 }

package/dist/annotation/canvas/AnnotationCanvasInner.native.js

@@ -65,7 +65,7 @@ const LOUPE_CROSS_WIDTH_PX = 1.5;
 // is only re-synced once each gesture ends. The tool/tap path still hops to
 // JS (`runOnJS(true)`) since drawing/selection are React-state operations.
 export const AnnotationCanvasInner = (props) => {
-    const { resolveImageUrl, deferBackgroundToResolver, hideLinkBadges, stampFontSource, stampValueFontSize = 14, width, height, style, magnifierTopOffset = 0, snapToGeometry = false, renderBackground, } = props;
+    const { resolveImageUrl, deferBackgroundToResolver, hideLinkBadges, stampFontSource, stampValueFontSize = 14, width, height, style, magnifierTopOffset = 0, onInteractingChange, snapToGeometry = false, renderBackground, } = props;
     const valueFont = useFont(stampFontSource, stampValueFontSize);
     // The animated-viewport implementation needs the Reanimated shared values,
     // which are created below AFTER the state hook — so the hook gets a stable
@@ -159,6 +159,13 @@ export const AnnotationCanvasInner = (props) => {
     const magTouchX = useSharedValue(0);
     const magTouchY = useSharedValue(0);
     const [magnifying, setMagnifying] = useState(false);
+    // Viewport pan/zoom in motion. Set from the viewport pan/pinch onChange
+    // worklets on the first frame that actually moves the viewport (never their
+    // onBegin, which fires for plain taps too) and cleared when the LAST
+    // viewport gesture finalizes — the two run simultaneously during a
+    // two-finger gesture, hence the endViewportGesture ref-count check rather
+    // than clearing per-gesture.
+    const [viewportMoving, setViewportMoving] = useState(false);
     // Lens geometry (screen points): a fixed square in the top-left, pushed below
     // any overlaid toolbar by magnifierTopOffset. Its CENTER maps to the live
     // touch point, so the magnified slice is the canvas around the finger.
@@ -474,6 +481,22 @@ export const AnnotationCanvasInner = (props) => {
     // per-frame JS. The Skia line stays static (draggingId is NOT set), only the
     // tile moves.
     const [slidingId, setSlidingId] = useState(null);
+    // Consumer notification (onInteractingChange): `magnifying` covers every
+    // precision gesture (set on actual movement, cleared on every finalize
+    // path); whole-element moves and tile slides deliberately DON'T show the
+    // loupe, so their gating ids are OR'd in here — as is viewport motion.
+    // (The other sub-drag ids — endpoint/corner/crop — all set `magnifying`
+    // alongside their own id, so they're already covered.) Ref-guarded so a
+    // consumer that re-renders us doesn't get duplicate notifications, and so
+    // the mount render doesn't fire a spurious `false`.
+    const interacting = magnifying || viewportMoving || draggingId != null || slidingId != null;
+    const notifiedInteractingRef = useRef(false);
+    useEffect(() => {
+        if (notifiedInteractingRef.current === interacting)
+            return;
+        notifiedInteractingRef.current = interacting;
+        onInteractingChange?.(interacting);
+    }, [interacting, onInteractingChange]);
     const slideCtx = useSharedValue({ ax: 0, ay: 0, bx: 0, by: 0, t0: 0.5 });
     const slideTargetRef = useRef(null);
     // Endpoint drag (resize/rotate a measurement annotation's line). `epDragId`
@@ -1139,6 +1162,10 @@ export const AnnotationCanvasInner = (props) => {
         };
         const endViewportGesture = () => {
             activeViewportGestures.current = Math.max(0, activeViewportGestures.current - 1);
+            // Simultaneous pan+pinch: only the LAST finalize ends "viewport moving"
+            // (a no-op setState when it never started — onChange never fired).
+            if (activeViewportGestures.current === 0)
+                setViewportMoving(false);
         };
         const toolPan = Gesture.Pan()
             .minPointers(1)
@@ -1274,6 +1301,10 @@ export const AnnotationCanvasInner = (props) => {
             'worklet';
             panX.value -= e.changeX / zoom.value;
             panY.value -= e.changeY / zoom.value;
+            // First frame of actual movement flips "viewport moving" (gated on
+            // the dirty bit so it's one JS hop per gesture, not per frame).
+            if (!viewportDirty.value)
+                runOnJS(setViewportMoving)(true);
             viewportDirty.value = true;
         })
             // onFinalize, not onEnd: on Android this pan normally exits through
@@ -1344,6 +1375,10 @@ export const AnnotationCanvasInner = (props) => {
             panX.value = focalWorldX - e.focalX / next;
             panY.value = focalWorldY - e.focalY / next;
             zoom.value = next;
+            // Same first-movement flip as the pan (see there) — the early returns
+            // above keep a no-op pinch from ever firing it.
+            if (!viewportDirty.value)
+                runOnJS(setViewportMoving)(true);
             viewportDirty.value = true;
         })
             // onFinalize, not onEnd, for the same reason as the pan: an Android

package/package.json

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