@lvce-editor/renderer-process 30.46.3 → 30.46.5

package/dist/rendererProcessMain.js

@@ -3669,15 +3669,18 @@ const addFileHandle = fileHandle => {
   return addFileHandle$1(fileHandle);
 };
 
+const getWindowControlsOverlay = () => {
+  const navigatorWithWindowControls = globalThis.navigator;
+  return navigatorWithWindowControls.windowControlsOverlay;
+};
+const getTitleBarRect = () => {
+  return getWindowControlsOverlay()?.getTitlebarAreaRect();
+};
 const getTitleBarHeight = () => {
-  if (
-  // @ts-expect-error
-  globalThis.navigator.windowControlsOverlay?.getTitlebarAreaRect) {
-    // @ts-expect-error
-    const titleBarRect = globalThis.navigator.windowControlsOverlay.getTitlebarAreaRect();
-    return titleBarRect.height;
-  }
-  return 0;
+  return getTitleBarRect()?.height ?? 0;
+};
+const getTitleBarLeftInset = () => {
+  return getTitleBarRect()?.x ?? 0;
 };
 const getBounds = () => {
   return {
@@ -7790,8 +7793,21 @@ const isNativeButtonActivation = event => {
   }
   return target instanceof HTMLButtonElement && target.role !== MenuItem && (key === 'Enter' || key === ' ');
 };
+const isTerminalTextInput = event => {
+  const {
+    altKey,
+    ctrlKey,
+    key,
+    metaKey,
+    target
+  } = event;
+  if (altKey || ctrlKey || metaKey || key.length !== 1) {
+    return false;
+  }
+  return target instanceof Element && Boolean(target.closest('.XtermTerminal'));
+};
 const handleKeyDown$1 = event => {
-  if (isNativeButtonActivation(event)) {
+  if (isNativeButtonActivation(event) || isTerminalTextInput(event)) {
     return;
   }
   const identifier = getKeyBindingIdentifier(event);
@@ -8813,6 +8829,9 @@ const ViewletTitleBarMenuBarEvents = {
 };
 
 const activeId = 'TitleBarEntryActive';
+const getMenuX = x => {
+  return x + getTitleBarLeftInset();
+};
 const removeDocumentClickListener = state => {
   const {
     documentClickListener
@@ -8941,7 +8960,7 @@ const openMenu = (state, unFocusIndex, index, level, menuItems, menuFocusedIndex
     items: menuItems,
     level,
     width,
-    x,
+    x: getMenuX(x),
     y
   });
   if (menuFocusedIndex !== -1) {
@@ -9008,7 +9027,7 @@ const addMenu = ($$Menus, change, uid) => {
     x,
     y
   } = menu;
-  setBounds$a($Menu, x, y, width, height);
+  setBounds$a($Menu, getMenuX(x), y, width, height);
   renderInto($Menu, dom);
   $Menu.id = `Menu-${level}`;
   append$1($Menu);
@@ -9040,7 +9059,7 @@ const updateMenu = ($$Menus, change) => {
     y
   } = menu;
   const $Menu = $$Menus[level];
-  setBounds$a($Menu, x, y, width, height);
+  setBounds$a($Menu, getMenuX(x), y, width, height);
   renderInto($Menu, dom);
   const isOpeningSubMenu = $$Menus.length < newLength;
   if (level === newLength - 1 || isOpeningSubMenu) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "30.46.3",
+  "version": "30.46.5",
   "keywords": [
     "lvce-editor",
     "renderer-process"