cloudmr-ux 4.8.5 → 4.8.6

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

@@ -636,20 +636,9 @@ export default function CloudMrNiivueViewer(props) {
                 if (next.kind === "polyline") {
                     var count = (_c = (_b = next.vertices) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0;
                     if (count >= 2) {
-                        // Redraw segments in the new color, then update the base so the
-                        // rubber-band preview also uses the new color.
                         redrawPolylineDraft(nv, __assign(__assign({}, next), { filled: false }));
                         if (nv.drawBitmap)
                             nv._cloudMrPolylineBaseBitmap = nv.drawBitmap.slice();
-                        // Re-apply fill on top when polygon is closeable (base stays segments-only).
-                        if (count >= 3) {
-                            nv.drawPenAxCorSag = next.axCorSag;
-                            nv.drawPenFillPts = next.vertices.map(function (v) { return __spreadArray([], v, true); });
-                            nv._cloudMrSkipNextUndoBitmap = true;
-                            nv.drawPenFilled();
-                            nv.refreshDrawing(false, false);
-                            nv.drawScene();
-                        }
                     }
                 }
                 else if (next.kind === "freehand") {
@@ -943,8 +932,8 @@ export default function CloudMrNiivueViewer(props) {
         }
     }
     function applyPenDraftHandler(_a) {
-        var _b, _c, _d, _e, _f;
-        var _g = _a === void 0 ? {} : _a, _h = _g.keepTool, keepTool = _h === void 0 ? false : _h;
+        var _b, _c, _d, _e, _f, _g;
+        var _h = _a === void 0 ? {} : _a, _j = _h.keepTool, keepTool = _j === void 0 ? false : _j;
         var draft = penDraftRef.current;
         if (!draft)
             return;
@@ -973,9 +962,37 @@ export default function CloudMrNiivueViewer(props) {
             setPolylineVertexCount(0);
         }
         else if (draft._registryId && nv._cloudMrPolylineRegistry) {
-            // Was a committed polyline reopened as a freehand draft (move-only).
-            // Remove the stale registry entry so it is not matched on future clicks.
-            nv._cloudMrPolylineRegistry = nv._cloudMrPolylineRegistry.filter(function (e) { return e.id !== draft._registryId; });
+            // Was a committed polyline reopened as a freehand draft (move-only, possibly recolored).
+            // Re-register with the current penValue and voxel positions so future clicks
+            // open it with the correct (possibly changed) color.
+            var entryIdx = nv._cloudMrPolylineRegistry.findIndex(function (e) { return e.id === draft._registryId; });
+            if (entryIdx >= 0) {
+                var old = nv._cloudMrPolylineRegistry[entryIdx];
+                // Collect the newly committed voxel positions using the draft's current penValue.
+                var newIndices = new Set();
+                if (nv.drawBitmap && draft.baseBitmap) {
+                    var pv = draft.penValue;
+                    for (var i = 0; i < nv.drawBitmap.length; i++) {
+                        if (nv.drawBitmap[i] === pv && draft.baseBitmap[i] !== pv)
+                            newIndices.add(i);
+                    }
+                }
+                // Fall back to stroke voxel positions if bitmap diff returned nothing.
+                if (newIndices.size === 0 && draft.strokeVoxels && ((_g = nv.back) === null || _g === void 0 ? void 0 : _g.dims)) {
+                    var dx = nv.back.dims[1];
+                    var dy = nv.back.dims[2];
+                    for (var _i = 0, _k = draft.strokeVoxels; _i < _k.length; _i++) {
+                        var _l = _k[_i], x = _l[0], y = _l[1], z = _l[2];
+                        newIndices.add(x + y * dx + z * dx * dy);
+                    }
+                }
+                if (newIndices.size > 0) {
+                    nv._cloudMrPolylineRegistry[entryIdx] = __assign(__assign({}, old), { penValue: draft.penValue, voxelIndices: newIndices });
+                }
+                else {
+                    nv._cloudMrPolylineRegistry = nv._cloudMrPolylineRegistry.filter(function (e) { return e.id !== draft._registryId; });
+                }
+            }
         }
         setPenDraft(null);
         penDraftRef.current = null;
@@ -1051,27 +1068,23 @@ export default function CloudMrNiivueViewer(props) {
         nv.opts.deferFreehandCommit = false;
         nv.opts.polylinePenMode = false;
         nvSetDrawingEnabled(false);
+        // Sync palette to the reopened ROI's color so the user can change it.
+        if (draft.penValue != null) {
+            setDrawPen(draft.penValue);
+            nv.setPenValue(draft.penValue, false);
+        }
     };
     nv.onPolylineChange = function (count) {
-        var _a, _b;
+        var _a;
         setPolylineVertexCount(count);
         if (drawShapeToolRef.current === "polyline" && count >= 2) {
-            var draft = polylineDraftFromNv(nv, { filled: count >= 3 });
+            var draft = polylineDraftFromNv(nv, { filled: false });
             if (draft) {
-                if (count >= 3) {
-                    // Show fill live on canvas after each vertex commit.
-                    // Save/restore _cloudMrPolylineBaseBitmap (segments-only) so the
-                    // rubber-band preview still works correctly on mouse move.
-                    var savedBase = (_a = nv._cloudMrPolylineBaseBitmap) === null || _a === void 0 ? void 0 : _a.slice();
-                    redrawPolylineDraft(nv, draft);
-                    if (savedBase)
-                        nv._cloudMrPolylineBaseBitmap = savedBase;
-                }
                 setPenDraft(draft);
                 penDraftRef.current = draft;
             }
         }
-        else if (((_b = penDraftRef.current) === null || _b === void 0 ? void 0 : _b.kind) === "polyline") {
+        else if (((_a = penDraftRef.current) === null || _a === void 0 ? void 0 : _a.kind) === "polyline") {
             setPenDraft(null);
             penDraftRef.current = null;
         }
@@ -1294,6 +1307,11 @@ export default function CloudMrNiivueViewer(props) {
         nv.opts.penType = draft.penType;
         nv.opts.deferShapeCommit = true;
         nvSetDrawingEnabled(false);
+        // Sync palette to the reopened shape's color so the user can change it.
+        if (draft.penValue != null) {
+            setDrawPen(draft.penValue);
+            nv.setPenValue(draft.penValue, false);
+        }
     };
     nv.onApplyActiveDraft = function () {
         applyActiveDraftIfAny();
@@ -1309,34 +1327,25 @@ 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);
         };
-        // 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);
+        var onMouseDown = function (event) {
+            if (event.button === 2) {
+                applyOnRightClick(event);
+            }
         };
-        document.addEventListener("mousedown", onDocMouseDown, true);
+        canvas.addEventListener("mousedown", onMouseDown, true);
+        canvas.addEventListener("contextmenu", applyOnRightClick, true);
         return function () {
-            if (canvas) {
-                canvas.removeEventListener("contextmenu", applyOnRightClick, true);
-            }
-            document.removeEventListener("mousedown", onDocMouseDown, true);
+            canvas.removeEventListener("mousedown", onMouseDown, true);
+            canvas.removeEventListener("contextmenu", applyOnRightClick, true);
         };
     }, [shapeDraft, penDraft]);
     React.useEffect(function () {

package/package.json

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