cloudmr-ux 4.6.6 → 4.6.7

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

@@ -932,9 +932,11 @@ export default function CloudMrNiivueViewer(props) {
         setShapeDraft(null);
         shapeDraftRef.current = null;
         nv._cloudMrShapeDraftActive = false;
-        if (drawShapeToolRef.current) {
-            nvSetDrawingEnabled(true);
-        }
+        // Deactivate tool entirely — palette closes, user re-enters edit by clicking the ROI
+        setDrawShapeTool(null);
+        nv.opts.deferShapeCommit = false;
+        nv.opts.penType = NI_PEN_TYPE.PEN;
+        nvSetDrawingEnabled(false);
         resampleImage();
     }
     function onShapeDraftChange(draft) {
@@ -945,6 +947,11 @@ export default function CloudMrNiivueViewer(props) {
         setShapeDraft(draft);
         shapeDraftRef.current = draft;
         nv._cloudMrShapeDraftActive = true;
+        // Auto-select the correct tool so the palette opens on re-entry via ROI click
+        var tool = draft.penType === NI_PEN_TYPE.ELLIPSE ? "ellipse" : "rectangle";
+        setDrawShapeTool(tool);
+        nv.opts.penType = draft.penType;
+        nv.opts.deferShapeCommit = true;
         nvSetDrawingEnabled(false);
     };
     nv.onApplyActiveDraft = function () {

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

@@ -1488,17 +1488,14 @@ function cloudMrTryApplyDraftOnRightClick(nv, event) {
 
 /**
  * Re-enter rectangle/ellipse edit mode when clicking an existing applied ROI.
+ * Works regardless of which tool is currently active (or whether any tool is active),
+ * so clicking an ROI after apply always re-enters edit mode.
  */
 function cloudMrTryReopenShapeDraftOnClick(nv) {
-  const penType = nv.opts.penType;
-  if (
-    !nv.opts.deferShapeCommit ||
-    !nv.opts.drawingEnabled ||
-    nv._cloudMrShapeDraftActive ||
-    nv._cloudMrPenDraftActive ||
-    !isClickWithoutDrag(nv.uiData) ||
-    (penType !== NI_PEN_TYPE.RECTANGLE && penType !== NI_PEN_TYPE.ELLIPSE)
-  ) {
+  if (nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive) {
+    return false;
+  }
+  if (!isClickWithoutDrag(nv.uiData)) {
     return false;
   }
 

package/dist/CmrComponents/niivue-viewer/mro-draw-toolkit/MroDrawToolkit.js

@@ -71,6 +71,11 @@ export function MroDrawToolkit(props) {
     var _d = useState(undefined), setMaskColor = _d[1];
     var filled = props.drawPen > 7;
     useEffect(function () {
+        // Close palette when tool is deactivated programmatically (e.g. after Apply)
+        if (drawShapeTool === null && !props.shapeDraftActive && !props.penDraftActive) {
+            setExpandedOption("n");
+            return;
+        }
         if (!props.shapeDraftActive && !props.penDraftActive)
             return;
         if (drawShapeTool === "rectangle")

package/package.json

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