something WIP

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/ViewModelContext.js

@@ -1,43 +0,0 @@
-import React, { Component } from 'react';
-
-const ViewModelContext = React.createContext({
-  displaySetInstanceUids: [],
-  setDisplaySetInstanceUids: () => {},
-  toolBarLayout: [],
-  setToolBarLayout: () => {},
-});
-
-ViewModelContext.displayName = 'ViewModelContext';
-
-class ViewModelProvider extends Component {
-  state = {
-    displaySetInstanceUids: [],
-  };
-
-  render() {
-    const setDisplaySetInstanceUids = displaySetInstanceUids => {
-      this.setState({ displaySetInstanceUids });
-    };
-
-    const setToolBarLayout = toolBarLayout => {
-      this.setState({ toolBarLayout });
-    };
-
-    return (
-      <ViewModelContext.Provider
-        value={{
-          displaySetInstanceUids: this.state.displaySetInstanceUids,
-          setDisplaySetInstanceUids,
-          toolBarLayout: this.state.toolBarLayout,
-          setToolBarLayout,
-        }}
-      >
-        {this.props.children}
-      </ViewModelContext.Provider>
-    );
-  }
-}
-
-export default ViewModelContext;
-
-export { ViewModelProvider };

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: