fix: Don't focus WebView when starting minimized (WEBAPP-6277) (#4042)

Author: ffflorian

electron/renderer/src/actions/AccountAction.js

@@ -56,22 +56,18 @@ export class AccountAction {
 
   switchWebview = accountIndex => {
     return async (dispatch, getState) => {
-      try {
-        const account = AccountSelector.getAccounts(getState())[Math.max(accountIndex, 0)];
-        dispatch(switchAccount(account.id));
+      const account = AccountSelector.getAccounts(getState())[Math.max(accountIndex, 0)];
+      dispatch(switchAccount(account.id));
 
-        // Note: We need to focus window first to properly set focus
-        // on the webview with shortcuts like Cmd+1/2/3
-        window.blur();
-        window.focus();
+      // Note: We need to focus window first to properly set focus
+      // on the webview with shortcuts like Cmd+1/2/3
+      window.blur();
+      window.focus();
 
-        const webview = document.querySelector(`.Webview[data-accountid="${account.id}"]`);
-        if (webview) {
-          webview.blur();
-          webview.focus();
-        }
-      } catch (error) {
-        throw error;
+      const webview = document.querySelector(`.Webview[data-accountid="${account.id}"]`);
+      if (webview) {
+        webview.blur();
+        webview.focus();
       }
     };
   };

electron/renderer/src/components/Sidebar.jsx

@@ -70,7 +70,7 @@ const Sidebar = ({
         <div
           style={{color: colorFromId(currentAccentID)}}
           className={getClassName(account)}
-          onClick={preventFocus(event =>
+          onClick={preventFocus(() =>
             window.dispatchEvent(
               new CustomEvent(EVENT_TYPE.ACTION.SWITCH_ACCOUNT, {detail: {accountIndex: accounts.indexOf(account)}}),
             ),

electron/renderer/src/components/Webview.jsx

@@ -83,16 +83,22 @@ const Webview = ({
   // https://github.com/electron/electron/issues/14474#issuecomment-425794480
   useEffect(() => {
     const webview = webviewRef.current;
-    const listener = () => {
-      webview.blur();
-      webview.focus();
+    const currentLocation = new URL(window.location.href);
+    const focusParam = currentLocation.searchParams.get('focus');
+
+    const focusWebView = () => {
+      if (focusParam && focusParam === 'true') {
+        webview.blur();
+        webview.focus();
+      }
     };
+
     if (account.visible && webview) {
-      webview.addEventListener('dom-ready', listener);
+      webview.addEventListener('dom-ready', focusWebView);
     }
     return () => {
       if (webview) {
-        webview.removeEventListener('dom-ready', listener);
+        webview.removeEventListener('dom-ready', focusWebView);
       }
     };
   }, [account, webviewRef]);

electron/src/lib/eventType.ts

@@ -63,7 +63,6 @@ export const EVENT_TYPE = {
     UNREAD_COUNT: 'EVENT_TYPE.LIFECYCLE.UNREAD_COUNT',
   },
   PREFERENCES: {
-    SET_HIDDEN: 'EVENT_TYPE.PREFERENCES.SET_HIDDEN',
     SHOW: 'EVENT_TYPE.PREFERENCES.SHOW',
   },
   PROXY_PROMPT: {

electron/src/main.ts

@@ -93,6 +93,7 @@ const BASE_URL = EnvironmentUtil.web.getWebappUrl(argv[config.ARGUMENT.ENV]);
 
 const logger = getLogger(path.basename(__filename));
 const currentLocale = locale.getCurrent();
+const startHidden = Boolean(argv[config.ARGUMENT.STARTUP] || argv[config.ARGUMENT.HIDDEN]);
 
 if (argv[config.ARGUMENT.VERSION]) {
   console.info(config.version);
@@ -244,7 +245,7 @@ const showMainWindow = async (mainWindowState: WindowStateKeeper.State) => {
     main.webContents.openDevTools({mode: 'detach'});
   }
 
-  if (!argv[config.ARGUMENT.STARTUP] && !argv[config.ARGUMENT.HIDDEN]) {
+  if (!startHidden) {
     if (!WindowUtil.isInView(main)) {
       main.center();
     }
@@ -320,14 +321,11 @@ const showMainWindow = async (mainWindowState: WindowStateKeeper.State) => {
 
   const mainURL = new URL(fileUrl(INDEX_HTML));
   mainURL.searchParams.set('env', encodeURIComponent(webappURL.href));
+  mainURL.searchParams.set('focus', String(!startHidden));
 
   await main.loadURL(mainURL.href);
   const wrapperCSSContent = await fs.readFile(WRAPPER_CSS, 'utf8');
   await main.webContents.insertCSS(wrapperCSSContent);
-
-  if (argv[config.ARGUMENT.STARTUP] || argv[config.ARGUMENT.HIDDEN]) {
-    WindowManager.sendActionToPrimaryWindow(EVENT_TYPE.PREFERENCES.SET_HIDDEN);
-  }
 };
 
 // App Events

electron/src/renderer/preload-app.ts

@@ -79,10 +79,6 @@ const subscribeToMainProcessEvents = () => {
   ipcRenderer.on(EVENT_TYPE.ACTION.SWITCH_ACCOUNT, (event, accountIndex: number) => {
     window.dispatchEvent(new CustomEvent(EVENT_TYPE.ACTION.SWITCH_ACCOUNT, {detail: {accountIndex}}));
   });
-
-  ipcRenderer.on(EVENT_TYPE.PREFERENCES.SET_HIDDEN, () => {
-    window.dispatchEvent(new CustomEvent(EVENT_TYPE.PREFERENCES.SET_HIDDEN));
-  });
 };
 
 const setupIpcInterface = (): void => {