@ohif/app 3.7.0-beta.9 → 3.7.0-beta.91

package/dist/{55.bundle.550a823e75eb608e8d5e.js → 250.bundle.4bebed43526c7e06344f.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[55,806],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[250,579],{
 
-/***/ 76440:
+/***/ 76516:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -13,22 +13,22 @@ __webpack_require__.d(__webpack_exports__, {
 });
 
 // EXTERNAL MODULE: ../../../node_modules/react/index.js
-var react = __webpack_require__(32735);
+var react = __webpack_require__(43001);
 // EXTERNAL MODULE: ../../../node_modules/react-resize-detector/build/index.esm.js
-var index_esm = __webpack_require__(14664);
+var index_esm = __webpack_require__(7023);
 // EXTERNAL MODULE: ../../../node_modules/prop-types/index.js
-var prop_types = __webpack_require__(60216);
+var prop_types = __webpack_require__(3827);
 var prop_types_default = /*#__PURE__*/__webpack_require__.n(prop_types);
 // EXTERNAL MODULE: ../../../node_modules/lodash.debounce/index.js
-var lodash_debounce = __webpack_require__(40001);
+var lodash_debounce = __webpack_require__(8324);
 var lodash_debounce_default = /*#__PURE__*/__webpack_require__.n(lodash_debounce);
-// EXTERNAL MODULE: ../../ui/src/index.js + 452 modules
-var src = __webpack_require__(28619);
+// EXTERNAL MODULE: ../../ui/src/index.js + 485 modules
+var src = __webpack_require__(71783);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/DicomMicroscopyViewport.css
 // extracted by mini-css-extract-plugin
 
 // EXTERNAL MODULE: ../../../node_modules/classnames/index.js
-var classnames = __webpack_require__(40841);
+var classnames = __webpack_require__(44921);
 var classnames_default = /*#__PURE__*/__webpack_require__.n(classnames);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/components/ViewportOverlay/listComponentGenerator.tsx
 const listComponentGenerator = props => {
@@ -36,11 +36,17 @@ const listComponentGenerator = props => {
     list,
     itemGenerator
   } = props;
-  if (!list) return;
+  if (!list) {
+    return;
+  }
   return list.map(item => {
-    if (!item) return;
+    if (!item) {
+      return;
+    }
     const generator = item.generator || itemGenerator;
-    if (!generator) throw new Error(`No generator for ${item}`);
+    if (!generator) {
+      throw new Error(`No generator for ${item}`);
+    }
     return generator({
       ...props,
       item
@@ -52,9 +58,9 @@ const listComponentGenerator = props => {
 // extracted by mini-css-extract-plugin
 
 // EXTERNAL MODULE: ../../../node_modules/moment/moment.js
-var moment_moment = __webpack_require__(53806);
-// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 335 modules
-var esm = __webpack_require__(77331);
+var moment_moment = __webpack_require__(71271);
+// EXTERNAL MODULE: ../../../node_modules/@cornerstonejs/core/dist/esm/index.js + 331 modules
+var esm = __webpack_require__(3743);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/components/ViewportOverlay/utils.ts
 
 
@@ -138,7 +144,7 @@ function utils_formatPN(name) {
  * Gets compression type
  *
  * @param {number} imageId
- * @returns {string} comrpession type.
+ * @returns {string} compression type.
  */
 function getCompression(imageId) {
   const generalImageModule = cornerstone.metaData.get('generalImageModule', imageId) || {};
@@ -230,8 +236,12 @@ const itemGenerator = props => {
   props.formatTime = formatDICOMTime;
   props.formatPN = formatPN;
   props.formatNumberPrecision = formatNumberPrecision;
-  if (condition && !condition(props)) return null;
-  if (!contents && !valueFunc) return null;
+  if (condition && !condition(props)) {
+    return null;
+  }
+  if (!contents && !valueFunc) {
+    return null;
+  }
   const value = valueFunc && valueFunc(props);
   const contentsValue = contents && contents(props) || [{
     className: 'mr-1',
@@ -250,9 +260,9 @@ const itemGenerator = props => {
 };
 /* harmony default export */ const ViewportOverlay = (generateFromConfig({}));
 // EXTERNAL MODULE: ../../../node_modules/dicomweb-client/build/dicomweb-client.es.js
-var dicomweb_client_es = __webpack_require__(75935);
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var core_src = __webpack_require__(48501);
+var dicomweb_client_es = __webpack_require__(97604);
+// EXTERNAL MODULE: ../../core/src/index.ts + 64 modules
+var core_src = __webpack_require__(67869);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/dicomWebClient.ts
 
 
@@ -332,9 +342,9 @@ function getDicomWebClient(_ref) {
   return client;
 }
 // EXTERNAL MODULE: ../../../node_modules/dcmjs/build/dcmjs.es.js
-var dcmjs_es = __webpack_require__(22737);
-// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 58 modules
-var default_src = __webpack_require__(96082);
+var dcmjs_es = __webpack_require__(67540);
+// EXTERNAL MODULE: ../../../extensions/default/src/index.ts + 76 modules
+var default_src = __webpack_require__(56342);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-microscopy/src/utils/cleanDenaturalizedDataset.ts
 
 function isPrimitive(v) {
@@ -415,11 +425,11 @@ class DicomMicroscopyViewport extends react.Component {
     this.setViewportActiveHandler = () => {
       const {
         setViewportActive,
-        viewportIndex,
-        activeViewportIndex
+        viewportId,
+        activeViewportId
       } = this.props;
-      if (viewportIndex !== activeViewportIndex) {
-        setViewportActive(viewportIndex);
+      if (viewportId !== activeViewportId) {
+        setViewportActive(viewportId);
       }
     };
     this.onWindowResize = () => {
@@ -430,7 +440,9 @@ class DicomMicroscopyViewport extends react.Component {
     } = this.props.servicesManager.services;
     this.microscopyService = microscopyService;
     this.debouncedResize = lodash_debounce_default()(() => {
-      if (this.viewer) this.viewer.resize();
+      if (this.viewer) {
+        this.viewer.resize();
+      }
     }, 100);
   }
   /**
@@ -465,7 +477,7 @@ class DicomMicroscopyViewport extends react.Component {
       const {
         viewer: DicomMicroscopyViewer,
         metadata: metadataUtils
-      } = await __webpack_require__.e(/* import() | dicom-microscopy-viewer */ 18).then(__webpack_require__.t.bind(__webpack_require__, 78457, 23));
+      } = await __webpack_require__.e(/* import() | dicom-microscopy-viewer */ 18).then(__webpack_require__.t.bind(__webpack_require__, 42613, 23));
       const microscopyViewer = DicomMicroscopyViewer.VolumeImageViewer;
       const client = getDicomWebClient({
         extensionManager: this.props.extensionManager,
@@ -571,7 +583,7 @@ class DicomMicroscopyViewport extends react.Component {
         StudyInstanceUID,
         SeriesInstanceUID
       } = displaySet;
-      this.managedViewer = this.microscopyService.addViewer(this.viewer, this.props.viewportIndex, container, StudyInstanceUID, SeriesInstanceUID);
+      this.managedViewer = this.microscopyService.addViewer(this.viewer, this.props.viewportId, container, StudyInstanceUID, SeriesInstanceUID);
       this.managedViewer.addContextMenuCallback(event => {
         // TODO: refactor this after Bill's changes on ContextMenu feature get merged
         // const roiAnnotationNearBy = this.getNearbyROI(event);
@@ -592,9 +604,13 @@ class DicomMicroscopyViewport extends react.Component {
   componentDidMount() {
     const {
       displaySets,
-      viewportIndex
+      viewportOptions
     } = this.props;
-    const displaySet = displaySets[viewportIndex];
+    const {
+      viewportId
+    } = viewportOptions;
+    // Todo-rename: this is always getting the 0
+    const displaySet = displaySets[0];
     this.installOpenLayersRenderer(this.container.current, displaySet).then(() => {
       this.setState({
         isLoaded: true
@@ -658,17 +674,17 @@ class DicomMicroscopyViewport extends react.Component {
       style: style,
       ref: this.container
     }), this.state.isLoaded ? null : /*#__PURE__*/react.createElement(src/* LoadingIndicatorProgress */.LE, {
-      className: 'w-full h-full bg-black'
+      className: 'h-full w-full bg-black'
     }));
   }
 }
 DicomMicroscopyViewport.propTypes = {
   viewportData: (prop_types_default()).object,
-  activeViewportIndex: (prop_types_default()).number,
+  activeViewportId: (prop_types_default()).string,
   setViewportActive: (prop_types_default()).func,
   // props from OHIF Viewport Grid
   displaySets: (prop_types_default()).array,
-  viewportIndex: (prop_types_default()).number,
+  viewportId: (prop_types_default()).string,
   viewportLabel: (prop_types_default()).string,
   dataSource: (prop_types_default()).object,
   viewportOptions: (prop_types_default()).object,

package/dist/{973.bundle.5aa91607481865ead93f.js → 281.bundle.b50f5766fb3f79b2ed9d.js}

@@ -1,7 +1,7 @@
 "use strict";
-(globalThis["webpackChunk"] = globalThis["webpackChunk"] || []).push([[973],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[281],{
 
-/***/ 31973:
+/***/ 42281:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -13,8 +13,8 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ microscopy_src)
 });
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 101 modules
-var src = __webpack_require__(48501);
+// EXTERNAL MODULE: ../../core/src/index.ts + 64 modules
+var src = __webpack_require__(67869);
 ;// CONCATENATED MODULE: ../../../modes/microscopy/package.json
 const package_namespaceObject = JSON.parse('{"u2":"@ohif/mode-microscopy"}');
 ;// CONCATENATED MODULE: ../../../modes/microscopy/src/id.js
@@ -160,7 +160,10 @@ const extensionDependencies = {
   '@ohif/extension-dicom-video': '^3.0.1',
   '@ohif/extension-dicom-microscopy': '^3.0.0'
 };
-function modeFactory() {
+function modeFactory(_ref) {
+  let {
+    modeConfiguration
+  } = _ref;
   return {
     // TODO: We're using this as a route segment
     // We should not be.
@@ -170,12 +173,12 @@ function modeFactory() {
     /**
      * Lifecycle hooks
      */
-    onModeEnter: _ref => {
+    onModeEnter: _ref2 => {
       let {
         servicesManager,
         extensionManager,
         commandsManager
-      } = _ref;
+      } = _ref2;
       const {
         toolbarService
       } = servicesManager.services;
@@ -183,10 +186,10 @@ function modeFactory() {
       toolbarService.addButtons(src_toolbarButtons);
       toolbarService.createButtonSection('primary', ['MeasurementTools', 'dragPan']);
     },
-    onModeExit: _ref2 => {
+    onModeExit: _ref3 => {
       let {
         servicesManager
-      } = _ref2;
+      } = _ref3;
       const {
         toolbarService
       } = servicesManager.services;
@@ -196,10 +199,10 @@ function modeFactory() {
       study: [],
       series: []
     },
-    isValidMode: _ref3 => {
+    isValidMode: _ref4 => {
       let {
         modalities
-      } = _ref3;
+      } = _ref4;
       const modalities_list = modalities.split('\\');
 
       // Slide Microscopy and ECG modality not supported by basic mode yet
@@ -210,11 +213,11 @@ function modeFactory() {
       /*init: ({ servicesManager, extensionManager }) => {
         //defaultViewerRouteInit
       },*/
-      layoutTemplate: _ref4 => {
+      layoutTemplate: _ref5 => {
         let {
           location,
           servicesManager
-        } = _ref4;
+        } = _ref5;
         return {
           id: ohif.layout,
           props: {
@@ -246,7 +249,8 @@ function modeFactory() {
     // general handler needs to come last.  For this case, the dicomvideo must
     // come first to remove video transfer syntax before ohif uses images
     sopClassHandlers: ['@ohif/extension-dicom-microscopy.sopClassHandlerModule.DicomMicroscopySopClassHandler', '@ohif/extension-dicom-microscopy.sopClassHandlerModule.DicomMicroscopySRSopClassHandler', dicomvideo.sopClassHandler, dicompdf.sopClassHandler],
-    hotkeys: [...src/* hotkeys */.dD.defaults.hotkeyBindings]
+    hotkeys: [...src/* hotkeys */.dD.defaults.hotkeyBindings],
+    ...modeConfiguration
   };
 }
 const mode = {