@cornerstonejs/tools 4.1.4 → 4.2.1

package/dist/esm/eventDispatchers/mouseEventHandlers/mouseMove.js

@@ -1,8 +1,11 @@
 import { state } from '../../store/state';
 import { ToolModes } from '../../enums';
 import filterToolsWithAnnotationsForElement from '../../store/filterToolsWithAnnotationsForElement';
+import { getToolGroupForViewport } from '../../store/ToolGroupManager';
 import getToolsWithModesForMouseEvent from '../shared/getToolsWithModesForMouseEvent';
 import triggerAnnotationRender from '../../utilities/triggerAnnotationRender';
+import { setCursorForElement } from '../../cursors';
+import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 const { Active, Passive } = ToolModes;
 export default function mouseMove(evt) {
     if (state.isInteractingWithTool || state.isMultiPartToolActive) {
@@ -13,17 +16,36 @@ export default function mouseMove(evt) {
         Passive,
     ]);
     const eventDetail = evt.detail;
-    const { element } = eventDetail;
+    const { element, currentPoints, renderingEngineId, viewportId } = eventDetail;
     const toolsWithAnnotations = filterToolsWithAnnotationsForElement(element, activeAndPassiveTools);
     const toolsWithoutAnnotations = activeAndPassiveTools.filter((tool) => {
         const doesNotHaveAnnotations = !toolsWithAnnotations.some((toolAndAnnotation) => toolAndAnnotation.tool.getToolName() === tool.getToolName());
         return doesNotHaveAnnotations;
     });
     let annotationsNeedToBeRedrawn = false;
+    let showCrosshairsCursor = false;
     for (const { tool, annotations } of toolsWithAnnotations) {
         if (typeof tool.mouseMoveCallback === 'function') {
             annotationsNeedToBeRedrawn =
                 tool.mouseMoveCallback(evt, annotations) || annotationsNeedToBeRedrawn;
+            for (const annotation of annotations) {
+                showCrosshairsCursor =
+                    !!tool.getHandleNearImagePoint(element, annotation, currentPoints.canvas, 6) || showCrosshairsCursor;
+            }
+        }
+    }
+    const showGrabCursorEnabled = Boolean(getStyleProperty('showGrabCursor', {}));
+    if (showCrosshairsCursor && showGrabCursorEnabled) {
+        setCursorForElement(element, 'move');
+    }
+    else {
+        const toolGroup = getToolGroupForViewport(viewportId, renderingEngineId);
+        const activeTool = toolGroup?.getActivePrimaryMouseButtonTool();
+        if (activeTool) {
+            setCursorForElement(element, activeTool);
+        }
+        else {
+            setCursorForElement(element, 'default');
         }
     }
     toolsWithoutAnnotations.forEach((tool) => {

package/dist/esm/tools/annotation/AngleTool.js

@@ -13,6 +13,7 @@ import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnota
 import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../stateManagement/annotation/helpers/state';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
+import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 class AngleTool extends AnnotationTool {
     static { this.toolName = 'Angle'; }
     constructor(toolProps = {}, defaultToolProps = {
@@ -295,7 +296,8 @@ class AngleTool extends AnnotationTool {
                 if (!isAnnotationVisible(annotationUID)) {
                     continue;
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean(getStyleProperty('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
                         color,

package/dist/esm/tools/annotation/ArrowAnnotateTool.js

@@ -12,6 +12,7 @@ import { triggerAnnotationCompleted, triggerAnnotationModified, } from '../../st
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
 import { setAnnotationLabel } from '../../utilities';
+import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 class ArrowAnnotateTool extends AnnotationTool {
     static { this.toolName = 'ArrowAnnotate'; }
     constructor(toolProps = {}, defaultToolProps = {
@@ -296,7 +297,8 @@ class ArrowAnnotateTool extends AnnotationTool {
                 if (!isAnnotationVisible(annotationUID)) {
                     continue;
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean(getStyleProperty('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
                         color,

package/dist/esm/tools/annotation/BidirectionalTool.js

@@ -15,6 +15,7 @@ import * as lineSegment from '../../utilities/math/line';
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
+import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 const { transformWorldToIndex } = csUtils;
 class BidirectionalTool extends AnnotationTool {
     static { this.toolName = 'Bidirectional'; }
@@ -514,9 +515,10 @@ class BidirectionalTool extends AnnotationTool {
                     activeHandleIndex !== null) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean(getStyleProperty('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
-                    drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, activeHandleCanvasCoords, {
+                    drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, showHandlesAlways ? canvasCoordinates : activeHandleCanvasCoords, {
                         color,
                     });
                 }

package/dist/esm/tools/annotation/CircleROITool.js

@@ -20,6 +20,7 @@ import { getCanvasCircleCorners, getCanvasCircleRadius, } from '../../utilities/
 import { pointInEllipse } from '../../utilities/math/ellipse';
 import { BasicStatsCalculator } from '../../utilities/math/basic';
 import { vec2, vec3 } from 'gl-matrix';
+import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 const { transformWorldToIndex } = csUtils;
 class CircleROITool extends AnnotationTool {
     static { this.toolName = 'CircleROI'; }
@@ -409,9 +410,10 @@ class CircleROITool extends AnnotationTool {
                         activeHandleCanvasCoords = canvasCoordinates;
                     }
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean(getStyleProperty('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
-                    drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, activeHandleCanvasCoords, {
+                    drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, showHandlesAlways ? canvasCoordinates : activeHandleCanvasCoords, {
                         color,
                     });
                 }

package/dist/esm/tools/annotation/CobbAngleTool.js

@@ -16,6 +16,7 @@ import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
 import { isAnnotationVisible } from '../../stateManagement/annotation/annotationVisibility';
+import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 class CobbAngleTool extends AnnotationTool {
     static { this.toolName = 'CobbAngle'; }
     constructor(toolProps = {}, defaultToolProps = {
@@ -350,7 +351,8 @@ class CobbAngleTool extends AnnotationTool {
                 if (!isAnnotationVisible(annotationUID)) {
                     continue;
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean(getStyleProperty('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
                         color,

package/dist/esm/tools/annotation/EllipticalROITool.js

@@ -19,6 +19,7 @@ import { getPixelValueUnits } from '../../utilities/getPixelValueUnits';
 import { isViewportPreScaled } from '../../utilities/viewport/isViewportPreScaled';
 import { BasicStatsCalculator } from '../../utilities/math/basic';
 import { vec2 } from 'gl-matrix';
+import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 const { transformWorldToIndex } = csUtils;
 class EllipticalROITool extends AnnotationTool {
     static { this.toolName = 'EllipticalROI'; }
@@ -444,9 +445,10 @@ class EllipticalROITool extends AnnotationTool {
                     activeHandleIndex !== null) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean(getStyleProperty('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
-                    drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, activeHandleCanvasCoords, {
+                    drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, showHandlesAlways ? canvasCoordinates : activeHandleCanvasCoords, {
                         color,
                     });
                 }

package/dist/esm/tools/annotation/HeightTool.js

@@ -14,6 +14,7 @@ import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters'
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
+import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 const { transformWorldToIndex } = csUtils;
 class HeightTool extends AnnotationTool {
     static { this.toolName = 'Height'; }
@@ -258,7 +259,8 @@ class HeightTool extends AnnotationTool {
                     activeHandleIndex !== null) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean(getStyleProperty('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
                         color,

package/dist/esm/tools/annotation/LengthTool.js

@@ -14,6 +14,7 @@ import { getViewportIdsWithToolToRender } from '../../utilities/viewportFilters'
 import { getTextBoxCoordsCanvas } from '../../utilities/drawing';
 import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnotationRenderForViewportIds';
 import { resetElementCursor, hideElementCursor, } from '../../cursors/elementCursor';
+import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 const { transformWorldToIndex } = csUtils;
 class LengthTool extends AnnotationTool {
     static { this.toolName = 'Length'; }
@@ -271,7 +272,8 @@ class LengthTool extends AnnotationTool {
                     activeHandleIndex !== null) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean(getStyleProperty('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
                     drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, canvasCoordinates, {
                         color,

package/dist/esm/tools/annotation/RectangleROITool.js

@@ -18,6 +18,7 @@ import triggerAnnotationRenderForViewportIds from '../../utilities/triggerAnnota
 import { getPixelValueUnits } from '../../utilities/getPixelValueUnits';
 import { isViewportPreScaled } from '../../utilities/viewport/isViewportPreScaled';
 import { BasicStatsCalculator } from '../../utilities/math/basic';
+import { getStyleProperty } from '../../stateManagement/annotation/config/helpers';
 const { transformWorldToIndex } = csUtils;
 class RectangleROITool extends AnnotationTool {
     static { this.toolName = 'RectangleROI'; }
@@ -380,9 +381,10 @@ class RectangleROITool extends AnnotationTool {
                     activeHandleIndex !== undefined) {
                     activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
                 }
-                if (activeHandleCanvasCoords) {
+                const showHandlesAlways = Boolean(getStyleProperty('showHandlesAlways', {}));
+                if (activeHandleCanvasCoords || showHandlesAlways) {
                     const handleGroupUID = '0';
-                    drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, activeHandleCanvasCoords, {
+                    drawHandlesSvg(svgDrawingHelper, annotationUID, handleGroupUID, showHandlesAlways ? canvasCoordinates : activeHandleCanvasCoords, {
                         color,
                     });
                 }

package/dist/esm/types/AnnotationStyle.d.ts

@@ -1,6 +1,6 @@
 type Modes = '' | 'Active' | 'Passive' | 'Enabled';
 type States = '' | 'Highlighted' | 'Selected' | 'Locked' | 'AutoGenerated';
-type Properties = 'color' | 'colorAutoGenerated' | 'lineWidth' | 'lineWidthAutoGenerated' | 'lineDash' | 'textBoxFontFamily' | 'textBoxFontSize' | 'textBoxColor' | 'textBoxBackground' | 'textBoxLinkLineWidth' | 'textBoxLinkLineDash' | 'locked' | 'fillColor' | 'fillOpacity' | 'textbox' | 'shadow' | 'visibility' | 'markerSize' | 'angleArcLineDash' | 'pointerStrokeWidth';
+type Properties = 'color' | 'colorAutoGenerated' | 'lineWidth' | 'lineWidthAutoGenerated' | 'lineDash' | 'textBoxFontFamily' | 'textBoxFontSize' | 'textBoxColor' | 'textBoxBackground' | 'textBoxLinkLineWidth' | 'textBoxLinkLineDash' | 'locked' | 'fillColor' | 'fillOpacity' | 'textbox' | 'shadow' | 'visibility' | 'markerSize' | 'angleArcLineDash' | 'pointerStrokeWidth' | 'showHandlesAlways' | 'showGrabCursor';
 export type AnnotationStyle = {
     [key in `${Properties}${States}${Modes}`]?: string | number | boolean | Record<string, unknown>;
 };

package/dist/esm/version.d.ts

@@ -1 +1 @@
-export declare const version = "4.1.4";
+export declare const version = "4.2.1";

package/dist/esm/version.js

@@ -1 +1 @@
-export const version = '4.1.4';
+export const version = '4.2.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "4.1.4",
+  "version": "4.2.1",
   "description": "Cornerstone3D Tools",
   "types": "./dist/esm/index.d.ts",
   "module": "./dist/esm/index.js",
@@ -108,7 +108,7 @@
     "canvas": "^3.1.0"
   },
   "peerDependencies": {
-    "@cornerstonejs/core": "^4.1.4",
+    "@cornerstonejs/core": "^4.2.1",
     "@kitware/vtk.js": "32.12.1",
     "@types/d3-array": "^3.0.4",
     "@types/d3-interpolate": "^3.0.1",
@@ -127,5 +127,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "abe7ccc901f1dd79ee7604eddca77c74f58b5784"
+  "gitHead": "086ca005e5f4911e76dcc3e9ec4389822746b5c8"
 }