relocate useKeyboardShortcuts

packages/editor/src/client/components-internal/CodeMirrorEditor/CodeMirrorEditor.tsx

@@ -17,7 +17,6 @@ import {
 import { useCodeMirrorEditorIsolated } from '../../stores/codemirror-editor';
 import { useDefaultExtensions } from '../../stores/use-default-extensions';
 import { useEditorSettings } from '../../stores/use-editor-settings';
-import { useEditorShortcuts } from '../../stores/use-editor-shortcuts';
 
 import { Toolbar } from './Toolbar';
 
@@ -71,7 +70,6 @@ export const CodeMirrorEditor = (props: Props): JSX.Element => {
 
   useDefaultExtensions(codeMirrorEditor);
   useEditorSettings(codeMirrorEditor, editorSettings, onSave);
-  useEditorShortcuts(codeMirrorEditor);
 
   useShowTableIcon(codeMirrorEditor);
 

packages/editor/src/client/stores/use-editor-settings.ts

@@ -14,6 +14,8 @@ import {
   getEditorTheme, getKeymap, insertNewlineContinueMarkup, insertNewRowToMarkdownTable, isInTable,
 } from '../services-internal';
 
+import { useKeyBindings, useKeyboardShortcuts, useGetCustomKeyBindings } from './use-editor-shortcuts';
+
 
 export const useEditorSettings = (
     codeMirrorEditor?: UseCodeMirrorEditor,
@@ -92,5 +94,7 @@ export const useEditorSettings = (
 
   }, [codeMirrorEditor, keymapExtension]);
 
-
+  const customKeyBindings = useGetCustomKeyBindings(codeMirrorEditor?.view, editorSettings?.keymapMode);
+  const keyBindings = useKeyBindings(codeMirrorEditor?.view, customKeyBindings);
+  useKeyboardShortcuts(codeMirrorEditor, keyBindings);
 };