hendrik/lens
1
0 Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix Electron 9.4 frame ipc bug (#1888)

Browse Source 
* use pid+frameId

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

* use correct process id

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>
This commit is contained in:
Jari Kolehmainen authored and GitHub committed 2021-01-04 14:16:35 +02:00
1 parent 8c70e055ee
commit 06d41acc26
5 files changed
+30 -20
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/window-manager.ts
+13 -8
View File
@@ -7,7 +7,7 @@ import { subscribeToBroadcast } from "../common/ipc";
import { initMenu } from "./menu";
import { initTray } from "./tray";
import { Singleton } from "../common/utils";
import { clusterFrameMap } from "../common/cluster-frames";
import { ClusterFrameInfo, clusterFrameMap } from "../common/cluster-frames";
export class WindowManager extends Singleton {
protected mainWindow: BrowserWindow;
@@ -118,9 +118,9 @@ export class WindowManager extends Singleton {
return this.mainWindow;
}
sendToView({ channel, frameId, data = [] }: { channel: string, frameId?: number, data?: any[] }) {
if (frameId) {
this.mainWindow.webContents.sendToFrame(frameId, channel, ...data);
sendToView({ channel, frameInfo, data = [] }: { channel: string, frameInfo?: ClusterFrameInfo, data?: any[] }) {
if (frameInfo) {
this.mainWindow.webContents.sendToFrame([frameInfo.processId, frameInfo.frameId], channel, ...data);
} else {
this.mainWindow.webContents.send(channel, ...data);
}
@@ -128,18 +128,23 @@ export class WindowManager extends Singleton {
async navigate(url: string, frameId?: number) {
await this.ensureMainWindow();
let frameInfo: ClusterFrameInfo;
if (frameId) {
frameInfo = Array.from(clusterFrameMap.values()).find((frameInfo) => frameInfo.frameId === frameId);
}
this.sendToView({
channel: "renderer:navigate",
frameId,
frameInfo,
data: [url],
});
}
reload() {
const frameId = clusterFrameMap.get(this.activeClusterId);
const frameInfo = clusterFrameMap.get(this.activeClusterId);
if (frameId) {
this.sendToView({ channel: "renderer:reload", frameId });
if (frameInfo) {
this.sendToView({ channel: "renderer:reload", frameInfo });
} else {
webContents.getFocusedWebContents()?.reload();
}