@lvce-editor/main-process 6.22.0 → 6.22.1

package/dist/mainProcessMain.js

@@ -4064,6 +4064,7 @@ const handleSecondInstance = async (event, commandLine, workingDirectory, additi
 
 const ContextMenu = 'context-menu';
 const WillNavigate = 'will-navigate';
+const DidStartNavigation = 'did-start-navigation';
 const DidNavigate = 'did-navigate';
 const PageTitleUpdated = 'page-title-updated';
 const Destroyed = 'destroyed';
@@ -6290,7 +6291,7 @@ const handleWebContentsViewZoomKeyBinding = (webContentsId, input) => {
 };
 
 const key$7 = 'before-input';
-const attach$7 = (webContents, listener) => {
+const attach$8 = (webContents, listener) => {
   webContents.on(BeforeInputEvent, listener);
 };
 const detach$7 = (webContents, listener) => {
@@ -6330,14 +6331,14 @@ const handler$7 = (event, input, webContentsId) => {
 
 const ElectronBrowserViewEventListenerBeforeInput = {
 	__proto__: null,
-	attach: attach$7,
+	attach: attach$8,
 	detach: detach$7,
 	handler: handler$7,
 	key: key$7
 };
 
 const key$6 = 'context-menu';
-const attach$6 = (webContents, listener) => {
+const attach$7 = (webContents, listener) => {
   webContents.on(ContextMenu, listener);
 };
 const detach$6 = (webContents, listener) => {
@@ -6352,14 +6353,14 @@ const handler$6 = (event, params) => {
 
 const ElectronBrowserViewEventListenerContextMenu = {
 	__proto__: null,
-	attach: attach$6,
+	attach: attach$7,
 	detach: detach$6,
 	handler: handler$6,
 	key: key$6
 };
 
 const key$5 = 'destroyed';
-const attach$5 = (webContents, listener) => {
+const attach$6 = (webContents, listener) => {
   webContents.on(Destroyed, listener);
 };
 const detach$5 = (webContents, listener) => {
@@ -6374,14 +6375,14 @@ const handler$5 = () => {
 
 const ElectronBrowserViewEventListenerDestroyed = {
 	__proto__: null,
-	attach: attach$5,
+	attach: attach$6,
 	detach: detach$5,
 	handler: handler$5,
 	key: key$5
 };
 
 const key$4 = 'did-navigate';
-const attach$4 = (webContents, listener) => {
+const attach$5 = (webContents, listener) => {
   webContents.on(DidNavigate, listener);
 };
 const detach$4 = (webContents, listener) => {
@@ -6396,7 +6397,7 @@ const handler$4 = (event, url) => {
 
 const ElectronBrowserViewEventListenerDidNavigate = {
 	__proto__: null,
-	attach: attach$4,
+	attach: attach$5,
 	detach: detach$4,
 	handler: handler$4,
 	key: key$4
@@ -6436,7 +6437,7 @@ const cancelForWebContents = webContentsId => {
 };
 
 const key$3 = Login;
-const attach$3 = (webContents, listener) => {
+const attach$4 = (webContents, listener) => {
   webContents.on(Login, listener);
 };
 const detach$3 = (webContents, listener) => {
@@ -6461,14 +6462,14 @@ const handler$3 = (event, authenticationResponseDetails, authInfo, callback, web
 
 const ElectronBrowserViewEventListenerLogin = {
 	__proto__: null,
-	attach: attach$3,
+	attach: attach$4,
 	detach: detach$3,
 	handler: handler$3,
 	key: key$3
 };
 
 const key$2 = 'page-title-updated';
-const attach$2 = (webContents, listener) => {
+const attach$3 = (webContents, listener) => {
   webContents.on(PageTitleUpdated, listener);
 };
 const detach$2 = (webContents, listener) => {
@@ -6483,14 +6484,14 @@ const handler$2 = (event, title) => {
 
 const ElectronBrowserViewEventListenerPageTitleUpdated = {
 	__proto__: null,
-	attach: attach$2,
+	attach: attach$3,
 	detach: detach$2,
 	handler: handler$2,
 	key: key$2
 };
 
 const key$1 = 'will-navigate';
-const attach$1 = (webContents, listener) => {
+const attach$2 = (webContents, listener) => {
   webContents.on(WillNavigate, listener);
 };
 const detach$1 = (webContents, listener) => {
@@ -6505,14 +6506,14 @@ const handler$1 = (event, url) => {
 
 const ElectronBrowserViewEventListenerWillNavigate = {
 	__proto__: null,
-	attach: attach$1,
+	attach: attach$2,
 	detach: detach$1,
 	handler: handler$1,
 	key: key$1
 };
 
 const key = 'window-open';
-const attach = (webContents, listener) => {
+const attach$1 = (webContents, listener) => {
   webContents.setWindowOpenHandler(listener);
 };
 const detach = (webContents, listener) => {
@@ -6534,7 +6535,7 @@ const handler = ({
 
 const ElectronBrowserViewEventListenerWindowOpen = {
 	__proto__: null,
-	attach,
+	attach: attach$1,
 	detach,
 	handler,
 	key
@@ -6552,6 +6553,23 @@ const ElectronBrowserViewEventListeners = {
 	windowOpen: ElectronBrowserViewEventListenerWindowOpen
 };
 
+const attach = (webContents, parentWebContents) => {
+  let shouldRestoreParentFocus = false;
+  webContents.on(DidStartNavigation, (_event, _url, _isInPlace, isMainFrame) => {
+    if (!isMainFrame) {
+      return;
+    }
+    shouldRestoreParentFocus = parentWebContents.isFocused();
+  });
+  webContents.on(DidNavigate, () => {
+    if (!shouldRestoreParentFocus) {
+      return;
+    }
+    shouldRestoreParentFocus = false;
+    parentWebContents.focus();
+  });
+};
+
 const send = (method, ...params) => {
   const rpc = get(EmbedsProcess);
   if (!rpc) {
@@ -6581,9 +6599,11 @@ const createWebContentsView = async () => {
 const attachEventListeners = webContentsId => {
   number(webContentsId);
   const webContents = Electron.webContents.fromId(webContentsId);
-  if (!webContents) {
+  const state = get$3(webContentsId);
+  if (!webContents || !state) {
     return;
   }
+  attach(webContents, state.browserWindow.webContents);
   const values = Object.values(ElectronBrowserViewEventListeners);
   for (const value of values) {
     const wrappedListener = (...args) => {

package/package.json

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