1 files changed, 53 insertions, 9 deletions

diff --git a/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts b/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts
index cff7957..f1e3c7e 100644
--- a/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts
+++ b/packages/main/src/infrastructure/electron/impl/ElectronMainWindow.ts
@@ -22,22 +22,29 @@ import {
   Action,
   MainToRendererIpcMessage,
   RendererToMainIpcMessage,
+  Translation,
 } from '@sophie/shared';
 import { BrowserWindow, ipcMain, IpcMainEvent } from 'electron';
+import { reaction } from 'mobx';
 import type { IJsonPatch } from 'mobx-state-tree';
 
-import type MainStore from '../../../stores/MainStore';
-import { getLogger } from '../../../utils/log';
-import RendererBridge from '../RendererBridge';
-import type { MainWindow, ServiceView } from '../types';
+import type MainStore from '../../../stores/MainStore.js';
+import Disposer from '../../../utils/Disposer.js';
+import getLogger from '../../../utils/getLogger.js';
+import RendererBridge from '../RendererBridge.js';
+import type { MainWindow, ServiceView } from '../types.js';
 
-import ElectronServiceView from './ElectronServiceView';
-import type ElectronViewFactory from './ElectronViewFactory';
-import { openDevToolsWhenReady } from './devTools';
-import lockWebContentsToFile from './lockWebContentsToFile';
+import ElectronServiceView from './ElectronServiceView.js';
+import type ElectronViewFactory from './ElectronViewFactory.js';
+import { openDevToolsWhenReady } from './devTools.js';
+import lockWebContentsToFile from './lockWebContentsToFile.js';
 
 const log = getLogger('ElectronMainWindow');
 
+function getBackroundColor(useDarkTheme: boolean): string {
+  return useDarkTheme ? '#121212' : '#FFF';
+}
+
 export default class ElectronMainWindow implements MainWindow {
   private readonly browserWindow: BrowserWindow;
 
@@ -65,6 +72,8 @@ export default class ElectronMainWindow implements MainWindow {
     }
   };
 
+  private readonly disposeBackgroundColorReaction: Disposer;
+
   constructor(
     private readonly store: MainStore,
     private readonly parent: ElectronViewFactory,
@@ -73,6 +82,7 @@ export default class ElectronMainWindow implements MainWindow {
       show: false,
       autoHideMenuBar: true,
       darkTheme: store.shared.shouldUseDarkColors,
+      backgroundColor: getBackroundColor(store.shared.shouldUseDarkColors),
       webPreferences: {
         sandbox: true,
         devTools: parent.devMode,
@@ -96,6 +106,24 @@ export default class ElectronMainWindow implements MainWindow {
       return this.bridge.snapshot;
     });
 
+    ipcMain.handle(
+      RendererToMainIpcMessage.GetTranslation,
+      (event, translation) => {
+        const { id } = event.sender;
+        if (id !== webContents.id) {
+          log.warn(
+            'Unexpected',
+            RendererToMainIpcMessage.GetTranslation,
+            'from webContents',
+            id,
+          );
+          throw new Error('Invalid IPC call');
+        }
+        const { language, namespace } = Translation.parse(translation);
+        return store.getTranslation(language, namespace);
+      },
+    );
+
     this.bridge = new RendererBridge(store, (patch) => {
       webContents.send(MainToRendererIpcMessage.SharedStorePatch, patch);
     });
@@ -107,6 +135,13 @@ export default class ElectronMainWindow implements MainWindow {
 
     webContents.userAgent = parent.userAgents.mainWindowUserAgent;
 
+    this.disposeBackgroundColorReaction = reaction(
+      () => store.shared.shouldUseDarkColors,
+      (useDarkTheme) => {
+        this.browserWindow.setBackgroundColor(getBackroundColor(useDarkTheme));
+      },
+    );
+
     this.browserWindow.on('ready-to-show', () => this.browserWindow.show());
 
     this.browserWindow.on('close', () => this.dispose());
@@ -134,7 +169,9 @@ export default class ElectronMainWindow implements MainWindow {
     }
     if (serviceView instanceof ElectronServiceView) {
       this.browserWindow.setBrowserView(serviceView.browserView);
-      serviceView.browserView.setBackgroundColor('#fff');
+      // If this `BrowserView` hasn't been attached previously,
+      // we must update its bounds _after_ attaching for the resizing to take effect.
+      serviceView.updateBounds();
       return;
     }
     throw new TypeError(
@@ -142,8 +179,15 @@ export default class ElectronMainWindow implements MainWindow {
     );
   }
 
+  reloadTranslations(): void {
+    this.browserWindow.webContents.send(
+      MainToRendererIpcMessage.ReloadTranslations,
+    );
+  }
+
   dispose() {
     this.bridge.dispose();
+    this.disposeBackgroundColorReaction();
     this.browserWindow.destroy();
     ipcMain.removeHandler(RendererToMainIpcMessage.GetSharedStoreSnapshot);
     ipcMain.removeListener(