cloudmr-ux 4.6.3 → 4.6.5

package/dist/CmrComponents/niivue-viewer/CloudMrNiivuePanel.js

@@ -186,7 +186,7 @@ export function CloudMrNiivuePanel(props) {
                                     left: 0,
                                     width: "100%",
                                     height: "100%"
-                                } }), props.shapeDraft && (_jsx(ShapeDraftOverlay, { nv: props.nv, draft: props.shapeDraft, onDraftChange: props.onShapeDraftChange, onApplyDraft: props.onApplyShapeDraft, overlayKey: props.mms })), props.penDraft && (_jsx(PenDraftOverlay, { nv: props.nv, draft: props.penDraft, onDraftChange: props.onPenDraftChange, onApplyDraft: props.onApplyPenDraft, overlayKey: props.mms }))] }))] })), _jsxs(Box, __assign({ sx: {
+                                } }), props.shapeDraft && (_jsx(ShapeDraftOverlay, { nv: props.nv, draft: props.shapeDraft, onDraftChange: props.onShapeDraftChange, overlayKey: props.mms })), props.penDraft && (_jsx(PenDraftOverlay, { nv: props.nv, draft: props.penDraft, onDraftChange: props.onPenDraftChange, overlayKey: props.mms }))] }))] })), _jsxs(Box, __assign({ sx: {
                     width: {
                         xs: "100%",
                         md: "35%"

package/dist/CmrComponents/niivue-viewer/CloudMrNiivueViewer.js

@@ -586,6 +586,7 @@ export default function CloudMrNiivueViewer(props) {
                 setPenDraft(null);
                 penDraftRef.current = null;
                 nv._cloudMrPenDraftActive = false;
+                clearActivePenDraftRef();
                 setPolylineVertexCount(0);
             }
             if (shapeDraftRef.current) {
@@ -610,6 +611,7 @@ export default function CloudMrNiivueViewer(props) {
             setPenDraft(null);
             penDraftRef.current = null;
             nv._cloudMrPenDraftActive = false;
+            clearActivePenDraftRef();
         }
         setDrawShapeTool(null);
         nv.opts.penType = NI_PEN_TYPE.PEN;
@@ -641,6 +643,7 @@ export default function CloudMrNiivueViewer(props) {
             setPenDraft(null);
             penDraftRef.current = null;
             nv._cloudMrPenDraftActive = false;
+            clearActivePenDraftRef();
         }
         nvUpdateDrawPen({ target: { value: 8 } });
         nvSetDrawingEnabled(true);
@@ -838,6 +841,12 @@ export default function CloudMrNiivueViewer(props) {
     function clearActiveShapeDraftRef() {
         nv._cloudMrActiveShapeDraft = null;
     }
+    function syncActivePenDraftRef() {
+        nv._cloudMrActivePenDraft = penDraftRef.current;
+    }
+    function clearActivePenDraftRef() {
+        nv._cloudMrActivePenDraft = null;
+    }
     function cancelPenDraftHandler() {
         var _a;
         var draft = penDraftRef.current;
@@ -851,6 +860,7 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(null);
         penDraftRef.current = null;
         nv._cloudMrPenDraftActive = false;
+        clearActivePenDraftRef();
         if (drawShapeToolRef.current === "pen") {
             nvSetDrawingEnabled(true);
         }
@@ -868,6 +878,7 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(null);
         penDraftRef.current = null;
         nv._cloudMrPenDraftActive = false;
+        clearActivePenDraftRef();
         setDrawingChanged(true);
         if (drawShapeToolRef.current === "pen") {
             nvSetDrawingEnabled(true);
@@ -884,6 +895,7 @@ export default function CloudMrNiivueViewer(props) {
     function onPenDraftChange(draft) {
         setPenDraft(draft);
         penDraftRef.current = draft;
+        syncActivePenDraftRef();
         if (draft.kind === "polyline") {
             syncPolylineDraftToNv(nv, draft);
         }
@@ -895,6 +907,7 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(draft);
         penDraftRef.current = draft;
         nv._cloudMrPenDraftActive = true;
+        syncActivePenDraftRef();
         nvSetDrawingEnabled(false);
     };
     nv.onPolylineChange = function (count) {
@@ -909,11 +922,13 @@ export default function CloudMrNiivueViewer(props) {
             if (draft) {
                 setPenDraft(draft);
                 penDraftRef.current = draft;
+                syncActivePenDraftRef();
             }
         }
         else if (((_b = penDraftRef.current) === null || _b === void 0 ? void 0 : _b.kind) === "polyline") {
             setPenDraft(null);
             penDraftRef.current = null;
+            clearActivePenDraftRef();
         }
     };
     function cancelShapeDraft() {

package/dist/CmrComponents/niivue-viewer/NiivuePatcher.js

@@ -1481,6 +1481,23 @@ function isClickOnActiveShapeDraft(nv) {
   return isVoxelPartOfDraft(nv, draft, vox);
 }
 
+function isClickOnActivePenDraft(nv) {
+  const draft = nv._cloudMrActivePenDraft;
+  if (!draft || !nv._cloudMrPenDraftActive) return false;
+  const vox = voxFromMouse(nv);
+  if (!vox) return false;
+  return isVoxelPartOfDraft(nv, draft, vox);
+}
+
+function voxelLabelAt(nv, vox) {
+  const dims = nv.back?.dims;
+  if (!dims || !nv.drawBitmap || !vox) return 0;
+  const dx = dims[1];
+  const dy = dims[2];
+  const idx = vox[0] + vox[1] * dx + vox[2] * dx * dy;
+  return nv.drawBitmap[idx] || 0;
+}
+
 function canReopenShapeDraftOnClick(nv) {
   const penType = nv.opts.penType;
   return (
@@ -1506,18 +1523,25 @@ function cloudMrOpenShapeDraftFromClick(nv) {
 /**
  * Re-enter rectangle/ellipse edit mode when clicking an existing shape ROI.
  */
-function cloudMrTryReopenShapeDraftOnClick(nv) {
-  if (!isClickWithoutDrag(nv.uiData) || !canReopenShapeDraftOnClick(nv)) {
+function cloudMrTryOpenShapeDraftOnMouseDown(nv) {
+  if (nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive) {
+    return false;
+  }
+  if (!canReopenShapeDraftOnClick(nv)) {
+    return false;
+  }
+  const vox = voxFromMouse(nv);
+  if (!vox || !voxelLabelAt(nv, vox)) {
     return false;
   }
   return cloudMrOpenShapeDraftFromClick(nv);
 }
 
 /**
- * While editing one shape, mousedown on another shape applies the current
- * draft immediately and opens the clicked shape for editing.
+ * Click-away exits shape edit mode; clicking another shape selects it for editing.
+ * Disconnected same-color shapes are distinguished by flood-fill from the click point.
  */
-function cloudMrTrySwitchShapeDraftOnMouseDown(nv) {
+function cloudMrHandleShapeDraftClickOnMouseDown(nv) {
   if (!nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive) {
     return false;
   }
@@ -1526,29 +1550,55 @@ function cloudMrTrySwitchShapeDraftOnMouseDown(nv) {
   }
 
   const vox = voxFromMouse(nv);
-  if (!vox || isClickOnActiveShapeDraft(nv)) {
+  if (!vox) {
+    return false;
+  }
+  if (isClickOnActiveShapeDraft(nv)) {
     return false;
   }
 
-  const dims = nv.back?.dims;
-  if (!dims || !nv.drawBitmap) return false;
-  const dx = dims[1];
-  const dy = dims[2];
-  const idx = vox[0] + vox[1] * dx + vox[2] * dx * dy;
-  if (!nv.drawBitmap[idx]) {
+  if (typeof nv.onApplyActiveDraft === "function") {
+    nv.onApplyActiveDraft();
+  }
+
+  if (voxelLabelAt(nv, vox) > 0) {
+    cloudMrOpenShapeDraftFromClick(nv);
+  }
+  return true;
+}
+
+/** Click-away applies a pen draft without starting a new stroke. */
+function cloudMrHandlePenDraftClickOnMouseDown(nv) {
+  if (!nv._cloudMrPenDraftActive) {
+    return false;
+  }
+
+  const vox = voxFromMouse(nv);
+  if (!vox) {
+    return false;
+  }
+  if (isClickOnActivePenDraft(nv)) {
     return false;
   }
 
   if (typeof nv.onApplyActiveDraft === "function") {
     nv.onApplyActiveDraft();
   }
-  return cloudMrOpenShapeDraftFromClick(nv);
+  return true;
 }
 
 const _mouseDownListener = Niivue.prototype.mouseDownListener;
 Niivue.prototype.mouseDownListener = function cloudMrMouseDownListener(e) {
-  if (e.button === 0 && cloudMrTrySwitchShapeDraftOnMouseDown(this)) {
-    return;
+  if (e.button === 0) {
+    if (cloudMrHandleShapeDraftClickOnMouseDown(this)) {
+      return;
+    }
+    if (cloudMrHandlePenDraftClickOnMouseDown(this)) {
+      return;
+    }
+    if (cloudMrTryOpenShapeDraftOnMouseDown(this)) {
+      return;
+    }
   }
   if (shouldDeferFreehandCommit(this) && this.drawBitmap) {
     this._cloudMrFreehandSessionStartBitmap = this.drawBitmap.slice();
@@ -1618,14 +1668,12 @@ Niivue.prototype.mouseUpListener = function cloudMrMouseUpListener() {
   }
 
   if (!pendingDraft?.baseBitmap) {
-    cloudMrTryReopenShapeDraftOnClick(this);
     return;
   }
   if (isDraftTooSmall(pendingDraft.ptA, pendingDraft.ptB)) {
     this.drawBitmap.set(pendingDraft.baseBitmap);
     this.refreshDrawing(true, false);
     this.drawScene();
-    cloudMrTryReopenShapeDraftOnClick(this);
     return;
   }
   this._cloudMrSuppressDrawingChangedMouseUp = true;

package/dist/CmrComponents/niivue-viewer/PenDraftOverlay.d.ts

@@ -1,12 +1,11 @@
 /**
  * Adjust handles for polyline (vertex drag) or freehand (move only) drafts.
- * @param {{ nv: any, draft: any, onDraftChange: (d: any) => void, onApplyDraft?: () => void, overlayKey?: unknown }} props
+ * @param {{ nv: any, draft: any, onDraftChange: (d: any) => void, overlayKey?: unknown }} props
  */
-export function PenDraftOverlay({ nv, draft, onDraftChange, onApplyDraft, overlayKey }: {
+export function PenDraftOverlay({ nv, draft, onDraftChange, overlayKey }: {
     nv: any;
     draft: any;
     onDraftChange: (d: any) => void;
-    onApplyDraft?: (() => void) | undefined;
     overlayKey?: unknown;
 }): import("react/jsx-runtime").JSX.Element | null;
 export default PenDraftOverlay;

package/dist/CmrComponents/niivue-viewer/PenDraftOverlay.js

@@ -29,10 +29,10 @@ function cloneFreehandDraft(draft) {
 }
 /**
  * Adjust handles for polyline (vertex drag) or freehand (move only) drafts.
- * @param {{ nv: any, draft: any, onDraftChange: (d: any) => void, onApplyDraft?: () => void, overlayKey?: unknown }} props
+ * @param {{ nv: any, draft: any, onDraftChange: (d: any) => void, overlayKey?: unknown }} props
  */
 export function PenDraftOverlay(_a) {
-    var nv = _a.nv, draft = _a.draft, onDraftChange = _a.onDraftChange, onApplyDraft = _a.onApplyDraft, overlayKey = _a.overlayKey;
+    var nv = _a.nv, draft = _a.draft, onDraftChange = _a.onDraftChange, overlayKey = _a.overlayKey;
     var dragRef = useRef(null);
     var draftRef = useRef(draft);
     draftRef.current = draft;
@@ -110,7 +110,6 @@ export function PenDraftOverlay(_a) {
         onDraftChange(nextDraft);
     }, [nv, onDraftChange]);
     finishDragRef.current = function () {
-        var hadDrag = dragRef.current != null;
         dragRef.current = null;
         if (onPointerMoveRef.current) {
             window.removeEventListener("pointermove", onPointerMoveRef.current);
@@ -118,10 +117,6 @@ export function PenDraftOverlay(_a) {
         if (finishDragRef.current) {
             window.removeEventListener("pointerup", finishDragRef.current);
         }
-        // Auto-apply as soon as the user releases the handle after a move/resize
-        if (hadDrag && onApplyDraft) {
-            onApplyDraft();
-        }
     };
     onPointerMoveRef.current = function (event) {
         var drag = dragRef.current;

package/dist/CmrComponents/niivue-viewer/ShapeDraftOverlay.d.ts

@@ -1,12 +1,11 @@
 /**
  * Overlay handles for adjusting a rectangle/ellipse draft before commit.
- * @param {{ nv: any, draft: import('./shapeDraftUtils').ShapeDraft, onDraftChange: (d: any) => void, onApplyDraft?: () => void, overlayKey?: unknown }} props
+ * @param {{ nv: any, draft: import('./shapeDraftUtils').ShapeDraft, onDraftChange: (d: any) => void, overlayKey?: unknown }} props
  */
-export function ShapeDraftOverlay({ nv, draft, onDraftChange, onApplyDraft, overlayKey }: {
+export function ShapeDraftOverlay({ nv, draft, onDraftChange, overlayKey }: {
     nv: any;
     draft: import('./shapeDraftUtils').ShapeDraft;
     onDraftChange: (d: any) => void;
-    onApplyDraft?: (() => void) | undefined;
     overlayKey?: unknown;
 }): import("react/jsx-runtime").JSX.Element | null;
 export default ShapeDraftOverlay;

package/dist/CmrComponents/niivue-viewer/ShapeDraftOverlay.js

@@ -25,11 +25,11 @@ var HANDLE_SIZE = 10;
 var ACCENT = "#580f8b";
 /**
  * Overlay handles for adjusting a rectangle/ellipse draft before commit.
- * @param {{ nv: any, draft: import('./shapeDraftUtils').ShapeDraft, onDraftChange: (d: any) => void, onApplyDraft?: () => void, overlayKey?: unknown }} props
+ * @param {{ nv: any, draft: import('./shapeDraftUtils').ShapeDraft, onDraftChange: (d: any) => void, overlayKey?: unknown }} props
  */
 export function ShapeDraftOverlay(_a) {
     var _b;
-    var nv = _a.nv, draft = _a.draft, onDraftChange = _a.onDraftChange, onApplyDraft = _a.onApplyDraft, overlayKey = _a.overlayKey;
+    var nv = _a.nv, draft = _a.draft, onDraftChange = _a.onDraftChange, overlayKey = _a.overlayKey;
     var dragRef = useRef(null);
     var draftRef = useRef(draft);
     draftRef.current = draft;
@@ -84,7 +84,6 @@ export function ShapeDraftOverlay(_a) {
         onDraftChange(nextDraft);
     }, [nv, onDraftChange]);
     finishDragRef.current = function () {
-        var hadDrag = dragRef.current != null;
         dragRef.current = null;
         if (onPointerMoveRef.current) {
             window.removeEventListener("pointermove", onPointerMoveRef.current);
@@ -92,10 +91,6 @@ export function ShapeDraftOverlay(_a) {
         if (finishDragRef.current) {
             window.removeEventListener("pointerup", finishDragRef.current);
         }
-        // Auto-apply as soon as the user releases the handle after a move/resize
-        if (hadDrag && onApplyDraft) {
-            onApplyDraft();
-        }
     };
     onPointerMoveRef.current = function (event) {
         var drag = dragRef.current;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudmr-ux",
-  "version": "4.6.3",
+  "version": "4.6.5",
   "author": "erosmontin@gmail.com",
   "license": "MIT",
   "repository": "erosmontin/cloudmr-ux",