@cornerstonejs/tools 4.13.1 → 4.13.3

package/dist/esm/store/ToolGroupManager/ToolGroup.js

@@ -193,9 +193,11 @@ export default class ToolGroup {
                 const cursor = MouseCursor.getDefinedCursor('default');
                 this._setCursorForViewports(cursor);
             }
+            toolInstance.isPrimary = false;
         }
         else {
             this.setViewportsCursorByToolName(toolName);
+            toolInstance.isPrimary = true;
         }
         if (this._hasMousePrimaryButtonBinding(toolBindingsOptions)) {
             if (this.prevActivePrimaryToolName === null) {
@@ -242,6 +244,7 @@ export default class ToolGroup {
         }
         this.toolOptions[toolName] = toolOptions;
         toolInstance.mode = mode;
+        toolInstance.isPrimary = false;
         if (typeof toolInstance.onSetToolPassive === 'function') {
             toolInstance.onSetToolPassive();
         }

package/dist/esm/tools/base/BaseTool.d.ts

@@ -5,10 +5,12 @@ import type StrategyCallbacks from '../../enums/StrategyCallbacks';
 import type { InteractionTypes, ToolProps, PublicToolProps } from '../../types';
 declare abstract class BaseTool {
     static toolName: any;
+    static activeCursorTool: any;
     supportedInteractionTypes: InteractionTypes[];
     configuration: Record<string, any>;
     toolGroupId: string;
     mode: ToolModes;
+    isPrimary: boolean;
     protected memo: csUtils.HistoryMemo.Memo;
     static defaults: {
         configuration: {

package/dist/esm/tools/base/BaseTool.js

@@ -11,6 +11,7 @@ class BaseTool {
         },
     }; }
     constructor(toolProps, defaultToolProps) {
+        this.isPrimary = false;
         const mergedDefaults = BaseTool.mergeDefaultProps(BaseTool.defaults, defaultToolProps);
         const initialProps = csUtils.deepMerge(mergedDefaults, toolProps);
         const { configuration = {}, supportedInteractionTypes, toolGroupId, } = initialProps;

package/dist/esm/tools/segmentation/BrushTool.js

@@ -5,7 +5,6 @@ import { fillInsideSphere, thresholdInsideSphere, thresholdInsideSphereIsland, }
 import { eraseInsideSphere } from './strategies/eraseSphere';
 import { thresholdInsideCircle, fillInsideCircle, } from './strategies/fillCircle';
 import { eraseInsideCircle } from './strategies/eraseCircle';
-import { drawCircle as drawCircleSvg } from '../../drawingSvg';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import triggerAnnotationRenderForViewportUIDs from '../../utilities/triggerAnnotationRenderForViewportIds';
 import LabelmapBaseTool from './LabelmapBaseTool';
@@ -120,6 +119,9 @@ class BrushTool extends LabelmapBaseTool {
             return true;
         };
         this.mouseMoveCallback = (evt) => {
+            if (!this.isPrimary) {
+                return;
+            }
             if (this.mode === ToolModes.Active) {
                 this.updateCursor(evt);
                 if (!this.configuration.preview.enabled) {
@@ -286,6 +288,7 @@ class BrushTool extends LabelmapBaseTool {
         if (!this._hoverData) {
             return;
         }
+        BrushTool.activeCursorTool = this;
         triggerAnnotationRenderForViewportUIDs(this._hoverData.viewportIdsToRender);
     }
     _calculateCursor(element, centerCanvas) {
@@ -338,7 +341,7 @@ class BrushTool extends LabelmapBaseTool {
         this._hoverData.brushCursor.metadata.segmentColor = segmentColor;
     }
     renderAnnotation(enabledElement, svgDrawingHelper) {
-        if (!this._hoverData) {
+        if (!this._hoverData || BrushTool.activeCursorTool !== this) {
             return;
         }
         const { viewport } = enabledElement;

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.13.1";
+export declare const version = "4.13.3";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.13.1';
+export const version = '4.13.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.13.1",
+  "version": "4.13.3",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "3.2.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "4.13.1",
+    "@cornerstonejs/core": "4.13.3",
     "@kitware/vtk.js": "34.15.1",
     "@types/d3-array": "3.2.1",
     "@types/d3-interpolate": "3.0.4",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "8fe7f5e867c51affcbf8f0647b13b42e08754db7"
+  "gitHead": "97b7d22e28d3caa6f8d6d43a5b37689e4ceea521"
 }