@lvce-editor/main-process 6.39.0 → 6.41.0

package/dist/mainProcessMain.js

@@ -4791,7 +4791,7 @@ const windows = new Map();
 const setEnabled = (windowId, enabled) => {
   windows.get(windowId)?.setEnabled(enabled);
 };
-const attach$d = (window, contents) => {
+const attach$e = (window, contents) => {
   windows.get(window.id)?.attach(contents);
 };
 const listen$2 = (window, rpc) => {
@@ -5497,32 +5497,47 @@ const getElectronCallbacks = () => {
   };
 };
 
-const getElectronMenuItems = (menuItems, click) => {
-  const template = [];
-  for (const menuItem of menuItems) {
-    // @ts-ignore
-    template.push({
+const editingActions = new Set(['undo', 'redo', 'cut', 'copy', 'paste', 'selectAll']);
+const getElectronMenuItems = (menuItems, click, contents) => {
+  return menuItems.map(menuItem => {
+    const {
+      role,
+      ...options
+    } = menuItem;
+    if (contents && editingActions.has(role)) {
+      return {
+        ...options,
+        click(item) {
+          if (!contents.isDestroyed()) contents[role]();
+          click(item);
+        }
+      };
+    }
+    return {
       ...menuItem,
       click
-    });
-  }
-  return template;
+    };
+  });
 };
 
-const openContextMenu = async (menuItems, x, y) => {
+const openContextMenu = async (menuItems, x, y, browserViewId) => {
   array(menuItems);
   number(x);
   number(y);
+  const origin = browserViewId === undefined ? undefined : get$4(browserViewId);
+  if (browserViewId !== undefined && (!origin || origin.view.webContents.isDestroyed())) return {
+    data: undefined,
+    type: 'close'
+  };
   const {
     handleClick,
     handleClose,
     promise
   } = getElectronCallbacks();
-  const template = getElectronMenuItems(menuItems, handleClick);
+  const template = getElectronMenuItems(menuItems, handleClick, origin?.view.webContents);
   const menu = Menu.buildFromTemplate(template);
-  // TODO pass window id
-  const window = BrowserWindow.getFocusedWindow();
-  if (!window) {
+  const window = origin?.browserWindow || BrowserWindow.getFocusedWindow();
+  if (!window || window.isDestroyed()) {
     return {
       data: undefined,
       type: 'close'
@@ -6427,7 +6442,7 @@ const handleWebContentsViewZoomKeyBinding = (webContentsId, input) => {
 };
 
 const key$a = 'before-input';
-const attach$c = (webContents, listener) => {
+const attach$d = (webContents, listener) => {
   webContents.on(BeforeInputEvent, listener);
 };
 const detach$a = (webContents, listener) => {
@@ -6467,14 +6482,14 @@ const handler$a = (event, input, webContentsId) => {
 
 const ElectronBrowserViewEventListenerBeforeInput = {
 	__proto__: null,
-	attach: attach$c,
+	attach: attach$d,
 	detach: detach$a,
 	handler: handler$a,
 	key: key$a
 };
 
 const key$9 = AudioStateChanged;
-const attach$b = (webContents, listener) => {
+const attach$c = (webContents, listener) => {
   webContents.on(AudioStateChanged, listener);
 };
 const detach$9 = (webContents, listener) => {
@@ -6489,29 +6504,32 @@ const handler$9 = event => {
 
 const ElectronBrowserViewEventListenerAudioStateChanged = {
 	__proto__: null,
-	attach: attach$b,
+	attach: attach$c,
 	detach: detach$9,
 	handler: handler$9,
 	key: key$9
 };
 
 const key$8 = 'context-menu';
-const attach$a = (webContents, listener) => {
+const attach$b = (webContents, listener) => {
   webContents.on(ContextMenu, listener);
 };
 const detach$8 = (webContents, listener) => {
   webContents.off(ContextMenu, listener);
 };
-const handler$8 = (event, params) => {
+const handler$8 = (event, params, browserViewId) => {
   return {
-    messages: [['handleContextMenu', params]],
+    messages: [['handleContextMenu', {
+      ...params,
+      browserViewId
+    }]],
     result: undefined
   };
 };
 
 const ElectronBrowserViewEventListenerContextMenu = {
 	__proto__: null,
-	attach: attach$a,
+	attach: attach$b,
 	detach: detach$8,
 	handler: handler$8,
 	key: key$8
@@ -6551,7 +6569,7 @@ const cancelForWebContents = webContentsId => {
 };
 
 const key$7 = 'destroyed';
-const attach$9 = (webContents, listener) => {
+const attach$a = (webContents, listener) => {
   webContents.on(Destroyed, listener);
 };
 const detach$7 = (webContents, listener) => {
@@ -6579,7 +6597,7 @@ const handler$7 = (_event, webContentsId) => {
 
 const ElectronBrowserViewEventListenerDestroyed = {
 	__proto__: null,
-	attach: attach$9,
+	attach: attach$a,
 	detach: detach$7,
 	handler: handler$7,
 	key: key$7
@@ -6596,7 +6614,7 @@ const has = (webContents, url) => {
 const maxFaviconBytes = 1024 * 1024;
 const faviconFetchTimeout = 2000;
 const key$6 = PageFaviconUpdated;
-const attach$8 = (webContents, listener) => {
+const attach$9 = (webContents, listener) => {
   webContents.on(PageFaviconUpdated, listener);
 };
 const detach$6 = (webContents, listener) => {
@@ -6686,7 +6704,7 @@ const handler$6 = async (_event, favicons, _webContentsId, webContents) => {
 
 const ElectronBrowserViewEventListenerPageFaviconUpdated = {
 	__proto__: null,
-	attach: attach$8,
+	attach: attach$9,
 	detach: detach$6,
 	handler: handler$6,
 	key: key$6,
@@ -6694,7 +6712,7 @@ const ElectronBrowserViewEventListenerPageFaviconUpdated = {
 };
 
 const key$5 = 'did-navigate';
-const attach$7 = (webContents, listener) => {
+const attach$8 = (webContents, listener) => {
   webContents.on(DidNavigate, listener);
 };
 const detach$5 = (webContents, listener) => {
@@ -6731,14 +6749,14 @@ const handler$5 = async (_event, url, _httpResponseCode, _httpStatusText, _webCo
 
 const ElectronBrowserViewEventListenerDidNavigate = {
 	__proto__: null,
-	attach: attach$7,
+	attach: attach$8,
 	detach: detach$5,
 	handler: handler$5,
 	key: key$5
 };
 
 const key$4 = DidNavigateInPage;
-const attach$6 = (webContents, listener) => {
+const attach$7 = (webContents, listener) => {
   webContents.on(DidNavigateInPage, listener);
 };
 const detach$4 = (webContents, listener) => {
@@ -6754,14 +6772,14 @@ const handler$4 = (_event, url, isMainFrame) => {
 
 const ElectronBrowserViewEventListenerDidNavigateInPage = {
 	__proto__: null,
-	attach: attach$6,
+	attach: attach$7,
 	detach: detach$4,
 	handler: handler$4,
 	key: key$4
 };
 
 const key$3 = Login;
-const attach$5 = (webContents, listener) => {
+const attach$6 = (webContents, listener) => {
   webContents.on(Login, listener);
 };
 const detach$3 = (webContents, listener) => {
@@ -6786,14 +6804,14 @@ const handler$3 = (event, authenticationResponseDetails, authInfo, callback, web
 
 const ElectronBrowserViewEventListenerLogin = {
 	__proto__: null,
-	attach: attach$5,
+	attach: attach$6,
 	detach: detach$3,
 	handler: handler$3,
 	key: key$3
 };
 
 const key$2 = 'page-title-updated';
-const attach$4 = (webContents, listener) => {
+const attach$5 = (webContents, listener) => {
   webContents.on(PageTitleUpdated, listener);
 };
 const detach$2 = (webContents, listener) => {
@@ -6808,14 +6826,14 @@ const handler$2 = (event, title) => {
 
 const ElectronBrowserViewEventListenerPageTitleUpdated = {
 	__proto__: null,
-	attach: attach$4,
+	attach: attach$5,
 	detach: detach$2,
 	handler: handler$2,
 	key: key$2
 };
 
 const key$1 = 'will-navigate';
-const attach$3 = (webContents, listener) => {
+const attach$4 = (webContents, listener) => {
   webContents.on(WillNavigate, listener);
 };
 const detach$1 = (webContents, listener) => {
@@ -6830,14 +6848,14 @@ const handler$1 = (event, url) => {
 
 const ElectronBrowserViewEventListenerWillNavigate = {
 	__proto__: null,
-	attach: attach$3,
+	attach: attach$4,
 	detach: detach$1,
 	handler: handler$1,
 	key: key$1
 };
 
 const key = 'window-open';
-const attach$2 = (webContents, listener) => {
+const attach$3 = (webContents, listener) => {
   webContents.setWindowOpenHandler(listener);
 };
 const detach = (webContents, listener) => {
@@ -6867,7 +6885,7 @@ const handler = ({
 
 const ElectronBrowserViewEventListenerWindowOpen = {
 	__proto__: null,
-	attach: attach$2,
+	attach: attach$3,
 	detach,
 	handler,
 	key
@@ -7037,8 +7055,13 @@ const getSession = () => {
   return state.session;
 };
 
-const attach$1 = (webContents, parentWebContents) => {
+const attach$2 = (webContents, parentWebContents) => {
   let shouldRestoreParentFocus = false;
+  const cancel = () => {
+    shouldRestoreParentFocus = false;
+  };
+  parentWebContents.on('blur', cancel);
+  webContents.once('destroyed', () => parentWebContents.off('blur', cancel));
   webContents.on(DidStartNavigation, (_event, _url, _isInPlace, isMainFrame) => {
     if (!isMainFrame) {
       return;
@@ -7046,7 +7069,7 @@ const attach$1 = (webContents, parentWebContents) => {
     shouldRestoreParentFocus = parentWebContents.isFocused();
   });
   webContents.on(DidNavigate, () => {
-    if (!shouldRestoreParentFocus) {
+    if (!shouldRestoreParentFocus || parentWebContents.isDestroyed()) {
       return;
     }
     shouldRestoreParentFocus = false;
@@ -7086,7 +7109,7 @@ const isSoundCloudUrl = url => {
     return false;
   }
 };
-const attach = webContents => {
+const attach$1 = webContents => {
   webContents.on(DidNavigate, (_event, url) => {
     if (!isSoundCloudUrl(url)) {
       return;
@@ -7103,14 +7126,23 @@ const send = (method, ...params) => {
   return rpc.send(method, ...params);
 };
 
+const focusTimes = new WeakMap();
+const attach = contents => {
+  if (focusTimes.has(contents)) return;
+  focusTimes.set(contents, 0);
+  contents.on('focus', () => focusTimes.set(contents, Date.now()));
+};
+const getLastFocusedAt = contents => focusTimes.get(contents) || 0;
+
 const webContentsWithEventListeners = new WeakSet();
 const attachEventListenersToWebContents = (webContentsId, webContents, browserWindow) => {
   if (webContentsWithEventListeners.has(webContents)) {
     return;
   }
-  attach$d(browserWindow, webContents);
-  attach$1(webContents, browserWindow.webContents);
   attach(webContents);
+  attach$e(browserWindow, webContents);
+  attach$2(webContents, browserWindow.webContents);
+  attach$1(webContents);
   const values = Object.values(ElectronBrowserViewEventListeners);
   for (const value of values) {
     const handleResult = ({
@@ -7506,6 +7538,8 @@ const getStats = (view, includeMemory = false) => {
     canGoBack,
     canGoForward,
     isAudioMuted,
+    isFocused: webContents.isFocused(),
+    lastFocusedAt: getLastFocusedAt(webContents),
     title,
     url
   };

package/package.json

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