@lvce-editor/menu-worker 1.5.0 → 1.6.0

package/dist/menuWorkerMain.js

@@ -1231,7 +1231,7 @@ const invoke = async (method, ...params) => {
   // TODO
 };
 
-const state$2 = {
+const state$1 = {
   /**
    * @type {any}
    */
@@ -1829,7 +1829,7 @@ const getMenuEntries2 = async (uid, menuId, ...args) => {
 };
 
 const addKeyBindings = menuEntries => {
-  const keyBindings = state$2.matchingKeyBindings;
+  const keyBindings = state$1.matchingKeyBindings;
   const newMenuEntries = [];
   for (const menuEntry of menuEntries) {
     const keyBinding = getCommandKeyBinding(keyBindings, menuEntry.command, menuEntry.args);
@@ -2085,17 +2085,36 @@ const getVisible = (items, focusedIndex, expanded, level) => {
   return visibleItems;
 };
 
+/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 // TODO lazyload menuEntries and use Command.execute (maybe)
-const CONTEXT_MENU_WIDTH$1 = 250;
-const state$1 = {
+
+// TODO difference between focusing with mouse or keyboard
+// with mouse -> open submenu
+// with keyboard -> don't open submenu, only focus
+
+// TODO this code seems a bit too complicated, maybe it can be simplified
+
+const state = {
   menus: []};
-const addMenuInternal$1 = menu => {
-  if (state$1.menus.length > 5) {
+const addMenuInternal = menu => {
+  if (state.menus.length > 5) {
     throw new Error('too many menus');
   }
-  state$1.menus.push(menu);
+  state.menus.push(menu);
   return menu;
 };
+const getCount = () => {
+  return state.menus.length;
+};
+const reset = () => {
+  state.menus = [];
+};
+const getAll = () => {
+  return state.menus;
+};
+
+// TODO lazyload menuEntries and use Command.execute (maybe)
+const CONTEXT_MENU_WIDTH$1 = 250;
 
 // TODO handle printable letter and focus item that starts with that letter
 
@@ -2147,11 +2166,11 @@ const getMenuBounds$1 = (x, y, items) => {
 const show$2 = async (x, y, id, mouseBlocking = false, ...args) => {
   const items = await getMenuEntriesWithKeyBindings(id, ...args);
   const bounds = getMenuBounds$1(x, y, items);
-  const menu = addMenuInternal$1({
+  const menu = addMenuInternal({
     id,
     items,
     focusedIndex: -1,
-    level: state$1.menus.length,
+    level: getCount(),
     x: bounds.x,
     y: bounds.y
   });
@@ -2162,11 +2181,11 @@ const show$2 = async (x, y, id, mouseBlocking = false, ...args) => {
 const show2$2 = async (uid, menuId, x, y, mouseBlocking = false, ...args) => {
   const items = await getMenuEntriesWithKeyBindings2(uid, menuId, ...args);
   const bounds = getMenuBounds$1(x, y, items);
-  const menu = addMenuInternal$1({
+  const menu = addMenuInternal({
     id: menuId,
     items,
     focusedIndex: -1,
-    level: state$1.menus.length,
+    level: getCount(),
     x: bounds.x,
     y: bounds.y
   });
@@ -2175,10 +2194,10 @@ const show2$2 = async (uid, menuId, x, y, mouseBlocking = false, ...args) => {
   await invoke(/* Menu.show */'Menu.showMenu', /* x */bounds.x, /* y */bounds.y, /* width */bounds.width, /* height */bounds.height, /* items */menu.items, /* level */menu.level, /* parentIndex */-1, /* dom */dom, /* mouseBlocking */mouseBlocking);
 };
 const hide = async (restoreFocus = true) => {
-  if (state$1.menus.length === 0) {
+  if (getCount() === 0) {
     return;
   }
-  state$1.menus = [];
+  reset();
   await invoke(/* Menu.hide */'Menu.hide', /* restoreFocus */restoreFocus);
 };
 
@@ -2332,6 +2351,33 @@ const getKeyBindings = () => {
   }];
 };
 
+const getMenuHideCommands = async (restoreFocus = true) => {
+  if (getCount() === 0) {
+    return {
+      newMenus: [],
+      commands: []
+    };
+  }
+  reset();
+  return {
+    commands: [/* Menu.hide */'Menu.hide', /* restoreFocus */restoreFocus],
+    newMenus: []
+  };
+};
+
+const menus = [MenuEntriesEdit, MenuEntriesFile, MenuEntriesGo, MenuEntriesHelp, MenuEntriesRun, MenuEntriesSelection, MenuEntriesTerminal, MenuEntriesTitleBar, MenuEntriesView, MenuEntriesOpenRecent];
+
+const getMenuIds = () => {
+  return menus.map(menu => menu.id);
+};
+const getMenuEntries = (id, platform) => {
+  const menu = menus.find(item => item.id === id);
+  if (!menu) {
+    return [];
+  }
+  return menu.getMenuEntries(platform);
+};
+
 // TODO lazyload menuEntries and use Command.execute (maybe)
 const CONTEXT_MENU_WIDTH = 250;
 
@@ -2341,16 +2387,6 @@ const CONTEXT_MENU_WIDTH = 250;
 
 // TODO this code seems a bit too complicated, maybe it can be simplified
 
-const state = {
-  menus: []};
-const addMenuInternal = menu => {
-  if (state.menus.length > 5) {
-    throw new Error('too many menus');
-  }
-  state.menus.push(menu);
-  return menu;
-};
-
 // TODO handle printable letter and focus item that starts with that letter
 
 // TODO pageup / pagedown keys
@@ -2404,45 +2440,19 @@ const getMenuShowCommands = async (items, menuId, x, y, mouseBlocking = false) =
     id: menuId,
     items,
     focusedIndex: -1,
-    level: state.menus.length,
+    level: getCount(),
     x: bounds.x,
     y: bounds.y
   });
   const visible = getVisible(menu.items, -1, false, menu.level);
   const dom = getMenuVirtualDom(visible).slice(1);
   return {
+    menus: getAll(),
     menu,
     commands: [/* Menu.show */'Menu.showMenu', /* x */bounds.x, /* y */bounds.y, /* width */bounds.width, /* height */bounds.height, /* items */menu.items, /* level */menu.level, /* parentIndex */-1, /* dom */dom, /* mouseBlocking */mouseBlocking]
   };
 };
 
-const getMenuHideCommands = async (restoreFocus = true) => {
-  if (state.menus.length === 0) {
-    return {
-      newMenus: [],
-      commands: []
-    };
-  }
-  state.menus = [];
-  return {
-    commands: [/* Menu.hide */'Menu.hide', /* restoreFocus */restoreFocus],
-    newMenus: []
-  };
-};
-
-const menus = [MenuEntriesEdit, MenuEntriesFile, MenuEntriesGo, MenuEntriesHelp, MenuEntriesRun, MenuEntriesSelection, MenuEntriesTerminal, MenuEntriesTitleBar, MenuEntriesView, MenuEntriesOpenRecent];
-
-const getMenuIds = () => {
-  return menus.map(menu => menu.id);
-};
-const getMenuEntries = (id, platform) => {
-  const menu = menus.find(item => item.id === id);
-  if (!menu) {
-    return [];
-  }
-  return menu.getMenuEntries(platform);
-};
-
 const handleContextMenu = state => {
   return state;
 };

package/package.json

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