Avoid deprecated ipcRenderer.sendTo.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2024-01-08 16:02:14 -08:00
parent 47cdd5fa8b
commit cf2f4fe9c9
6 changed files with 42 additions and 9 deletions

View File

@@ -1,7 +1,14 @@
import type {Event} from "electron/common";
import {clipboard} from "electron/common";
import type {IpcMainEvent, WebContents} from "electron/main";
import {BrowserWindow, app, dialog, powerMonitor, session} from "electron/main";
import {
BrowserWindow,
app,
dialog,
powerMonitor,
session,
webContents,
} from "electron/main";
import {Buffer} from "node:buffer";
import crypto from "node:crypto";
import path from "node:path";
@@ -389,6 +396,21 @@ ${error}`,
},
);
ipcMain.on(
"forward-to",
<Channel extends keyof RendererMessage>(
_event: IpcMainEvent,
webContentsId: number,
listener: Channel,
...parameters: Parameters<RendererMessage[Channel]>
) => {
const contents = webContents.fromId(webContentsId);
if (contents !== undefined) {
send(contents, listener, ...parameters);
}
},
);
ipcMain.on("update-menu", (_event, props: MenuProps) => {
AppMenu.setMenu(props);
if (props.activeTabIndex !== undefined) {

View File

@@ -33,6 +33,15 @@ export const ipcMain: {
...args: Parameters<RendererMessage[Channel]>
) => void,
): void;
on(
channel: "forward-to",
listener: <Channel extends keyof RendererMessage>(
event: IpcMainEvent,
webContentsId: number,
channel: Channel,
...args: Parameters<RendererMessage[Channel]>
) => void,
): void;
on<Channel extends keyof MainMessage>(
channel: Channel,
listener: MainListener<Channel>,

View File

@@ -226,7 +226,7 @@ export default class WebView {
channel: Channel,
...args: Parameters<RendererMessage[Channel]>
): void {
ipcRenderer.sendTo(this.webContentsId, channel, ...args);
ipcRenderer.send("forward-to", this.webContentsId, channel, ...args);
}
private registerListeners(): void {

View File

@@ -356,7 +356,8 @@ export function initGeneralSection({$root}: GeneralSectionProps): void {
const newValue = !ConfigUtil.getConfigItem("silent", true);
ConfigUtil.setConfigItem("silent", newValue);
updateSilentOption();
ipcRenderer.sendTo(
ipcRenderer.send(
"forward-to",
currentBrowserWindow.webContents.id,
"toggle-silent",
newValue,

View File

@@ -138,7 +138,7 @@ function sendAction<Channel extends keyof RendererMessage>(
win.restore();
}
ipcRenderer.sendTo(win.webContents.id, channel, ...args);
ipcRenderer.send("forward-to", win.webContents.id, channel, ...args);
}
const createTray = function (): void {

View File

@@ -37,6 +37,12 @@ export const ipcRenderer: {
rendererChannel: Channel,
...args: Parameters<RendererMessage[Channel]>
): void;
send<Channel extends keyof RendererMessage>(
channel: "forward-to",
webContentsId: number,
rendererChannel: Channel,
...args: Parameters<RendererMessage[Channel]>
): void;
send<Channel extends keyof MainMessage>(
channel: Channel,
...args: Parameters<MainMessage[Channel]>
@@ -56,11 +62,6 @@ export const ipcRenderer: {
: never,
transfer?: MessagePort[],
): void;
sendTo<Channel extends keyof RendererMessage>(
webContentsId: number,
channel: Channel,
...args: Parameters<RendererMessage[Channel]>
): void;
sendToHost<Channel extends keyof RendererMessage>(
channel: Channel,
...args: Parameters<RendererMessage[Channel]>