[Rewrite Branch] Fixes undo redo selectall (#2181)

This fixes the undo, redo, and selectall in the Electron menu

desktop/app.js

@@ -18,7 +18,7 @@ const importNotes = require('./evernote-import');
 const platform = require('./detect/platform');
 const updater = require('./updater');
 const { isDev } = require('./env');
-const spellcheck = require('./spellchecker');
+const contextMenu = require('./context-menu');
 
 require('module').globalPaths.push(path.resolve(path.join(__dirname)));
 
@@ -76,7 +76,7 @@ module.exports = function main() {
       mainWindow.loadUrl(url);
     }
 
-    spellcheck(mainWindow);
+    contextMenu(mainWindow);
 
     if (
       'test' !== process.env.NODE_ENV &&

desktop/context-menu/index.js

@@ -0,0 +1,43 @@
+'use strict';
+
+/**
+ * External dependencies
+ */
+const { Menu } = require('electron');
+
+const { editorCommandSender } = require('../menus/utils');
+
+module.exports = function (mainWindow) {
+  mainWindow.webContents.on('context-menu', (event, params) => {
+    const { editFlags } = params;
+    Menu.buildFromTemplate([
+      {
+        id: 'selectAll',
+        label: 'Select All',
+        click: editorCommandSender({ action: 'selectAll' }),
+        enabled: editFlags.canSelectAll,
+      },
+      {
+        id: 'cut',
+        label: 'Cut',
+        role: 'cut',
+        enabled: editFlags.canCut,
+      },
+      {
+        id: 'copy',
+        label: 'Copy',
+        role: 'copy',
+        enabled: editFlags.canCopy,
+      },
+      {
+        id: 'paste',
+        label: 'Paste',
+        role: 'paste',
+        enabled: editFlags.canPaste,
+      },
+      {
+        type: 'separator',
+      },
+    ]).popup({});
+  });
+};

desktop/menus/edit-menu.js

@@ -1,4 +1,4 @@
-const { appCommandSender } = require('./utils');
+const { appCommandSender, editorCommandSender } = require('./utils');
 
 const buildEditMenu = (settings, isAuthenticated) => {
   settings = settings || {};
@@ -9,11 +9,11 @@ const buildEditMenu = (settings, isAuthenticated) => {
     submenu: [
       {
         label: '&Undo',
-        role: 'undo',
+        click: editorCommandSender({ action: 'undo' }),
       },
       {
         label: '&Redo',
-        role: 'redo',
+        click: editorCommandSender({ action: 'redo' }),
       },
       {
         type: 'separator',
@@ -32,7 +32,7 @@ const buildEditMenu = (settings, isAuthenticated) => {
       },
       {
         label: '&Select All',
-        role: 'selectall',
+        click: editorCommandSender({ action: 'selectAll' }),
       },
       { type: 'separator' },
       {

desktop/menus/help-menu.js

@@ -19,7 +19,10 @@ const buildHelpMenu = (mainWindow, isAuthenticated) => {
     {
       label: '&Keyboard Shortcuts',
       visible: isAuthenticated,
-      click: appCommandSender({ action: 'showDialog', dialog: 'KEYBINDINGS' }),
+      click: appCommandSender({
+        action: 'showDialog',
+        dialog: 'KEYBINDINGS',
+      }),
     },
     { type: 'separator' },
     {

desktop/menus/utils.js

@@ -15,14 +15,23 @@ const buildRadioGroup = ({ action, propName, settings }) => {
 };
 
 const appCommandSender = (arg) => {
+  return commandSender('appCommand', arg);
+};
+
+const editorCommandSender = (arg) => {
+  return commandSender('editorCommand', arg);
+};
+
+const commandSender = (commandName, arg) => {
   return (item, focusedWindow) => {
     if (focusedWindow) {
-      focusedWindow.webContents.send('appCommand', arg);
+      focusedWindow.webContents.send(commandName, arg);
     }
   };
 };
 
 module.exports = {
   buildRadioGroup,
   appCommandSender,
+  editorCommandSender,
 };

desktop/menus/view-menu.js

@@ -40,7 +40,9 @@ const buildViewMenu = (settings, isAuthenticated) => {
               label: '&Reversed',
               type: 'checkbox',
               checked: settings.sortReversed,
-              click: appCommandSender({ action: 'toggleSortOrder' }),
+              click: appCommandSender({
+                action: 'toggleSortOrder',
+              }),
             },
           ]),
       },
@@ -96,7 +98,9 @@ const buildViewMenu = (settings, isAuthenticated) => {
             label: '&Sort Alphabetically',
             type: 'checkbox',
             checked: settings.sortTagsAlpha,
-            click: appCommandSender({ action: 'toggleSortTagsAlpha' }),
+            click: appCommandSender({
+              action: 'toggleSortTagsAlpha',
+            }),
           },
         ],
       },

desktop/preload.js

@@ -3,6 +3,7 @@ const { contextBridge, ipcRenderer, remote } = require('electron');
 const validChannels = [
   'appCommand',
   'clearCookies',
+  'editorCommand',
   'importNotes',
   'noteImportChannel',
   'setAutoHideMenuBar',

lib/global.d.ts

@@ -11,6 +11,7 @@ declare global {
       confirmLogout(changes: string): 'logout' | 'reconsider' | 'export';
       isMac: boolean;
       receive(command: 'appCommand', callback: (event: any) => any);
+      receive(command: 'editorCommand', callback: (event: any) => any);
       receive(command: 'noteImportChannel', callback: (event: any) => any);
       receive(command: 'wpLogin', callback: (event: any) => any);
       removeListener(command: 'noteImportChannel');

lib/note-content-editor.tsx

@@ -100,6 +100,7 @@ class NoteContentEditor extends Component<Props> {
     if (this.bootTimer) {
       clearTimeout(this.bootTimer);
     }
+    window.electron?.removeListener('editorCommand');
     window.removeEventListener('keydown', this.handleKeys, true);
   }
 
@@ -189,6 +190,20 @@ class NoteContentEditor extends Component<Props> {
     this.editor = editor;
     this.monaco = monaco;
 
+    window.electron?.receive('editorCommand', (command) => {
+      switch (command.action) {
+        case 'redo':
+          editor.trigger('', 'redo');
+          return;
+        case 'selectAll':
+          editor.setSelection(editor.getModel().getFullModelRange());
+          return;
+        case 'undo':
+          editor.trigger('', 'undo');
+          return;
+      }
+    });
+
     const titleDecoration = (line: number) => ({
       range: new monaco.Range(line, 1, line, 1),
       options: {