@ohif/app 3.10.0-beta.26 → 3.10.0-beta.28

package/dist/{1185.bundle.c533af299c67a45628fc.js → 1185.bundle.bb1d0c4c926220c4dc6a.js}

@@ -22,8 +22,8 @@ var prop_types = __webpack_require__(97598);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js
 var dist_esm = __webpack_require__(81985);
-// EXTERNAL MODULE: ../../ui/src/index.js + 689 modules
-var src = __webpack_require__(80457);
+// EXTERNAL MODULE: ../../ui/src/index.js + 691 modules
+var src = __webpack_require__(32907);
 // EXTERNAL MODULE: ../../../node_modules/moment/moment.js
 var moment = __webpack_require__(14867);
 var moment_default = /*#__PURE__*/__webpack_require__.n(moment);
@@ -597,7 +597,7 @@ CustomizableViewportOverlay.propTypes = {
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(86326);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(97598);
 /* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(80457);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(32907);
 /* harmony import */ var _services_ViewportActionCornersService_ViewportActionCornersService__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(77954);
 
 
@@ -6222,8 +6222,8 @@ function getCustomizationModule() {
 var gl_matrix_esm = __webpack_require__(3823);
 // EXTERNAL MODULE: ../../../node_modules/html2canvas/dist/html2canvas.esm.js
 var html2canvas_esm = __webpack_require__(91037);
-// EXTERNAL MODULE: ../../ui/src/index.js + 689 modules
-var ui_src = __webpack_require__(80457);
+// EXTERNAL MODULE: ../../ui/src/index.js + 691 modules
+var ui_src = __webpack_require__(32907);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone/src/utils/CornerstoneViewportDownloadForm.tsx
 
 
@@ -16969,7 +16969,7 @@ const cornerstoneExtension = {
 /* harmony export */   A: () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 /* harmony import */ var _ohif_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(29463);
-/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80457);
+/* harmony import */ var _ohif_ui__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(32907);
 var _ViewportActionCornersService;
 
 

package/dist/{1266.bundle.d05c9e3e79ce62556b5b.js → 1266.bundle.65739d873dab9ecff9d6.js}

@@ -25,8 +25,8 @@ const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/mode-longi
 
 const id = package_namespaceObject.UU;
 
-// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/index.tsx + 16 modules
-var cornerstone_dicom_sr_src = __webpack_require__(85687);
+// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/index.tsx + 17 modules
+var cornerstone_dicom_sr_src = __webpack_require__(84003);
 ;// CONCATENATED MODULE: ../../../modes/longitudinal/src/initToolGroups.js
 
 const colours = {

package/dist/{1374.bundle.bb71d7f2ba720e6bb094.js → 1374.bundle.e3d67cc4e0e672abd1a3.js}

@@ -12,8 +12,8 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ basic_dev_mode_src)
 });
 
-// EXTERNAL MODULE: ../../ui/src/index.js + 689 modules
-var src = __webpack_require__(80457);
+// EXTERNAL MODULE: ../../ui/src/index.js + 691 modules
+var src = __webpack_require__(32907);
 // EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
 var core_src = __webpack_require__(29463);
 ;// CONCATENATED MODULE: ../../../modes/basic-dev-mode/src/toolbarButtons.js

package/dist/{2701.bundle.dfc09bd2d3c699d2e91b.js → 2701.bundle.e45478f9ac738d0cfbff.js}

@@ -23,12 +23,8 @@ var src = __webpack_require__(29463);
 var es = __webpack_require__(99993);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/tools/modules/dicomSRModule.js
 var dicomSRModule = __webpack_require__(76654);
-// EXTERNAL MODULE: ../../ui/src/index.js + 689 modules
-var ui_src = __webpack_require__(80457);
-// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/hydrateStructuredReport.ts + 1 modules
-var hydrateStructuredReport = __webpack_require__(22989);
-// EXTERNAL MODULE: ./state/index.js + 1 modules
-var state = __webpack_require__(45981);
+// EXTERNAL MODULE: ../../ui/src/index.js + 691 modules
+var ui_src = __webpack_require__(32907);
 // EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/utils/createReferencedImageDisplaySet.ts
 var createReferencedImageDisplaySet = __webpack_require__(92643);
 // EXTERNAL MODULE: ../../../extensions/cornerstone/src/index.tsx + 105 modules
@@ -46,8 +42,6 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 
 
 
-
-
 const MEASUREMENT_TRACKING_EXTENSION_ID = '@ohif/extension-measurement-tracking';
 const SR_TOOLGROUP_BASE_NAME = 'SRToolGroup';
 function OHIFCornerstoneSRMeasurementViewport(props) {
@@ -59,10 +53,8 @@ function OHIFCornerstoneSRMeasurementViewport(props) {
     servicesManager,
     extensionManager
   } = props;
-  const [appConfig] = (0,state/* useAppConfig */.r)();
   const {
     displaySetService,
-    measurementService,
     viewportActionCornersService
   } = servicesManager.services;
   const viewportId = viewportOptions.viewportId;
@@ -91,36 +83,11 @@ function OHIFCornerstoneSRMeasurementViewport(props) {
 
   // Optional hook into tracking extension, if present.
   let trackedMeasurements;
-  let sendTrackedMeasurementsEvent;
   const hasMeasurementTrackingExtension = extensionManager.registeredExtensionIds.includes(MEASUREMENT_TRACKING_EXTENSION_ID);
   if (hasMeasurementTrackingExtension) {
     const contextModule = extensionManager.getModuleEntry('@ohif/extension-measurement-tracking.contextModule.TrackedMeasurementsContext');
     const tracked = (0,react.useContext)(contextModule.context);
     trackedMeasurements = tracked?.[0];
-    sendTrackedMeasurementsEvent = tracked?.[1];
-  }
-  if (!sendTrackedMeasurementsEvent) {
-    // if no panels from measurement-tracking extension is used, this code will run
-    trackedMeasurements = null;
-    sendTrackedMeasurementsEvent = (eventName, {
-      displaySetInstanceUID
-    }) => {
-      measurementService.clearMeasurements();
-      const {
-        SeriesInstanceUIDs
-      } = (0,hydrateStructuredReport/* default */.A)({
-        servicesManager,
-        extensionManager,
-        appConfig
-      }, displaySetInstanceUID);
-      const displaySets = displaySetService.getDisplaySetsForSeries(SeriesInstanceUIDs[0]);
-      if (displaySets.length) {
-        viewportGridService.setDisplaySetsForViewports([{
-          viewportId: activeViewportId,
-          displaySetInstanceUIDs: [displaySets[0].displaySetInstanceUID]
-        }]);
-      }
-    };
   }
 
   /**
@@ -308,8 +275,8 @@ function OHIFCornerstoneSRMeasurementViewport(props) {
         viewportId,
         isRehydratable: srDisplaySet.isRehydratable,
         isLocked,
-        sendTrackedMeasurementsEvent,
-        t
+        t,
+        servicesManager
       }),
       indexPriority: -100,
       location: viewportActionCornersService.LOCATIONS.topLeft
@@ -324,7 +291,7 @@ function OHIFCornerstoneSRMeasurementViewport(props) {
       indexPriority: 0,
       location: viewportActionCornersService.LOCATIONS.topRight
     }]);
-  }, [isLocked, onMeasurementChange, sendTrackedMeasurementsEvent, srDisplaySet, t, viewportActionCornersService, viewportId]);
+  }, [isLocked, onMeasurementChange, srDisplaySet, t, viewportActionCornersService, viewportId]);
 
   // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   let childrenWithProps = null;
@@ -399,15 +366,9 @@ function _getStatusComponent({
   viewportId,
   isRehydratable,
   isLocked,
-  sendTrackedMeasurementsEvent,
-  t
+  t,
+  servicesManager
 }) {
-  const handleMouseUp = () => {
-    sendTrackedMeasurementsEvent('HYDRATE_SR', {
-      displaySetInstanceUID: srDisplaySet.displaySetInstanceUID,
-      viewportId
-    });
-  };
   const loadStr = t('LOAD');
 
   // 1 - Incompatible
@@ -436,18 +397,46 @@ function _getStatusComponent({
       });
       ToolTipMessage = () => /*#__PURE__*/react.createElement("div", null, `Click ${loadStr} to restore measurements.`);
   }
-  const StatusArea = () => /*#__PURE__*/react.createElement("div", {
-    className: "flex h-6 cursor-default text-sm leading-6 text-white"
-  }, /*#__PURE__*/react.createElement("div", {
-    className: "bg-customgray-100 flex min-w-[45px] items-center rounded-l-xl rounded-r p-1"
-  }, /*#__PURE__*/react.createElement(StatusIcon, null), /*#__PURE__*/react.createElement("span", {
-    className: "ml-1"
-  }, "SR")), state === 3 && /*#__PURE__*/react.createElement("div", {
-    className: "bg-primary-main hover:bg-primary-light ml-1 cursor-pointer rounded px-1.5 hover:text-black"
-    // Using onMouseUp here because onClick is not working when the viewport is not active and is styled with pointer-events:none
-    ,
-    onMouseUp: handleMouseUp
-  }, loadStr));
+  const StatusArea = () => {
+    const {
+      toolbarButtons: loadSRMeasurementsButtons,
+      onInteraction
+    } = (0,src/* useToolbar */.tR)({
+      servicesManager,
+      buttonSection: 'loadSRMeasurements'
+    });
+    const commandOptions = {
+      displaySetInstanceUID: srDisplaySet.displaySetInstanceUID,
+      viewportId
+    };
+    return /*#__PURE__*/react.createElement("div", {
+      className: "flex h-6 cursor-default text-sm leading-6 text-white"
+    }, /*#__PURE__*/react.createElement("div", {
+      className: "bg-customgray-100 flex min-w-[45px] items-center rounded-l-xl rounded-r p-1"
+    }, /*#__PURE__*/react.createElement(StatusIcon, null), /*#__PURE__*/react.createElement("span", {
+      className: "ml-1"
+    }, "SR")), state === 3 && /*#__PURE__*/react.createElement(react.Fragment, null, loadSRMeasurementsButtons.map(toolDef => {
+      if (!toolDef) {
+        return null;
+      }
+      const {
+        id,
+        Component,
+        componentProps
+      } = toolDef;
+      const tool = /*#__PURE__*/react.createElement(Component, _extends({
+        key: id,
+        id: id,
+        onInteraction: args => onInteraction({
+          ...args,
+          ...commandOptions
+        })
+      }, componentProps));
+      return /*#__PURE__*/react.createElement("div", {
+        key: id
+      }, tool);
+    })));
+  };
   return /*#__PURE__*/react.createElement(react.Fragment, null, ToolTipMessage && /*#__PURE__*/react.createElement(ui_src/* Tooltip */.m_, {
     content: /*#__PURE__*/react.createElement(ToolTipMessage, null),
     position: "bottom-left"

package/dist/{3198.bundle.88e42b9465970cc81f62.js → 3198.bundle.389da8f7bb3302293928.js}

@@ -722,8 +722,8 @@ var react = __webpack_require__(86326);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(97598);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
-// EXTERNAL MODULE: ../../ui/src/index.js + 689 modules
-var src = __webpack_require__(80457);
+// EXTERNAL MODULE: ../../ui/src/index.js + 691 modules
+var src = __webpack_require__(32907);
 // EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
 var core_src = __webpack_require__(29463);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules

package/dist/{3200.bundle.8d22d9e43c28ed90c852.js → 3200.bundle.51c58dc8268ca43f55b2.js}

@@ -20,8 +20,8 @@ var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 var es = __webpack_require__(70574);
 // EXTERNAL MODULE: ../../../node_modules/@xstate/react/es/index.js + 8 modules
 var react_es = __webpack_require__(95261);
-// EXTERNAL MODULE: ../../ui/src/index.js + 689 modules
-var src = __webpack_require__(80457);
+// EXTERNAL MODULE: ../../ui/src/index.js + 691 modules
+var src = __webpack_require__(32907);
 // EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 115 modules
 var default_src = __webpack_require__(28797);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/measurementTrackingMachine.js
@@ -716,8 +716,8 @@ function promptTrackNewStudy_askSaveDiscardOrCancel(UIViewportDialogService, vie
   });
 }
 /* harmony default export */ const TrackedMeasurementsContext_promptTrackNewStudy = (promptTrackNewStudy);
-// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/index.tsx + 16 modules
-var cornerstone_dicom_sr_src = __webpack_require__(85687);
+// EXTERNAL MODULE: ../../../extensions/cornerstone-dicom-sr/src/index.tsx + 17 modules
+var cornerstone_dicom_sr_src = __webpack_require__(84003);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/contexts/TrackedMeasurementsContext/promptHydrateStructuredReport.js
 
 
@@ -1092,6 +1092,13 @@ function TrackedMeasurementsContextProvider({
     };
     triggerPromptHydrateFlow();
   }, [trackedMeasurements, activeViewportId, sendTrackedMeasurementsEvent, servicesManager.services, viewports]);
+  (0,react.useEffect)(() => {
+    // The command needs to be bound to the context's sendTrackedMeasurementsEvent
+    // so the command has to be registered in a React component.
+    commandsManager.registerCommand('DEFAULT', 'loadTrackedSRMeasurements', {
+      commandFn: props => sendTrackedMeasurementsEvent('HYDRATE_SR', props)
+    });
+  }, [commandsManager, sendTrackedMeasurementsEvent]);
   return /*#__PURE__*/react.createElement(TrackedMeasurementsContext.Provider, {
     value: [trackedMeasurements, sendTrackedMeasurementsEvent]
   }, children);
@@ -1142,10 +1149,10 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ measurement_tracking_src)
 });
 
-// EXTERNAL MODULE: ../../../extensions/measurement-tracking/src/getContextModule.tsx + 9 modules
-var getContextModule = __webpack_require__(79044);
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
 var react = __webpack_require__(86326);
+// EXTERNAL MODULE: ../../../extensions/measurement-tracking/src/getContextModule.tsx + 9 modules
+var getContextModule = __webpack_require__(79044);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
 var prop_types = __webpack_require__(97598);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
@@ -1155,8 +1162,8 @@ var dist = __webpack_require__(4194);
 var es = __webpack_require__(99993);
 // EXTERNAL MODULE: ../../core/src/index.ts + 71 modules
 var src = __webpack_require__(29463);
-// EXTERNAL MODULE: ../../ui/src/index.js + 689 modules
-var ui_src = __webpack_require__(80457);
+// EXTERNAL MODULE: ../../ui/src/index.js + 691 modules
+var ui_src = __webpack_require__(32907);
 // EXTERNAL MODULE: ../../ui-next/src/index.ts + 2603 modules
 var ui_next_src = __webpack_require__(24338);
 // EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 115 modules
@@ -2106,11 +2113,16 @@ const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/extension-
 
 const id = package_namespaceObject.UU;
 
+// EXTERNAL MODULE: ../../i18n/src/index.js + 150 modules
+var i18n_src = __webpack_require__(16076);
 ;// CONCATENATED MODULE: ../../../extensions/measurement-tracking/src/index.tsx
 
 
 
 
+
+
+
 const measurementTrackingExtension = {
   /**
    * Only required property. Should be a unique value across all extensions.
@@ -2118,7 +2130,25 @@ const measurementTrackingExtension = {
   id: id,
   getContextModule: getContextModule/* default */.A,
   getPanelModule: src_getPanelModule,
-  getViewportModule: src_getViewportModule
+  getViewportModule: src_getViewportModule,
+  onModeEnter({
+    servicesManager
+  }) {
+    const {
+      toolbarService
+    } = servicesManager.services;
+    toolbarService.addButtons([{
+      // A button for loading tracked, SR measurements.
+      // Note that the command run is registered in TrackedMeasurementsContext
+      // because it must be bound to a React context's data.
+      id: 'loadSRMeasurements',
+      component: props => /*#__PURE__*/react.createElement(ui_src/* ViewportActionButton */.N8, props, i18n_src/* default */.A.t('Common:LOAD')),
+      props: {
+        commands: ['loadTrackedSRMeasurements']
+      }
+    }], true // replace the button if it is already defined
+    );
+  }
 };
 /* harmony default export */ const measurement_tracking_src = (measurementTrackingExtension);
 

package/dist/{3902.bundle.bcd1136521a2376e6ffd.js → 3902.bundle.cae392d517bba3de8f3c.js}

@@ -16,8 +16,8 @@ __webpack_require__.d(__webpack_exports__, {
 var react = __webpack_require__(86326);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
 var es = __webpack_require__(99993);
-// EXTERNAL MODULE: ../../ui/src/index.js + 689 modules
-var src = __webpack_require__(80457);
+// EXTERNAL MODULE: ../../ui/src/index.js + 691 modules
+var src = __webpack_require__(32907);
 ;// CONCATENATED MODULE: ../../../extensions/cornerstone-dicom-seg/src/utils/initSEGToolGroup.ts
 function createSEGToolGroupAndAddTools(ToolGroupService, customizationService, toolGroupId) {
   const {
@@ -136,11 +136,8 @@ function _getStatusComponent({
       className: "bg-customgray-100 flex min-w-[45px] items-center rounded-l-xl rounded-r p-1"
     }, /*#__PURE__*/react.createElement(StatusIcon, null), /*#__PURE__*/react.createElement("span", {
       className: "ml-1"
-    }, "SEG")), !isHydrated && /*#__PURE__*/react.createElement("div", {
-      className: "bg-primary-main hover:bg-primary-light ml-1 cursor-pointer rounded px-1.5 hover:text-black"
-      // Using onMouseUp here because onClick is not working when the viewport is not active and is styled with pointer-events:none
-      ,
-      onMouseUp: onStatusClick
+    }, "SEG")), !isHydrated && /*#__PURE__*/react.createElement(src/* ViewportActionButton */.N8, {
+      onInteraction: onStatusClick
     }, loadStr));
   };
   return /*#__PURE__*/react.createElement(react.Fragment, null, ToolTipMessage && /*#__PURE__*/react.createElement(src/* Tooltip */.m_, {