@lvce-editor/main-process 5.1.0 → 5.2.0

package/dist/mainProcessMain.js

@@ -4758,18 +4758,87 @@ const getWindowById = windowId => {
   return Electron.BrowserWindow.fromId(windowId);
 };
 
-const executeWindowFunction = (browserWindowId, key) => {
+const devtoolsBeforeInputListeners = new WeakMap();
+const isToggleDevtoolsInput = input => {
+  if (input.type !== 'keyDown') {
+    return false;
+  }
+  if (!input.shift) {
+    return false;
+  }
+  if (!input.control && !input.meta) {
+    return false;
+  }
+  return input.code === 'KeyI' || input.key === 'I' || input.key === 'i';
+};
+const removeDevtoolsKeyListener = devtoolsWebContents => {
+  const listener = devtoolsBeforeInputListeners.get(devtoolsWebContents);
+  if (!listener) {
+    return;
+  }
+  devtoolsBeforeInputListeners.delete(devtoolsWebContents);
+  devtoolsWebContents.off('before-input-event', listener);
+};
+const attachDevtoolsKeyListener = browserWindow => {
+  const devtoolsWebContents = browserWindow.webContents.devToolsWebContents;
+  if (!devtoolsWebContents) {
+    return;
+  }
+  if (devtoolsBeforeInputListeners.has(devtoolsWebContents)) {
+    return;
+  }
+  const listener = (event, input) => {
+    if (!isToggleDevtoolsInput(input)) {
+      return;
+    }
+    event.preventDefault();
+    browserWindow.webContents.closeDevTools();
+  };
+  devtoolsBeforeInputListeners.set(devtoolsWebContents, listener);
+  devtoolsWebContents.on('before-input-event', listener);
+  devtoolsWebContents.once('destroyed', () => {
+    removeDevtoolsKeyListener(devtoolsWebContents);
+  });
+  browserWindow.webContents.once('devtools-closed', () => {
+    removeDevtoolsKeyListener(devtoolsWebContents);
+  });
+};
+const getBrowserWindow = browserWindowId => {
   const browserWindow = getWindowById(browserWindowId);
   if (!browserWindow) {
     info(`[main-process] browser window not found ${browserWindow}`);
+    return undefined;
+  }
+  return browserWindow;
+};
+const toggleDevtools = browserWindow => {
+  if (browserWindow.webContents.isDevToolsOpened()) {
+    browserWindow.webContents.closeDevTools();
+    return;
+  }
+  if (browserWindow.webContents.devToolsWebContents) {
+    attachDevtoolsKeyListener(browserWindow);
+  } else {
+    browserWindow.webContents.once('devtools-opened', () => {
+      attachDevtoolsKeyListener(browserWindow);
+    });
+  }
+  browserWindow.webContents.openDevTools();
+};
+const executeWindowFunction = (browserWindowId, key) => {
+  const browserWindow = getBrowserWindow(browserWindowId);
+  if (!browserWindow) {
+    return;
+  }
+  if (key === 'toggleDevtools') {
+    toggleDevtools(browserWindow);
     return;
   }
   browserWindow[key]();
 };
 const executeWebContentsFunction = (browserWindowId, key, ...args) => {
-  const browserWindow = getWindowById(browserWindowId);
+  const browserWindow = getBrowserWindow(browserWindowId);
   if (!browserWindow) {
-    info(`[main-process] browser window not found ${browserWindow}`);
     return;
   }
   browserWindow.webContents[key](...args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-process",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "keywords": [
     "lvce-editor",
     "electron"