@cornerstonejs/tools 1.28.1 → 1.28.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/tools",
-  "version": "1.28.1",
+  "version": "1.28.3",
   "description": "Cornerstone3D Tools",
   "main": "src/index.ts",
   "types": "dist/esm/index.d.ts",
@@ -29,7 +29,7 @@
     "webpack:watch": "webpack --mode development --progress --watch  --config ./.webpack/webpack.dev.js"
   },
   "dependencies": {
-    "@cornerstonejs/core": "^1.28.1",
+    "@cornerstonejs/core": "^1.28.3",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "^4.4.2"
   },
@@ -52,5 +52,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "5a9e221773f68002c2514a0ed7ae87c5f89c81ad"
+  "gitHead": "6afa11385606812dd212aec3005e85c58665f982"
 }

package/src/stateManagement/annotation/config/ToolStyle.ts

@@ -193,56 +193,71 @@ class ToolStyle {
     toolName: string
   ) {
     if (annotationUID) {
-      const styles = this.getAnnotationToolStyles(annotationUID);
+      const annotationToolStyles = this.getAnnotationToolStyles(annotationUID);
 
-      if (styles) {
+      if (annotationToolStyles) {
         // check first in the toolSpecific styles
-        if (styles[property]) {
-          return styles[property];
+        if (annotationToolStyles[property] !== undefined) {
+          return annotationToolStyles[property];
         }
       }
     }
 
     if (viewportId) {
-      const styles = this.getViewportToolStyles(viewportId);
+      const viewportToolStyles = this.getViewportToolStyles(viewportId);
 
-      if (styles) {
+      if (viewportToolStyles) {
         // check if we have the viewportId specific style
         // check first in the toolSpecific styles
-        if (styles[toolName] && styles[toolName][property]) {
-          return styles[toolName][property];
+        if (
+          viewportToolStyles[toolName] &&
+          viewportToolStyles[toolName][property] !== undefined
+        ) {
+          return viewportToolStyles[toolName][property];
         }
 
         // check if we have the style in the viewport specific global viewportSpecificStyles
-        if (styles.global && styles.global[property]) {
-          return styles.global[property];
+        if (
+          viewportToolStyles.global &&
+          viewportToolStyles.global[property] !== undefined
+        ) {
+          return viewportToolStyles.global[property];
         }
       }
     }
 
     if (toolGroupId) {
-      const styles = this.getToolGroupToolStyles(toolGroupId);
+      const toolGroupToolStyles = this.getToolGroupToolStyles(toolGroupId);
 
-      if (styles) {
+      if (toolGroupToolStyles) {
         // check first in the toolSpecific styles
-        if (styles[toolName] && styles[toolName][property]) {
-          return styles[toolName][property];
+        if (
+          toolGroupToolStyles[toolName] &&
+          toolGroupToolStyles[toolName][property] !== undefined
+        ) {
+          return toolGroupToolStyles[toolName][property];
         }
 
         // check if we have the style in the toolGroup specific global styles
-        if (styles.global && styles.global[property]) {
-          return styles.global[property];
+        if (
+          toolGroupToolStyles.global &&
+          toolGroupToolStyles.global[property] !== undefined
+        ) {
+          return toolGroupToolStyles.global[property];
         }
       }
     }
 
     const globalStyles = this.getDefaultToolStyles();
 
-    if (globalStyles[toolName] && globalStyles[toolName][property]) {
+    if (
+      globalStyles[toolName] &&
+      globalStyles[toolName][property] !== undefined
+    ) {
       return globalStyles[toolName][property];
     }
 
-    if (globalStyles.global && globalStyles.global[property]) {
+    if (globalStyles.global && globalStyles.global[property] !== undefined) {
       return globalStyles.global[property];
     }
   }

package/src/store/SynchronizerManager/Synchronizer.ts

@@ -215,15 +215,19 @@ class Synchronizer {
         if (targetIsSource) {
           continue;
         }
-        promises.push(
-          this._eventHandler(
-            this,
-            sourceViewport,
-            targetViewport,
-            sourceEvent,
-            this._options
-          )
+        const result = this._eventHandler(
+          this,
+          sourceViewport,
+          targetViewport,
+          sourceEvent,
+          this._options
         );
+
+        // if the result is a promise, then add it to the list of promises
+        // to wait for before setting _ignoreFiredEvents to false
+        if (result instanceof Promise) {
+          promises.push(result);
+        }
       }
     } catch (ex) {
       console.warn(`Synchronizer, for: ${this._eventName}`, ex);

package/src/tools/CrosshairsTool.ts

@@ -1432,7 +1432,19 @@ class CrosshairsTool extends AnnotationTool {
 
   _getAnnotations = (enabledElement: Types.IEnabledElement) => {
     const { viewport } = enabledElement;
-    return getAnnotations(this.getToolName(), viewport.element);
+    const annotations =
+      getAnnotations(this.getToolName(), viewport.element) || [];
+    const viewportIds = this._getViewportsInfo().map(
+      ({ viewportId }) => viewportId
+    );
+
+    // filter the annotations to only keep that are for this toolGroup
+    const toolGroupAnnotations = annotations.filter((annotation) => {
+      const { data } = annotation;
+      return viewportIds.includes(data.viewportId);
+    });
+
+    return toolGroupAnnotations;
   };
 
   _onNewVolume = (e: any) => {

package/src/types/ISynchronizerEventHandler.ts

@@ -8,5 +8,5 @@ export default interface ISynchronizerEventHandler {
     targetViewport: Types.IViewportId,
     sourceEvent: any,
     options?: any
-  ): void;
+  ): Promise<void> | void;
 }