@cornerstonejs/tools 0.67.2 → 0.67.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "0.67.2",
+  "version": "0.67.3",
   "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": "^0.46.2",
+    "@cornerstonejs/core": "^0.47.0",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -49,5 +49,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "1e5e0ec2e760c409d532f14b145f52853a9f50ec"
+  "gitHead": "2c2efd8536d4af3ede72a47bdab199efe67bb1d3"
 }

package/src/tools/CrosshairsTool.ts

@@ -1793,9 +1793,9 @@ class CrosshairsTool extends AnnotationTool {
     for (let i = 0; i < otherViewportAnnotations.length; ++i) {
       const annotation = otherViewportAnnotations[i];
       if (
-        otherViewportsAnnotationsWithUniqueCameras.find(
+        otherViewportsAnnotationsWithUniqueCameras.some(
           (element) => element === annotation
-        ) === true
+        )
       ) {
         continue;
       }

package/src/tools/StackScrollToolMouseWheelTool.ts

@@ -1,11 +1,7 @@
-import {
-  getEnabledElement,
-  VolumeViewport,
-  StackViewport,
-} from '@cornerstonejs/core';
+import { getEnabledElement } from '@cornerstonejs/core';
 import { BaseTool } from './base';
 import { MouseWheelEventType } from '../types/EventTypes';
-import { scrollVolume } from '../utilities/scroll';
+import scroll from '../utilities/scroll';
 
 /**
  * The StackScrollMouseWheelTool is a tool that allows the user to scroll through a
@@ -37,20 +33,15 @@ class StackScrollMouseWheelTool extends BaseTool {
     const { viewport } = getEnabledElement(element);
     const delta = direction * (invert ? -1 : 1);
 
-    if (viewport instanceof StackViewport) {
-      viewport.scroll(
-        delta,
-        this.configuration.debounceIfNotLoaded,
-        this.configuration.loop
-      );
-    } else if (viewport instanceof VolumeViewport) {
-      const targetId = this.getTargetId(viewport);
-      const volumeId = targetId.split('volumeId:')[1];
-      // TODO: add loop implemention for scroll volume.
-      scrollVolume(viewport, volumeId, delta);
-    } else {
-      throw new Error('StackScrollMouseWheelTool: Unsupported viewport type');
-    }
+    const targetId = this.getTargetId(viewport);
+    const volumeId = targetId.split('volumeId:')[1];
+
+    scroll(viewport, {
+      delta,
+      debounceLoading: this.configuration.debounceIfNotLoaded,
+      loop: this.configuration.loop,
+      volumeId,
+    });
   }
 }
 

package/src/tools/annotation/RectangleROITool.ts

@@ -653,7 +653,7 @@ class RectangleROITool extends AnnotationTool {
       // force to recalculate the stats from the points
       if (
         !data.cachedStats[targetId] ||
-        data.cachedStats[targetId].unit === undefined
+        data.cachedStats[targetId].areaUnit === undefined
       ) {
         data.cachedStats[targetId] = {
           Modality: null,

package/src/utilities/scroll.ts

@@ -5,6 +5,7 @@ import {
   eventTarget,
   EVENTS,
   utilities as csUtils,
+  getEnabledElement,
 } from '@cornerstonejs/core';
 import { ScrollOptions, EventTypes } from '../types';
 
@@ -21,6 +22,20 @@ export default function scroll(
   viewport: Types.IStackViewport | Types.IVolumeViewport,
   options: ScrollOptions
 ): void {
+  // check if viewport is disabled then throw error
+  const enabledElement = getEnabledElement(viewport.element);
+
+  if (!enabledElement) {
+    throw new Error('Scroll::Viewport is not enabled (it might be disabled)');
+  }
+
+  if (
+    viewport instanceof StackViewport &&
+    viewport.getImageIds().length === 0
+  ) {
+    throw new Error('Scroll::Stack Viewport has no images');
+  }
+
   const { type: viewportType } = viewport;
   const { volumeId, delta } = options;