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

fix: Inspector method overrides when contextIsolation enabled #29841

Merged
merged 3 commits into from Jun 24, 2021
Merged

fix: Inspector method overrides when contextIsolation enabled #29841

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e84b922
fix: Inspector method overrides when contextIsolation enabled
codebytere Jun 22, 2021
74d5e46
fix: handle DevToolsAPI call
codebytere Jun 22, 2021
6d4f5c7
refactor: always use webFrame.executeJavaScript
codebytere Jun 22, 2021
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
45 changes: 35 additions & 10 deletions lib/renderer/inspector.ts
View file
Open in desktop
@@ -1,16 +1,32 @@
import { internalContextBridge } from '@electron/internal/renderer/api/context-bridge';
import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
import { webFrame } from 'electron/renderer';
import { IPC_MESSAGES } from '../common/ipc-messages';

window.onload = function () {
// Use menu API to show context menu.
window.InspectorFrontendHost!.showContextMenuAtPoint = createMenu;

// correct for Chromium returning undefined for filesystem
window.Persistence!.FileSystemWorkspaceBinding.completeURL = completeURL;
const { contextIsolationEnabled } = internalContextBridge;

// Use dialog API to override file chooser dialog.
window.UI!.createFileSelectorElement = createFileSelectorElement;
/* Corrects for some Inspector adaptations needed in Electron.
* 1) Use menu API to show context menu.
* 2) Correct for Chromium returning undefined for filesystem.
* 3) Use dialog API to override file chooser dialog.
*/
window.onload = function () {
if (contextIsolationEnabled) {
internalContextBridge.overrideGlobalValueFromIsolatedWorld([
'InspectorFrontendHost', 'showContextMenuAtPoint'
], createMenu);
internalContextBridge.overrideGlobalValueFromIsolatedWorld([
'Persistence', 'FileSystemWorkspaceBinding', 'completeURL'
], completeURL);
internalContextBridge.overrideGlobalValueFromIsolatedWorld([
'UI', 'createFileSelectorElement'
], createFileSelectorElement);
} else {
window.InspectorFrontendHost!.showContextMenuAtPoint = createMenu;
window.Persistence!.FileSystemWorkspaceBinding.completeURL = completeURL;
window.UI!.createFileSelectorElement = createFileSelectorElement;
}
};

// Extra / is needed as a result of MacOS requiring absolute paths
Expand All @@ -36,9 +52,18 @@ const createMenu = function (x: number, y: number, items: ContextMenuItem[]) {
const isEditMenu = useEditMenuItems(x, y, items);
ipcRendererInternal.invoke<number>(IPC_MESSAGES.INSPECTOR_CONTEXT_MENU, items, isEditMenu).then(id => {
if (typeof id === 'number') {
window.DevToolsAPI!.contextMenuItemSelected(id);
if (contextIsolationEnabled) {
webFrame.executeJavaScript(`window.DevToolsAPI.contextMenuItemSelected(${JSON.stringify(id)})`);
} else {
window.DevToolsAPI!.contextMenuItemSelected(id);
}
codebytere marked this conversation as resolved.
Show resolved Hide resolved
}

if (contextIsolationEnabled) {
webFrame.executeJavaScript('window.DevToolsAPI.contextMenuCleared()');
} else {
window.DevToolsAPI!.contextMenuCleared();
}
window.DevToolsAPI!.contextMenuCleared();
});
};

Expand Down