@cornerstonejs/tools 1.34.0 → 1.35.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/types/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.34.0",
+    "@cornerstonejs/core": "^1.35.0",
     "comlink": "^4.4.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
@@ -53,5 +53,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "a1bdeb0d4083453272dbca7e8c5f445d30d1fd4c"
+  "gitHead": "115719df9d081849d8ee1c3d9c39b3c2249be17c"
 }

package/src/eventDispatchers/mouseEventHandlers/mouseDown.ts

@@ -82,6 +82,14 @@ export default function mouseDown(evt: EventTypes.MouseDownEventType) {
     ...(passiveToolsIfEventWasPrimaryMouseButton || []),
   ];
 
+  // Actions need to run before tool/handle selected callbacks otherwise actions
+  // like the one from SplineTool to remove/add control points would not work.
+  const actionExecuted = mouseDownAnnotationAction(evt);
+
+  if (actionExecuted) {
+    return;
+  }
+
   const eventDetail = evt.detail;
   const { element } = eventDetail;
 
@@ -151,12 +159,6 @@ export default function mouseDown(evt: EventTypes.MouseDownEventType) {
     }
   }
 
-  const actionExecuted = mouseDownAnnotationAction(evt);
-
-  if (actionExecuted) {
-    return;
-  }
-
   // Don't stop propagation so that mouseDownActivate can handle the event
 }
 

package/src/eventDispatchers/shared/getToolsWithActionsForMouseEvent.ts

@@ -41,14 +41,15 @@ export default function getToolsWithActionsForMouseEvent(
   for (let j = 0; j < toolGroupToolNames.length; j++) {
     const toolName = toolGroupToolNames[j];
     const tool = toolGroup.getToolInstance(toolName);
-    const actions = tool.configuration?.actions;
+    const actionsConfig = tool.configuration?.actions ?? {};
+    const actions = Object.values(actionsConfig);
 
     if (!actions?.length || !toolModes.includes(tool.mode)) {
       continue;
     }
 
     const action = actions.find(
-      (action) =>
+      (action: any) =>
         action.bindings.length &&
         action.bindings.some(
           (binding) =>

package/src/index.ts

@@ -39,6 +39,7 @@ import {
   RectangleROITool,
   EllipticalROITool,
   CircleROITool,
+  SplineROITool,
   BidirectionalTool,
   PlanarFreehandROITool,
   ArrowAnnotateTool,
@@ -102,6 +103,7 @@ export {
   RectangleROITool,
   EllipticalROITool,
   CircleROITool,
+  SplineROITool,
   BidirectionalTool,
   PlanarFreehandROITool,
   ArrowAnnotateTool,

package/src/tools/AdvancedMagnifyTool.ts

@@ -41,8 +41,13 @@ import { getCanvasCircleRadius } from '../utilities/math/circle';
 import AdvancedMagnifyViewportManager from './AdvancedMagnifyViewportManager';
 import type { AutoPanCallbackData } from './AdvancedMagnifyViewport';
 
+enum AdvancedMagnifyToolActions {
+  ShowZoomFactorsList = 'showZoomFactorsList',
+}
+
 class AdvancedMagnifyTool extends AnnotationTool {
   static toolName;
+  static Actions = AdvancedMagnifyToolActions;
 
   magnifyViewportManager: AdvancedMagnifyViewportManager;
   touchDragCallback: any;
@@ -71,8 +76,8 @@ class AdvancedMagnifyTool extends AnnotationTool {
             padding: 10, // px
           },
         },
-        actions: [
-          {
+        actions: {
+          showZoomFactorsList: {
             method: 'showZoomFactorsList',
             bindings: [
               {
@@ -81,7 +86,7 @@ class AdvancedMagnifyTool extends AnnotationTool {
               },
             ],
           },
-        ],
+        },
       },
     }
   ) {