@lvce-editor/title-bar-worker 4.25.3 → 4.25.5

package/dist/titleBarWorkerMain.js

@@ -5354,19 +5354,33 @@ const selectIndexNone = async (state, item) => {
   const {
     uid
   } = state;
-  await executeMenuItemCommand(item);
   const storedState = get(uid);
   const latestState = storedState?.newState ?? state;
-  const newState = {
+  const closedState = {
     ...latestState,
     focusedIndex: -1,
     isMenuOpen: false,
     menus: []
   };
   if (storedState) {
-    set$1(uid, storedState.oldState, newState, newState);
+    set$1(uid, storedState.oldState, closedState, closedState);
+    if (latestState.menus.length > 0) {
+      const [command, ...args] = renderMenus(latestState, closedState);
+      await invoke$2(command, ...args);
+    }
   }
-  return newState;
+  await executeMenuItemCommand(item);
+  const latestCommandState = get(uid)?.newState ?? closedState;
+  const finalState = {
+    ...latestCommandState,
+    focusedIndex: -1,
+    isMenuOpen: false,
+    menus: []
+  };
+  if (storedState) {
+    set$1(uid, finalState, finalState, finalState);
+  }
+  return finalState;
 };
 
 const selectIndexRestoreEditorFocus = async (state, item) => {
@@ -5510,6 +5524,23 @@ const handleKeySpaceMenuOpen = state => handleKeyEnterMenuOpen(state);
 // TODO this is same as handle key enter -> merge the functions
 const handleKeySpace = ifElse(handleKeySpaceMenuOpen, handleKeySpaceMenuClosed);
 
+const handleMenuMouseLeave = state => {
+  object(state);
+  const {
+    menus
+  } = state;
+  if (menus.every(menu => menu.focusedIndex === -1)) {
+    return state;
+  }
+  return {
+    ...state,
+    menus: menus.map(menu => ({
+      ...menu,
+      focusedIndex: -1
+    }))
+  };
+};
+
 const getNewMenus = async (menus, level, index, flags) => {
   const menu = menus[level];
   if (!menu) {
@@ -5663,6 +5694,7 @@ const commandMap = {
   'TitleBar.handleKeyHome': wrapCommand(handleKeyHome),
   'TitleBar.handleKeySpace': wrapCommand(handleKeySpace),
   'TitleBar.handleMenuClick': wrapCommand(handleMenuClick),
+  'TitleBar.handleMenuMouseLeave': wrapCommand(handleMenuMouseLeave),
   'TitleBar.handleMenuMouseOver': wrapCommand(handleMenuMouseOver),
   'TitleBar.handleMessagePort': handleDirectMessagePort,
   'TitleBar.handleMouseOut': wrapCommand(handleMouseOut),

package/package.json

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