Merge pull request #9 from CodinGame/fix-keybinding-service-now-singleton

Fix keybinding service usage which is now a singleton

Author: CGNonofr

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-editor-react",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Monaco Editor React component",
   "scripts": {
     "build": "tsc",
@@ -19,7 +19,7 @@
   ],
   "types": "dist/index.d.ts",
   "dependencies": {
-    "@codingame/monaco-editor-wrapper": "^1.5.0",
+    "@codingame/monaco-editor-wrapper": "^1.6.0",
     "deep-equal": "^2.0.5",
     "lodash.debounce": "^4.0.8"
   },

package.json

@@ -1,6 +1,6 @@
 import React, { ForwardedRef, forwardRef, ReactElement, useEffect, useMemo, useRef, useState } from 'react'
 import debounce from 'lodash.debounce'
-import { monaco, createEditor, getMonacoLanguage, updateEditorKeybindings, registerEditorOpenHandler } from '@codingame/monaco-editor-wrapper'
+import { monaco, createEditor, getMonacoLanguage, updateEditorKeybindingsMode, registerEditorOpenHandler } from '@codingame/monaco-editor-wrapper'
 import { useDeepMemo, useLastValueRef, useLastVersion, useThemeData, useUserConfiguration } from './hooks'
 import './style'
 
@@ -75,7 +75,6 @@ export interface MonacoEditorProps {
   onChange?: (value: string, event: monaco.editor.IModelContentChangedEvent) => void
   markers?: monaco.editor.IMarkerData[]
   keyBindingsMode?: KeyBindingsMode
-  keyBindings?: monaco.extra.IUserFriendlyKeybinding[]
   /**
    * Called when the editor will switch to another model
    *
@@ -107,7 +106,6 @@ function MonacoEditor ({
   options,
   overrideServices,
   onChange,
-  keyBindings,
   keyBindingsMode = 'classic',
   markers,
   saveViewState = defaultSaveViewState,
@@ -247,14 +245,14 @@ function MonacoEditor ({
     editorRef.current!.updateOptions(allOptions)
   }, [allOptions])
 
-  // Keybindings
+  // Keybindings mode
   useEffect(() => {
     const editor = editorRef.current!
-    const disposable = updateEditorKeybindings(editor, keyBindingsMode, statusBarRef.current!, keyBindings)
+    const disposable = updateEditorKeybindingsMode(editor, keyBindingsMode, statusBarRef.current!)
     return () => {
       disposable.dispose()
     }
-  }, [keyBindings, keyBindingsMode])
+  }, [keyBindingsMode])
 
   // Update markers
   useEffect(() => {

src/MonacoEditor.tsx

@@ -1,12 +1,14 @@
-import { monaco } from '@codingame/monaco-editor-wrapper'
+import { monaco, updateKeybindings, updateUserConfiguration } from '@codingame/monaco-editor-wrapper'
 import { useThemeData, useUserConfiguration } from './hooks'
 import MonacoEditor, { MonacoEditorProps } from './MonacoEditor'
 
 export default MonacoEditor
 export {
   monaco,
   useThemeData,
-  useUserConfiguration
+  useUserConfiguration,
+  updateKeybindings,
+  updateUserConfiguration
 }
 export type {
   MonacoEditorProps