cloudmr-ux 4.6.5 → 4.6.7

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

@@ -586,7 +586,6 @@ export default function CloudMrNiivueViewer(props) {
                 setPenDraft(null);
                 penDraftRef.current = null;
                 nv._cloudMrPenDraftActive = false;
-                clearActivePenDraftRef();
                 setPolylineVertexCount(0);
             }
             if (shapeDraftRef.current) {
@@ -611,7 +610,6 @@ export default function CloudMrNiivueViewer(props) {
             setPenDraft(null);
             penDraftRef.current = null;
             nv._cloudMrPenDraftActive = false;
-            clearActivePenDraftRef();
         }
         setDrawShapeTool(null);
         nv.opts.penType = NI_PEN_TYPE.PEN;
@@ -643,7 +641,6 @@ export default function CloudMrNiivueViewer(props) {
             setPenDraft(null);
             penDraftRef.current = null;
             nv._cloudMrPenDraftActive = false;
-            clearActivePenDraftRef();
         }
         nvUpdateDrawPen({ target: { value: 8 } });
         nvSetDrawingEnabled(true);
@@ -835,18 +832,6 @@ export default function CloudMrNiivueViewer(props) {
             (_a = nv.cloudMrCancelPolyline) === null || _a === void 0 ? void 0 : _a.call(nv);
         }
     }
-    function syncActiveShapeDraftRef() {
-        nv._cloudMrActiveShapeDraft = shapeDraftRef.current;
-    }
-    function clearActiveShapeDraftRef() {
-        nv._cloudMrActiveShapeDraft = null;
-    }
-    function syncActivePenDraftRef() {
-        nv._cloudMrActivePenDraft = penDraftRef.current;
-    }
-    function clearActivePenDraftRef() {
-        nv._cloudMrActivePenDraft = null;
-    }
     function cancelPenDraftHandler() {
         var _a;
         var draft = penDraftRef.current;
@@ -860,7 +845,6 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(null);
         penDraftRef.current = null;
         nv._cloudMrPenDraftActive = false;
-        clearActivePenDraftRef();
         if (drawShapeToolRef.current === "pen") {
             nvSetDrawingEnabled(true);
         }
@@ -878,7 +862,6 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(null);
         penDraftRef.current = null;
         nv._cloudMrPenDraftActive = false;
-        clearActivePenDraftRef();
         setDrawingChanged(true);
         if (drawShapeToolRef.current === "pen") {
             nvSetDrawingEnabled(true);
@@ -895,7 +878,6 @@ export default function CloudMrNiivueViewer(props) {
     function onPenDraftChange(draft) {
         setPenDraft(draft);
         penDraftRef.current = draft;
-        syncActivePenDraftRef();
         if (draft.kind === "polyline") {
             syncPolylineDraftToNv(nv, draft);
         }
@@ -907,7 +889,6 @@ export default function CloudMrNiivueViewer(props) {
         setPenDraft(draft);
         penDraftRef.current = draft;
         nv._cloudMrPenDraftActive = true;
-        syncActivePenDraftRef();
         nvSetDrawingEnabled(false);
     };
     nv.onPolylineChange = function (count) {
@@ -922,13 +903,11 @@ 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() {
@@ -941,7 +920,6 @@ export default function CloudMrNiivueViewer(props) {
         setShapeDraft(null);
         shapeDraftRef.current = null;
         nv._cloudMrShapeDraftActive = false;
-        clearActiveShapeDraftRef();
         if (drawShapeToolRef.current) {
             nvSetDrawingEnabled(true);
         }
@@ -954,22 +932,26 @@ export default function CloudMrNiivueViewer(props) {
         setShapeDraft(null);
         shapeDraftRef.current = null;
         nv._cloudMrShapeDraftActive = false;
-        clearActiveShapeDraftRef();
-        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) {
         setShapeDraft(draft);
         shapeDraftRef.current = draft;
-        syncActiveShapeDraftRef();
     }
     nv.onShapeDraftReady = function (draft) {
         setShapeDraft(draft);
         shapeDraftRef.current = draft;
         nv._cloudMrShapeDraftActive = true;
-        syncActiveShapeDraftRef();
+        // 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 () {
@@ -986,6 +968,32 @@ export default function CloudMrNiivueViewer(props) {
     React.useEffect(function () {
         nv._cloudMrShapeDraftActive = shapeDraft != null;
     }, [shapeDraft]);
+    React.useEffect(function () {
+        if (!shapeDraft && !penDraft) {
+            return undefined;
+        }
+        var canvas = document.getElementById("niiCanvas");
+        if (!canvas) {
+            return undefined;
+        }
+        var applyOnRightClick = function (event) {
+            var _a;
+            event.preventDefault();
+            event.stopPropagation();
+            (_a = nv.onApplyActiveDraft) === null || _a === void 0 ? void 0 : _a.call(nv);
+        };
+        var onMouseDown = function (event) {
+            if (event.button === 2) {
+                applyOnRightClick(event);
+            }
+        };
+        canvas.addEventListener("mousedown", onMouseDown, true);
+        canvas.addEventListener("contextmenu", applyOnRightClick, true);
+        return function () {
+            canvas.removeEventListener("mousedown", onMouseDown, true);
+            canvas.removeEventListener("contextmenu", applyOnRightClick, true);
+        };
+    }, [shapeDraft, penDraft]);
     React.useEffect(function () {
         if (!shapeDraft && !penDraft) {
             return undefined;
@@ -999,6 +1007,16 @@ export default function CloudMrNiivueViewer(props) {
                 else if (penDraft) {
                     cancelPenDraftHandler();
                 }
+                return;
+            }
+            if (event.key === "Enter") {
+                event.preventDefault();
+                if (shapeDraft) {
+                    applyShapeDraft();
+                }
+                else if (penDraft) {
+                    applyPenDraftHandler();
+                }
             }
         };
         window.addEventListener("keydown", onKeyDown);

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

@@ -6,7 +6,6 @@ import {
   captureDeferredShapeDraft,
   captureShapeDraftFromClick,
   isDraftTooSmall,
-  isVoxelPartOfDraft,
   redrawDraftShape,
   shouldDeferShapeCommit,
 } from "./shapeDraftUtils.js";
@@ -1469,136 +1468,52 @@ Niivue.prototype.cloudMrResetPolyline = function cloudMrResetPolyline() {
   resetPolylineState(this);
 };
 
+const RIGHT_MOUSE_BUTTON = 2;
+
 function cloudMrHasApplyableDraft(nv) {
   return !!(nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive);
 }
 
-function isClickOnActiveShapeDraft(nv) {
-  const draft = nv._cloudMrActiveShapeDraft;
-  if (!draft || !nv._cloudMrShapeDraftActive) return false;
-  const vox = voxFromMouse(nv);
-  if (!vox) return false;
-  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 (
-    nv.opts.deferShapeCommit &&
-    nv.opts.drawingEnabled &&
-    !nv._cloudMrShapeDraftActive &&
-    !nv._cloudMrPenDraftActive &&
-    (penType === NI_PEN_TYPE.RECTANGLE || penType === NI_PEN_TYPE.ELLIPSE)
-  );
-}
-
-function cloudMrOpenShapeDraftFromClick(nv) {
-  const reopenDraft = captureShapeDraftFromClick(nv);
-  if (!reopenDraft) return false;
-  redrawDraftShape(nv, reopenDraft);
-  nv._cloudMrSuppressDrawingChangedMouseUp = true;
-  if (typeof nv.onShapeDraftReady === "function") {
-    nv.onShapeDraftReady(reopenDraft);
-  }
-  return true;
-}
-
-/**
- * Re-enter rectangle/ellipse edit mode when clicking an existing shape ROI.
- */
-function cloudMrTryOpenShapeDraftOnMouseDown(nv) {
-  if (nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive) {
-    return false;
-  }
-  if (!canReopenShapeDraftOnClick(nv)) {
+function cloudMrTryApplyDraftOnRightClick(nv, event) {
+  if (!cloudMrHasApplyableDraft(nv)) {
     return false;
   }
-  const vox = voxFromMouse(nv);
-  if (!vox || !voxelLabelAt(nv, vox)) {
-    return false;
-  }
-  return cloudMrOpenShapeDraftFromClick(nv);
-}
-
-/**
- * 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 cloudMrHandleShapeDraftClickOnMouseDown(nv) {
-  if (!nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive) {
-    return false;
-  }
-  if (!nv.opts.deferShapeCommit || !nv.opts.drawingEnabled) {
-    return false;
-  }
-
-  const vox = voxFromMouse(nv);
-  if (!vox) {
-    return false;
-  }
-  if (isClickOnActiveShapeDraft(nv)) {
-    return false;
-  }
-
+  event.preventDefault();
+  event.stopPropagation();
   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) {
+/**
+ * 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) {
+  if (nv._cloudMrShapeDraftActive || nv._cloudMrPenDraftActive) {
     return false;
   }
-  if (isClickOnActivePenDraft(nv)) {
+  if (!isClickWithoutDrag(nv.uiData)) {
     return false;
   }
 
-  if (typeof nv.onApplyActiveDraft === "function") {
-    nv.onApplyActiveDraft();
+  const reopenDraft = captureShapeDraftFromClick(nv);
+  if (!reopenDraft) return false;
+
+  redrawDraftShape(nv, reopenDraft);
+  nv._cloudMrSuppressDrawingChangedMouseUp = true;
+  if (typeof nv.onShapeDraftReady === "function") {
+    nv.onShapeDraftReady(reopenDraft);
   }
   return true;
 }
 
 const _mouseDownListener = Niivue.prototype.mouseDownListener;
 Niivue.prototype.mouseDownListener = function cloudMrMouseDownListener(e) {
-  if (e.button === 0) {
-    if (cloudMrHandleShapeDraftClickOnMouseDown(this)) {
-      return;
-    }
-    if (cloudMrHandlePenDraftClickOnMouseDown(this)) {
-      return;
-    }
-    if (cloudMrTryOpenShapeDraftOnMouseDown(this)) {
-      return;
-    }
+  if (e.button === RIGHT_MOUSE_BUTTON && cloudMrTryApplyDraftOnRightClick(this, e)) {
+    return;
   }
   if (shouldDeferFreehandCommit(this) && this.drawBitmap) {
     this._cloudMrFreehandSessionStartBitmap = this.drawBitmap.slice();
@@ -1668,12 +1583,14 @@ 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,11 +1,10 @@
 /**
  * Adjust handles for polyline (vertex drag) or freehand (move only) drafts.
- * @param {{ nv: any, draft: any, onDraftChange: (d: any) => void, overlayKey?: unknown }} props
  */
 export function PenDraftOverlay({ nv, draft, onDraftChange, overlayKey }: {
     nv: any;
     draft: any;
-    onDraftChange: (d: any) => void;
-    overlayKey?: unknown;
+    onDraftChange: any;
+    overlayKey: any;
 }): import("react/jsx-runtime").JSX.Element | null;
 export default PenDraftOverlay;

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

@@ -29,7 +29,6 @@ function cloneFreehandDraft(draft) {
 }
 /**
  * Adjust handles for polyline (vertex drag) or freehand (move only) drafts.
- * @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, overlayKey = _a.overlayKey;

package/dist/CmrComponents/niivue-viewer/mro-draw-toolkit/DrawColorPlatte.d.ts

@@ -1,4 +1,4 @@
-export default function DrawColorPlatte({ expanded, updateDrawPen, setDrawingEnabled, showPenModes, penDrawMode, onPenDrawModeChange, polylineVertexCount, penDraftActive, onCancelPenDraft, onFillPenDraft, brushSize, updateBrushSize, shapeDraftActive, onCancelShapeDraft, }: {
+export default function DrawColorPlatte({ expanded, updateDrawPen, setDrawingEnabled, showPenModes, penDrawMode, onPenDrawModeChange, polylineVertexCount, penDraftActive, onApplyPenDraft, onCancelPenDraft, onFillPenDraft, brushSize, updateBrushSize, shapeDraftActive, onApplyShapeDraft, onCancelShapeDraft, }: {
     expanded: any;
     updateDrawPen: any;
     setDrawingEnabled: any;
@@ -7,10 +7,12 @@ export default function DrawColorPlatte({ expanded, updateDrawPen, setDrawingEna
     onPenDrawModeChange: any;
     polylineVertexCount?: number | undefined;
     penDraftActive?: boolean | undefined;
+    onApplyPenDraft: any;
     onCancelPenDraft: any;
     onFillPenDraft: any;
     brushSize?: number | undefined;
     updateBrushSize: any;
     shapeDraftActive?: boolean | undefined;
+    onApplyShapeDraft: any;
     onCancelShapeDraft: any;
 }): import("react/jsx-runtime").JSX.Element;

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

@@ -11,13 +11,12 @@ var __assign = (this && this.__assign) || function () {
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
- * Pen palette adds freehand vs polyline mode; pen/shape drafts show Cancel while adjusting.
- * Shapes are applied automatically on mouse release.
+ * Pen palette adds freehand vs polyline mode; pen/shape drafts show Apply/Cancel while adjusting.
  */
 import { Stack, IconButton, Button, Tooltip, Typography } from "@mui/material";
 import FiberManualRecordIcon from "@mui/icons-material/FiberManualRecord";
+import CheckIcon from "@mui/icons-material/Check";
 import CloseIcon from "@mui/icons-material/Close";
-import FormatColorFillIcon from "@mui/icons-material/FormatColorFill";
 import { BrushSizeSlider } from "./BrushSizeSlider";
 var FILLED_COLORS = [
     { sx: { color: "red" } },
@@ -38,7 +37,7 @@ var modeBtnSx = function (active) { return ({
     px: 0.75
 }); };
 export default function DrawColorPlatte(_a) {
-    var expanded = _a.expanded, updateDrawPen = _a.updateDrawPen, setDrawingEnabled = _a.setDrawingEnabled, _b = _a.showPenModes, showPenModes = _b === void 0 ? false : _b, _c = _a.penDrawMode, penDrawMode = _c === void 0 ? "freehand" : _c, onPenDrawModeChange = _a.onPenDrawModeChange, _d = _a.polylineVertexCount, polylineVertexCount = _d === void 0 ? 0 : _d, _e = _a.penDraftActive, penDraftActive = _e === void 0 ? false : _e, onCancelPenDraft = _a.onCancelPenDraft, onFillPenDraft = _a.onFillPenDraft, _f = _a.brushSize, brushSize = _f === void 0 ? 1 : _f, updateBrushSize = _a.updateBrushSize, _g = _a.shapeDraftActive, shapeDraftActive = _g === void 0 ? false : _g, onCancelShapeDraft = _a.onCancelShapeDraft;
+    var expanded = _a.expanded, updateDrawPen = _a.updateDrawPen, setDrawingEnabled = _a.setDrawingEnabled, _b = _a.showPenModes, showPenModes = _b === void 0 ? false : _b, _c = _a.penDrawMode, penDrawMode = _c === void 0 ? "freehand" : _c, onPenDrawModeChange = _a.onPenDrawModeChange, _d = _a.polylineVertexCount, polylineVertexCount = _d === void 0 ? 0 : _d, _e = _a.penDraftActive, penDraftActive = _e === void 0 ? false : _e, onApplyPenDraft = _a.onApplyPenDraft, onCancelPenDraft = _a.onCancelPenDraft, onFillPenDraft = _a.onFillPenDraft, _f = _a.brushSize, brushSize = _f === void 0 ? 1 : _f, updateBrushSize = _a.updateBrushSize, _g = _a.shapeDraftActive, shapeDraftActive = _g === void 0 ? false : _g, onApplyShapeDraft = _a.onApplyShapeDraft, onCancelShapeDraft = _a.onCancelShapeDraft;
     return (_jsxs(Stack, __assign({ style: {
             position: "absolute",
             top: "100%",
@@ -63,22 +62,36 @@ export default function DrawColorPlatte(_a) {
                                 py: 0.25,
                                 px: 0.75,
                                 "& .MuiButton-startIcon": { mr: 0.5, ml: 0 }
-                            } }, { children: "Cancel" })) })), penDrawMode === "polyline" && polylineVertexCount >= 3 && (_jsx(Tooltip, __assign({ title: "Fill interior (keeps outline editable until release)" }, { children: _jsx(Button, __assign({ size: "small", "aria-label": "fill polyline", onClick: function () { return onFillPenDraft === null || onFillPenDraft === void 0 ? void 0 : onFillPenDraft(); }, startIcon: _jsx(FormatColorFillIcon, { sx: { fontSize: ACTION_ICON_SIZE } }), sx: {
+                            } }, { children: "Cancel" })) })), _jsxs(Stack, __assign({ direction: "row", alignItems: "center", spacing: 1 }, { children: [penDrawMode === "polyline" && polylineVertexCount >= 3 && (_jsx(Tooltip, __assign({ title: "Fill interior (keeps outline editable until Apply)" }, { children: _jsx(Button, __assign({ size: "small", "aria-label": "fill polyline", onClick: function () { return onFillPenDraft === null || onFillPenDraft === void 0 ? void 0 : onFillPenDraft(); }, sx: {
+                                        color: "#c9a0e8",
+                                        fontSize: ACTION_FONT_SIZE,
+                                        textTransform: "none",
+                                        minWidth: 0,
+                                        py: 0.25,
+                                        px: 0.75
+                                    } }, { children: "Fill" })) }))), _jsx(Tooltip, __assign({ title: "Apply shape (enter or right-click)" }, { children: _jsx(Button, __assign({ size: "small", "aria-label": "apply pen draft", onClick: function () { return onApplyPenDraft === null || onApplyPenDraft === void 0 ? void 0 : onApplyPenDraft(); }, startIcon: _jsx(CheckIcon, { sx: { fontSize: ACTION_ICON_SIZE } }), sx: {
+                                        color: "#c9a0e8",
+                                        fontSize: ACTION_FONT_SIZE,
+                                        textTransform: "none",
+                                        minWidth: 0,
+                                        py: 0.25,
+                                        px: 0.75,
+                                        "& .MuiButton-startIcon": { mr: 0.5, ml: 0 }
+                                    } }, { children: "Apply" })) }))] }))] }))), shapeDraftActive && expanded && (_jsxs(Stack, __assign({ direction: "row", alignItems: "center", justifyContent: "space-between", sx: { px: 1, py: 0.5, borderTop: "1px solid #555", width: "100%" } }, { children: [_jsx(Tooltip, __assign({ title: "Cancel shape (Esc)" }, { children: _jsx(Button, __assign({ size: "small", "aria-label": "cancel shape", onClick: function () { return onCancelShapeDraft === null || onCancelShapeDraft === void 0 ? void 0 : onCancelShapeDraft(); }, startIcon: _jsx(CloseIcon, { sx: { fontSize: ACTION_ICON_SIZE } }), sx: {
+                                color: "#ccc",
+                                fontSize: ACTION_FONT_SIZE,
+                                textTransform: "none",
+                                minWidth: 0,
+                                py: 0.25,
+                                px: 0.75,
+                                "& .MuiButton-startIcon": { mr: 0.5, ml: 0 }
+                            } }, { children: "Cancel" })) })), _jsx(Tooltip, __assign({ title: "Apply shape (enter or right-click)" }, { children: _jsx(Button, __assign({ size: "small", "aria-label": "apply shape", onClick: function () { return onApplyShapeDraft === null || onApplyShapeDraft === void 0 ? void 0 : onApplyShapeDraft(); }, startIcon: _jsx(CheckIcon, { sx: { fontSize: ACTION_ICON_SIZE } }), sx: {
                                 color: "#c9a0e8",
                                 fontSize: ACTION_FONT_SIZE,
                                 textTransform: "none",
                                 minWidth: 0,
                                 py: 0.25,
                                 px: 0.75,
-                                ml: "auto",
                                 "& .MuiButton-startIcon": { mr: 0.5, ml: 0 }
-                            } }, { children: "Fill" })) })))] }))), shapeDraftActive && expanded && (_jsx(Stack, __assign({ direction: "row", alignItems: "center", sx: { px: 1, py: 0.5, borderTop: "1px solid #555", width: "100%" } }, { children: _jsx(Tooltip, __assign({ title: "Cancel shape (Esc)" }, { children: _jsx(Button, __assign({ size: "small", "aria-label": "cancel shape", onClick: function () { return onCancelShapeDraft === null || onCancelShapeDraft === void 0 ? void 0 : onCancelShapeDraft(); }, startIcon: _jsx(CloseIcon, { sx: { fontSize: ACTION_ICON_SIZE } }), sx: {
-                            color: "#ccc",
-                            fontSize: ACTION_FONT_SIZE,
-                            textTransform: "none",
-                            minWidth: 0,
-                            py: 0.25,
-                            px: 0.75,
-                            "& .MuiButton-startIcon": { mr: 0.5, ml: 0 }
-                        } }, { children: "Cancel" })) })) })))] })));
+                            } }, { children: "Apply" })) }))] })))] })));
 }

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/dist/CmrComponents/niivue-viewer/shapeDraftUtils.d.ts

@@ -49,27 +49,10 @@ export function captureDeferredShapeDraft(nv: any): {
     baseBitmap: Uint8Array | null;
 };
 export function shouldDeferShapeCommit(nv: any): any;
-/**
- * Flood-fill a connected voxel cluster from a seed.
- * @returns {{ label: number, visited: Set<number>, voxels: [number,number,number][], bounds: object } | null}
- */
-export function floodFillClusterFromVox(nv: any, seedVox: any): {
-    label: number;
-    visited: Set<number>;
-    voxels: [number, number, number][];
-    bounds: object;
-} | null;
-/** True when a voxel belongs to the live draft overlay (drawn on top of baseBitmap). */
-export function isVoxelPartOfDraft(nv: any, draft: any, seedVox: any): boolean;
-export function eraseClusterFromBitmap(bitmap: any, visited: any): Uint8Array;
-/** Guess rectangle vs ellipse from the filled voxel pattern, not the active tool. */
-export function inferShapePenTypeFromCluster(cluster: any, axCorSag: any): 1 | 2;
 /**
  * When the user clicks on an existing filled ROI while the rectangle/ellipse tool
  * is active (but no draft is currently open), flood-fill the clicked cluster to
  * reconstruct a ShapeDraft so the bounding-box overlay reappears for re-editing.
- *
- * Returns null if the click didn't land on a labeled voxel.
  */
 export function captureShapeDraftFromClick(nv: any): {
     ptA: any[];

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

@@ -210,11 +210,18 @@ function inferAxCorSagFromBounds(x1, y1, z1, x2, y2, z2, fallback) {
         return 2;
     return fallback;
 }
+function sliceKey(axCorSag, x, y, z) {
+    if (axCorSag === 0)
+        return "".concat(x, ",").concat(y);
+    if (axCorSag === 1)
+        return "".concat(x, ",").concat(z);
+    return "".concat(y, ",").concat(z);
+}
 /**
  * Flood-fill a connected voxel cluster from a seed.
  * @returns {{ label: number, visited: Set<number>, voxels: [number,number,number][], bounds: object } | null}
  */
-export function floodFillClusterFromVox(nv, seedVox) {
+function floodFillClusterFromVox(nv, seedVox) {
     var _a;
     var dims = (_a = nv.back) === null || _a === void 0 ? void 0 : _a.dims;
     if (!dims || !nv.drawBitmap || !seedVox)
@@ -274,36 +281,15 @@ export function floodFillClusterFromVox(nv, seedVox) {
         bounds: { x1: x1, y1: y1, z1: z1, x2: x2, y2: y2, z2: z2 }
     };
 }
-/** True when a voxel belongs to the live draft overlay (drawn on top of baseBitmap). */
-export function isVoxelPartOfDraft(nv, draft, seedVox) {
-    var _a;
-    if (!(draft === null || draft === void 0 ? void 0 : draft.baseBitmap) || !(nv === null || nv === void 0 ? void 0 : nv.drawBitmap) || !seedVox)
-        return false;
-    var dims = (_a = nv.back) === null || _a === void 0 ? void 0 : _a.dims;
-    if (!dims)
-        return false;
-    var dx = dims[1];
-    var dy = dims[2];
-    var idx = voxelIndex(seedVox[0], seedVox[1], seedVox[2], dx, dy);
-    return (nv.drawBitmap[idx] === draft.penValue &&
-        draft.baseBitmap[idx] !== draft.penValue);
-}
-export function eraseClusterFromBitmap(bitmap, visited) {
+function eraseClusterFromBitmap(bitmap, visited) {
     var next = new Uint8Array(bitmap);
     visited.forEach(function (idx) {
         next[idx] = 0;
     });
     return next;
 }
-function sliceKey(axCorSag, x, y, z) {
-    if (axCorSag === 0)
-        return "".concat(x, ",").concat(y);
-    if (axCorSag === 1)
-        return "".concat(x, ",").concat(z);
-    return "".concat(y, ",").concat(z);
-}
 /** Guess rectangle vs ellipse from the filled voxel pattern, not the active tool. */
-export function inferShapePenTypeFromCluster(cluster, axCorSag) {
+function inferShapePenTypeFromCluster(cluster, axCorSag) {
     var bounds = cluster.bounds, voxels = cluster.voxels;
     var x1 = bounds.x1, y1 = bounds.y1, z1 = bounds.z1, x2 = bounds.x2, y2 = bounds.y2, z2 = bounds.z2;
     var filled = new Set();
@@ -358,8 +344,6 @@ export function inferShapePenTypeFromCluster(cluster, axCorSag) {
  * When the user clicks on an existing filled ROI while the rectangle/ellipse tool
  * is active (but no draft is currently open), flood-fill the clicked cluster to
  * reconstruct a ShapeDraft so the bounding-box overlay reappears for re-editing.
- *
- * Returns null if the click didn't land on a labeled voxel.
  */
 export function captureShapeDraftFromClick(nv) {
     var seedVox = voxFromMouse(nv);

package/package.json

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