@lvce-editor/main-process 6.40.0 → 6.41.1

package/dist/mainProcessMain.js

@@ -4748,14 +4748,39 @@ const create$3 = () => {
   let pressedAt = -1;
   let releasedAt = -1;
   let controlCode = '';
-  const reset = () => {
+  const heldControls = new Set();
+  let overlappingControls = false;
+  const resetTaps = () => {
     pressedAt = -1;
     releasedAt = -1;
     controlCode = '';
   };
+  const reset = () => {
+    resetTaps();
+    heldControls.clear();
+    overlappingControls = false;
+  };
+  const hasOverlappingControls = (input, isControl) => {
+    if (isControl && !input.isAutoRepeat) {
+      if (input.type === 'keyDown') {
+        if (heldControls.size > 0) overlappingControls = true;
+        heldControls.add(input.code);
+      } else if (input.type === 'keyUp') {
+        heldControls.delete(input.code);
+      }
+      if (overlappingControls) {
+        resetTaps();
+        if (heldControls.size === 0) overlappingControls = false;
+        return true;
+      }
+    }
+    return false;
+  };
   const accept = (input, now) => {
-    if (!['ControlLeft', 'ControlRight'].includes(input.code) || input.alt || input.meta || input.shift || input.isComposing) {
-      reset();
+    const isControl = ['ControlLeft', 'ControlRight'].includes(input.code);
+    if (hasOverlappingControls(input, isControl)) return false;
+    if (!isControl || input.alt || input.meta || input.shift || input.isComposing) {
+      resetTaps();
       return false;
     }
     if (input.isAutoRepeat) {
@@ -4763,19 +4788,19 @@ const create$3 = () => {
     }
     if (input.type === 'keyDown') {
       if (pressedAt !== -1 || controlCode !== input.code || now - releasedAt > 400) {
-        reset();
+        resetTaps();
       }
       controlCode = input.code;
       pressedAt = now;
       return false;
     }
     if (input.type !== 'keyUp' || controlCode !== input.code || pressedAt === -1 || now - pressedAt > 250) {
-      reset();
+      resetTaps();
       return false;
     }
     pressedAt = -1;
     if (releasedAt !== -1 && now - releasedAt <= 400) {
-      reset();
+      resetTaps();
       return true;
     }
     releasedAt = now;
@@ -4791,7 +4816,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) => {
@@ -6442,7 +6467,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) => {
@@ -6482,14 +6507,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) => {
@@ -6504,29 +6529,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
@@ -6566,7 +6594,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) => {
@@ -6594,7 +6622,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
@@ -6611,7 +6639,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) => {
@@ -6701,7 +6729,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,
@@ -6709,7 +6737,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) => {
@@ -6746,14 +6774,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) => {
@@ -6769,14 +6797,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) => {
@@ -6801,14 +6829,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) => {
@@ -6823,14 +6851,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) => {
@@ -6845,14 +6873,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) => {
@@ -6882,7 +6910,7 @@ const handler = ({
 
 const ElectronBrowserViewEventListenerWindowOpen = {
 	__proto__: null,
-	attach: attach$2,
+	attach: attach$3,
 	detach,
 	handler,
 	key
@@ -7052,7 +7080,7 @@ const getSession = () => {
   return state.session;
 };
 
-const attach$1 = (webContents, parentWebContents) => {
+const attach$2 = (webContents, parentWebContents) => {
   let shouldRestoreParentFocus = false;
   const cancel = () => {
     shouldRestoreParentFocus = false;
@@ -7106,7 +7134,7 @@ const isSoundCloudUrl = url => {
     return false;
   }
 };
-const attach = webContents => {
+const attach$1 = webContents => {
   webContents.on(DidNavigate, (_event, url) => {
     if (!isSoundCloudUrl(url)) {
       return;
@@ -7123,14 +7151,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 = ({
@@ -7526,6 +7563,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.40.0",
+  "version": "6.41.1",
   "keywords": [
     "lvce-editor",
     "electron"