@lvce-editor/title-bar-worker 4.20.1 → 4.20.2

package/dist/titleBarWorkerMain.js

@@ -3554,14 +3554,31 @@ const set = rpc => {
   state.connected = true;
 };
 
+const commandQueues = new Map();
 const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess = true) => {
   const executeViewletCommand = async (uid, command, ...args) => {
     const fn = viewletCommandMap[`TitleBar.${command}`];
     if (typeof fn !== 'function') {
       throw new TypeError(`Viewlet command not found: ${command}`);
     }
-    await fn(uid, ...args);
-    await invoke$1('Viewlet.requestRender', uid);
+    const previous = commandQueues.get(uid);
+    const {
+      promise: next,
+      resolve
+    } = Promise.withResolvers();
+    commandQueues.set(uid, next);
+    if (previous) {
+      await previous;
+    }
+    try {
+      await fn(uid, ...args);
+      await invoke$1('Viewlet.requestRender', uid);
+    } finally {
+      resolve();
+      if (commandQueues.get(uid) === next) {
+        commandQueues.delete(uid);
+      }
+    }
   };
   const rpc = await create$5({
     commandMap: {
@@ -4866,6 +4883,7 @@ const create = (id, uri, x, y, width, height) => {
 
 const closeMenu = (state, keepFocus) => {
   const {
+    focused,
     focusedIndex,
     isMenuOpen,
     menus
@@ -4873,12 +4891,14 @@ const closeMenu = (state, keepFocus) => {
   // TODO send to renderer process
   // 1. close menu
   // 2. focus top level entry
+  const newFocused = keepFocus ? focused : false;
   const newFocusedIndex = keepFocus ? focusedIndex : -1;
-  if (!isMenuOpen && menus.length === 0 && focusedIndex === newFocusedIndex) {
+  if (!isMenuOpen && menus.length === 0 && focused === newFocused && focusedIndex === newFocusedIndex) {
     return state;
   }
   return {
     ...state,
+    focused: newFocused,
     focusedIndex: newFocusedIndex,
     isMenuOpen: false,
     menus: []
@@ -4951,7 +4971,11 @@ const handleClick = async (state, button, index) => {
   if (index === -1) {
     return state;
   }
-  return toggleIndex(state, index);
+  const newState = await toggleIndex(state, index);
+  return {
+    ...newState,
+    focused: true
+  };
 };
 
 const handleClickAt = async (state, button, eventX, eventY) => {

package/package.json

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