Merge pull request #1494 from Hirobreak/electron-eight

bump electron, builder and keytar version to allow native spellchecker

Author: javiteri95

electron_app/package.json

@@ -145,8 +145,8 @@
   },
   "devDependencies": {
     "@criptext/criptext-js-tools": "^0.5.2",
-    "electron": "6.1.4",
-    "electron-builder": "21.2.0",
+    "electron": "8.0.0",
+    "electron-builder": "22.4.0",
     "electron-notarize": "^0.1.1"
   },
   "dependencies": {
@@ -163,7 +163,7 @@
     "electron-updater": "^4.0.0",
     "electron-window-state": "^4.1.1",
     "getos": "^3.1.1",
-    "keytar": "^5.0.0",
+    "keytar": "5.2.0",
     "knex": "0.17.6",
     "line-by-line": "^0.1.6",
     "moment": "^2.24.0",
@@ -174,7 +174,6 @@
     "rimraf": "^2.6.3",
     "rmdir-recursive": "^0.0.1",
     "sequelize": "^5.21.2",
-    "spellchecker": "^3.7.0",
     "sqlite3": "^4.1.0",
     "umzug": "^2.2.0",
     "unused-filename": "^2.1.0",

electron_app/src/windows/composer.js

@@ -1,13 +1,13 @@
 const path = require('path');
-const { BrowserWindow } = require('electron');
+const { BrowserWindow, Menu, MenuItem } = require('electron');
 const { composerUrl } = require('./../window_routing');
 const globalManager = require('./../globalManager');
 const { EVENTS, callEvent } = require('./events');
 const fileUtils = require('../utils/FileUtils');
 const { API_TRACKING_EVENT } = require('../utils/const');
 const { filterInvalidEmailAddresses } = require('./../utils/EmailUtils');
+const { isMacOS } = require('./windowUtils');
 const logger = require('../logger');
-const spellChecker = require('spellchecker');
 
 const lang = require('./../lang');
 const { windowTitle } = lang.strings.windows.composer;
@@ -51,7 +51,8 @@ const createComposerWindow = () => {
     minWidth: composerSize.minWidth,
     minHeight: composerSize.minHeight,
     webPreferences: {
-      nodeIntegration: true
+      nodeIntegration: true,
+      spellcheck: true
     }
   });
   globalManager.composerData.set(window.id, {});
@@ -85,33 +86,54 @@ const createComposerWindow = () => {
     }
   });
 
-  require('electron-context-menu')({
-    window,
-    showSaveImageAs: false,
-    showInspectElement: false,
-    showCopyImageAddress: false,
-    prepend: (defaultActions, browserWindow) => {
-      const checker = new spellChecker.Spellchecker();
+  if (!isMacOS) {
+    const mySession = window.session || window.webContents.session;
+    if (mySession && mySession.setSpellCheckerLanguages) {
+      mySession.setSpellCheckerLanguages(['es', 'en', 'fr', 'de', 'ru']);
+      logger.info(mySession.availableSpellCheckerLanguages);
+    }
+  }
+  window.webContents.on('context-menu', (event, params) => {
+    const { editFlags, mediaType } = params;
+    const menu = new Menu();
 
-      let options = [];
-      if (defaultActions.misspelledWord) {
-        options = options.concat(
-          checker
-            .getCorrectionsForMisspelling(defaultActions.misspelledWord)
-            .map(word => {
-              return {
-                label: word,
-                click: () => {
-                  browserWindow.webContents.insertText(word);
-                }
-              };
-            })
-            .slice(0, 5)
-        );
-      }
-      return options;
+    for (const suggestion of params.dictionarySuggestions.slice(0, 5)) {
+      menu.append(
+        new MenuItem({
+          label: suggestion,
+          click: () => window.webContents.replaceMisspelling(suggestion)
+        })
+      );
     }
+
+    if (params.dictionarySuggestions.length > 0)
+      menu.append(new MenuItem({ type: 'separator' }));
+
+    menu.append(
+      new MenuItem({
+        label: 'Cut',
+        enabled: editFlags.canCut,
+        click: () => window.webContents.cut()
+      })
+    );
+    menu.append(
+      new MenuItem({
+        label: 'Copy',
+        enabled: editFlags.canCopy,
+        click: () => window.webContents.copy()
+      })
+    );
+    menu.append(
+      new MenuItem({
+        label: 'Paste',
+        enabled: editFlags.canPaste && mediaType === 'none',
+        click: () => window.webContents.paste()
+      })
+    );
+
+    menu.popup();
   });
+
   return window;
 };