@lvce-editor/main-process 6.39.0 → 6.40.0

package/dist/mainProcessMain.js

@@ -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'
@@ -7039,6 +7054,11 @@ const getSession = () => {
 
 const attach$1 = (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 +7066,7 @@ const attach$1 = (webContents, parentWebContents) => {
     shouldRestoreParentFocus = parentWebContents.isFocused();
   });
   webContents.on(DidNavigate, () => {
-    if (!shouldRestoreParentFocus) {
+    if (!shouldRestoreParentFocus || parentWebContents.isDestroyed()) {
       return;
     }
     shouldRestoreParentFocus = false;

package/package.json

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