fix: undo/redo menu triggers (#1178)

Author: codebytere

src/ipc-events.ts

@@ -29,6 +29,8 @@ export enum IpcEvents {
   CONFIRM_QUIT = 'CONFIRM_QUIT',
   GET_APP_PATHS = 'GET_APP_PATHS',
   SELECT_ALL_IN_EDITOR = 'SELECT_ALL_IN_EDITOR',
+  UNDO_IN_EDITOR = 'UNDO_IN_EDITOR',
+  REDO_IN_EDITOR = 'REDO_IN_EDITOR',
   BLOCK_ACCELERATORS = 'BLOCK_ACCELERATORS',
   SET_SHOW_ME_TEMPLATE = 'SET_SHOW_ME_TEMPLATE',
   CLICK_TITLEBAR_MAC = 'CLICK_TITLEBAR_MAC',
@@ -79,6 +81,8 @@ export const ipcRendererEvents = [
   IpcEvents.BEFORE_QUIT,
   IpcEvents.GET_APP_PATHS,
   IpcEvents.SELECT_ALL_IN_EDITOR,
+  IpcEvents.UNDO_IN_EDITOR,
+  IpcEvents.REDO_IN_EDITOR,
   IpcEvents.SET_SHOW_ME_TEMPLATE,
   IpcEvents.TASK_BISECT,
   IpcEvents.TASK_TEST,

src/main/menu.ts

@@ -339,6 +339,28 @@ export function setupMenu(options?: SetUpMenuOptions) {
           Menu.sendActionToFirstResponder('selectAll:');
         }
       };
+
+      const undo = item.submenu.find((i) => i.label === 'Undo')!;
+      delete undo.role; // override default role
+      undo.click = () => {
+        ipcMainManager.send(IpcEvents.UNDO_IN_EDITOR);
+
+        // Allow undo to occur in text fields outside the editors.
+        if (process.platform === 'darwin') {
+          Menu.sendActionToFirstResponder('undo:');
+        }
+      };
+
+      const redo = item.submenu.find((i) => i.label === 'Redo')!;
+      delete redo.role; // override default role
+      redo.click = () => {
+        ipcMainManager.send(IpcEvents.REDO_IN_EDITOR);
+
+        // Allow redo to occur in text fields outside the editors.
+        if (process.platform === 'darwin') {
+          Menu.sendActionToFirstResponder('redo:');
+        }
+      };
     }
 
     // Tweak "View" menu

src/renderer/components/editors.tsx

@@ -95,6 +95,22 @@ export const Editors = observer(
         },
       );
 
+      ipcRendererManager.on(IpcEvents.REDO_IN_EDITOR, (_event) => {
+        const editor = this.props.appState.editorMosaic.focusedEditor();
+        if (editor) {
+          const model = editor.getModel();
+          if (model) (model as any).redo();
+        }
+      });
+
+      ipcRendererManager.on(IpcEvents.UNDO_IN_EDITOR, (_event) => {
+        const editor = this.props.appState.editorMosaic.focusedEditor();
+        if (editor) {
+          const model = editor.getModel();
+          if (model) (model as any).undo();
+        }
+      });
+
       ipcRendererManager.on(IpcEvents.SELECT_ALL_IN_EDITOR, (_event) => {
         const editor = this.props.appState.editorMosaic.focusedEditor();
         if (editor) {
@@ -116,6 +132,8 @@ export const Editors = observer(
       ipcRendererManager.removeAllListeners(IpcEvents.FS_NEW_TEST);
       ipcRendererManager.removeAllListeners(IpcEvents.MONACO_TOGGLE_OPTION);
       ipcRendererManager.removeAllListeners(IpcEvents.SELECT_ALL_IN_EDITOR);
+      ipcRendererManager.removeAllListeners(IpcEvents.UNDO_IN_EDITOR);
+      ipcRendererManager.removeAllListeners(IpcEvents.REDO_IN_EDITOR);
     }
 
     /**