@lvce-editor/title-bar-worker 4.15.1 → 4.15.3

package/dist/titleBarWorkerMain.js

@@ -5057,57 +5057,6 @@ const handleKeyEnterMenuClosed = state => {
   return openMenu(state, /* focus */true);
 };
 
-const handleKeyEnterMenuOpen = state => {
-  // TODO
-  // await Menu.selectCurrent()
-  return state;
-};
-
-const handleKeyEnter = ifElse(handleKeyEnterMenuOpen, handleKeyEnterMenuClosed);
-
-const handleKeyEscapeMenuOpen = state => {
-  const {
-    menus
-  } = state;
-  if (menus.length > 1) {
-    return closeOneMenu(state);
-  }
-  return closeMenu(state, /* keepFocus */true);
-};
-
-const handleKeyEscape = ifElse(handleKeyEscapeMenuOpen, noop);
-
-const handleKeyHomeMenuOpen = state => {
-  const {
-    menus
-  } = state;
-  const menu = menus[0];
-  const newFocusedIndex = getIndexToFocusFirst(menu.items);
-  const newMenus = [{
-    ...menu,
-    focusedIndex: newFocusedIndex
-  }];
-  return {
-    ...state,
-    menus: newMenus
-  };
-};
-
-const handleKeyHome = ifElse(handleKeyHomeMenuOpen, focusFirst);
-
-const handleKeySpaceMenuClosed = state => {
-  return openMenu(state, /* focus */true);
-};
-
-const handleKeySpaceMenuOpen = state => {
-  // TODO
-  // await Menu.selectCurrent()
-  return state;
-};
-
-// TODO this is same as handle key enter -> merge the functions
-const handleKeySpace = ifElse(handleKeySpaceMenuOpen, handleKeySpaceMenuClosed);
-
 const executeMenuItemCommand = async item => {
   await invoke(item.command, ...(item.args || []));
 };
@@ -5156,15 +5105,16 @@ const selectIndexSubMenu = async (state, menu, index) => {
   const subMenu = {
     focusedIndex: -1,
     items: subMenuEntries,
-    level: menus.length,
+    level: level + 1,
     x: x + MENU_WIDTH,
     y: y + index * 25
   };
   const newParentMenu = {
     ...menu,
+    expanded: true,
     focusedIndex: index
   };
-  const newMenus = [...menus.slice(0, level - 1), newParentMenu, subMenu];
+  const newMenus = [...menus.slice(0, level), newParentMenu, subMenu];
   return {
     ...state,
     menus: newMenus
@@ -5198,6 +5148,58 @@ const handleMenuClick = async (state, level, index) => {
   }
 };
 
+const handleKeyEnterMenuOpen = state => {
+  const {
+    menus
+  } = state;
+  const menu = menus.at(-1);
+  if (!menu) {
+    return state;
+  }
+  return handleMenuClick(state, menu.level, menu.focusedIndex);
+};
+
+const handleKeyEnter = ifElse(handleKeyEnterMenuOpen, handleKeyEnterMenuClosed);
+
+const handleKeyEscapeMenuOpen = state => {
+  const {
+    menus
+  } = state;
+  if (menus.length > 1) {
+    return closeOneMenu(state);
+  }
+  return closeMenu(state, /* keepFocus */true);
+};
+
+const handleKeyEscape = ifElse(handleKeyEscapeMenuOpen, noop);
+
+const handleKeyHomeMenuOpen = state => {
+  const {
+    menus
+  } = state;
+  const menu = menus[0];
+  const newFocusedIndex = getIndexToFocusFirst(menu.items);
+  const newMenus = [{
+    ...menu,
+    focusedIndex: newFocusedIndex
+  }];
+  return {
+    ...state,
+    menus: newMenus
+  };
+};
+
+const handleKeyHome = ifElse(handleKeyHomeMenuOpen, focusFirst);
+
+const handleKeySpaceMenuClosed = state => {
+  return openMenu(state, /* focus */true);
+};
+
+const handleKeySpaceMenuOpen = state => handleKeyEnterMenuOpen(state);
+
+// TODO this is same as handle key enter -> merge the functions
+const handleKeySpace = ifElse(handleKeySpaceMenuOpen, handleKeySpaceMenuClosed);
+
 const getNewMenus = async (menus, level, index, flags) => {
   const menu = menus[level];
   if (!menu) {
@@ -5244,19 +5246,21 @@ const getNewMenus = async (menus, level, index, flags) => {
     const subMenu = {
       focusedIndex: -1,
       items: subMenuEntries,
-      level: menus.length,
+      level: level + 1,
       x: x + MENU_WIDTH,
       y: y + index * 25
     };
     const newParentMenu = {
       ...menu,
+      expanded: true,
       focusedIndex: index
     };
-    const newMenus = [...menus.slice(0, level - 1), newParentMenu, subMenu];
+    const newMenus = [...menus.slice(0, level), newParentMenu, subMenu];
     return newMenus;
   }
   const newMenus = [...menus.slice(0, level), {
     ...menu,
+    expanded: false,
     focusedIndex: index
   }];
   return newMenus;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/title-bar-worker",
-  "version": "4.15.1",
+  "version": "4.15.3",
   "description": "Title Bar Worker",
   "repository": {
     "type": "git",