something WIP

platform/core/src/ToolBarManager.js

@@ -15,8 +15,6 @@ export default class toolBarManager {
 
       this.buttons[id] = buttonDefinition;
     });
-
-    console.log(this.buttons);
   }
 
   setToolBarLayout(layouts) {
@@ -44,9 +42,6 @@ export default class toolBarManager {
       toolBarLayout.push(toolBarDefinitions);
     });
 
-    console.log(`TOOLBAR LAYOUT`);
-    console.log(toolBarLayout);
-
     this.viewModelContextSetToolBarLayout(toolBarLayout);
   }
 }

platform/core/src/ViewModelContext.js

@@ -1,4 +1,6 @@
-import React, { Component } from 'react';
+import React, { Component, useContext } from 'react';
+
+/// TODO MAKE THIS PRETTY DANNY
 
 const ViewModelContext = React.createContext({
   displaySetInstanceUids: [],
@@ -38,6 +40,8 @@ class ViewModelProvider extends Component {
   }
 }
 
+const useViewModel = () => useContext(ViewModelContext);
+
 export default ViewModelContext;
 
-export { ViewModelProvider };
+export { ViewModelProvider, useViewModel };

platform/core/src/index.js

@@ -21,6 +21,7 @@ import user from './user.js';
 import dicomMetadataStore from './dicomMetadataStore';
 import displaySetManager from './displaySetManager';
 import ToolBarManager from './ToolBarManager';
+import { ViewModelProvider, useViewModel } from './ViewModelContext';
 import utils, { hotkeys } from './utils/';
 
 import {
@@ -70,6 +71,8 @@ const OHIF = {
   dicomMetadataStore,
   displaySetManager,
   ToolBarManager,
+  ViewModelProvider,
+  useViewModel,
 };
 
 export {
@@ -108,6 +111,8 @@ export {
   dicomMetadataStore,
   displaySetManager,
   ToolBarManager,
+  ViewModelProvider,
+  useViewModel,
 };
 
 export { OHIF };

platform/viewer/src/routes/ModeRoute.js

@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useCallback } from 'react';
 import { displaySetManager, ToolBarManager } from '@ohif/core';
-import ViewModelContext from './ViewModelContext';
+import { useViewModel } from '@ohif/core';
 import Compose from './Compose';
 
 export default function ModeRoute({
@@ -9,7 +9,7 @@ export default function ModeRoute({
   dataSourceName,
   extensionManager,
 }) {
-  const { routes, sopClassHandlers, extensions, init } = mode;
+  const { routes, sopClassHandlers, extensions } = mode;
   const dataSources = extensionManager.getDataSources(dataSourceName);
 
   // Add toolbar state to the view model context?
@@ -18,7 +18,7 @@ export default function ModeRoute({
     setToolBarLayout,
     displaySetInstanceUids,
     setDisplaySetInstanceUids,
-  } = useContext(ViewModelContext);
+  } = useViewModel();
 
   // TODO: For now assume one unique datasource.
 

platform/viewer/src/routes/buildModeRoutes.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import ModeRoute from './ModeRoute';
-import { ViewModelProvider } from './ViewModelContext';
+import { ViewModelProvider } from '@ohif/core';
 
 /*
   Routes uniquely define an entry point to: