Desktop: Enable CodeMirror keybindings (#3545)

laurent22 · Aug 2, 2020 · 223caca · 223caca
1 parent ee358f7
commit 223caca
Showing 1 changed file with 78 additions and 68 deletions.
diff --git a/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx b/ElectronClient/gui/NoteEditor/NoteBody/CodeMirror/Editor.tsx
@@ -24,6 +24,7 @@ import 'codemirror/keymap/vim';
 import 'codemirror/keymap/sublime'; // Used for swapLineUp and swapLineDown
 
 import 'codemirror/mode/meta';
+const { shim } = require('lib/shim.js');
 
 const { reg } = require('lib/registry.js');
 
@@ -92,74 +93,6 @@ function Editor(props: EditorProps, ref: any) {
 	useEditorSearch(CodeMirror);
 	useJoplinMode(CodeMirror);
 
-	CodeMirror.keyMap.basic = {
-		'Left': 'goCharLeft',
-		'Right': 'goCharRight',
-		'Up': 'goLineUp',
-		'Down': 'goLineDown',
-		'End': 'goLineEnd',
-		'Home': 'goLineStartSmart',
-		'PageUp': 'goPageUp',
-		'PageDown': 'goPageDown',
-		'Delete': 'delCharAfter',
-		'Backspace': 'delCharBefore',
-		'Shift-Backspace': 'delCharBefore',
-		'Tab': 'smartListIndent',
-		'Shift-Tab': 'smartListUnindent',
-		'Enter': 'insertListElement',
-		'Insert': 'toggleOverwrite',
-		'Esc': 'singleSelection',
-	};
-	CodeMirror.keyMap.default = {
-		'Ctrl-A': 'selectAll',
-		'Ctrl-D': 'deleteLine',
-		'Ctrl-Z': 'undo',
-		'Shift-Ctrl-Z': 'redo',
-		'Ctrl-Y': 'redo',
-		'Ctrl-Home': 'goDocStart',
-		'Ctrl-End': 'goDocEnd',
-		'Ctrl-Up': 'goLineUp',
-		'Ctrl-Down': 'goLineDown',
-		'Ctrl-Left': 'goGroupLeft',
-		'Ctrl-Right': 'goGroupRight',
-		'Alt-Left': 'goLineStart',
-		'Alt-Right': 'goLineEnd',
-		'Ctrl-Backspace': 'delGroupBefore',
-		'Ctrl-Delete': 'delGroupAfter',
-		'Ctrl-[': 'indentLess',
-		'Ctrl-]': 'indentMore',
-		'Ctrl-/': 'toggleComment',
-		'Ctrl-Alt-S': 'sortSelectedLines',
-		'Alt-Up': 'swapLineUp',
-		'Alt-Down': 'swapLineDown',
-		'fallthrough': 'basic',
-	};
-	CodeMirror.keyMap.pcDefault = CodeMirror.keyMap.default;
-	CodeMirror.keyMap.macDefault = {
-		'Cmd-A': 'selectAll',
-		'Cmd-D': 'deleteLine',
-		'Cmd-Z': 'undo',
-		'Shift-Cmd-Z': 'redo',
-		'Cmd-Y': 'redo',
-		'Cmd-Home': 'goDocStart',
-		'Cmd-Up': 'goDocStart',
-		'Cmd-End': 'goDocEnd',
-		'Cmd-Down': 'goDocEnd',
-		'Alt-Left': 'goGroupLeft',
-		'Alt-Right': 'goGroupRight',
-		'Cmd-Left': 'goLineLeft',
-		'Cmd-Right': 'goLineRight',
-		'Alt-Backspace': 'delGroupBefore',
-		'Alt-Delete': 'delGroupAfter',
-		'Cmd-[': 'indentLess',
-		'Cmd-]': 'indentMore',
-		'Cmd-/': 'toggleComment',
-		'Cmd-Opt-S': 'sortSelectedLines',
-		'Opt-Up': 'swapLineUp',
-		'Opt-Down': 'swapLineDown',
-		'fallthrough': 'basic',
-	};
-
 	useImperativeHandle(ref, () => {
 		return editor;
 	});
@@ -201,6 +134,83 @@ function Editor(props: EditorProps, ref: any) {
 		}
 	}, []);
 
+	useEffect(() => {
+		CodeMirror.keyMap.basic = {
+			'Left': 'goCharLeft',
+			'Right': 'goCharRight',
+			'Up': 'goLineUp',
+			'Down': 'goLineDown',
+			'End': 'goLineEnd',
+			'Home': 'goLineStartSmart',
+			'PageUp': 'goPageUp',
+			'PageDown': 'goPageDown',
+			'Delete': 'delCharAfter',
+			'Backspace': 'delCharBefore',
+			'Shift-Backspace': 'delCharBefore',
+			'Tab': 'smartListIndent',
+			'Shift-Tab': 'smartListUnindent',
+			'Enter': 'insertListElement',
+			'Insert': 'toggleOverwrite',
+			'Esc': 'singleSelection',
+		};
+
+		if (shim.isMac()) {
+			CodeMirror.keyMap.default = {
+				// MacOS
+				'Cmd-A': 'selectAll',
+				'Cmd-D': 'deleteLine',
+				'Cmd-Z': 'undo',
+				'Shift-Cmd-Z': 'redo',
+				'Cmd-Y': 'redo',
+				'Cmd-Home': 'goDocStart',
+				'Cmd-Up': 'goDocStart',
+				'Cmd-End': 'goDocEnd',
+				'Cmd-Down': 'goDocEnd',
+				'Cmd-Left': 'goLineLeft',
+				'Cmd-Right': 'goLineRight',
+				'Alt-Left': 'goGroupLeft',
+				'Alt-Right': 'goGroupRight',
+				'Alt-Backspace': 'delGroupBefore',
+				'Alt-Delete': 'delGroupAfter',
+				'Cmd-[': 'indentLess',
+				'Cmd-]': 'indentMore',
+				'Cmd-/': 'toggleComment',
+				'Cmd-Opt-S': 'sortSelectedLines',
+				'Opt-Up': 'swapLineUp',
+				'Opt-Down': 'swapLineDown',
+
+				'fallthrough': 'basic',
+			};
+		} else {
+			CodeMirror.keyMap.default = {
+				// Windows/linux
+				'Ctrl-A': 'selectAll',
+				'Ctrl-D': 'deleteLine',
+				'Ctrl-Z': 'undo',
+				'Shift-Ctrl-Z': 'redo',
+				'Ctrl-Y': 'redo',
+				'Ctrl-Home': 'goDocStart',
+				'Ctrl-End': 'goDocEnd',
+				'Ctrl-Up': 'goLineUp',
+				'Ctrl-Down': 'goLineDown',
+				'Ctrl-Left': 'goGroupLeft',
+				'Ctrl-Right': 'goGroupRight',
+				'Alt-Left': 'goLineStart',
+				'Alt-Right': 'goLineEnd',
+				'Ctrl-Backspace': 'delGroupBefore',
+				'Ctrl-Delete': 'delGroupAfter',
+				'Ctrl-[': 'indentLess',
+				'Ctrl-]': 'indentMore',
+				'Ctrl-/': 'toggleComment',
+				'Ctrl-Alt-S': 'sortSelectedLines',
+				'Alt-Up': 'swapLineUp',
+				'Alt-Down': 'swapLineDown',
+
+				'fallthrough': 'basic',
+			};
+		}
+	}, []);
+
 	useEffect(() => {
 		if (!editorParent.current) return () => {};