feat(App): Improved spell checker & context menu

5 files changed, 100 insertions, 34 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 3e8b18801..45335c488 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -13,6 +13,7 @@ import { isMac, isLinux, isWindows } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
 import { onVisibilityChange } from '../helpers/visibility-helper';
+import { getLocale } from '../helpers/i18n-helpers';
 
 import { getServiceIdsFromPartitions, removeServicePartitionDirectory } from '../helpers/service-helpers.js';
 
@@ -59,6 +60,8 @@ export default class AppStore extends Store {
 
   @observable isFocused = true;
 
+  dictionaries = [];
+
   constructor(...args) {
     super(...args);
 
@@ -82,7 +85,7 @@ export default class AppStore extends Store {
     ]);
   }
 
-  setup() {
+  async setup() {
     this._appStartsCounter();
     // Focus the active service
     window.addEventListener('focus', this.actions.service.focusActiveService);
@@ -169,11 +172,6 @@ export default class AppStore extends Store {
 
     onVisibilityChange((isVisible) => {
       this.isFocused = isVisible;
-      // debug('Last focus', moment().diff(this.timeLastFocusStart));
-
-      // if (isVisible) {
-      //   this.timeLastFocusStart = moment();
-      // }
 
       debug('Window is visible/focused', isVisible);
     });
@@ -322,31 +320,37 @@ export default class AppStore extends Store {
   }
 
   _getDefaultLocale() {
-    let locale = app.getLocale();
-    if (locales[locale] === undefined) {
-      let localeFuzzy;
-      Object.keys(locales).forEach((localStr) => {
-        if (locales && Object.hasOwnProperty.call(locales, localStr)) {
-          if (locale.substring(0, 2) === localStr.substring(0, 2)) {
-            localeFuzzy = localStr;
-          }
-        }
-      });
-
-      if (localeFuzzy !== undefined) {
-        locale = localeFuzzy;
-      }
-    }
-
-    if (locales[locale] === undefined) {
-      locale = defaultLocale;
-    }
-
-    if (!locale) {
-      locale = DEFAULT_APP_SETTINGS.fallbackLocale;
-    }
+    return getLocale({
+      locale: app.getLocale(),
+      locales,
+      defaultLocale,
+      fallbackLocale: DEFAULT_APP_SETTINGS.fallbackLocale,
+    });
 
-    return locale;
+    // if (locales[locale] === undefined) {
+    //   let localeFuzzy;
+    //   Object.keys(locales).forEach((localStr) => {
+    //     if (locales && Object.hasOwnProperty.call(locales, localStr)) {
+    //       if (locale.substring(0, 2) === localStr.substring(0, 2)) {
+    //         localeFuzzy = localStr;
+    //       }
+    //     }
+    //   });
+
+    //   if (localeFuzzy !== undefined) {
+    //     locale = localeFuzzy;
+    //   }
+    // }
+
+    // if (locales[locale] === undefined) {
+    //   locale = defaultLocale;
+    // }
+
+    // if (!locale) {
+    //   locale = DEFAULT_APP_SETTINGS.fallbackLocale;
+    // }
+
+    // return locale;
   }
 
   _muteAppHandler() {
diff --git a/src/stores/DictionaryStore.js b/src/stores/DictionaryStore.js
new file mode 100644
index 000000000..b9c5f2abf
--- /dev/null
+++ b/src/stores/DictionaryStore.js
@@ -0,0 +1,45 @@
+import { observable } from 'mobx';
+import { createDownloader } from 'hunspell-dict-downloader';
+
+import Store from './lib/Store';
+
+import { DICTIONARY_PATH } from '../config';
+
+const debug = require('debug')('Franz:DictionaryStore');
+
+export default class DictionaryStore extends Store {
+  @observable available = []
+  @observable installed = []
+
+  _dictDownloader = null
+
+  constructor(...args) {
+    super(...args);
+
+    this.registerReactions([
+      this._downloadDictForUserLocale.bind(this),
+    ]);
+  }
+
+  async setup() {
+    this._dictDownloader = await createDownloader(DICTIONARY_PATH);
+    debug('dicts', this._dictDownloader);
+
+    this.available = this._dictDownloader.availableDictionaries;
+    this.installed = this._dictDownloader.installedDictionaries;
+
+    if (!this.installed.includes('en-us')) {
+      this._dictDownloader.installDictionary('en-us');
+    }
+  }
+
+  _downloadDictForUserLocale() {
+    const spellcheckerLanguage = this.stores.settings.app.spellcheckerLanguage;
+
+    debug('trying to Downloading dict for', spellcheckerLanguage);
+    if (!this.installed.includes(spellcheckerLanguage) && this.available.includes(spellcheckerLanguage) && spellcheckerLanguage !== 'en-us') {
+      debug('Downloading dict for', spellcheckerLanguage);
+      this._dictDownloader.installDictionary(spellcheckerLanguage);
+    }
+  }
+}
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index e22b343e7..8f217ea94 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -67,9 +67,14 @@ export default class ServicesStore extends Store {
   }
 
   setup() {
-    // Single key reactions
+    // Single key reactions for the sake of your CPU
     reaction(
-      () => this.stores.settings.all.app.enableSpellchecking,
+      () => this.stores.settings.app.enableSpellchecking,
+      () => this._shareSettingsWithServiceProcess(),
+    );
+
+    reaction(
+      () => this.stores.settings.app.spellcheckerLanguage,
       () => this._shareSettingsWithServiceProcess(),
     );
   }
@@ -590,9 +595,10 @@ export default class ServicesStore extends Store {
   }
 
   _shareSettingsWithServiceProcess() {
+    const settings = this.stores.settings.app;
     this.actions.service.sendIPCMessageToAllServices({
       channel: 'settings-update',
-      args: this.stores.settings.all.app,
+      args: settings,
     });
   }
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index b62ac15e0..4a42ed924 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -5,8 +5,10 @@ import localStorage from 'mobx-localstorage';
 import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
+import { getLocale } from '../helpers/i18n-helpers';
 
 import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES } from '../config';
+import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
 const { systemPreferences } = remote;
 const debug = require('debug')('Franz:SettingsStore');
@@ -41,7 +43,6 @@ export default class SettingsStore extends Store {
     });
 
     this.fileSystemSettingsTypes.forEach((type) => {
-      console.log(type);
       ipcRenderer.send('getAppSettings', type);
     });
   }
@@ -157,10 +158,18 @@ export default class SettingsStore extends Store {
 
     // Enable dark mode once
     if (!this.all.migration['5.0.0-beta.19-settings']) {
+      const spellcheckerLanguage = getLocale({
+        locale: this.stores.settings.app.locale,
+        locales: SPELLCHECKER_LOCALES,
+        defaultLocale: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
+        fallbackLocale: DEFAULT_APP_SETTINGS.spellcheckerLanguage,
+      });
+
       this.actions.settings.update({
         type: 'app',
         data: {
           darkMode: systemPreferences.isDarkMode(),
+          spellcheckerLanguage,
         },
       });
 
diff --git a/src/stores/index.js b/src/stores/index.js
index 96b844c95..f547d0a7a 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -9,6 +9,7 @@ import UIStore from './UIStore';
 import PaymentStore from './PaymentStore';
 import NewsStore from './NewsStore';
 import RequestStore from './RequestStore';
+import DictionaryStore from './DictionaryStore';
 import GlobalErrorStore from './GlobalErrorStore';
 
 export default (api, actions, router) => {
@@ -26,6 +27,7 @@ export default (api, actions, router) => {
     payment: new PaymentStore(stores, api, actions),
     news: new NewsStore(stores, api, actions),
     requests: new RequestStore(stores, api, actions),
+    dictionary: new DictionaryStore(stores, api, actions),
     globalError: new GlobalErrorStore(stores, api, actions),
   });
   // Initialize all stores