CR Updates

platform/viewer/src/hooks/index.js

@@ -1,5 +1,4 @@
 import useDebounce from './useDebounce.js';
 import useQuery from './useQuery.js';
-import useHotkeys from './useHotkeys.js';
 
-export { useDebounce, useQuery, useHotkeys };
+export { useDebounce, useQuery };

platform/viewer/src/hooks/useHotkeys.js

@@ -1,31 +0,0 @@
-import { useEffect, useState } from 'react';
-
-/**
- * @param {Object} manager HotkeysManager instance
- * @param {Object} hotkeys hotkey bindings
- * @param {Object} defaultHotkeys default hotkey bindings
- */
-const useHotkeys = (manager, hotkeys, defaultHotkeys) => {
-  const [isLoaded, setIsLoaded] = useState(false);
-
-  useEffect(() => {
-    if (!hotkeys) {
-      console.warn('[hotkeys] No bindings defined for hotkeys hook!');
-      return;
-    }
-
-    console.debug('[hotkeys] Setting up hotkeys...');
-    manager.setDefaultHotKeys(defaultHotkeys || hotkeys);
-    manager.setHotkeys(hotkeys);
-    setIsLoaded(true);
-
-    return () => {
-      console.debug('[hotkeys] Removing hotkeys...');
-      manager.destroy();
-    };
-  }, [manager, hotkeys, defaultHotkeys]);
-
-  return isLoaded;
-}
-
-export default useHotkeys;

platform/viewer/src/routes/Mode/Mode.jsx

@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';
 import { DicomMetadataStore } from '@ohif/core';
 import { DragAndDropProvider, ImageViewerProvider } from '@ohif/ui';
 //
-import { useQuery, useHotkeys } from '@hooks';
+import { useQuery } from '@hooks';
 import ViewportGrid from '@components/ViewportGrid';
 import Compose from './Compose';
 
@@ -17,7 +17,6 @@ export default function ModeRoute({
   servicesManager,
   hotkeysManager
 }) {
-  const isHotkeysLoaded = useHotkeys(hotkeysManager, mode.hotkeys);
   // Parse route params/querystring
   const query = useQuery();
   const queryStudyInstanceUIDs = query.get('StudyInstanceUIDs');
@@ -28,7 +27,7 @@ export default function ModeRoute({
       ? StudyInstanceUIDs
       : [StudyInstanceUIDs];
 
-  const { extensions, sopClassHandlers } = mode;
+  const { extensions, sopClassHandlers, hotkeys } = mode;
 
   if (dataSourceName === undefined) {
     dataSourceName = extensionManager.defaultDataSourceName;
@@ -76,6 +75,22 @@ export default function ModeRoute({
     return ViewportGrid({ ...props, dataSource });
   }
 
+  useEffect(() => {
+    if (!hotkeys) {
+      console.warn('[hotkeys] No bindings defined for hotkeys hook!');
+      return;
+    }
+
+    console.debug('[hotkeys] Setting up hotkeys...');
+    hotkeysManager.setDefaultHotKeys(hotkeys);
+    hotkeysManager.setHotkeys(hotkeys);
+
+    return () => {
+      console.debug('[hotkeys] Removing hotkeys...');
+      hotkeysManager.destroy();
+    };
+  }, []);
+
   useEffect(() => {
     route.init({ servicesManager, extensionManager });
   }, [
@@ -85,8 +100,7 @@ export default function ModeRoute({
     route,
     servicesManager,
     extensionManager,
-    hotkeysManager,
-    isHotkeysLoaded
+    hotkeysManager
   ]);
 
   // This queries for series, but... What does it do with them?