@lvce-editor/menu-worker 4.2.0 → 4.4.0

package/dist/menuWorkerMain.js

@@ -1875,12 +1875,12 @@ const getMenuEntries$c = platform => {
     label: openRecent()
   }, menuEntrySeparator, {
     command: 'Main.save',
-    flags: None,
+    flags: Disabled,
     id: 'save',
     label: save()
   }, {
     command: 'Main.saveAll',
-    flags: None,
+    flags: Disabled,
     id: 'saveAll',
     label: saveAll()
   }];
@@ -2273,6 +2273,7 @@ const Menu = 'Menu';
 const MenuItem = 'MenuItem';
 const MenuItemCheckMark = 'MenuItemCheckMark';
 const MenuItemCheckmarkIcon = 'MenuItemCheckmarkIcon';
+const MenuItemDisabled = 'MenuItemDisabled';
 const MenuItemFocused = 'MenuItemFocused';
 const MenuItemKeyBinding = 'MenuItemKeyBinding';
 const MenuItemSeparator = 'MenuItemSeparator';
@@ -2357,8 +2358,9 @@ const getMenuItemDefaultDom = menuItem => {
 };
 
 const disabled = {
+  ariaDisabled: true,
   childCount: 1,
-  className: MenuItem,
+  className: `${MenuItem} ${MenuItemDisabled}`,
   disabled: true,
   role: MenuItem$1,
   tabIndex: -1,
@@ -2562,6 +2564,7 @@ const show$2 = async (x, y, id, mouseBlocking = false, ...args) => {
   const items = await getMenuEntriesWithKeyBindings(id, ...args);
   const bounds = await getMenuBounds(x, y, items);
   const menu = addMenuInternal({
+    args,
     focusedIndex: -1,
     id,
     items,
@@ -2577,10 +2580,12 @@ const show2$2 = async (uid, menuId, x, y, mouseBlocking = false, ...args) => {
   const items = await getMenuEntriesWithKeyBindings2(uid, menuId, ...args);
   const bounds = await getMenuBounds(x, y, items);
   const menu = addMenuInternal({
+    args,
     focusedIndex: -1,
     id: menuId,
     items,
     level: getCount(),
+    uid,
     x: bounds.x,
     y: bounds.y
   });
@@ -2906,20 +2911,37 @@ const resolveAfterTimeout = async () => {
   await promise;
 };
 
+const getSubMenuItems = async (parentMenu, item) => {
+  const args = item.args || parentMenu.args || [];
+  if (typeof parentMenu.uid === 'number') {
+    return getMenuEntries2(parentMenu.uid, item.id, ...args);
+  }
+  return getMenuEntries$1(item.id, ...args);
+};
+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) => {
   // TODO delete old menus
   set$1(getAll().slice(0, level + 1));
   const parentMenu = get$1(level);
   const item = parentMenu.items[index];
-  const subMenuItems = await getMenuEntries$1(item.id);
+  const subMenuItems = await getSubMenuItems(parentMenu, item);
+  const openSubMenuToLeft = getOpenSubMenuToLeft(parentMenu);
   const subMenu = addMenuInternal({
+    args: item.args || parentMenu.args || [],
     enterX,
     enterY,
     focusedIndex: -1,
     id: item.id,
     items: subMenuItems,
     level: getCount(),
-    x: parentMenu.x + MENU_WIDTH,
+    openSubMenuToLeft,
+    uid: parentMenu.uid,
+    x: getSubMenuX(parentMenu, openSubMenuToLeft),
     y: parentMenu.y + index * 25
   });
   const width = getMenuWidth();

package/package.json

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