@ohif/app 3.8.0-beta.8 → 3.8.0-beta.80

package/dist/{236.bundle.4e9924934a747afac132.js → 889.bundle.7858e4b7ca1a2b12b64f.js}

@@ -1,9 +1,9 @@
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[236],{
+"use strict";
+(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[889],{
 
-/***/ 80965:
+/***/ 62889:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
-"use strict";
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
@@ -13,21 +13,21 @@ __webpack_require__.d(__webpack_exports__, {
 });
 
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/package.json
-const package_namespaceObject = JSON.parse('{"u2":"@ohif/extension-dicom-microscopy"}');
+const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/extension-dicom-microscopy"}');
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/id.js
 
-const id = package_namespaceObject.u2;
+const id = package_namespaceObject.UU;
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(43001);
-// EXTERNAL MODULE: ../../ui/src/index.js + 486 modules
-var src = __webpack_require__(22582);
-// EXTERNAL MODULE: ../../core/src/index.ts + 65 modules
-var core_src = __webpack_require__(71771);
+var react = __webpack_require__(41766);
+// EXTERNAL MODULE: ../../ui/src/index.js + 785 modules
+var src = __webpack_require__(5085);
+// EXTERNAL MODULE: ../../core/src/index.ts + 70 modules
+var core_src = __webpack_require__(55411);
 // EXTERNAL MODULE: ../../../node_modules/react-i18next/dist/es/index.js + 15 modules
-var es = __webpack_require__(69190);
-// EXTERNAL MODULE: ../../../node_modules/mathjs/lib/esm/index.js + 982 modules
-var esm = __webpack_require__(55220);
+var es = __webpack_require__(80619);
+// EXTERNAL MODULE: ../../../node_modules/mathjs/lib/esm/index.js + 996 modules
+var esm = __webpack_require__(23109);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/coordinateFormatScoord3d2Geometry.js
 
 
@@ -117,9 +117,9 @@ function mapSlideCoord2PixelCoord(options) {
   }
   const point = options.point;
   const m = [[orientation[0] * spacing[1], orientation[3] * spacing[0], offset[0]], [orientation[1] * spacing[1], orientation[4] * spacing[0], offset[1]], [0, 0, 1]];
-  const mInverted = (0,esm/* inv */.JBn)(m);
+  const mInverted = (0,esm/* inv */.WCD)(m);
   const vSlide = [[point[0]], [point[1]], [1]];
-  const vImage = (0,esm/* multiply */.JpY)(mInverted, vSlide);
+  const vImage = (0,esm/* multiply */.lwT)(mInverted, vSlide);
   const row = Number(vImage[1][0].toFixed(4));
   const col = Number(vImage[0][0].toFixed(4));
   return [col, row];
@@ -212,7 +212,7 @@ const EVENTS = {
  * ViewerManager encapsulates the complexity of the third-party viewer and
  * expose only the features/behaviors that are relevant to the application
  */
-class ViewerManager extends core_src/* PubSubService */.hC {
+class ViewerManager extends core_src/* PubSubService */.Rc {
   constructor(viewer, viewportId, container, studyInstanceUID, seriesInstanceUID) {
     super(EVENTS);
     this.viewer = viewer;
@@ -414,11 +414,10 @@ class ViewerManager extends core_src/* PubSubService */.hC {
    * @param {object} roi.properties - ROI properties
    * @returns {void}
    */
-  updateROIProperties(_ref) {
-    let {
-      uid,
-      properties
-    } = _ref;
+  updateROIProperties({
+    uid,
+    properties
+  }) {
     this.viewer.updateROI({
       uid,
       properties
@@ -616,10 +615,8 @@ const RoiAnnotation_EVENTS = {
 /**
  * Represents a single annotation for the Microscopy Viewer
  */
-class RoiAnnotation extends core_src/* PubSubService */.hC {
-  constructor(roiGraphic, studyInstanceUID, seriesInstanceUID) {
-    let label = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
-    let viewState = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
+class RoiAnnotation extends core_src/* PubSubService */.Rc {
+  constructor(roiGraphic, studyInstanceUID, seriesInstanceUID, label = '', viewState = null) {
     super(RoiAnnotation_EVENTS);
     this.uid = roiGraphic.uid;
     this.roiGraphic = roiGraphic;
@@ -770,6 +767,7 @@ class RoiAnnotation extends core_src/* PubSubService */.hC {
 
 /* harmony default export */ const utils_RoiAnnotation = (RoiAnnotation);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/services/MicroscopyService.ts
+var _MicroscopyService;
 
 
 
@@ -788,7 +786,7 @@ const MicroscopyService_EVENTS = {
  * viewers and handle their ROI graphics to create, remove and modify the
  * ROI annotations relevant to the application
  */
-class MicroscopyService extends core_src/* PubSubService */.hC {
+class MicroscopyService extends core_src/* PubSubService */.Rc {
   constructor(serviceManager) {
     super(MicroscopyService_EVENTS);
     this.serviceManager = void 0;
@@ -1296,6 +1294,9 @@ class MicroscopyService extends core_src/* PubSubService */.hC {
     this.managedViewers.forEach(mv => mv.activateInteractions(interactions));
     this.activeInteractions = interactions;
   }
+  getActiveInteractions() {
+    return this.activeInteractions;
+  }
 
   /**
    * Triggers the relabelling process for the given RoiAnnotation instance, by
@@ -1304,21 +1305,16 @@ class MicroscopyService extends core_src/* PubSubService */.hC {
    * @param {RoiAnnotation} roiAnnotation The instance to be relabelled
    * @param {boolean} newAnnotation Whether the annotation is newly drawn (so it deletes on cancel).
    */
-  triggerRelabel(roiAnnotation) {
-    let newAnnotation = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    let onRelabel = arguments.length > 2 ? arguments[2] : undefined;
+  triggerRelabel(roiAnnotation, newAnnotation = false, onRelabel) {
     if (!onRelabel) {
-      onRelabel = _ref => {
-        let {
+      onRelabel = ({
+        label
+      }) => this.managedViewers.forEach(mv => mv.updateROIProperties({
+        uid: roiAnnotation.uid,
+        properties: {
           label
-        } = _ref;
-        return this.managedViewers.forEach(mv => mv.updateROIProperties({
-          uid: roiAnnotation.uid,
-          properties: {
-            label
-          }
-        }));
-      };
+        }
+      }));
     }
     this._broadcastEvent(MicroscopyService_EVENTS.RELABEL, {
       roiAnnotation,
@@ -1354,21 +1350,21 @@ class MicroscopyService extends core_src/* PubSubService */.hC {
     this.managedViewers.forEach(mv => mv.setROIStyle(uid, styleOptions));
   }
 }
+_MicroscopyService = MicroscopyService;
 MicroscopyService.REGISTRATION = serviceManager => {
   return {
     name: 'microscopyService',
     altName: 'MicroscopyService',
-    create: _ref2 => {
-      let {
-        configuration = {}
-      } = _ref2;
-      return new MicroscopyService(serviceManager);
+    create: ({
+      configuration = {}
+    }) => {
+      return new _MicroscopyService(serviceManager);
     }
   };
 };
 
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
-var dcmjs_es = __webpack_require__(67540);
+var dcmjs_es = __webpack_require__(31426);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/callInputDialog.tsx
 
 
@@ -1382,19 +1378,17 @@ var dcmjs_es = __webpack_require__(67540);
  * @param {func} callback
  * @param {*} isArrowAnnotateInputDialog
  */
-function callInputDialog(_ref) {
-  let {
-    uiDialogService,
-    title = 'Annotation',
-    defaultValue = '',
-    callback = (value, action) => {}
-  } = _ref;
+function callInputDialog({
+  uiDialogService,
+  title = 'Annotation',
+  defaultValue = '',
+  callback = (value, action) => {}
+}) {
   const dialogId = 'microscopy-input-dialog';
-  const onSubmitHandler = _ref2 => {
-    let {
-      action,
-      value
-    } = _ref2;
+  const onSubmitHandler = ({
+    action,
+    value
+  }) => {
     switch (action.id) {
       case 'save':
         callback(value.value, action.id);
@@ -1413,7 +1407,7 @@ function callInputDialog(_ref) {
       centralize: true,
       isDraggable: false,
       showOverlay: true,
-      content: src/* Dialog */.Vq,
+      content: src/* Dialog */.lG,
       contentProps: {
         title: title,
         value: {
@@ -1426,19 +1420,18 @@ function callInputDialog(_ref) {
         actions: [{
           id: 'cancel',
           text: 'Cancel',
-          type: src/* ButtonEnums.type */.LZ.dt.secondary
+          type: src/* ButtonEnums.type */.Ny.NW.secondary
         }, {
           id: 'save',
           text: 'Save',
-          type: src/* ButtonEnums.type */.LZ.dt.primary
+          type: src/* ButtonEnums.type */.Ny.NW.primary
         }],
         onSubmit: onSubmitHandler,
-        body: _ref3 => {
-          let {
-            value,
-            setValue
-          } = _ref3;
-          return /*#__PURE__*/react.createElement(src/* Input */.II, {
+        body: ({
+          value,
+          setValue
+        }) => {
+          return /*#__PURE__*/react.createElement(src/* Input */.pd, {
             label: "Enter your annotation",
             labelClassName: "text-white text-[14px] leading-[1.2]",
             autoFocus: true,
@@ -1485,11 +1478,10 @@ const uid = '2.25.285241207697168520771311899641885187923';
  *
  * @return Comprehensive3DSR dataset
  */
-function constructSR(metadata, _ref, annotations) {
-  let {
-    SeriesDescription,
-    SeriesNumber
-  } = _ref;
+function constructSR(metadata, {
+  SeriesDescription,
+  SeriesNumber
+}, annotations) {
   // Handle malformed data
   if (!metadata.SpecimenDescriptionSequence) {
     metadata.SpecimenDescriptionSequence = {
@@ -1502,34 +1494,34 @@ function constructSR(metadata, _ref, annotations) {
   } = metadata;
 
   // construct Comprehensive3DSR dataset
-  const observationContext = new dcmjs_es["default"].sr.templates.ObservationContext({
-    observerPersonContext: new dcmjs_es["default"].sr.templates.ObserverContext({
-      observerType: new dcmjs_es["default"].sr.coding.CodedConcept({
+  const observationContext = new dcmjs_es/* default.sr */.Ay.sr.templates.ObservationContext({
+    observerPersonContext: new dcmjs_es/* default.sr */.Ay.sr.templates.ObserverContext({
+      observerType: new dcmjs_es/* default.sr */.Ay.sr.coding.CodedConcept({
         value: '121006',
         schemeDesignator: 'DCM',
         meaning: 'Person'
       }),
-      observerIdentifyingAttributes: new dcmjs_es["default"].sr.templates.PersonObserverIdentifyingAttributes({
+      observerIdentifyingAttributes: new dcmjs_es/* default.sr */.Ay.sr.templates.PersonObserverIdentifyingAttributes({
         name: '@ohif/extension-dicom-microscopy'
       })
     }),
-    observerDeviceContext: new dcmjs_es["default"].sr.templates.ObserverContext({
-      observerType: new dcmjs_es["default"].sr.coding.CodedConcept({
+    observerDeviceContext: new dcmjs_es/* default.sr */.Ay.sr.templates.ObserverContext({
+      observerType: new dcmjs_es/* default.sr */.Ay.sr.coding.CodedConcept({
         value: '121007',
         schemeDesignator: 'DCM',
         meaning: 'Device'
       }),
-      observerIdentifyingAttributes: new dcmjs_es["default"].sr.templates.DeviceObserverIdentifyingAttributes({
+      observerIdentifyingAttributes: new dcmjs_es/* default.sr */.Ay.sr.templates.DeviceObserverIdentifyingAttributes({
         uid: DEVICE_OBSERVER_UID
       })
     }),
-    subjectContext: new dcmjs_es["default"].sr.templates.SubjectContext({
-      subjectClass: new dcmjs_es["default"].sr.coding.CodedConcept({
+    subjectContext: new dcmjs_es/* default.sr */.Ay.sr.templates.SubjectContext({
+      subjectClass: new dcmjs_es/* default.sr */.Ay.sr.coding.CodedConcept({
         value: '121027',
         schemeDesignator: 'DCM',
         meaning: 'Specimen'
       }),
-      subjectClassSpecificContext: new dcmjs_es["default"].sr.templates.SubjectContextSpecimen({
+      subjectClassSpecificContext: new dcmjs_es/* default.sr */.Ay.sr.templates.SubjectContextSpecimen({
         uid: SpecimenDescriptionSequence.SpecimenUID,
         identifier: SpecimenDescriptionSequence.SpecimenIdentifier || metadata.SeriesInstanceUID,
         containerIdentifier: metadata.ContainerIdentifier || metadata.SeriesInstanceUID
@@ -1561,14 +1553,14 @@ function constructSR(metadata, _ref, annotations) {
       const ConceptName = Array.isArray(measurement.ConceptNameCodeSequence) ? measurement.ConceptNameCodeSequence[0] : measurement.ConceptNameCodeSequence;
       const MeasuredValue = Array.isArray(measurement.MeasuredValueSequence) ? measurement.MeasuredValueSequence[0] : measurement.MeasuredValueSequence;
       const MeasuredValueUnits = Array.isArray(MeasuredValue.MeasurementUnitsCodeSequence) ? MeasuredValue.MeasurementUnitsCodeSequence[0] : MeasuredValue.MeasurementUnitsCodeSequence;
-      return new dcmjs_es["default"].sr.valueTypes.NumContentItem({
-        name: new dcmjs_es["default"].sr.coding.CodedConcept({
+      return new dcmjs_es/* default.sr */.Ay.sr.valueTypes.NumContentItem({
+        name: new dcmjs_es/* default.sr */.Ay.sr.coding.CodedConcept({
           meaning: ConceptName.CodeMeaning,
           value: ConceptName.CodeValue,
           schemeDesignator: ConceptName.CodingSchemeDesignator
         }),
         value: MeasuredValue.NumericValue,
-        unit: new dcmjs_es["default"].sr.coding.CodedConcept({
+        unit: new dcmjs_es/* default.sr */.Ay.sr.coding.CodedConcept({
           value: MeasuredValueUnits.CodeValue,
           meaning: MeasuredValueUnits.CodeMeaning,
           schemeDesignator: MeasuredValueUnits.CodingSchemeDesignator
@@ -1579,8 +1571,8 @@ function constructSR(metadata, _ref, annotations) {
     /** Avoid incompatibility with dcmjs */
     evaluations = evaluations.map(evaluation => {
       const ConceptName = Array.isArray(evaluation.ConceptNameCodeSequence) ? evaluation.ConceptNameCodeSequence[0] : evaluation.ConceptNameCodeSequence;
-      return new dcmjs_es["default"].sr.valueTypes.TextContentItem({
-        name: new dcmjs_es["default"].sr.coding.CodedConcept({
+      return new dcmjs_es/* default.sr */.Ay.sr.valueTypes.TextContentItem({
+        name: new dcmjs_es/* default.sr */.Ay.sr.coding.CodedConcept({
           value: ConceptName.CodeValue,
           meaning: ConceptName.CodeMeaning,
           schemeDesignator: ConceptName.CodingSchemeDesignator
@@ -1590,17 +1582,17 @@ function constructSR(metadata, _ref, annotations) {
       });
     });
     const identifier = `ROI #${i + 1}`;
-    const group = new dcmjs_es["default"].sr.templates.PlanarROIMeasurementsAndQualitativeEvaluations({
-      trackingIdentifier: new dcmjs_es["default"].sr.templates.TrackingIdentifier({
+    const group = new dcmjs_es/* default.sr */.Ay.sr.templates.PlanarROIMeasurementsAndQualitativeEvaluations({
+      trackingIdentifier: new dcmjs_es/* default.sr */.Ay.sr.templates.TrackingIdentifier({
         uid: roi.uid,
         identifier: presentationState ? identifier.concat(`(${JSON.stringify(presentationState)})`) : identifier
       }),
-      referencedRegion: new dcmjs_es["default"].sr.contentItems.ImageRegion3D({
+      referencedRegion: new dcmjs_es/* default.sr */.Ay.sr.contentItems.ImageRegion3D({
         graphicType: roi.scoord3d.graphicType,
         graphicData: roi.scoord3d.graphicData,
         frameOfReferenceUID: roi.scoord3d.frameOfReferenceUID
       }),
-      findingType: new dcmjs_es["default"].sr.coding.CodedConcept({
+      findingType: new dcmjs_es/* default.sr */.Ay.sr.coding.CodedConcept({
         value: label,
         schemeDesignator: '@ohif/extension-dicom-microscopy',
         meaning: 'FREETEXT'
@@ -1611,23 +1603,23 @@ function constructSR(metadata, _ref, annotations) {
     });
     imagingMeasurements.push(...group);
   }
-  const measurementReport = new dcmjs_es["default"].sr.templates.MeasurementReport({
-    languageOfContentItemAndDescendants: new dcmjs_es["default"].sr.templates.LanguageOfContentItemAndDescendants({}),
+  const measurementReport = new dcmjs_es/* default.sr */.Ay.sr.templates.MeasurementReport({
+    languageOfContentItemAndDescendants: new dcmjs_es/* default.sr */.Ay.sr.templates.LanguageOfContentItemAndDescendants({}),
     observationContext,
-    procedureReported: new dcmjs_es["default"].sr.coding.CodedConcept({
+    procedureReported: new dcmjs_es/* default.sr */.Ay.sr.coding.CodedConcept({
       value: '112703',
       schemeDesignator: 'DCM',
       meaning: 'Whole Slide Imaging'
     }),
     imagingMeasurements
   });
-  const dataset = new dcmjs_es["default"].sr.documents.Comprehensive3DSR({
+  const dataset = new dcmjs_es/* default.sr */.Ay.sr.documents.Comprehensive3DSR({
     content: measurementReport[0],
     evidence: [metadata],
-    seriesInstanceUID: dcmjs_es["default"].data.DicomMetaDictionary.uid(),
+    seriesInstanceUID: dcmjs_es/* default.data */.Ay.data.DicomMetaDictionary.uid(),
     seriesNumber: SeriesNumber,
     seriesDescription: SeriesDescription || 'Whole slide imaging structured report',
-    sopInstanceUID: dcmjs_es["default"].data.DicomMetaDictionary.uid(),
+    sopInstanceUID: dcmjs_es/* default.data */.Ay.data.DicomMetaDictionary.uid(),
     instanceNumber: 1,
     manufacturer: 'dcmjs-org'
   });
@@ -1647,7 +1639,7 @@ function constructSR(metadata, _ref, annotations) {
       vr: 'UI'
     },
     ImplementationClassUID: {
-      Value: [dcmjs_es["default"].data.DicomMetaDictionary.uid()],
+      Value: [dcmjs_es/* default.data */.Ay.data.DicomMetaDictionary.uid()],
       vr: 'UI'
     },
     ImplementationVersionName: {
@@ -1685,7 +1677,7 @@ function saveByteArray(buffer, filename) {
 let saving = false;
 const {
   datasetToBuffer
-} = dcmjs_es["default"].data;
+} = dcmjs_es/* default.data */.Ay.data;
 const formatArea = area => {
   let mult = 1;
   let unit = 'mm';
@@ -1931,10 +1923,9 @@ function MicroscopyPanel(props) {
    *
    * @param param0
    */
-  const onMeasurementItemClickHandler = _ref => {
-    let {
-      uid
-    } = _ref;
+  const onMeasurementItemClickHandler = ({
+    uid
+  }) => {
     const roiAnnotation = microscopyService.getAnnotation(uid);
     microscopyService.selectAnnotation(roiAnnotation);
     microscopyService.focusAnnotation(roiAnnotation, props.activeViewportId);
@@ -1944,15 +1935,21 @@ function MicroscopyPanel(props) {
    * Handler for "Edit" action of an annotation item
    * @param param0
    */
-  const onMeasurementItemEditHandler = _ref2 => {
-    let {
-      uid,
-      isActive
-    } = _ref2;
+  const onMeasurementItemEditHandler = ({
+    uid,
+    isActive
+  }) => {
     props.commandsManager.runCommand('setLabel', {
       uid
     }, 'MICROSCOPY');
   };
+  const onMeasurementDeleteHandler = ({
+    uid,
+    isActive
+  }) => {
+    const roiAnnotation = microscopyService.getAnnotation(uid);
+    microscopyService.removeAnnotation(roiAnnotation);
+  };
 
   // Convert ROI annotations managed by microscopyService into our
   // own format for display
@@ -1986,19 +1983,19 @@ function MicroscopyPanel(props) {
       roiAnnotation
     };
   });
-  const disabled = data.length === 0;
   return /*#__PURE__*/react.createElement(react.Fragment, null, /*#__PURE__*/react.createElement("div", {
     className: "ohif-scrollbar overflow-y-auto overflow-x-hidden",
     "data-cy": 'measurements-panel'
-  }, /*#__PURE__*/react.createElement(src/* MeasurementTable */.wt, {
+  }, /*#__PURE__*/react.createElement(src/* MeasurementTable */.V, {
     title: "Measurements",
     servicesManager: props.servicesManager,
     data: data,
     onClick: onMeasurementItemClickHandler,
-    onEdit: onMeasurementItemEditHandler
+    onEdit: onMeasurementItemEditHandler,
+    onDelete: onMeasurementDeleteHandler
   })));
 }
-const connectedMicroscopyPanel = (0,es/* withTranslation */.Zh)(['MicroscopyTable', 'Common'])(MicroscopyPanel);
+const connectedMicroscopyPanel = (0,es/* withTranslation */.CI)(['MicroscopyTable', 'Common'])(MicroscopyPanel);
 /* harmony default export */ const MicroscopyPanel_MicroscopyPanel = (connectedMicroscopyPanel);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/getPanelModule.tsx
 
@@ -2010,17 +2007,16 @@ const connectedMicroscopyPanel = (0,es/* withTranslation */.Zh)(['MicroscopyTabl
 // - cancel promises when component is destroyed
 // - show errors in UI for thumbnails if promise fails
 
-function getPanelModule(_ref) {
-  let {
-    commandsManager,
-    extensionManager,
-    servicesManager
-  } = _ref;
+function getPanelModule({
+  commandsManager,
+  extensionManager,
+  servicesManager
+}) {
   const wrappedMeasurementPanel = () => {
     const [{
       activeViewportId,
       viewports
-    }] = (0,src/* useViewportGrid */.O_)();
+    }] = (0,src/* useViewportGrid */.ih)();
     return /*#__PURE__*/react.createElement(MicroscopyPanel_MicroscopyPanel, {
       viewports: viewports,
       activeViewportId: activeViewportId,
@@ -2043,12 +2039,11 @@ function getPanelModule(_ref) {
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/getCommandsModule.ts
 
 
-function getCommandsModule(_ref) {
-  let {
-    servicesManager,
-    commandsManager,
-    extensionManager
-  } = _ref;
+function getCommandsModule({
+  servicesManager,
+  commandsManager,
+  extensionManager
+}) {
   const {
     viewportGridService,
     uiDialogService,
@@ -2056,10 +2051,9 @@ function getCommandsModule(_ref) {
   } = servicesManager.services;
   const actions = {
     // Measurement tool commands:
-    deleteMeasurement: _ref2 => {
-      let {
-        uid
-      } = _ref2;
+    deleteMeasurement: ({
+      uid
+    }) => {
       if (uid) {
         const roiAnnotation = microscopyService.getAnnotation(uid);
         if (roiAnnotation) {
@@ -2067,10 +2061,9 @@ function getCommandsModule(_ref) {
         }
       }
     },
-    setLabel: _ref3 => {
-      let {
-        uid
-      } = _ref3;
+    setLabel: ({
+      uid
+    }) => {
       const roiAnnotation = microscopyService.getAnnotation(uid);
       callInputDialog({
         uiDialogService,
@@ -2086,11 +2079,10 @@ function getCommandsModule(_ref) {
         }
       });
     },
-    setToolActive: _ref4 => {
-      let {
-        toolName,
-        toolGroupId = 'MICROSCOPY'
-      } = _ref4;
+    setToolActive: ({
+      toolName,
+      toolGroupId = 'MICROSCOPY'
+    }) => {
       const dragPanOnMiddle = ['dragPan', {
         bindings: {
           mouseButtons: ['middle']
@@ -2146,8 +2138,7 @@ function getCommandsModule(_ref) {
 
       // overview
       const {
-        activeViewportId,
-        viewports
+        activeViewportId
       } = viewportGridService.getState();
       microscopyService.toggleOverviewMap(activeViewportId);
     },
@@ -2157,29 +2148,19 @@ function getCommandsModule(_ref) {
   };
   const definitions = {
     deleteMeasurement: {
-      commandFn: actions.deleteMeasurement,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.deleteMeasurement
     },
     setLabel: {
-      commandFn: actions.setLabel,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.setLabel
     },
     setToolActive: {
-      commandFn: actions.setToolActive,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.setToolActive
     },
     toggleOverlays: {
-      commandFn: actions.toggleOverlays,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.toggleOverlays
     },
     toggleAnnotations: {
-      commandFn: actions.toggleAnnotations,
-      storeContexts: [],
-      options: {}
+      commandFn: actions.toggleAnnotations
     }
   };
   return {
@@ -2192,7 +2173,7 @@ function getCommandsModule(_ref) {
 
 const {
   utils
-} = core_src["default"];
+} = core_src/* default */.Ay;
 const SOP_CLASS_UIDS = {
   VL_WHOLE_SLIDE_MICROSCOPY_IMAGE_STORAGE: '1.2.840.10008.5.1.4.1.1.77.1.6'
 };
@@ -2284,11 +2265,10 @@ function _getDisplaySetsFromSeries(instances, servicesManager, extensionManager)
   };
   return [displaySet];
 }
-function getDicomMicroscopySopClassHandler(_ref) {
-  let {
-    servicesManager,
-    extensionManager
-  } = _ref;
+function getDicomMicroscopySopClassHandler({
+  servicesManager,
+  extensionManager
+}) {
   const getDisplaySetsFromSeries = instances => {
     return _getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
   };
@@ -2311,7 +2291,6 @@ const DCM_CODE_VALUES = {
   LONG_AXIS: 'G-A185',
   ELLIPSE_AREA: 'G-D7FE' // TODO: Remove this
 };
-
 /* harmony default export */ const dcmCodeValues = (DCM_CODE_VALUES);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/toArray.js
 function toArray(item) {
@@ -2321,7 +2300,7 @@ function toArray(item) {
 
 
 
-const MeasurementReport = dcmjs_es["default"].adapters.DICOMMicroscopyViewer.MeasurementReport;
+const MeasurementReport = dcmjs_es/* default.adapters */.Ay.adapters.DICOMMicroscopyViewer.MeasurementReport;
 
 // Define as async so that it returns a promise, expected by the ViewportGrid
 async function loadSR(microscopyService, microscopySRDisplaySet, referencedDisplaySet) {
@@ -2358,7 +2337,7 @@ async function loadSR(microscopyService, microscopySRDisplaySet, referencedDispl
 async function _getROIsFromToolState(naturalizedDataset, FrameOfReferenceUID) {
   const toolState = MeasurementReport.generateToolState(naturalizedDataset);
   const tools = Object.getOwnPropertyNames(toolState);
-  const DICOMMicroscopyViewer = await __webpack_require__.e(/* import() | dicom-microscopy-viewer */ 18).then(__webpack_require__.t.bind(__webpack_require__, 42613, 23));
+  const DICOMMicroscopyViewer = await __webpack_require__.e(/* import() | dicom-microscopy-viewer */ 525).then(__webpack_require__.t.bind(__webpack_require__, 95226, 23));
   const measurementGroupContentItems = _getMeasurementGroups(naturalizedDataset);
   const rois = [];
   const labels = [];
@@ -2492,7 +2471,7 @@ function getSourceDisplaySet(allDisplaySets, microscopySRDisplaySet) {
 
 const {
   utils: DicomMicroscopySRSopClassHandler_utils
-} = core_src["default"];
+} = core_src/* default */.Ay;
 const DicomMicroscopySRSopClassHandler_SOP_CLASS_UIDS = {
   COMPREHENSIVE_3D_SR: '1.2.840.10008.5.1.4.1.1.88.34'
 };
@@ -2573,11 +2552,10 @@ function DicomMicroscopySRSopClassHandler_getDisplaySetsFromSeries(instances, se
   };
   return [displaySet];
 }
-function getDicomMicroscopySRSopClassHandler(_ref) {
-  let {
-    servicesManager,
-    extensionManager
-  } = _ref;
+function getDicomMicroscopySRSopClassHandler({
+  servicesManager,
+  extensionManager
+}) {
   const getDisplaySetsFromSeries = instances => {
     return DicomMicroscopySRSopClassHandler_getDisplaySetsFromSeries(instances, servicesManager, extensionManager);
   };
@@ -2598,7 +2576,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 
 
 const Component = /*#__PURE__*/react.lazy(() => {
-  return Promise.all(/* import() */[__webpack_require__.e(743), __webpack_require__.e(604), __webpack_require__.e(417), __webpack_require__.e(23), __webpack_require__.e(342), __webpack_require__.e(250)]).then(__webpack_require__.bind(__webpack_require__, 76516));
+  return Promise.all(/* import() */[__webpack_require__.e(433), __webpack_require__.e(183), __webpack_require__.e(644), __webpack_require__.e(931), __webpack_require__.e(206), __webpack_require__.e(544)]).then(__webpack_require__.bind(__webpack_require__, 17919));
 });
 const MicroscopyViewport = props => {
   return /*#__PURE__*/react.createElement(react.Suspense, {
@@ -2609,19 +2587,15 @@ const MicroscopyViewport = props => {
 /**
  * You can remove any of the following modules if you don't need them.
  */
-/* harmony default export */ const dicom_microscopy_src = ({
+const extension = {
   /**
    * Only required property. Should be a unique value across all extensions.
    * You ID can be anything you want, but it should be unique.
    */
   id: id,
-  async preRegistration(_ref) {
-    let {
-      servicesManager,
-      commandsManager,
-      configuration = {},
-      appConfig
-    } = _ref;
+  async preRegistration({
+    servicesManager
+  }) {
     servicesManager.registerService(MicroscopyService.REGISTRATION(servicesManager));
   },
   /**
@@ -2630,12 +2604,11 @@ const MicroscopyViewport = props => {
    * {name, component} object. Example of a viewport module is the CornerstoneViewport
    * that is provided by the Cornerstone extension in OHIF.
    */
-  getViewportModule(_ref2) {
-    let {
-      servicesManager,
-      extensionManager,
-      commandsManager
-    } = _ref2;
+  getViewportModule({
+    servicesManager,
+    extensionManager,
+    commandsManager
+  }) {
     /**
      *
      * @param props {*}
@@ -2651,11 +2624,20 @@ const MicroscopyViewport = props => {
       const {
         viewportOptions
       } = props;
-      const [viewportGrid, viewportGridService] = (0,src/* useViewportGrid */.O_)();
+      const [viewportGrid, viewportGridService] = (0,src/* useViewportGrid */.ih)();
       const {
         activeViewportId
       } = viewportGrid;
+
+      // a unique identifier based on the contents of displaySets.
+      // since we changed our rendering pipeline and if there is no
+      // element size change nor viewportId change we won't re-render
+      // we need a way to force re-rendering when displaySets change.
+      const displaySetsKey = (0,react.useMemo)(() => {
+        return props.displaySets.map(ds => ds.displaySetInstanceUID).join('-');
+      }, [props.displaySets]);
       return /*#__PURE__*/react.createElement(MicroscopyViewport, _extends({
+        key: displaySetsKey,
         servicesManager: servicesManager,
         extensionManager: extensionManager,
         commandsManager: commandsManager,
@@ -2671,18 +2653,50 @@ const MicroscopyViewport = props => {
       component: ExtendedMicroscopyViewport
     }];
   },
+  getToolbarModule({
+    servicesManager
+  }) {
+    return [{
+      name: 'evaluate.microscopyTool',
+      evaluate: ({
+        button
+      }) => {
+        const {
+          microscopyService
+        } = servicesManager.services;
+        const activeInteractions = microscopyService.getActiveInteractions();
+        const isPrimaryActive = activeInteractions.find(interactions => {
+          const sameMouseButton = interactions[1].bindings.mouseButtons.includes('left');
+          if (!sameMouseButton) {
+            return false;
+          }
+          const notDraw = interactions[0] !== 'draw';
+
+          // there seems to be a custom logic for draw tool for some reason
+          return notDraw ? interactions[0] === button.id : interactions[1].geometryType === button.id;
+        });
+        return {
+          disabled: false,
+          className: isPrimaryActive ? '!text-black bg-primary-light' : '!text-common-bright hover:!bg-primary-dark hover:!text-primary-light',
+          // Todo: isActive right now is used for nested buttons where the primary
+          // button needs to be fully rounded (vs partial rounded) when active
+          // otherwise it does not have any other use
+          isActive: isPrimaryActive
+        };
+      }
+    }];
+  },
   /**
    * SopClassHandlerModule should provide a list of sop class handlers that will be
    * available in OHIF for Modes to consume and use to create displaySets from Series.
    * Each sop class handler is defined by a { name, sopClassUids, getDisplaySetsFromSeries}.
    * Examples include the default sop class handler provided by the default extension
    */
-  getSopClassHandlerModule(_ref3) {
-    let {
-      servicesManager,
-      commandsManager,
-      extensionManager
-    } = _ref3;
+  getSopClassHandlerModule({
+    servicesManager,
+    commandsManager,
+    extensionManager
+  }) {
     return [getDicomMicroscopySopClassHandler({
       servicesManager,
       extensionManager
@@ -2693,14 +2707,8 @@ const MicroscopyViewport = props => {
   },
   getPanelModule: getPanelModule,
   getCommandsModule: getCommandsModule
-});
-
-/***/ }),
-
-/***/ 78753:
-/***/ (() => {
-
-/* (ignored) */
+};
+/* harmony default export */ const dicom_microscopy_src = (extension);
 
 /***/ })