Consolidate fullscreen APIs (#125)

src/createWindow.ts

@@ -214,11 +214,11 @@ export function createWindow(props?: WindowProps): BrowserWindow {
   });
 
   window.on('enter-full-screen', () => {
-    window.webContents.send(events.ON_ENTER_FULLSCREEN);
+    window.webContents.send(events.ON_FULLSCREEN_CHANGED, true);
   });
 
   window.on('leave-full-screen', () => {
-    window.webContents.send(events.ON_LEAVE_FULLSCREEN);
+    window.webContents.send(events.ON_FULLSCREEN_CHANGED, false);
   });
 
   // Bypass the browser's cache when initially loading the remote URL

src/events.ts

@@ -13,7 +13,6 @@ export enum events {
   LOGOUT = 'LOGOUT',
   SHOW_MESSAGE_BOX = 'SHOW_MESSAGE_BOX',
   CHECK_FOR_UPDATES = 'CHECK_FOR_UPDATES',
-  ON_ENTER_FULLSCREEN = 'ON_ENTER_FULLSCREEN',
-  ON_LEAVE_FULLSCREEN = 'ON_LEAVE_FULLSCREEN',
+  ON_FULLSCREEN_CHANGED = 'ON_FULLSCREEN_CHANGED',
   THEME_VALUES_CHANGED = 'THEME_VALUES_CHANGED',
 }

src/preload.ts

@@ -1,16 +1,6 @@
 import { contextBridge, ipcRenderer, IpcRendererEvent } from 'electron';
 import { events } from './events';
 
-function makeEventHandler(event: events) {
-  return function (callback: () => void) {
-    ipcRenderer.on(event, callback);
-
-    return () => {
-      ipcRenderer.removeListener(event, callback);
-    };
-  };
-}
-
 function parseArgument(name: string) {
   // Must be passed in as an entry to the `additionalArguments` array in `webPreferences`
   const arg = process.argv.find((a) => a.includes(`--${name}=`));
@@ -45,8 +35,18 @@ contextBridge.exposeInMainWorld('replitDesktop', {
   },
   showMessageBox: async (params: Electron.MessageBoxOptions) =>
     ipcRenderer.invoke(events.SHOW_MESSAGE_BOX, params),
-  onEnterFullscreen: makeEventHandler(events.ON_ENTER_FULLSCREEN),
-  onLeaveFullscreen: makeEventHandler(events.ON_LEAVE_FULLSCREEN),
+
+  onFullScreenChanged: (callback: (isFullScreen: boolean) => void) => {
+    function listener(_event: IpcRendererEvent, isFullScreen: boolean) {
+      callback(isFullScreen);
+    }
+
+    ipcRenderer.on(events.ON_FULLSCREEN_CHANGED, listener);
+
+    return () => {
+      ipcRenderer.removeListener(events.ON_FULLSCREEN_CHANGED, listener);
+    };
+  },
   updateThemeValues: (themeValues: {
     backgroundRoot: string;
     foregroundDefault: string;