-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
get preload script working, minimize/maximize buttons, upgrade deps
- Loading branch information
1 parent
61a06bf
commit ad4b4d2
Showing
19 changed files
with
1,198 additions
and
1,126 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| export type WindowState = { | ||
| maximized: boolean; | ||
| fullscreen: boolean; | ||
| fullscreenable: boolean; | ||
| }; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| import { app, BrowserWindow, ipcMain, shell } from 'electron'; | ||
| import fastDeepEqual from 'fast-deep-equal'; | ||
|
|
||
| declare const APP_WEBPACK_ENTRY: string; | ||
| declare const APP_PRELOAD_WEBPACK_ENTRY: string; | ||
|
|
||
| // Handle creating/removing shortcuts on Windows when installing/uninstalling. | ||
| if (require('electron-squirrel-startup')) { | ||
| // eslint-disable-line global-require | ||
| app.quit(); | ||
| } | ||
|
|
||
| console.log(APP_PRELOAD_WEBPACK_ENTRY, APP_WEBPACK_ENTRY); | ||
|
|
||
| const createWindow = (): void => { | ||
| // Create the browser window. | ||
| const mainWindow = new BrowserWindow({ | ||
| width: 800, | ||
| height: 500, | ||
| resizable: true, | ||
| maximizable: true, | ||
| minimizable: true, | ||
| frame: false, | ||
|
|
||
| webPreferences: { | ||
| allowRunningInsecureContent: false, | ||
| contextIsolation: true, | ||
| enableRemoteModule: false, | ||
| preload: APP_PRELOAD_WEBPACK_ENTRY, | ||
| nativeWindowOpen: true, | ||
| nodeIntegration: false, | ||
| nodeIntegrationInWorker: false, | ||
| nodeIntegrationInSubFrames: false, | ||
| safeDialogs: true, | ||
| sandbox: true, | ||
| webSecurity: false, // Needed to bypass CORS requests---could replace this with a proxied fetch in the future | ||
| webviewTag: false, | ||
| }, | ||
| }); | ||
|
|
||
| // and load the index.html of the app. | ||
| mainWindow.loadURL(APP_WEBPACK_ENTRY); | ||
|
|
||
| // Open the DevTools. | ||
| mainWindow.webContents.openDevTools({ mode: 'detach' }); | ||
| let lastWindowState: unknown; | ||
| function updateWindowState() { | ||
| const windowState = { | ||
| maximized: mainWindow.isMaximized(), | ||
| fullscreen: mainWindow.isFullScreen(), | ||
| fullscreenable: mainWindow.isFullScreenable(), | ||
| }; | ||
| if (!fastDeepEqual(lastWindowState, windowState)) { | ||
| lastWindowState = windowState; | ||
| mainWindow.webContents.send('window-state', windowState); | ||
| } | ||
| } | ||
| mainWindow.on('maximize', updateWindowState); | ||
| mainWindow.on('resize', updateWindowState); | ||
| mainWindow.on('minimize', updateWindowState); | ||
| mainWindow.on('enter-full-screen', updateWindowState); | ||
| mainWindow.on('enter-html-full-screen', updateWindowState); | ||
| mainWindow.on('leave-full-screen', updateWindowState); | ||
| mainWindow.on('leave-html-full-screen', updateWindowState); | ||
| mainWindow.on('restore', updateWindowState); | ||
| mainWindow.webContents.once('did-finish-load', updateWindowState); | ||
| }; | ||
|
|
||
| app.on('web-contents-created', (event, contents) => { | ||
| contents | ||
| .on('new-window', (event, url) => { | ||
| event.preventDefault(); | ||
| if (url.startsWith('https://')) { | ||
| shell.openExternal(url); | ||
| } | ||
| }) | ||
| .on('will-navigate', (event, navigationUrl) => { | ||
| event.preventDefault(); | ||
| }); | ||
| }); | ||
|
|
||
| function getWin(event: Electron.IpcMainInvokeEvent) { | ||
| return BrowserWindow.getAllWindows().find( | ||
| (win) => win.webContents === event.sender, | ||
| ); | ||
| } | ||
|
|
||
| ipcMain.handle('minimize', (event) => { | ||
| getWin(event)?.minimize(); | ||
| }); | ||
| ipcMain.handle('restore', (event) => { | ||
| getWin(event)?.restore(); | ||
| }); | ||
| ipcMain.handle('maximize', (event) => { | ||
| getWin(event)?.maximize(); | ||
| }); | ||
| ipcMain.handle('unmaximize', (event) => { | ||
| getWin(event)?.unmaximize(); | ||
| }); | ||
|
|
||
| // This method will be called when Electron has finished | ||
| // initialization and is ready to create browser windows. | ||
| // Some APIs can only be used after this event occurs. | ||
| app.on('ready', createWindow); | ||
|
|
||
| // Quit when all windows are closed, except on macOS. There, it's common | ||
| // for applications and their menu bar to stay active until the user quits | ||
| // explicitly with Cmd + Q. | ||
| if (process.platform !== 'darwin') { | ||
| app.on('window-all-closed', () => { | ||
| app.quit(); | ||
| }); | ||
| app.on('activate', () => { | ||
| // On OS X it's common to re-create a window in the app when the | ||
| // dock icon is clicked and there are no other windows open. | ||
| if (BrowserWindow.getAllWindows().length === 0) { | ||
| createWindow(); | ||
| } | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| import { WindowState } from './WindowState'; | ||
|
|
||
| declare global { | ||
| interface Window { | ||
| ElectronMainApi: { | ||
| minimize(): void; | ||
| restore(): void; | ||
| maximize(): void; | ||
| unmaximize(): void; | ||
| getWindowState(): WindowState; | ||
| subscribeWindowState(callback: (state: WindowState) => void): () => void; | ||
| }; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import { contextBridge, ipcRenderer } from 'electron'; | ||
| import { WindowState } from '../WindowState'; | ||
|
|
||
| let windowState: WindowState = { | ||
| maximized: false, | ||
| fullscreen: false, | ||
| fullscreenable: false, | ||
| }; | ||
| const subscribers = new Set<(state: WindowState) => void>(); | ||
| ipcRenderer.on('window-state', (event, _windowState) => { | ||
| windowState = _windowState; | ||
| for (const subscriber of subscribers) { | ||
| subscriber(windowState); | ||
| } | ||
| }); | ||
|
|
||
| contextBridge.exposeInMainWorld('ElectronMainApi', { | ||
| minimize: () => ipcRenderer.invoke('minimize'), | ||
| restore: () => ipcRenderer.invoke('restore'), | ||
| maximize: () => ipcRenderer.invoke('maximize'), | ||
| unmaximize: () => ipcRenderer.invoke('unmaximize'), | ||
| getWindowState: () => windowState, | ||
| subscribeWindowState: (callback: (windowState: WindowState) => void) => { | ||
| subscribers.add(callback); | ||
| return () => { | ||
| subscribers.delete(callback); | ||
| }; | ||
| }, | ||
| }); |
Oops, something went wrong.