@ohif/app 3.8.0-beta.92 → 3.8.0-beta.94

package/dist/{117.bundle.a18b236cfb25b1daa254.js → 117.bundle.77cc4e62d0de5d843e2e.js}

@@ -563,7 +563,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _cache__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13320);
 /* harmony import */ var _enums_Events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11731);
 /* harmony import */ var _eventTarget__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(51884);
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(42781);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(35678);
 /* harmony import */ var _requestPool_imageLoadPoolManager__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(775);
 /* harmony import */ var ___WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(92136);
 
@@ -833,7 +833,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utilities_triggerEvent__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(13292);
 /* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(48463);
 /* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(42781);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(35678);
 /* harmony import */ var _init__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(71702);
 /* harmony import */ var _utilities_cacheUtils__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(51631);
 
@@ -1221,7 +1221,7 @@ imageLoadPoolManager.setMaxSimultaneousRequests(_enums_RequestType__WEBPACK_IMPO
 /* harmony export */   R: () => (/* binding */ RequestPoolManager)
 /* harmony export */ });
 /* harmony import */ var _enums_RequestType__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15453);
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(42781);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(35678);
 
 
 class RequestPoolManager {

package/dist/{164.bundle.0860b89ac7bde6ee83b0.js → 164.bundle.b101cb64d04a22453984.js}

@@ -556,7 +556,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _cache__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(13320);
 /* harmony import */ var _enums_Events__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(11731);
 /* harmony import */ var _eventTarget__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(51884);
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(42781);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(35678);
 /* harmony import */ var _requestPool_imageLoadPoolManager__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(775);
 /* harmony import */ var ___WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(92136);
 
@@ -825,7 +825,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _utilities_triggerEvent__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(13292);
 /* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(48463);
 /* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(42781);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(35678);
 /* harmony import */ var _init__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(71702);
 /* harmony import */ var _utilities_cacheUtils__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(51631);
 
@@ -1210,7 +1210,7 @@ imageLoadPoolManager.setMaxSimultaneousRequests(_enums_RequestType__WEBPACK_IMPO
 /* harmony export */   R: () => (/* binding */ RequestPoolManager)
 /* harmony export */ });
 /* harmony import */ var _enums_RequestType__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15453);
-/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(42781);
+/* harmony import */ var _utilities__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(35678);
 
 
 class RequestPoolManager {
@@ -10019,12 +10019,15 @@ class ViewportColorbar extends _Colorbar__WEBPACK_IMPORTED_MODULE_1__/* .Colorba
             this.imageRange = ViewportColorbar._getImageRange(element, volumeId);
         };
         this._viewportVOIModifiedCallback = (evt) => {
-            const { viewportId, volumeId, range: voiRange } = evt.detail;
+            const { viewportId, volumeId, range: voiRange, colormap } = evt.detail;
             const { viewport } = this.enabledElement;
             if (viewportId !== viewport.id || volumeId !== this._volumeId) {
                 return;
             }
             this.voiRange = voiRange;
+            if (colormap) {
+                this.activeColormapName = colormap.name;
+            }
             this.showAndAutoHideTicks();
         };
         this._viewportColormapModifiedCallback = (evt) => {

package/dist/{206.bundle.7b4b08331eec7dcc259b.js → 206.bundle.0edc971498dac9a7416b.js}

@@ -2750,8 +2750,8 @@ function ViewerHeader({
     hotkeyDefinitions,
     hotkeyDefaults
   } = hotkeysManager;
-  const versionNumber = "3.8.0-beta.92";
-  const commitHash = "c09311d3b7df05fcd00a9f36a7233e9d7e5589d0";
+  const versionNumber = "3.8.0-beta.94";
+  const commitHash = "e4b64789528669ca918e3973fbe0ff9d2c81bdaa";
   const menuOptions = [{
     title: t('Header:About'),
     icon: 'info',

package/dist/{236.bundle.7c88c873c95bac8610f3.js → 236.bundle.f774cdc955890e6cdac9.js}

@@ -11756,7 +11756,10 @@ class TrackballRotateTool extends _base__WEBPACK_IMPORTED_MODULE_4__/* .BaseTool
                 const viewportsInfo = this._getViewportsInfo();
                 viewportsInfo.forEach(({ viewportId, renderingEngineId }) => {
                     if (!this._resizeObservers.has(viewportId)) {
-                        const { viewport } = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_2__.getEnabledElementByIds)(viewportId, renderingEngineId);
+                        const { viewport } = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_2__.getEnabledElementByIds)(viewportId, renderingEngineId) || { viewport: null };
+                        if (!viewport) {
+                            return;
+                        }
                         const { element } = viewport;
                         const resizeObserver = new ResizeObserver(() => {
                             const element = (0,_cornerstonejs_core__WEBPACK_IMPORTED_MODULE_2__.getEnabledElementByIds)(viewportId, renderingEngineId);

package/dist/{321.bundle.506a5b5c6b8f5fb72014.js → 321.bundle.39a76114e54cd9833c43.js}

@@ -2585,6 +2585,7 @@ function RectangleROI_getMappedAnnotations(annotation, DisplaySetService) {
       unit: modalityUnit,
       mean,
       stdDev,
+      metadata,
       max,
       area,
       areaUnit
@@ -8315,6 +8316,7 @@ function getToolbarModule({
 }) {
   const {
     toolGroupService,
+    toolbarService,
     syncGroupService,
     cornerstoneViewportService,
     hangingProtocolService,
@@ -8329,21 +8331,22 @@ function getToolbarModule({
     evaluate: ({
       viewportId,
       button,
+      toolNames,
       disabledText
     }) => {
       const toolGroup = toolGroupService.getToolGroupForViewport(viewportId);
       if (!toolGroup) {
         return;
       }
-      const toolName = getToolNameForButton(button);
-      if (!toolGroup || !toolGroup.hasTool(toolName)) {
+      const toolName = toolbarService.getToolNameForButton(button);
+      if (!toolGroup || !toolGroup.hasTool(toolName) && !toolNames) {
         return {
           disabled: true,
           className: '!text-common-bright ohif-disabled',
           disabledText: disabledText ?? 'Not available on the current viewport'
         };
       }
-      const isPrimaryActive = toolGroup.getActivePrimaryMouseButtonTool() === toolName;
+      const isPrimaryActive = toolNames ? toolNames.includes(toolGroup.getActivePrimaryMouseButtonTool()) : toolGroup.getActivePrimaryMouseButtonTool() === toolName;
       return {
         disabled: false,
         className: isPrimaryActive ? '!text-black bg-primary-light rounded' : '!text-common-bright hover:!bg-primary-dark hover:!text-primary-light rounded',
@@ -8375,7 +8378,7 @@ function getToolbarModule({
       // check if the active toolName is part of the items then we need
       // to move it to the primary button
       const activeToolIndex = items.findIndex(item => {
-        const toolName = getToolNameForButton(item);
+        const toolName = toolbarService.getToolNameForButton(item);
         return toolName === activeToolName;
       });
 
@@ -8420,6 +8423,7 @@ function getToolbarModule({
     }) => _evaluateToggle({
       viewportId,
       button,
+      toolbarService,
       disabledText,
       offModes: [dist_esm.Enums.ToolModes.Disabled],
       toolGroupService
@@ -8433,6 +8437,7 @@ function getToolbarModule({
     }) => _evaluateToggle({
       viewportId,
       button,
+      toolbarService,
       disabledText,
       offModes: [dist_esm.Enums.ToolModes.Disabled, dist_esm.Enums.ToolModes.Passive],
       toolGroupService
@@ -8561,6 +8566,7 @@ function getToolbarModule({
 }
 function _evaluateToggle({
   viewportId,
+  toolbarService,
   button,
   disabledText,
   offModes,
@@ -8570,7 +8576,7 @@ function _evaluateToggle({
   if (!toolGroup) {
     return;
   }
-  const toolName = getToolNameForButton(button);
+  const toolName = toolbarService.getToolNameForButton(button);
   if (!toolGroup.hasTool(toolName)) {
     return {
       disabled: true,
@@ -8583,22 +8589,6 @@ function _evaluateToggle({
     className: getToggledClassName(!isOff)
   };
 }
-
-// Todo: this is duplicate, we should move it to a shared location
-function getToolNameForButton(button) {
-  const {
-    props
-  } = button;
-  const commands = props?.commands || button.commands;
-  const commandsArray = Array.isArray(commands) ? commands : [commands];
-  const firstCommand = commandsArray[0];
-  if (firstCommand?.commandOptions) {
-    return firstCommand.commandOptions.toolName ?? props?.id ?? button.id;
-  }
-
-  // use id as a fallback for toolName
-  return props?.id ?? button.id;
-}
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/services/ToolGroupService/ToolGroupService.ts
 var _ToolGroupService;
 
@@ -10993,13 +10983,29 @@ const DEFAULT_TOOLGROUP_ID = 'default';
 
 // Return true if the data contains the given display set UID OR the imageId
 // if it is a composite object.
-const dataContains = (data, displaySetUID, imageId) => {
-  if (data.displaySetInstanceUID === displaySetUID) {
-    return true;
-  }
+const dataContains = ({
+  data,
+  displaySetUID,
+  imageId,
+  viewport
+}) => {
   if (imageId && data.isCompositeStack && data.imageIds) {
     return !!data.imageIds.find(dataId => dataId === imageId);
   }
+  if (imageId && (data.volumeId || viewport instanceof esm.VolumeViewport)) {
+    const isAcquisition = !!viewport.getCurrentImageId();
+    if (!isAcquisition) {
+      return false;
+    }
+    const imageURI = esm.utilities.imageIdToURI(imageId);
+    const hasImageId = viewport.hasImageURI(imageURI);
+    if (hasImageId) {
+      return true;
+    }
+  }
+  if (data.displaySetInstanceUID === displaySetUID) {
+    return true;
+  }
   return false;
 };
 class ViewportInfo {
@@ -11029,10 +11035,23 @@ class ViewportInfo {
     if (!this.viewportData?.data) {
       return false;
     }
+    const {
+      viewport
+    } = (0,esm.getEnabledElementByViewportId)(this.viewportId) || {};
     if (this.viewportData.data.length) {
-      return !!this.viewportData.data.find(data => dataContains(data, displaySetUID, imageId));
+      return !!this.viewportData.data.find(data => dataContains({
+        data,
+        displaySetUID,
+        imageId,
+        viewport
+      }));
     }
-    return dataContains(this.viewportData.data, displaySetUID, imageId);
+    return dataContains({
+      data: this.viewportData.data,
+      displaySetUID,
+      imageId,
+      viewport
+    });
   }
   setRenderingEngineId(renderingEngineId) {
     this.renderingEngineId = renderingEngineId;
@@ -11657,6 +11676,9 @@ class CornerstoneViewportService extends src/* PubSubService */.Rc {
    */
   getViewportIdToJump(activeViewportId, displaySetInstanceUID, cameraProps) {
     const viewportInfo = this.getViewportInfo(activeViewportId);
+    if (viewportInfo.getViewportType() === esm.Enums.ViewportType.VOLUME_3D) {
+      return null;
+    }
     const {
       referencedImageId
     } = cameraProps;