@ohif/app 3.8.0-beta.63 → 3.8.0-beta.65

package/dist/{905.bundle.73a711d0255cb988fa6e.js → 905.bundle.6b5b42b2403e4676bb3a.js}

@@ -13,8 +13,8 @@ __webpack_require__.d(__webpack_exports__, {
   "default": () => (/* binding */ microscopy_src)
 });
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 66 modules
-var src = __webpack_require__(14283);
+// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
+var src = __webpack_require__(78198);
 // EXTERNAL MODULE: ../../../node_modules/i18next/dist/esm/i18next.js
 var i18next = __webpack_require__(92344);
 ;// CONCATENATED MODULE: ../../../modes/microscopy/package.json
@@ -24,101 +24,131 @@ const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/mode-micro
 const id = package_namespaceObject.UU;
 
 ;// CONCATENATED MODULE: ../../../modes/microscopy/src/toolbarButtons.js
-// TODO: torn, can either bake this here; or have to create a whole new button type
-/**
- *
- * @param {*} type - 'tool' | 'action' | 'toggle'
- * @param {*} id
- * @param {*} icon
- * @param {*} label
- */
-function _createButton(type, id, icon, label, commands, tooltip) {
-  return {
-    id,
-    icon,
-    label,
-    type,
-    commands,
-    tooltip
-  };
-}
-const _createActionButton = _createButton.bind(null, 'action');
-const _createToggleButton = _createButton.bind(null, 'toggle');
-const _createToolButton = _createButton.bind(null, 'tool');
-const toolbarButtons = [
-// Measurement
-{
+
+const toolbarButtons = [{
   id: 'MeasurementTools',
-  type: 'ohif.splitButton',
+  uiType: 'ohif.splitButton',
   props: {
     groupId: 'MeasurementTools',
-    isRadio: true,
-    // ?
-    // Switch?
-    primary: _createToolButton('line', 'tool-length', 'Line', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'line'
-      },
-      context: 'MICROSCOPY'
-    }], 'Line'),
+    // group evaluate to determine which item should move to the top
+    evaluate: 'evaluate.group.promoteToPrimary',
+    primary: src.ToolbarService.createButton({
+      id: 'line',
+      icon: 'tool-length',
+      label: 'Line',
+      tooltip: 'Line',
+      commands: [{
+        commandName: 'setToolActive',
+        commandOptions: {
+          toolName: 'line'
+        },
+        context: 'MICROSCOPY'
+      }],
+      evaluate: 'evaluate.microscopyTool'
+    }),
     secondary: {
       icon: 'chevron-down',
-      label: '',
-      isActive: true,
       tooltip: 'More Measure Tools'
     },
-    items: [_createToolButton('line', 'tool-length', 'Line', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'line'
-      },
-      context: 'MICROSCOPY'
-    }], 'Line Tool'), _createToolButton('point', 'tool-point', 'Point', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'point'
-      },
-      context: 'MICROSCOPY'
-    }], 'Point Tool'), _createToolButton('polygon', 'tool-polygon', 'Polygon', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'polygon'
-      },
-      context: 'MICROSCOPY'
-    }], 'Polygon Tool'), _createToolButton('circle', 'tool-circle', 'Circle', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'circle'
-      },
-      context: 'MICROSCOPY'
-    }], 'Circle Tool'), _createToolButton('box', 'tool-rectangle', 'Box', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'box'
-      },
-      context: 'MICROSCOPY'
-    }], 'Box Tool'), _createToolButton('freehandpolygon', 'tool-freehand-polygon', 'Freehand Polygon', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'freehandpolygon'
-      },
-      context: 'MICROSCOPY'
-    }], 'Freehand Polygon Tool'), _createToolButton('freehandline', 'tool-freehand-line', 'Freehand Line', [{
-      commandName: 'setToolActive',
-      commandOptions: {
-        toolName: 'freehandline'
-      },
-      context: 'MICROSCOPY'
-    }], 'Freehand Line Tool')]
+    items: [src.ToolbarService.createButton({
+      id: 'line',
+      icon: 'tool-length',
+      label: 'Line',
+      tooltip: 'Line',
+      commands: [{
+        commandName: 'setToolActive',
+        commandOptions: {
+          toolName: 'line'
+        },
+        context: 'MICROSCOPY'
+      }],
+      evaluate: 'evaluate.microscopyTool'
+    }), src.ToolbarService.createButton({
+      id: 'point',
+      icon: 'tool-point',
+      label: 'Point',
+      tooltip: 'Point Tool',
+      commands: [{
+        commandName: 'setToolActive',
+        commandOptions: {
+          toolName: 'point'
+        },
+        context: 'MICROSCOPY'
+      }],
+      evaluate: 'evaluate.microscopyTool'
+    }),
+    // Point Tool was previously defined
+    src.ToolbarService.createButton({
+      id: 'polygon',
+      icon: 'tool-polygon',
+      label: 'Polygon',
+      tooltip: 'Polygon Tool',
+      commands: [{
+        commandName: 'setToolActive',
+        commandOptions: {
+          toolName: 'polygon'
+        },
+        context: 'MICROSCOPY'
+      }],
+      evaluate: 'evaluate.microscopyTool'
+    }), src.ToolbarService.createButton({
+      id: 'circle',
+      icon: 'tool-circle',
+      label: 'Circle',
+      tooltip: 'Circle Tool',
+      commands: [{
+        commandName: 'setToolActive',
+        commandOptions: {
+          toolName: 'circle'
+        },
+        context: 'MICROSCOPY'
+      }],
+      evaluate: 'evaluate.microscopyTool'
+    }), src.ToolbarService.createButton({
+      id: 'box',
+      icon: 'tool-rectangle',
+      label: 'Box',
+      tooltip: 'Box Tool',
+      commands: [{
+        commandName: 'setToolActive',
+        commandOptions: {
+          toolName: 'box'
+        },
+        context: 'MICROSCOPY'
+      }],
+      evaluate: 'evaluate.microscopyTool'
+    }), src.ToolbarService.createButton({
+      id: 'freehandpolygon',
+      icon: 'tool-freehand-polygon',
+      label: 'Freehand Polygon',
+      tooltip: 'Freehand Polygon Tool',
+      commands: [{
+        commandName: 'setToolActive',
+        commandOptions: {
+          toolName: 'freehandpolygon'
+        },
+        context: 'MICROSCOPY'
+      }],
+      evaluate: 'evaluate.microscopyTool'
+    }), src.ToolbarService.createButton({
+      id: 'freehandline',
+      icon: 'tool-freehand-line',
+      label: 'Freehand Line',
+      tooltip: 'Freehand Line Tool',
+      commands: [{
+        commandName: 'setToolActive',
+        commandOptions: {
+          toolName: 'freehandline'
+        },
+        context: 'MICROSCOPY'
+      }],
+      evaluate: 'evaluate.microscopyTool'
+    })]
   }
-},
-// Pan...
-{
+}, {
   id: 'dragPan',
-  type: 'ohif.radioGroup',
+  uiType: 'ohif.radioGroup',
   props: {
-    type: 'tool',
     icon: 'tool-move',
     label: 'Pan',
     commands: [{
@@ -127,7 +157,8 @@ const toolbarButtons = [
         toolName: 'dragPan'
       },
       context: 'MICROSCOPY'
-    }]
+    }],
+    evaluate: 'evaluate.microscopyTool'
   }
 }];
 /* harmony default export */ const src_toolbarButtons = (toolbarButtons);
@@ -183,7 +214,6 @@ function modeFactory({
       const {
         toolbarService
       } = servicesManager.services;
-      toolbarService.init(extensionManager);
       toolbarService.addButtons(src_toolbarButtons);
       toolbarService.createButtonSection('primary', ['MeasurementTools', 'dragPan']);
     },

package/dist/{907.bundle.6932f0458b9e0143c18a.js → 907.bundle.fbd5768fa5b53f9d3f86.js}

@@ -21,8 +21,8 @@ const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/extension-
 const id = package_namespaceObject.UU;
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-pdf`;
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 66 modules
-var src = __webpack_require__(14283);
+// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
+var src = __webpack_require__(78198);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-pdf/src/getSopClassHandlerModule.js
 
 
@@ -146,18 +146,6 @@ const dicomPDFExtension = {
       component: ExtendedOHIFCornerstonePdfViewport
     }];
   },
-  // getCommandsModule({ servicesManager }) {
-  //   return {
-  //     definitions: {
-  //       setToolActive: {
-  //         commandFn: () => null,
-  //         storeContexts: [],
-  //         options: {},
-  //       },
-  //     },
-  //     defaultContext: 'ACTIVE_VIEWPORT::PDF',
-  // };
-  // },
   getSopClassHandlerModule: getSopClassHandlerModule
 };
 /* harmony default export */ const dicom_pdf_src = (dicomPDFExtension);

package/dist/{961.bundle.6cf1599ed3a2871c040f.js → 961.bundle.8bb5a713fc5a3817c6a6.js}

@@ -21,8 +21,8 @@ const package_namespaceObject = /*#__PURE__*/JSON.parse('{"UU":"@ohif/extension-
 const id = package_namespaceObject.UU;
 const SOPClassHandlerId = `${id}.sopClassHandlerModule.dicom-video`;
 
-// EXTERNAL MODULE: ../../core/src/index.ts + 66 modules
-var src = __webpack_require__(14283);
+// EXTERNAL MODULE: ../../core/src/index.ts + 67 modules
+var src = __webpack_require__(78198);
 ;// CONCATENATED MODULE: ../../../extensions/dicom-video/src/getSopClassHandlerModule.js
 
 
@@ -163,19 +163,6 @@ const dicomVideoExtension = {
       component: ExtendedOHIFCornerstoneVideoViewport
     }];
   },
-  // getCommandsModule({ servicesManager }) {
-  //   return {
-  //     definitions: {
-  //       setToolActive: {
-  //         commandFn: ({ toolName, element }) => {
-  //         },
-  //         storeContexts: [],
-  //         options: {},
-  //       },
-  //     },
-  //     defaultContext: 'ACTIVE_VIEWPORT::VIDEO',
-  //   };
-  // },
   getSopClassHandlerModule: getSopClassHandlerModule
 };
 function _getToolAlias(toolName) {

package/dist/{987.bundle.e7c041a6dfb4ddb41813.js → 987.bundle.91d4867efedd5b4d84cb.js}

@@ -115900,13 +115900,17 @@ module.exports = hasPropertyDescriptors;
 
 
 var test = {
+	__proto__: null,
 	foo: {}
 };
 
 var $Object = Object;
 
+/** @type {import('.')} */
 module.exports = function hasProto() {
-	return { __proto__: test }.foo === test.foo && !({ __proto__: null } instanceof $Object);
+	// @ts-expect-error: TS errors on an inherited property for some reason
+	return { __proto__: test }.foo === test.foo
+		&& !(test instanceof $Object);
 };