@cornerstonejs/tools 1.1.2 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -26,7 +26,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.1.2",
+    "@cornerstonejs/core": "^1.1.4",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -49,5 +49,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "85417732b63fd6d094625afee7a9539a1ccf1b5c"
+  "gitHead": "bd0b4c3bbbcf1646a9dffcbd6a26794dcd292cfb"
 }

package/src/eventDispatchers/shared/getActiveToolForKeyboardEvent.ts

@@ -36,6 +36,7 @@ export default function getActiveToolForKeyboardEvent(
   }
 
   const toolGroupToolNames = Object.keys(toolGroup.toolOptions);
+  const defaultMousePrimary = toolGroup.getDefaultMousePrimary();
 
   for (let j = 0; j < toolGroupToolNames.length; j++) {
     const toolName = toolGroupToolNames[j];
@@ -47,7 +48,7 @@ export default function getActiveToolForKeyboardEvent(
       toolOptions.bindings.length &&
       toolOptions.bindings.some(
         (binding) =>
-          binding.mouseButton === (mouseButton ?? MouseBindings.Primary) &&
+          binding.mouseButton === (mouseButton ?? defaultMousePrimary) &&
           binding.modifierKey === modifierKey
       );
 

package/src/eventDispatchers/shared/getActiveToolForMouseEvent.ts

@@ -38,6 +38,7 @@ export default function getActiveToolForMouseEvent(
   }
 
   const toolGroupToolNames = Object.keys(toolGroup.toolOptions);
+  const defaultMousePrimary = toolGroup.getDefaultMousePrimary();
 
   for (let j = 0; j < toolGroupToolNames.length; j++) {
     const toolName = toolGroupToolNames[j];
@@ -50,7 +51,7 @@ export default function getActiveToolForMouseEvent(
       toolOptions.bindings.some((binding) => {
         return (
           binding.mouseButton ===
-            (mouseEvent ? mouseEvent.buttons : MouseBindings.Primary) &&
+            (mouseEvent ? mouseEvent.buttons : defaultMousePrimary) &&
           binding.modifierKey === modifierKey
         );
       });

package/src/eventDispatchers/shared/getActiveToolForTouchEvent.ts

@@ -38,6 +38,7 @@ export default function getActiveToolForTouchEvent(
   // If any keyboard modifier key is also pressed
   const modifierKey =
     getMouseModifier(touchEvent) || keyEventListener.getModifierKey();
+  const defaultMousePrimary = toolGroup.getDefaultMousePrimary();
 
   for (let j = 0; j < toolGroupToolNames.length; j++) {
     const toolName = toolGroupToolNames[j];
@@ -55,7 +56,7 @@ export default function getActiveToolForTouchEvent(
         (binding) =>
           (binding.numTouchPoints === numTouchPoints ||
             (numTouchPoints === 1 &&
-              binding.mouseButton === MouseBindings.Primary)) &&
+              binding.mouseButton === defaultMousePrimary)) &&
           binding.modifierKey === modifierKey
       );
 

package/src/store/ToolGroupManager/ToolGroup.ts

@@ -406,12 +406,13 @@ export default class ToolGroup implements IToolGroup {
       }
     );
 
+    const defaultMousePrimary = this.getDefaultMousePrimary();
+
     // Remove the primary button bindings without modifiers, if they exist
     toolOptions.bindings = toolOptions.bindings.filter(
       (binding) =>
-        binding.mouseButton !== MouseBindings.Primary || binding.modifierKey
+        binding.mouseButton !== defaultMousePrimary || binding.modifierKey
     );
-
     // If there are other bindings, set the tool to be active
     let mode = Passive;
     if (toolOptions.bindings.length !== 0) {
@@ -620,6 +621,14 @@ export default class ToolGroup implements IToolGroup {
     return true;
   }
 
+  /**
+   * Returns the default mouse primary button.
+   *
+   */
+  public getDefaultMousePrimary(): MouseBindings {
+    return MouseBindings.Primary;
+  }
+
   /**
    * Get the configuration of tool. It returns only the config for the given path (in case exists).
    * ConfigurationPath is the the path of the property to get separated by '.'.
@@ -650,9 +659,11 @@ export default class ToolGroup implements IToolGroup {
    * @returns A boolean value.
    */
   private _hasMousePrimaryButtonBinding(toolOptions) {
+    const defaultMousePrimary = this.getDefaultMousePrimary();
+
     return toolOptions?.bindings?.some(
       (binding) =>
-        binding.mouseButton === MouseBindings.Primary &&
+        binding.mouseButton === defaultMousePrimary &&
         binding.modifierKey === undefined
     );
   }

package/src/types/IToolGroup.ts

@@ -1,6 +1,6 @@
 import type { Types } from '@cornerstonejs/core';
 import { SetToolBindingsType, ToolOptionsType } from './ISetToolModeOptions';
-
+import { MouseBindings } from '../enums';
 /**
  * ToolGroup interface
  */
@@ -69,4 +69,7 @@ export default interface IToolGroup {
   getToolConfiguration: {
     (toolName: string, configurationPath: string): any;
   };
+  getDefaultMousePrimary: {
+    (): MouseBindings;
+  };
 }