@lvce-editor/menu-worker 4.16.1 → 4.18.0

package/dist/menuWorkerMain.js

@@ -2472,11 +2472,6 @@ const getVisible = (items, focusedIndex, expanded, level) => {
   return visibleItems;
 };
 
-const CONTEXT_MENU_WIDTH = 250;
-const getMenuWidth = () => {
-  return CONTEXT_MENU_WIDTH;
-};
-
 // TODO lazyload menuEntries and use Command.execute (maybe)
 const CONTEXT_MENU_ITEM_HEIGHT = 26;
 const CONTEXT_MENU_SEPARATOR_HEIGHT = 11;
@@ -2915,9 +2910,6 @@ const getSubMenuItems = async (parentMenu, item) => {
 const getOpenSubMenuToLeft = parentMenu => {
   return parentMenu.openSubMenuToLeft === true || parentMenu.args?.[0]?.openSubMenuToLeft === true;
 };
-const getSubMenuX = (parentMenu, openSubMenuToLeft) => {
-  return openSubMenuToLeft ? parentMenu.x - MENU_WIDTH : parentMenu.x + MENU_WIDTH;
-};
 const showSubMenuAtEnter = async (level, index, enterX, enterY) => {
   const parentMenu = get$1(level);
   const item = parentMenu.items[index];
@@ -2928,6 +2920,7 @@ const showSubMenuAtEnter = async (level, index, enterX, enterY) => {
   set$1(getAll().slice(0, level + 1));
   const subMenuItems = await getSubMenuItems(parentMenu, item);
   const openSubMenuToLeft = getOpenSubMenuToLeft(parentMenu);
+  const width = await getMenuMeasuredWidth(subMenuItems);
   const subMenu = addMenuInternal({
     args: item.args || parentMenu.args || [],
     enterX,
@@ -2939,10 +2932,9 @@ const showSubMenuAtEnter = async (level, index, enterX, enterY) => {
     openSubMenuToLeft,
     parentIndex: index,
     uid: parentMenu.uid,
-    x: getSubMenuX(parentMenu, openSubMenuToLeft),
+    x: openSubMenuToLeft ? Math.max(0, parentMenu.x - width) : parentMenu.x + MENU_WIDTH,
     y: parentMenu.y + index * 25
   });
-  const width = getMenuWidth();
   const height = getMenuHeight(subMenuItems);
   const visible = getVisible(subMenu.items, -1, false, subMenu.level);
   const dom = getMenuVirtualDom(visible).slice(1);
@@ -3133,10 +3125,7 @@ const selectIndexRestoreFocus = async (menu, item) => {
 };
 
 const selectIndexSubMenu = async (menu, item, index) => {
-  if (menu.focusedIndex === index) {
-    return;
-  }
-  await showSubMenu(menu.level, menu.focusedIndex);
+  await showSubMenu(menu.level, index);
 };
 
 const getSelectIndexFunction = flags => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/menu-worker",
-  "version": "4.16.1",
+  "version": "4.18.0",
   "description": "Menu Worker",
   "repository": {
     "type": "git",