use electron-localshortcut to fix #79

Author: zaggino

app/appshell/app-menu.ts

@@ -8,6 +8,7 @@ import * as _ from "lodash";
 import * as assert from "assert";
 import { app, Menu } from "electron";
 import * as shell from "./shell";
+import * as electronLocalshortcut from "electron-localshortcut";
 
 const menuTemplate: MenuItemOptions[] = [];
 
@@ -20,27 +21,21 @@ app.on("browser-window-blur", function () {
     _refreshMenu();
 });
 
-// const systemShortcuts = ["Ctrl+Z", "Ctrl+Y", "Ctrl+X", "Ctrl+C", "Ctrl+V", "Ctrl+A"];
-
-function registerShortcuts(menuItem: MenuItemOptions) {
-    /* this shouldn't be used
+function registerShortcuts(win: Electron.BrowserWindow, menuItem: MenuItemOptions) {
     if (menuItem.accelerator) {
-        if (null == systemShortcuts.find((x) => x === menuItem.accelerator)) {
-            globalShortcut.register(menuItem.accelerator, menuItem.click as Function);
-        }
+        electronLocalshortcut.register(win, menuItem.accelerator, menuItem.click as Function);
     }
-    */
     if (Array.isArray(menuItem.submenu)) {
-        menuItem.submenu.forEach((i) => registerShortcuts(i));
+        menuItem.submenu.forEach((i) => registerShortcuts(win, i));
     }
 }
 
 const __refreshMenu = _.debounce(function () {
     Menu.setApplicationMenu(Menu.buildFromTemplate(_.cloneDeep(menuTemplate)));
-    // globalShortcut.unregisterAll();
     const mainWindow = shell.getMainWindow();
+    electronLocalshortcut.unregisterAll(mainWindow);
     if (mainWindow.isFocused()) {
-        menuTemplate.forEach((menuItem) => registerShortcuts(menuItem));
+        menuTemplate.forEach((menuItem) => registerShortcuts(mainWindow, menuItem));
     }
 }, 100);
 

app/electron-localshortcut.ts

@@ -0,0 +1,9 @@
+/* eslint no-undef:0 */
+
+declare module "electron-localshortcut" {
+
+  export function register(window: Electron.BrowserWindow, accelerator: string, callback: Function): void;
+
+  export function unregisterAll(window: Electron.BrowserWindow): void;
+
+}

package.json

@@ -46,6 +46,7 @@
         }
     },
     "scripts": {
+        "dep-change": "grunt dep-change",
         "install": "grunt install && npm run build",
         "build": "rimraf ./dist && gulp copy-src-dist && grunt build && tsc --project app && tsc --project src",
         "build-optimized": "npm run build && grunt optimize",
@@ -63,6 +64,7 @@
         "anymatch": "1.3.0",
         "chokidar": "1.6.1",
         "decompress-zip": "0.3.0",
+        "electron-localshortcut": "1.1.0",
         "fs-extra": "2.0.0",
         "isbinaryfile": "3.0.2",
         "lodash": "4.17.4",