mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: pressing ESC should exit fullscreen from webview (#30063)

Browse source
This commit is contained in:
Cheng Zhao 2021-07-14 20:51:26 +09:00 • committed by GitHub
parent 4d0475c9ce
commit 637ba48b42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/api/electron_api_web_contents.cc
View file

@ -3612,9 +3612,7 @@ void WebContents::UpdateHtmlApiFullscreen(bool fullscreen) {
manager->ForEachGuest( manager->ForEachGuest(
web_contents(), base::BindRepeating([](content::WebContents* guest) { web_contents(), base::BindRepeating([](content::WebContents* guest) {
WebContents* api_web_contents = WebContents::From(guest); WebContents* api_web_contents = WebContents::From(guest);
// Use UpdateHtmlApiFullscreen instead of SetXXX becuase there is no api_web_contents->SetHtmlApiFullscreen(false);
// need to interact with the owner window.
api_web_contents->UpdateHtmlApiFullscreen(false);
return false; return false;
})); }));
} }

30
spec-main/webview-spec.ts
View file

@ -3,6 +3,7 @@ import * as url from 'url';
import { BrowserWindow, session, ipcMain, app, WebContents } from 'electron/main'; import { BrowserWindow, session, ipcMain, app, WebContents } from 'electron/main';
import { closeAllWindows } from './window-helpers'; import { closeAllWindows } from './window-helpers';
import { emittedOnce, emittedUntil } from './events-helpers'; import { emittedOnce, emittedUntil } from './events-helpers';
import { ifit, delay } from './spec-helpers';
import { expect } from 'chai'; import { expect } from 'chai';
async function loadWebView (w: WebContents, attributes: Record<string, string>, openDevTools: boolean = false): Promise<void> { async function loadWebView (w: WebContents, attributes: Record<string, string>, openDevTools: boolean = false): Promise<void> {
@ -406,6 +407,35 @@ describe('<webview> tag', function () {
await parentFullscreen; await parentFullscreen;
expect(await w.webContents.executeJavaScript('isIframeFullscreen()')).to.be.true(); expect(await w.webContents.executeJavaScript('isIframeFullscreen()')).to.be.true();
}); });
// FIXME(zcbenz): Fullscreen events do not work on Linux.
// This test is flaky on arm64 macOS.
ifit(process.platform !== 'linux' && process.arch !== 'arm64')('exiting fullscreen should unfullscreen window', async () => {
const [w, webview] = await loadWebViewWindow();
const enterFullScreen = emittedOnce(w, 'enter-full-screen');
await webview.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
await enterFullScreen;
const leaveFullScreen = emittedOnce(w, 'leave-full-screen');
await webview.executeJavaScript('document.exitFullscreen()', true);
await leaveFullScreen;
await delay(0);
expect(w.isFullScreen()).to.be.false();
});
// Sending ESC via sendInputEvent only works on Windows.
ifit(process.platform === 'win32')('pressing ESC should unfullscreen window', async () => {
const [w, webview] = await loadWebViewWindow();
const enterFullScreen = emittedOnce(w, 'enter-full-screen');
await webview.executeJavaScript('document.getElementById("div").requestFullscreen()', true);
await enterFullScreen;
const leaveFullScreen = emittedOnce(w, 'leave-full-screen');
w.webContents.sendInputEvent({ type: 'keyDown', keyCode: 'Escape' });
await leaveFullScreen;
await delay(0);
expect(w.isFullScreen()).to.be.false();
});
}); });
describe('nativeWindowOpen option', () => { describe('nativeWindowOpen option', () => {