paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-10-27 18:13:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebView: Use a better focus() workaround.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2021-11-19 15:29:08 -08:00
parent b853856317
commit 86b7da45ef
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/renderer/js/components/webview.ts
View File

@@ -227,18 +227,9 @@ export default class WebView {
} }
focus(): void { focus(): void {
// Focus Webview and it's contents when Window regain focus.
const webContents = remote.webContents.fromId(this.$el!.getWebContentsId());
// HACK: webContents.isFocused() seems to be true even without the element
// being in focus. So, we check against `document.activeElement`.
if (webContents && this.$el !== document.activeElement) {
// HACK: Looks like blur needs to be called on the previously focused
// element to transfer focus correctly, in Electron v3.0.10
// See https://github.com/electron/electron/issues/15718
(document.activeElement as HTMLElement).blur();
this.$el!.focus(); this.$el!.focus();
webContents.focus(); // Work around https://github.com/electron/electron/issues/31918
} this.$el!.shadowRoot?.querySelector("iframe")?.focus();
} }
hide(): void { hide(): void {