othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Toolbar row to use new types

Browse Source
This commit is contained in:
dannyrb 2019-06-13 09:51:19 -04:00
parent 31c987d700
commit 361be79174
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/connectedComponents/ConnectedToolbarRow.js
View File

@ -18,7 +18,6 @@ const mapStateToProps = state => {
viewportSpecificData[activeViewportIndex].plugin; viewportSpecificData[activeViewportIndex].plugin;
const pluginInActiveViewport = const pluginInActiveViewport =
pluginInLayout || pluginInViewportData || defaultPlugin; pluginInLayout || pluginInViewportData || defaultPlugin;
// const extensionData = state.extensions[pluginInActiveViewport];
return { return {
pluginId: pluginInActiveViewport, pluginId: pluginInActiveViewport,

16
src/connectedComponents/ToolbarRow.js
View File

@ -7,6 +7,7 @@ import ConnectedPluginSwitch from './ConnectedPluginSwitch.js';
import { MODULE_TYPES } from 'ohif-core'; import { MODULE_TYPES } from 'ohif-core';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { RoundedButtonGroup } from 'react-viewerbase'; import { RoundedButtonGroup } from 'react-viewerbase';
import { extensionManager } from './../App.js';
class ToolbarRow extends Component { class ToolbarRow extends Component {
static propTypes = { static propTypes = {
@ -55,17 +56,14 @@ class ToolbarRow extends Component {
? rightSidebarToggle[0].value ? rightSidebarToggle[0].value
: null; : null;
const currentPluginId = this.props.pluginId; const availableToolbarModules = extensionManager[MODULE_TYPES.TOOLBAR];
const toolbarModuleDefinition = availableToolbarModules.find(
const plugin = availablePlugins.find(entry => { moduleDefinition => moduleDefinition.extensionId === this.props.pluginId
return ( );
entry.type === MODULE_TYPES.TOOLBAR && entry.id === currentPluginId
);
});
let pluginComp; let pluginComp;
if (plugin) { if (toolbarModuleDefinition) {
const PluginComponent = plugin.component; const PluginComponent = toolbarModuleDefinition.module;
pluginComp = <PluginComponent />; pluginComp = <PluginComponent />;
} }