Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try to capture key presses more aggressively in loading webviews #176326

Merged
merged 1 commit into from Mar 7, 2023
Merged

Try to capture key presses more aggressively in loading webviews #176326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html
View file
Open in desktop
Expand Up @@ -598,7 +598,7 @@
/**
* @param {KeyboardEvent} e
*/
const handleInnerUp = (e) => {
const handleInnerKeyup = (e) => {
hostMessaging.postMessage('did-keyup', {
key: e.key,
keyCode: e.keyCode,
Expand Down Expand Up @@ -827,6 +827,12 @@
return '<!DOCTYPE html>\n' + newDocument.documentElement.outerHTML;
}

// Also forward events before the contents of the webview have loaded
window.addEventListener('keydown', handleInnerKeydown);
window.addEventListener('keyup', handleInnerKeyup);
window.addEventListener('dragenter', handleInnerDragStartEvent);
window.addEventListener('dragover', handleInnerDragStartEvent);

onDomReady(() => {
if (!document.body) {
return;
Expand Down Expand Up @@ -957,6 +963,9 @@
newFrame.style.cssText = 'display: block; margin: 0; overflow: hidden; position: absolute; width: 100%; height: 100%; visibility: hidden';
document.body.appendChild(newFrame);

newFrame.contentWindow.addEventListener('keydown', handleInnerKeydown);
newFrame.contentWindow.addEventListener('keyup', handleInnerKeyup);

/**
* @param {Document} contentDocument
*/
Expand Down Expand Up @@ -1064,7 +1073,7 @@
contentWindow.addEventListener('click', handleInnerClick);
contentWindow.addEventListener('auxclick', handleAuxClick);
contentWindow.addEventListener('keydown', handleInnerKeydown);
contentWindow.addEventListener('keyup', handleInnerUp);
contentWindow.addEventListener('keyup', handleInnerKeyup);
contentWindow.addEventListener('contextmenu', e => {
if (e.defaultPrevented) {
// Extension code has already handled this event
Expand Down Expand Up @@ -1205,11 +1214,6 @@
}
};

// Also forward events before the contents of the webview have loaded
window.addEventListener('keydown', handleInnerKeydown);
window.addEventListener('dragenter', handleInnerDragStartEvent);
window.addEventListener('dragover', handleInnerDragStartEvent);

hostMessaging.signalReady();
});
</script>
Expand Down
20 changes: 12 additions & 8 deletions src/vs/workbench/contrib/webview/browser/pre/index.html
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8">

<meta http-equiv="Content-Security-Policy"
content="default-src 'none'; script-src 'sha256-f/XuzcTyXb1X6po1otWlqfEUBjHOsprrTOZknXfbS9I=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
content="default-src 'none'; script-src 'sha256-H4svLwQU3wxDoPkj+nPmtKUs0e266wn5f8Kb0LuxEHw=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">

<!-- Disable pinch zooming -->
<meta name="viewport"
Expand Down Expand Up @@ -599,7 +599,7 @@
/**
* @param {KeyboardEvent} e
*/
const handleInnerUp = (e) => {
const handleInnerKeyup = (e) => {
hostMessaging.postMessage('did-keyup', {
key: e.key,
keyCode: e.keyCode,
Expand Down Expand Up @@ -828,6 +828,12 @@
return '<!DOCTYPE html>\n' + newDocument.documentElement.outerHTML;
}

// Also forward events before the contents of the webview have loaded
window.addEventListener('keydown', handleInnerKeydown);
window.addEventListener('keyup', handleInnerKeyup);
window.addEventListener('dragenter', handleInnerDragStartEvent);
window.addEventListener('dragover', handleInnerDragStartEvent);

onDomReady(() => {
if (!document.body) {
return;
Expand Down Expand Up @@ -958,6 +964,9 @@
newFrame.style.cssText = 'display: block; margin: 0; overflow: hidden; position: absolute; width: 100%; height: 100%; visibility: hidden';
document.body.appendChild(newFrame);

newFrame.contentWindow.addEventListener('keydown', handleInnerKeydown);
newFrame.contentWindow.addEventListener('keyup', handleInnerKeyup);

/**
* @param {Document} contentDocument
*/
Expand Down Expand Up @@ -1065,7 +1074,7 @@
contentWindow.addEventListener('click', handleInnerClick);
contentWindow.addEventListener('auxclick', handleAuxClick);
contentWindow.addEventListener('keydown', handleInnerKeydown);
contentWindow.addEventListener('keyup', handleInnerUp);
contentWindow.addEventListener('keyup', handleInnerKeyup);
contentWindow.addEventListener('contextmenu', e => {
if (e.defaultPrevented) {
// Extension code has already handled this event
Expand Down Expand Up @@ -1206,11 +1215,6 @@
}
};

// Also forward events before the contents of the webview have loaded
window.addEventListener('keydown', handleInnerKeydown);
window.addEventListener('dragenter', handleInnerDragStartEvent);
window.addEventListener('dragover', handleInnerDragStartEvent);

hostMessaging.signalReady();
});
</script>
Expand Down