CB-5760 move hotkeys hook to core-blocks

dbeaver · Oct 14, 2024 · 5cc0ac6 · 5cc0ac6
1 parent 13c8ea9
commit 5cc0ac6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git a/webapp/packages/core-blocks/package.json b/webapp/packages/core-blocks/package.json
@@ -34,6 +34,7 @@
     "mobx": "^6",
     "mobx-react-lite": "^4",
     "react": "^18",
+    "react-hotkeys-hook": "^4",
     "reakit": "^1",
     "reakit-utils": "^0"
   },

diff --git a/webapp/packages/core-blocks/src/Slide/SlideBox.tsx b/webapp/packages/core-blocks/src/Slide/SlideBox.tsx
@@ -8,9 +8,7 @@
 import { observer } from 'mobx-react-lite';
 import { useEffect, useRef } from 'react';
 
-import { useHotkeys } from '@cloudbeaver/core-utils';
-
-import { s, useMergeRefs, useS } from '../index.js';
+import { s, useHotkeys, useMergeRefs, useS } from '../index.js';
 import SlideBoxStyles from './SlideBox.module.css';
 import SlideBoxElementStyles from './SlideElement.module.css';
 import SlideBoxOverlayStyles from './SlideOverlay.module.css';

diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
@@ -5,6 +5,8 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
+export { useHotkeys } from 'react-hotkeys-hook';
+
 export * from './CommonDialog/CommonDialog/CommonDialogBody.js';
 export * from './CommonDialog/CommonDialog/CommonDialogFooter.js';
 export * from './CommonDialog/CommonDialog/CommonDialogHeader.js';

diff --git a/webapp/packages/core-utils/package.json b/webapp/packages/core-utils/package.json
@@ -30,8 +30,7 @@
     "whatwg-mimetype": "^4",
     "zod": "^3",
     "zod-i18n-map": "^2",
-    "zod-validation-error": "^3",
-    "react-hotkeys-hook": "^4"
+    "zod-validation-error": "^3"
   },
   "peerDependencies": {},
   "devDependencies": {

diff --git a/webapp/packages/core-utils/src/index.ts b/webapp/packages/core-utils/src/index.ts
@@ -5,8 +5,6 @@
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
  */
-export { useHotkeys } from 'react-hotkeys-hook';
-
 export * from './Promises/CancellablePromise.js';
 export * from './Promises/cancellableTimeout.js';
 export * from './Promises/Deferred.js';

diff --git a/webapp/packages/core-view/src/View/CaptureView.tsx b/webapp/packages/core-view/src/View/CaptureView.tsx
@@ -8,9 +8,9 @@
 import { observer } from 'mobx-react-lite';
 import { useContext } from 'react';
 
-import { s, useFocus, useS } from '@cloudbeaver/core-blocks';
+import { s, useFocus, useHotkeys, useS } from '@cloudbeaver/core-blocks';
 import { useService } from '@cloudbeaver/core-di';
-import { isObjectsEqual, useHotkeys } from '@cloudbeaver/core-utils';
+import { isObjectsEqual } from '@cloudbeaver/core-utils';
 
 import { ActionService } from '../Action/ActionService.js';
 import type { IActionItem } from '../Action/IActionItem.js';