fix(App): Fix app focus detection

5 files changed, 20 insertions, 33 deletions

diff --git a/src/electron/ipc-api/focusState.js b/src/electron/ipc-api/focusState.js
new file mode 100644
index 000000000..0b4a0d8f3
--- /dev/null
+++ b/src/electron/ipc-api/focusState.js
@@ -0,0 +1,9 @@
+export default (params) => {
+  params.mainWindow.on('focus', () => {
+    params.mainWindow.webContents.send('isWindowFocused', true);
+  });
+
+  params.mainWindow.on('blur', () => {
+    params.mainWindow.webContents.send('isWindowFocused', false);
+  });
+};
diff --git a/src/electron/ipc-api/index.js b/src/electron/ipc-api/index.js
index 999ac7d2d..5da1edc39 100644
--- a/src/electron/ipc-api/index.js
+++ b/src/electron/ipc-api/index.js
@@ -5,6 +5,7 @@ import download from './download';
 import localServer from './localServer';
 import cld from './cld';
 import dnd from './dnd';
+import focusState from './focusState';
 
 export default (params) => {
   settings(params);
@@ -14,4 +15,5 @@ export default (params) => {
   localServer(params);
   cld(params);
   dnd();
+  focusState(params);
 };
diff --git a/src/helpers/visibility-helper.js b/src/helpers/visibility-helper.js
deleted file mode 100644
index 8456c4ecf..000000000
--- a/src/helpers/visibility-helper.js
+++ /dev/null
@@ -1,27 +0,0 @@
-export function onVisibilityChange(cb) {
-  let isVisible = true;
-
-  if (!cb) {
-    throw new Error('no callback given');
-  }
-
-  function focused() {
-    if (!isVisible) {
-      cb(isVisible = true);
-    }
-  }
-
-  function unfocused() {
-    if (isVisible) {
-      cb(isVisible = false);
-    }
-  }
-
-  document.addEventListener('visibilitychange', () => { (document.hidden ? unfocused : focused)(); });
-
-  window.onpageshow = focused;
-  window.onfocus = focused;
-
-  window.onpagehid = unfocused;
-  window.onblur = unfocused;
-}
diff --git a/src/index.js b/src/index.js
index d97f2cf09..b1d4907cc 100644
--- a/src/index.js
+++ b/src/index.js
@@ -455,7 +455,12 @@ ipcMain.on('open-browser-window', (e, { url, serviceId }) => {
   const serviceSession = session.fromPartition(`persist:service-${serviceId}`);
   const child = new BrowserWindow({
     parent: mainWindow,
-    webPreferences: { session: serviceSession },
+    webPreferences: {
+      session: serviceSession,
+      // TODO: Aren't these needed here?
+      // contextIsolation: false,
+      // enableRemoteModule: true,
+    },
   });
   child.show();
   child.loadURL(url);
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 180f01af6..72ddc2927 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -27,7 +27,6 @@ import {
   ferdiLocale,
 } from '../environment';
 import locales from '../i18n/translations';
-import { onVisibilityChange } from '../helpers/visibility-helper';
 import { getLocale } from '../helpers/i18n-helpers';
 
 import {
@@ -221,10 +220,9 @@ export default class AppStore extends Store {
 
     this.isSystemDarkModeEnabled = nativeTheme.shouldUseDarkColors;
 
-    onVisibilityChange((isVisible) => {
-      this.isFocused = isVisible;
-
-      debug('Window is visible/focused', isVisible);
+    ipcRenderer.on('isWindowFocused', (event, isFocused) => {
+      debug('Setting is focused to', isFocused);
+      this.isFocused = isFocused;
     });
 
     powerMonitor.on('suspend', () => {