Use electron-spellchecker instead of electron-hunspell

7 files changed, 240 insertions, 84 deletions

diff --git a/electron-builder.yml b/electron-builder.yml
index df7d2223a..f6dceabce 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -53,6 +53,5 @@ protocols:
   schemes: [ferdi]
 
 asarUnpack:
-  - ./dictionaries
   - ./recipes
   - ./assets/images/taskbar
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 4932d56f8..dda198c18 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -39,7 +39,6 @@ const paths = {
   src: 'src',
   dest: 'build',
   tmp: '.tmp',
-  dictionaries: 'dictionaries',
   package: `out/${config.version}`,
   recipes: {
     src: 'recipes/*.tar.gz',
@@ -194,29 +193,6 @@ export function webserver() {
   );
 }
 
-export function dictionaries(done) {
-  const { SPELLCHECKER_LOCALES } = require('./build/i18n/languages');
-
-  let packages = '';
-  Object.keys(SPELLCHECKER_LOCALES).forEach((key) => {
-    packages = `${packages} hunspell-dict-${key}`;
-  });
-
-  _shell(
-    `npm install --prefix "${path.join(__dirname, 'temp')}" ${packages}`,
-    () => {
-      moveSync(
-        path.join(__dirname, 'temp', 'node_modules'),
-        path.join(__dirname, 'build', paths.dictionaries),
-      );
-
-      removeSync(path.join(__dirname, 'temp'));
-
-      done();
-    },
-  );
-}
-
 export function recipes() {
   return gulp.src(paths.recipes.src, { since: gulp.lastRun(recipes) })
     .pipe(gulp.dest(paths.recipes.dest));
@@ -230,7 +206,6 @@ const build = gulp.series(
   clean,
   gulp.parallel(mvSrc, mvPackageJson, mvLernaPackages),
   gulp.parallel(html, scripts, styles, recipes, recipeInfo),
-  dictionaries,
 );
 export { build };
 
diff --git a/package-lock.json b/package-lock.json
index e037c9133..2cbbe8939 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,52 @@
       "integrity": "sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA==",
       "dev": true
     },
+    "@aabuhijleh/electron-remote": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@aabuhijleh/electron-remote/-/electron-remote-1.4.0.tgz",
+      "integrity": "sha512-EG4ZXxqbFY4lpX55vctwz14mFrEOcOHFCMLH5z5lOl6fiviTqscy86tSlKwEE3/o3ExtdPr2tECgCogYYL7d+g==",
+      "requires": {
+        "debug": "^2.5.1",
+        "hashids": "^1.1.1",
+        "lodash.get": "^4.4.2",
+        "pify": "^2.3.0",
+        "rxjs": "^5.0.0-beta.12",
+        "xmlhttprequest": "^1.8.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.6.9",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "pify": {
+          "version": "2.3.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
+        },
+        "rxjs": {
+          "version": "5.5.12",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
+          "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+          "requires": {
+            "symbol-observable": "1.0.1"
+          }
+        },
+        "symbol-observable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
+        }
+      }
+    },
     "@adlk/misty": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/@adlk/misty/-/misty-0.1.1.tgz",
@@ -1518,6 +1564,14 @@
         }
       }
     },
+    "@felixrieseberg/spellchecker": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/@felixrieseberg/spellchecker/-/spellchecker-4.0.10.tgz",
+      "integrity": "sha512-b+BlHcBXjx+W7yGNAtoVpAv8dvmAQ8Tp2YhNjqxIgocb6Wq1nKLl4jfu9DG60UWC0hTNvvQ74ny9ojiUFNqGSA==",
+      "requires": {
+        "nan": "^2.13.2"
+      }
+    },
     "@fimbul/bifrost": {
       "version": "0.17.0",
       "resolved": "https://registry.npmjs.org/@fimbul/bifrost/-/bifrost-0.17.0.tgz",
@@ -5041,6 +5095,11 @@
       "integrity": "sha1-NqS6tZTAUP17UHvKDbMMLZKvT/I=",
       "dev": true
     },
+    "bcp47": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/bcp47/-/bcp47-1.1.2.tgz",
+      "integrity": "sha1-NUvjMH/9CEM6ePXh4glYRfifx/4="
+    },
     "bcrypt-pbkdf": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
@@ -5973,6 +6032,31 @@
       "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
       "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
     },
+    "cld": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/cld/-/cld-2.5.1.tgz",
+      "integrity": "sha512-DwdvvcFVizwDdPCocoPPReFk3BwLEaTZ3RzFgJ4jLzsBzJKUC3cTna0ZmAZG4tFtMmQdl0ciso3+ijkH3OPZPA==",
+      "requires": {
+        "glob": "^5.0.10",
+        "nan": "^2.9.2",
+        "rimraf": "^2.4.0",
+        "underscore": "^1.6.0"
+      },
+      "dependencies": {
+        "glob": {
+          "version": "5.0.15",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
+          "requires": {
+            "inflight": "^1.0.4",
+            "inherits": "2",
+            "minimatch": "2 || 3",
+            "once": "^1.3.0",
+            "path-is-absolute": "^1.0.0"
+          }
+        }
+      }
+    },
     "cld3-asm": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cld3-asm/-/cld3-asm-1.0.1.tgz",
@@ -8428,6 +8512,78 @@
         }
       }
     },
+    "electron-spellchecker": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/electron-spellchecker/-/electron-spellchecker-2.2.0.tgz",
+      "integrity": "sha512-QkOVgjmjx6bDkqNshRTfVzEz9ctjiKVPZw77YLS0sQReP320QNtTXAKyo+01TORWk58RFT/LdxPZ/aejLdPmOA==",
+      "requires": {
+        "@aabuhijleh/electron-remote": "^1.4.0",
+        "@felixrieseberg/spellchecker": "^4.0.10",
+        "bcp47": "^1.1.2",
+        "cld": "^2.5.1",
+        "debug": "^4.1.1",
+        "keyboard-layout": "^2.0.16",
+        "lru-cache": "^5.1.1",
+        "mkdirp": "^0.5.1",
+        "pify": "^4.0.1",
+        "rxjs": "^5.0.1",
+        "rxjs-serial-subscription": "^0.1.1",
+        "spawn-rx": "^2.0.7"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+          "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+          "requires": {
+            "yallist": "^3.0.2"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
+        },
+        "rxjs": {
+          "version": "5.5.12",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
+          "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+          "requires": {
+            "symbol-observable": "1.0.1"
+          }
+        },
+        "spawn-rx": {
+          "version": "2.0.12",
+          "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-2.0.12.tgz",
+          "integrity": "sha512-gOPXiQQFQ9lTOLuys0iMn3jfxxv9c7zzwhbYLOEbQGvEShHVJ5sSR1oD3Daj88os7jKArDYT7rbOKdvNhe7iEg==",
+          "requires": {
+            "debug": "^2.5.1",
+            "lodash.assign": "^4.2.0",
+            "rxjs": "^5.1.1"
+          },
+          "dependencies": {
+            "debug": {
+              "version": "2.6.9",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+              "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+              "requires": {
+                "ms": "2.0.0"
+              }
+            }
+          }
+        },
+        "symbol-observable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
+        }
+      }
+    },
     "electron-to-chromium": {
       "version": "1.3.261",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.261.tgz",
@@ -9321,6 +9477,11 @@
         "es5-ext": "~0.10.14"
       }
     },
+    "event-kit": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/event-kit/-/event-kit-2.5.3.tgz",
+      "integrity": "sha512-b7Qi1JNzY4BfAYfnIRanLk0DOD1gdkWHT4GISIn8Q2tAf3LpU8SP2CMwWaq40imYoKWbtN4ZhbSRxvsnikooZQ=="
+    },
     "eventemitter2": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-5.0.1.tgz",
@@ -13360,6 +13521,11 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "hashids": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/hashids/-/hashids-1.2.2.tgz",
+      "integrity": "sha512-dEHCG2LraR6PNvSGxosZHIRgxF5sNLOIBFEHbj8lfP9WWmu/PWPMzsip1drdVSOFi51N2pU7gZavrgn7sbGFuw=="
+    },
     "haye": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/haye/-/haye-2.0.2.tgz",
@@ -15576,6 +15742,15 @@
       "integrity": "sha1-P55JkK3K0MaGwOcB92RYaPdfkes=",
       "dev": true
     },
+    "keyboard-layout": {
+      "version": "2.0.16",
+      "resolved": "https://registry.npmjs.org/keyboard-layout/-/keyboard-layout-2.0.16.tgz",
+      "integrity": "sha512-eGrxmlV6jbm/mbPEOpYGuH53XEC7wIUj9ZxKcT2z9QHJ/RwrT9iVkvxka9zRxqHZHwQzcffgsa5OxoVAKnhK9w==",
+      "requires": {
+        "event-kit": "^2.0.0",
+        "nan": "^2.13.2"
+      }
+    },
     "keyv": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
@@ -16036,8 +16211,7 @@
     "lodash.assign": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
+      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc="
     },
     "lodash.camelcase": {
       "version": "4.3.0",
@@ -16062,8 +16236,7 @@
     "lodash.get": {
       "version": "4.4.2",
       "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-      "dev": true
+      "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
     },
     "lodash.includes": {
       "version": "4.3.0",
@@ -21457,6 +21630,29 @@
         "tslib": "^1.9.0"
       }
     },
+    "rxjs-serial-subscription": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/rxjs-serial-subscription/-/rxjs-serial-subscription-0.1.1.tgz",
+      "integrity": "sha1-pCsdsL8QlLCSMRkeJ3jKP8+e0Uc=",
+      "requires": {
+        "rxjs": "^5.0.0-beta.12"
+      },
+      "dependencies": {
+        "rxjs": {
+          "version": "5.5.12",
+          "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
+          "integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+          "requires": {
+            "symbol-observable": "1.0.1"
+          }
+        },
+        "symbol-observable": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+          "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ="
+        }
+      }
+    },
     "safe-buffer": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
@@ -24198,6 +24394,11 @@
       "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
       "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo="
     },
+    "underscore": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz",
+      "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg=="
+    },
     "undertaker": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
@@ -25582,6 +25783,11 @@
       "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
       "dev": true
     },
+    "xmlhttprequest": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz",
+      "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw="
+    },
     "xmlhttprequest-ssl": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz",
diff --git a/package.json b/package.json
index 09675fa62..526a16947 100644
--- a/package.json
+++ b/package.json
@@ -72,6 +72,7 @@
     "electron-process-manager": "git+https://git@github.com/dizer/electron-process-manager.git",
     "electron-process-reporter": "git+https://git@github.com/dizer/electron-process-reporter.git",
     "electron-react-titlebar": "0.8.1",
+    "electron-spellchecker": "2.2.0",
     "electron-updater": "4.1.2",
     "electron-window-state": "5.0.3",
     "fs-extra": "7.0.1",
diff --git a/src/config.js b/src/config.js
index b1dbab1ff..e762f879f 100644
--- a/src/config.js
+++ b/src/config.js
@@ -116,7 +116,6 @@ export const LOCAL_SERVER = 'You are using Ferdi without a server';
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
 
 // Replacing app.asar is not beautiful but unforunately necessary
-export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries'));
 export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes'));
 
 export const ALLOWED_PROTOCOLS = [
diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json
index c64830574..678554c05 100644
--- a/src/i18n/locales/zh-Hant.json
+++ b/src/i18n/locales/zh-Hant.json
@@ -54,7 +54,6 @@
   "locked.invalidCredentials": "Password invalid",
   "locked.password.label": "Password",
   "locked.submit.label": "Unlock",
-  "login.changeServer": "Change server",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
   "login.email.label": "電子郵件信箱",
@@ -187,7 +186,6 @@
   "services.getStarted": "開始使用",
   "services.login": "Please login to use Ferdi.",
   "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
-  "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "歡迎使用 Ferdi",
   "settings.account.account.editButton": "更改帳戶資訊",
   "settings.account.accountType.basic": "基本帳戶",
@@ -356,8 +354,6 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "公司",
   "settings.user.form.accountType.individual": "個人",
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 1cb449110..2062429fd 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,36 +1,21 @@
 import { webFrame } from 'electron';
-import { attachSpellCheckProvider, SpellCheckerProvider } from 'electron-hunspell';
-import path from 'path';
-import { readFileSync } from 'fs';
+import {SpellCheckHandler, ContextMenuListener, ContextMenuBuilder} from 'electron-spellchecker';
 
-import { DICTIONARY_PATH } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
-const debug = require('debug')('Ferdi:spellchecker');
+const debug = require('debug')('Franz:spellchecker');
 
-let provider;
+let handler;
 let currentDict;
+let contextMenuBuilder;
 let _isEnabled = false;
-let attached;
 
-const DEFAULT_LOCALE = 'en-us';
-
-async function loadDictionary(locale) {
-  try {
-    const fileLocation = path.join(DICTIONARY_PATH, `hunspell-dict-${locale}/${locale}`);
-    debug('Loaded dictionary', locale, 'from', fileLocation);
-    return provider.loadDictionary(locale, readFileSync(`${fileLocation}.dic`), readFileSync(`${fileLocation}.aff`));
-  } catch (err) {
-    console.error('Could not load dictionary', err);
-  }
-}
-
-export async function switchDict(locale = DEFAULT_LOCALE) {
+export async function switchDict(locale) {
   try {
     debug('Trying to load dictionary', locale);
 
-    if (!provider) {
-      console.warn('SpellcheckProvider not initialized');
+    if (!handler) {
+      console.warn('SpellcheckHandler not initialized');
 
       return;
     }
@@ -41,11 +26,7 @@ export async function switchDict(locale = DEFAULT_LOCALE) {
       return;
     }
 
-    if (currentDict) {
-      provider.unloadDictionary(locale);
-    }
-    await loadDictionary(locale);
-    await attached.switchLanguage(locale);
+    handler.switchLanguage(locale);
 
     debug('Switched dictionary to', locale);
 
@@ -56,34 +37,22 @@ export async function switchDict(locale = DEFAULT_LOCALE) {
   }
 }
 
-export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
-  const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
-
-  if (locales.length >= 1) {
-    return locales[0];
-  }
-
-  return null;
-}
-
-export default async function initialize(languageCode = DEFAULT_LOCALE) {
+export default async function initialize(languageCode = 'en-us') {
   try {
-    provider = new SpellCheckerProvider();
-    const locale = getSpellcheckerLocaleByFuzzyIdentifier(languageCode);
+    handler = new SpellCheckHandler();
+    handler.attachToInput();
+    const locale = languageCode.toLowerCase();
 
     debug('Init spellchecker');
-    await provider.initialize();
-
-    debug('Attaching spellcheck provider');
-    attached = await attachSpellCheckProvider(provider);
-
-    const availableDictionaries = await provider.getAvailableDictionaries();
 
-    debug('Available spellchecker dictionaries', availableDictionaries);
+    switchDict(locale);
 
-    await switchDict(locale);
+    contextMenuBuilder = new ContextMenuBuilder(handler);
+    new ContextMenuListener((info) => {
+      contextMenuBuilder.showPopupMenu(info);
+    });
 
-    return provider;
+    return handler;
   } catch (err) {
     console.error(err);
     return false;
@@ -96,8 +65,19 @@ export function isEnabled() {
 
 export function disable() {
   if (isEnabled()) {
+    handler.unsubscribe();
     webFrame.setSpellCheckProvider(currentDict, { spellCheck: () => true });
     _isEnabled = false;
     currentDict = null;
   }
 }
+
+export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
+  const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
+
+  if (locales.length >= 1) {
+    return locales[0];
+  }
+
+  return null;
+}