@cornerstonejs/tools 0.62.2 → 0.63.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "0.62.2",
+  "version": "0.63.1",
   "description": "Cornerstone3D Tools",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -52,5 +52,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "cc3ce18f1c601fc911d8866987ae369a8f4c28df"
+  "gitHead": "693b331e265e5c11b832f2e33c3ad902bb5d63fa"
 }

package/src/eventDispatchers/shared/getActiveToolForMouseEvent.ts

@@ -22,10 +22,11 @@ export default function getActiveToolForMouseEvent(
   const { renderingEngineId, viewportId } = evt.detail;
   const mouseEvent = evt.detail.event;
 
-  // If any keyboard modifier key is also pressed
-  // Use the actual key if set, otherwise get the key from the mouse event.
+  // If any keyboard modifier key is also pressed - get the mouse version
+  // first since it handles combinations, while the key event handles non-modifier
+  // keys.
   const modifierKey =
-    keyEventListener.getModifierKey() || getMouseModifier(mouseEvent);
+    getMouseModifier(mouseEvent) || keyEventListener.getModifierKey();
 
   const toolGroup = ToolGroupManager.getToolGroupForViewport(
     viewportId,

package/src/eventDispatchers/shared/getActiveToolForTouchEvent.ts

@@ -2,6 +2,7 @@ import { ToolGroupManager } from '../../store';
 import { MouseBindings, ToolModes } from '../../enums';
 import { EventTypes } from '../../types';
 import getMouseModifier from './getMouseModifier';
+import { keyEventListener } from '../../eventListeners';
 
 const { Active } = ToolModes;
 
@@ -35,7 +36,8 @@ export default function getActiveToolForTouchEvent(
   const numTouchPoints = Object.keys(touchEvent.touches).length;
 
   // If any keyboard modifier key is also pressed
-  const modifierKey = getMouseModifier(touchEvent);
+  const modifierKey =
+    getMouseModifier(touchEvent) || keyEventListener.getModifierKey();
 
   for (let j = 0; j < toolGroupToolNames.length; j++) {
     const toolName = toolGroupToolNames[j];

package/src/eventDispatchers/shared/getMouseModifier.ts

@@ -22,7 +22,7 @@ const getMouseModifierKey = (evt) => {
     return (evt.metaKey && kb.AltMeta) || kb.Alt;
   }
   if (evt.metaKey) {
-    kb.Meta;
+    return kb.Meta;
   }
   return undefined;
 };

package/src/eventListeners/mouse/mouseDownListener.ts

@@ -134,7 +134,7 @@ function mouseDownListener(evt: MouseEvent) {
   // on anything except left double click.
   doubleClickState.doubleClickTimeout = setTimeout(
     _doStateMouseDownAndUp,
-    evt.button === 1 ? DOUBLE_CLICK_TOLERANCE_MS : 0
+    evt.buttons === 1 ? DOUBLE_CLICK_TOLERANCE_MS : 0
   );
 
   // First mouse down of a potential double click. So save it and start
@@ -144,7 +144,7 @@ function mouseDownListener(evt: MouseEvent) {
 
   state.element = <HTMLDivElement>evt.currentTarget;
 
-  state.mouseButton = evt.button;
+  state.mouseButton = evt.buttons;
 
   const enabledElement = getEnabledElement(state.element);
   const { renderingEngineId, viewportId } = enabledElement;

package/src/utilities/cine/playClip.ts

@@ -298,16 +298,18 @@ function _stopClipWithData(playClipData) {
   }
 }
 
-function _getVolumeFromViewport(viewport): Types.IImageVolume {
-  const actorEntry = viewport.getDefaultActor();
+function _getVolumesFromViewport(viewport): Types.IImageVolume[] {
+  return viewport
+    .getActors()
+    .map((actor) => cache.getVolume(actor.uid))
+    .filter((volume) => !!volume);
+}
 
-  if (!actorEntry) {
-    // This can happen during setup/teardown of viewports.
-    return;
-  }
+function _getVolumeFromViewport(viewport): Types.IImageVolume {
+  const volumes = _getVolumesFromViewport(viewport);
+  const dynamicVolume = volumes.find((volume) => volume.isDynamicVolume());
 
-  const volumeId = actorEntry.uid;
-  return cache.getVolume(volumeId);
+  return dynamicVolume ?? volumes[0];
 }
 
 function _createStackViewportCinePlayContext(