phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

[MM-39139] Workaround for transparency issue for BrowserViews on Electron v14.1.0+ (#1792)

Browse Source
This commit is contained in:
Devin Binnie
2021-10-06 16:26:01 -04:00
committed by GitHub
parent 67ddac1830
commit d1e5505bd4
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/views/modalView.ts
View File

@@ -35,6 +35,11 @@ export class ModalView<T, T2> {
contextIsolation: process.env.NODE_ENV !== 'test', contextIsolation: process.env.NODE_ENV !== 'test',
preload, preload,
nodeIntegration: process.env.NODE_ENV === 'test', nodeIntegration: process.env.NODE_ENV === 'test',
// Workaround for this issue: https://github.com/electron/electron/issues/30993
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
transparent: true,
}}); }});
this.onReject = onReject; this.onReject = onReject;
this.onResolve = onResolve; this.onResolve = onResolve;

5
src/main/views/teamDropdownView.ts
View File

@@ -49,6 +49,11 @@ export default class TeamDropdownView {
contextIsolation: process.env.NODE_ENV !== 'test', contextIsolation: process.env.NODE_ENV !== 'test',
preload, preload,
nodeIntegration: process.env.NODE_ENV === 'test', nodeIntegration: process.env.NODE_ENV === 'test',
// Workaround for this issue: https://github.com/electron/electron/issues/30993
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
transparent: true,
}}); }});
this.view.webContents.loadURL(getLocalURLString('dropdown.html')); this.view.webContents.loadURL(getLocalURLString('dropdown.html'));

5
src/main/views/viewManager.ts
View File

@@ -295,6 +295,11 @@ export class ViewManager {
nativeWindowOpen: true, nativeWindowOpen: true,
contextIsolation: process.env.NODE_ENV !== 'test', contextIsolation: process.env.NODE_ENV !== 'test',
nodeIntegration: process.env.NODE_ENV === 'test', nodeIntegration: process.env.NODE_ENV === 'test',
// Workaround for this issue: https://github.com/electron/electron/issues/30993
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
transparent: true,
}}); }});
const query = new Map([['url', urlString]]); const query = new Map([['url', urlString]]);
const localURL = getLocalURLString('urlView.html', query); const localURL = getLocalURLString('urlView.html', query);