cloudmr-ux 4.8.4 → 4.8.5

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

@@ -1309,25 +1309,34 @@ export default function CloudMrNiivueViewer(props) {
             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);
-            }
+        // Right-click on canvas: apply via Niivue's own handler.
+        if (canvas) {
+            canvas.addEventListener("contextmenu", applyOnRightClick, true);
+        }
+        // Any mousedown outside the canvas exits editing mode.
+        // Clicks on the canvas are handled by Niivue's own mouseUpListener,
+        // so we skip them here to avoid a double-apply race.
+        var onDocMouseDown = function (event) {
+            var _a;
+            var target = event.target;
+            var onCanvas = target === canvas || (canvas && canvas.contains(target));
+            if (onCanvas)
+                return;
+            // Left or right click anywhere outside the canvas → apply draft.
+            (_a = nv.onApplyActiveDraft) === null || _a === void 0 ? void 0 : _a.call(nv);
         };
-        canvas.addEventListener("mousedown", onMouseDown, true);
-        canvas.addEventListener("contextmenu", applyOnRightClick, true);
+        document.addEventListener("mousedown", onDocMouseDown, true);
         return function () {
-            canvas.removeEventListener("mousedown", onMouseDown, true);
-            canvas.removeEventListener("contextmenu", applyOnRightClick, true);
+            if (canvas) {
+                canvas.removeEventListener("contextmenu", applyOnRightClick, true);
+            }
+            document.removeEventListener("mousedown", onDocMouseDown, true);
         };
     }, [shapeDraft, penDraft]);
     React.useEffect(function () {

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

@@ -12,6 +12,7 @@ import {
 import { NI_PEN_TYPE } from "./niivuePenType.js";
 import {
   addPolylineVertex,
+  POLYLINE_CLOSE,
   axCorSagFromMouse,
   cancelPolyline,
   finishPolyline,
@@ -1664,7 +1665,11 @@ Niivue.prototype.mouseUpListener = function cloudMrMouseUpListener() {
   _mouseUpListener.call(this);
 
   if (polylineClick) {
-    addPolylineVertex(this);
+    const result = addPolylineVertex(this);
+    if (result === POLYLINE_CLOSE && typeof this.onApplyActiveDraft === "function") {
+      // Double-click detected — connect last vertex back to first, fill, and commit.
+      this.onApplyActiveDraft();
+    }
     return;
   }
 

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

@@ -92,7 +92,9 @@ export default function DrawColorPlatte(_a) {
                                 })
                             }
                         } }, { children: _jsx(FiberManualRecordIcon, { className: "color-swatch", sx: color.sx }) }), index));
-                }) })), isPolylineTool && expanded && (_jsx(Typography, __assign({ sx: { px: 1, pb: 0.5, fontSize: "0.68rem", color: "#aaa", userSelect: "none" } }, { children: "Click to add vertices \u00B7 Right-click to fill" }))), penDraftActive &&
+                }) })), isPolylineTool && expanded && (_jsx(Typography, __assign({ sx: { px: 1, pb: 0.5, fontSize: "0.68rem", color: "#aaa", userSelect: "none" } }, { children: polylineVertexCount >= 3
+                    ? "Double-click to close & fill · Right-click to cancel"
+                    : "Click to add vertices" }))), penDraftActive &&
                 expanded &&
                 ((isFreehandTool && penDraftKind === "freehand") ||
                     (isPolylineTool && penDraftKind === "polyline")) && (_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: "Delete this ROI drawing" }, { children: _jsx(Button, __assign({ size: "small", "aria-label": "delete pen draft", onClick: function () { return onDeletePenDraft === null || onDeletePenDraft === void 0 ? void 0 : onDeletePenDraft(); }, startIcon: _jsx(DeleteOutlineIcon, { sx: { fontSize: ACTION_ICON_SIZE } }), sx: {

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

@@ -6,7 +6,12 @@ export function notifyPolylineChange(nv: any, count: any): void;
 export function resetPolylineState(nv: any): void;
 export function cancelPolyline(nv: any): void;
 export function previewPolylineSegment(nv: any): void;
-export function addPolylineVertex(nv: any): boolean;
+export function addPolylineVertex(nv: any): boolean | typeof POLYLINE_CLOSE;
 export function finishPolyline(nv: any, { fillClosed }?: {
     fillClosed?: boolean | undefined;
 }): boolean;
+/**
+ * Sentinel returned by addPolylineVertex when a double-click is detected with
+ * ≥3 existing vertices.  The caller should close the polygon and auto-commit.
+ */
+export const POLYLINE_CLOSE: unique symbol;

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

@@ -46,6 +46,7 @@ export function resetPolylineState(nv) {
     nv._cloudMrPolylineBaseBitmap = null;
     nv._cloudMrPolylineSessionStartBitmap = null;
     nv._cloudMrPolylineAxCorSag = -1;
+    nv._cloudMrLastPolylineClickMs = null;
     notifyPolylineChange(nv, 0);
 }
 export function cancelPolyline(nv) {
@@ -69,12 +70,29 @@ export function previewPolylineSegment(nv) {
     nv.refreshDrawing(false, false);
     nv.drawScene();
 }
+/** Max ms between two clicks to be considered a double-click. */
+var DOUBLE_CLICK_MS = 400;
+/**
+ * Sentinel returned by addPolylineVertex when a double-click is detected with
+ * ≥3 existing vertices.  The caller should close the polygon and auto-commit.
+ */
+export var POLYLINE_CLOSE = Symbol("POLYLINE_CLOSE");
 export function addPolylineVertex(nv) {
     var pt = voxFromMouse(nv);
     if (!pt)
         return false;
     var penValue = nv.opts.penValue;
     var verts = nv._cloudMrPolylineVertices || (nv._cloudMrPolylineVertices = []);
+    // Double-click detection: two clicks within DOUBLE_CLICK_MS on ≥3 vertices.
+    var now = Date.now();
+    var isDoubleClick = verts.length >= 3 &&
+        nv._cloudMrLastPolylineClickMs != null &&
+        now - nv._cloudMrLastPolylineClickMs <= DOUBLE_CLICK_MS;
+    nv._cloudMrLastPolylineClickMs = now;
+    if (isDoubleClick) {
+        // Don't add this click as a vertex — signal close instead.
+        return POLYLINE_CLOSE;
+    }
     if (verts.length === 0) {
         nv._cloudMrPolylineSessionStartBitmap = nv.drawBitmap.slice();
         nv._cloudMrPolylineBaseBitmap = nv._cloudMrPolylineSessionStartBitmap.slice();

package/package.json

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