@lvce-editor/title-bar-worker 3.10.0 → 3.12.0

package/dist/titleBarWorkerMain.js

@@ -462,7 +462,7 @@ const getFirstEvent = (eventEmitter, eventMap) => {
   return promise;
 };
 const Message$1 = 3;
-const create$5$1 = async ({
+const create$5 = async ({
   isMessagePortOpen,
   messagePort
 }) => {
@@ -513,61 +513,19 @@ const wrap$5 = messagePort => {
 };
 const IpcParentWithMessagePort$1 = {
   __proto__: null,
-  create: create$5$1,
+  create: create$5,
   signal: signal$1,
   wrap: wrap$5
 };
 
-const Two = '2.0';
-const create$4$1 = (method, params) => {
-  return {
-    jsonrpc: Two,
-    method,
-    params
-  };
-};
+const Two$1 = '2.0';
 const callbacks = Object.create(null);
-const set$3 = (id, fn) => {
-  callbacks[id] = fn;
-};
 const get$2 = id => {
   return callbacks[id];
 };
 const remove = id => {
   delete callbacks[id];
 };
-let id = 0;
-const create$3$1 = () => {
-  return ++id;
-};
-const registerPromise = () => {
-  const id = create$3$1();
-  const {
-    resolve,
-    promise
-  } = Promise.withResolvers();
-  set$3(id, resolve);
-  return {
-    id,
-    promise
-  };
-};
-const create$2$1 = (method, params) => {
-  const {
-    id,
-    promise
-  } = registerPromise();
-  const message = {
-    jsonrpc: Two,
-    method,
-    params,
-    id
-  };
-  return {
-    message,
-    promise
-  };
-};
 class JsonRpcError extends Error {
   constructor(message) {
     super(message);
@@ -761,9 +719,9 @@ const getErrorProperty = (error, prettyError) => {
     }
   };
 };
-const create$1$1 = (id, error) => {
+const create$1$2 = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error
   };
@@ -772,22 +730,22 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const prettyError = preparePrettyError(error);
   logError(error, prettyError);
   const errorProperty = getErrorProperty(error, prettyError);
-  return create$1$1(id, errorProperty);
+  return create$1$2(id, errorProperty);
 };
-const create$6 = (message, result) => {
+const create$3 = (message, result) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id: message.id,
     result: result ?? null
   };
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$6(message, resultProperty);
+  return create$3(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
-    jsonrpc: Two,
+    jsonrpc: Two$1,
     id,
     error: {
       code: Custom,
@@ -874,29 +832,6 @@ const handleJsonRpcMessage = async (...args) => {
   }
   throw new JsonRpcError('unexpected message');
 };
-const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
-  const {
-    message,
-    promise
-  } = create$2$1(method, params);
-  if (useSendAndTransfer && ipc.sendAndTransfer) {
-    ipc.sendAndTransfer(message);
-  } else {
-    ipc.send(message);
-  }
-  const responseMessage = await promise;
-  return unwrapJsonRpcResult(responseMessage);
-};
-const send = (transport, method, ...params) => {
-  const message = create$4$1(method, params);
-  transport.send(message);
-};
-const invoke$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, false);
-};
-const invokeAndTransfer$1 = (ipc, method, ...params) => {
-  return invokeHelper(ipc, method, params, true);
-};
 
 class CommandNotFoundError extends Error {
   constructor(command) {
@@ -919,24 +854,87 @@ const execute = (command, ...args) => {
   return fn(...args);
 };
 
+const Two = '2.0';
+const create$s = (method, params) => {
+  return {
+    jsonrpc: Two,
+    method,
+    params
+  };
+};
+const create$r = (id, method, params) => {
+  const message = {
+    id,
+    jsonrpc: Two,
+    method,
+    params
+  };
+  return message;
+};
+let id = 0;
+const create$q = () => {
+  return ++id;
+};
+
+/* eslint-disable n/no-unsupported-features/es-syntax */
+
+const registerPromise = map => {
+  const id = create$q();
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  map[id] = resolve;
+  return {
+    id,
+    promise
+  };
+};
+
+// @ts-ignore
+const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer) => {
+  const {
+    id,
+    promise
+  } = registerPromise(callbacks);
+  const message = create$r(id, method, params);
+  if (useSendAndTransfer && ipc.sendAndTransfer) {
+    ipc.sendAndTransfer(message);
+  } else {
+    ipc.send(message);
+  }
+  const responseMessage = await promise;
+  return unwrapJsonRpcResult(responseMessage);
+};
 const createRpc = ipc => {
+  const callbacks = Object.create(null);
+  ipc._resolve = (id, response) => {
+    const fn = callbacks[id];
+    if (!fn) {
+      console.warn(`callback ${id} may already be disposed`);
+      return;
+    }
+    fn(response);
+    delete callbacks[id];
+  };
   const rpc = {
+    async dispose() {
+      await ipc?.dispose();
+    },
+    invoke(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, false);
+    },
+    invokeAndTransfer(method, ...params) {
+      return invokeHelper(callbacks, ipc, method, params, true);
+    },
     // @ts-ignore
     ipc,
     /**
      * @deprecated
      */
     send(method, ...params) {
-      send(ipc, method, ...params);
-    },
-    invoke(method, ...params) {
-      return invoke$1(ipc, method, ...params);
-    },
-    invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer$1(ipc, method, ...params);
-    },
-    async dispose() {
-      await ipc?.dispose();
+      const message = create$s(method, params);
+      ipc.send(message);
     }
   };
   return rpc;
@@ -953,7 +951,7 @@ const logError = () => {
 const handleMessage = event => {
   const actualRequiresSocket = event?.target?.requiresSocket || requiresSocket;
   const actualExecute = event?.target?.execute || execute;
-  return handleJsonRpcMessage(event.target, event.data, actualExecute, resolve, preparePrettyError, logError, actualRequiresSocket);
+  return handleJsonRpcMessage(event.target, event.data, actualExecute, event.target._resolve, preparePrettyError, logError, actualRequiresSocket);
 };
 const handleIpc = ipc => {
   if ('addEventListener' in ipc) {
@@ -971,15 +969,16 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
-const create$5 = async ({
+const create$4 = async ({
   commandMap,
+  isMessagePortOpen = true,
   messagePort
 }) => {
   // TODO create a commandMap per rpc instance
   register(commandMap);
   const rawIpc = await IpcParentWithMessagePort$1.create({
-    messagePort,
-    isMessagePortOpen: true
+    isMessagePortOpen,
+    messagePort
   });
   const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
   handleIpc(ipc);
@@ -987,8 +986,9 @@ const create$5 = async ({
   messagePort.start();
   return rpc;
 };
-const create$3 = async ({
+const create$2$1 = async ({
   commandMap,
+  isMessagePortOpen,
   send
 }) => {
   const {
@@ -996,16 +996,17 @@ const create$3 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$5({
+  return create$4({
     commandMap,
+    isMessagePortOpen,
     messagePort: port2
   });
 };
 const TransferMessagePortRpcParent = {
   __proto__: null,
-  create: create$3
+  create: create$2$1
 };
-const create$4 = async ({
+const create$1$1 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -1017,14 +1018,25 @@ const create$4 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$4
+  create: create$1$1
 };
 
 const ContentInfo = 'contentinfo';
+const Menu$1 = 'menu';
+const MenuBar$1 = 'menubar';
+const MenuItem$1 = 'menuitem';
+const MenuItemCheckBox = 'menuitemcheckbox';
+const None$1 = 'none';
+const Separator$2 = 'separator';
 
-const Div$1 = 4;
+const Button$1 = 1;
+const Div = 4;
+const Span = 8;
+const Text = 12;
+const I = 16;
+const Img = 17;
 
-const Button$1 = 'event.button';
+const Button = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const TargetName = 'event.target.name';
@@ -1032,16 +1044,16 @@ const TargetName = 'event.target.name';
 const Backspace$1 = 1;
 const Tab$1 = 2;
 const Enter$1 = 3;
-const Escape$2 = 8;
-const Space$2 = 9;
+const Escape$1 = 8;
+const Space$1 = 9;
 const PageUp$1 = 10;
 const PageDown$1 = 11;
-const End$2 = 255;
-const Home$2 = 12;
-const LeftArrow$2 = 13;
-const UpArrow$2 = 14;
-const RightArrow$2 = 15;
-const DownArrow$2 = 16;
+const End$1 = 255;
+const Home$1 = 12;
+const LeftArrow$1 = 13;
+const UpArrow$1 = 14;
+const RightArrow$1 = 15;
+const DownArrow$1 = 16;
 const Insert$1 = 17;
 const Delete$1 = 18;
 const Digit0$1 = 19;
@@ -1098,16 +1110,16 @@ const Unknown = 'Unknown';
 const Backspace = 'Backspace';
 const Tab = 'Tab';
 const Enter = 'Enter';
-const Escape$1 = 'Escape';
-const Space$1 = 'Space';
+const Escape = 'Escape';
+const Space = 'Space';
 const PageUp = 'PageUp';
 const PageDown = 'PageDown';
-const End$1 = 'End';
-const Home$1 = 'Home';
-const LeftArrow$1 = 'LeftArrow';
-const UpArrow$1 = 'UpArrow';
-const RightArrow$1 = 'RightArrow';
-const DownArrow$1 = 'DownArrow';
+const End = 'End';
+const Home = 'Home';
+const LeftArrow = 'LeftArrow';
+const UpArrow = 'UpArrow';
+const RightArrow = 'RightArrow';
+const DownArrow = 'DownArrow';
 const Insert = 'Insert';
 const Delete = 'Delete';
 const Digit0 = '0';
@@ -1192,16 +1204,16 @@ const getKeyCodeString = keyCode => {
       return Digit8;
     case Digit9$1:
       return Digit9;
-    case DownArrow$2:
-      return DownArrow$1;
-    case End$2:
-      return End$1;
+    case DownArrow$1:
+      return DownArrow;
+    case End$1:
+      return End;
     case Enter$1:
       return Enter;
     case Equal$1:
       return Equal;
-    case Escape$2:
-      return Escape$1;
+    case Escape$1:
+      return Escape;
     case F1$1:
       return F1;
     case F2$1:
@@ -1214,8 +1226,8 @@ const getKeyCodeString = keyCode => {
       return F5;
     case F6$1:
       return F6;
-    case Home$2:
-      return Home$1;
+    case Home$1:
+      return Home;
     case Insert$1:
       return Insert;
     case KeyA$1:
@@ -1270,8 +1282,8 @@ const getKeyCodeString = keyCode => {
       return KeyY;
     case KeyZ$1:
       return KeyZ;
-    case LeftArrow$2:
-      return LeftArrow$1;
+    case LeftArrow$1:
+      return LeftArrow;
     case Minus$1:
       return Minus;
     case PageDown$1:
@@ -1280,16 +1292,16 @@ const getKeyCodeString = keyCode => {
       return PageUp;
     case Plus$1:
       return Plus;
-    case RightArrow$2:
-      return RightArrow$1;
-    case Space$2:
-      return Space$1;
+    case RightArrow$1:
+      return RightArrow;
+    case Space$1:
+      return Space;
     case Star$1:
       return Star;
     case Tab$1:
       return Tab;
-    case UpArrow$2:
-      return UpArrow$1;
+    case UpArrow$1:
+      return UpArrow;
     default:
       return Unknown;
   }
@@ -1328,6 +1340,10 @@ const Electron$1 = 2;
 
 const RendererWorker = 1;
 
+const FocusSelector = 'Viewlet.focusSelector';
+const SetDom2 = 'Viewlet.setDom2';
+const SetFocusContext = 'Viewlet.setFocusContext';
+
 const FocusTitleBarMenuBar = 26;
 
 const rpcs = Object.create(null);
@@ -1489,6 +1505,7 @@ const createDefaultState = (uid = DEFAULT_UID) => ({
   commandCenterEnabled: false,
   commandMap: {},
   controlsOverlayEnabled: false,
+  focused: false,
   focusedIndex: -1,
   height: 30,
   iconWidth: 30,
@@ -1547,7 +1564,7 @@ const CheckForUpdates = 'Check For Updates';
 const ClearRecentlyOpened = 'Clear Recently Opened';
 const Close = 'Close';
 const Exit = 'Exit';
-const MenuBar$1 = 'Menu Bar';
+const MenuBar = 'Menu Bar';
 const CommandCenter = 'Command Center';
 const Edit$1 = 'Edit';
 const File$2 = 'File';
@@ -1619,7 +1636,7 @@ const close$1 = () => {
   return i18nString(Close);
 };
 const menuBar = () => {
-  return i18nString(MenuBar$1);
+  return i18nString(MenuBar);
 };
 const commandCenter = () => {
   return i18nString(CommandCenter);
@@ -1713,6 +1730,7 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
     commandCenterEnabled: false,
     commandMap: {},
     controlsOverlayEnabled,
+    focused: false,
     focusedIndex: -1,
     height,
     iconWidth: 30,
@@ -1737,50 +1755,29 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
   set(id, state, state);
 };
 
-const RenderEntries = 1;
-const RenderFocusedIndex = 2;
-const RenderMenus = 3;
-
 const isEqual$3 = (oldState, newState) => {
   return oldState.titleBarEntries === newState.titleBarEntries && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
 };
 
 const isEqual$2 = (oldState, newState) => {
-  return oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
+  return oldState.focused || !newState.focused;
 };
 
 const isEqual$1 = (oldState, newState) => {
-  return oldState.menus === newState.menus;
-};
-
-const modules$1 = [isEqual$3, isEqual$2, isEqual$1];
-const numbers$1 = [RenderEntries, RenderFocusedIndex, RenderMenus];
-
-const diff = (oldState, newState) => {
-  const diffResult = [];
-  for (let i = 0; i < modules$1.length; i++) {
-    const fn = modules$1[i];
-    if (!fn(oldState, newState)) {
-      diffResult.push(numbers$1[i]);
-    }
-  }
-  return diffResult;
-};
-
-const diff2 = uid => {
-  const {
-    newState,
-    oldState
-  } = get(uid);
-  return diff(oldState, newState);
+  return oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.titleBarEntries === newState.titleBarEntries && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen && oldState.assetDir === newState.assetDir && oldState.titleBarIconEnabled === newState.titleBarIconEnabled && oldState.title === newState.title && oldState.titleBarTitleEnabled === newState.titleBarTitleEnabled && oldState.platform === newState.platform && oldState.controlsOverlayEnabled === newState.controlsOverlayEnabled && oldState.titleBarStyleCustom === newState.titleBarStyleCustom && oldState.titleBarButtonsEnabled === newState.titleBarButtonsEnabled && oldState.titleBarButtons === newState.titleBarButtons;
+  return oldState.menus === newState.menus;
 };
 
-const modules = [isEqual, isEqual$2, isEqual$1];
-const numbers = [RenderEntries, RenderFocusedIndex, RenderMenus];
+const RenderEntries = 1;
+const RenderFocusedIndex = 2;
+const RenderMenus = 3;
+const RenderFocusContext = 4;
+
+const modules = [isEqual$3, isEqual$1, isEqual, isEqual$2];
+const numbers = [RenderEntries, RenderFocusedIndex, RenderMenus, RenderFocusContext];
 
 const diff3 = uid => {
   const {
@@ -1797,8 +1794,8 @@ const diff3 = uid => {
   return diffResult;
 };
 
-const Separator$2 = 1;
-const None$1 = 0;
+const Separator$1 = 1;
+const None = 0;
 const SubMenu$1 = 4;
 const Checked = 2;
 const Unchecked = 3;
@@ -1901,7 +1898,7 @@ const selectAllOccurrences = () => {
 
 const menuEntrySeparator = {
   command: '',
-  flags: Separator$2,
+  flags: Separator$1,
   id: 'separator',
   label: ''
 };
@@ -1909,37 +1906,37 @@ const menuEntrySeparator = {
 const getMenuEntries$c = () => {
   return [{
     command: /* TODO */'-1',
-    flags: None$1,
+    flags: None,
     id: 'undo',
     label: undo()
   }, {
     command: /* TODO */'-1',
-    flags: None$1,
+    flags: None,
     id: 'redo',
     label: redo()
   }, menuEntrySeparator, {
     command: /* Editor.cut */'Editor.cut',
-    flags: None$1,
+    flags: None,
     id: 'cut',
     label: cut()
   }, {
     command: /* Editor.copy */'Editor.copy',
-    flags: None$1,
+    flags: None,
     id: 'copy',
     label: copy()
   }, {
     command: /* Editor.paste */'Editor.paste',
-    flags: None$1,
+    flags: None,
     id: 'paste',
     label: paste()
   }, menuEntrySeparator, {
     command: /* Editor.toggleLineComment */'Editor.toggleLineComment',
-    flags: None$1,
+    flags: None,
     id: 'toggle-line-comment',
     label: toggleLineComment()
   }, {
     command: /* Editor.toggleBlockComment */'Editor.toggleBlockComment',
-    flags: None$1,
+    flags: None,
     id: 'toggle-block-comment',
     label: toggleBlockComment()
   }];
@@ -1996,17 +1993,17 @@ const View = 16;
 const getMenuEntries$b = platform => {
   const entries = [{
     command: '-1',
-    flags: None$1,
+    flags: None,
     id: 'newFile',
     label: newFile()
   }, {
     command: 'Window.openNew',
-    flags: None$1,
+    flags: None,
     id: 'newWindow',
     label: newWindow()
   }, menuEntrySeparator, {
     command: 'Dialog.openFile',
-    flags: None$1,
+    flags: None,
     id: 'openFile',
     label: openFile()
   }, {
@@ -2021,12 +2018,12 @@ const getMenuEntries$b = platform => {
     label: openRecent()
   }, menuEntrySeparator, {
     command: 'Main.save',
-    flags: None$1,
+    flags: None,
     id: 'save',
     label: save()
   }, {
     command: 'Main.saveAll',
-    flags: None$1,
+    flags: None,
     id: 'saveAll',
     label: saveAll()
   }];
@@ -2071,7 +2068,7 @@ const getMenuEntries$9 = async platform => {
   if (platform !== Web) {
     entries.push({
       command: 'Developer.toggleDeveloperTools',
-      flags: None$1,
+      flags: None,
       id: 'toggleDeveloperTools',
       label: toggleDeveloperTools()
     }, {
@@ -2094,7 +2091,7 @@ const getMenuEntries$9 = async platform => {
   }
   entries.push({
     command: 'About.showAbout',
-    flags: None$1,
+    flags: None,
     id: 'about',
     label: about()
   });
@@ -2135,7 +2132,7 @@ const toMenuItem = folder => {
   return {
     args: [folder],
     command: 'Workspace.setPath',
-    flags: None$1,
+    flags: None,
     label
   };
 };
@@ -2148,12 +2145,12 @@ const getMenuEntries$8 = async () => {
   }
   items.push({
     command: 'QuickPick.showRecent',
-    flags: None$1,
+    flags: None,
     id: 'more',
     label: moreDot()
   }, menuEntrySeparator, {
     command: 'RecentlyOpened.clearRecentlyOpened',
-    flags: None$1,
+    flags: None,
     id: 'clearRecentlyOpened',
     label: clearRecentlyOpened()
   });
@@ -2167,72 +2164,72 @@ const getMenuEntries$7 = () => {
 const getMenuEntries$6 = () => {
   return [{
     command: 'Editor.selectAll',
-    flags: None$1,
+    flags: None,
     id: 'selectAll',
     label: selectAll()
   }, {
     command: 'Editor.expandSelection',
-    flags: None$1,
+    flags: None,
     id: 'expandSelection',
     label: expandSelection()
   }, {
     command: 'Editor.shrinkSelection',
-    flags: None$1,
+    flags: None,
     id: 'shrinkSelection',
     label: shrinkSelection()
   }, menuEntrySeparator, {
     command: 'Editor.copyLineUp',
-    flags: None$1,
+    flags: None,
     id: 'copyLineUp',
     label: copyLineUp()
   }, {
     command: 'Editor.copyLineDown',
-    flags: None$1,
+    flags: None,
     id: 'copyLineDown',
     label: copyLineDown()
   }, {
     command: 'Editor.moveLineUp',
-    flags: None$1,
+    flags: None,
     id: 'moveLineUp',
     label: moveLineUp()
   }, {
     command: 'Editor.moveLineDown',
-    flags: None$1,
+    flags: None,
     id: 'moveLineDown',
     label: moveLineDown()
   }, {
     command: 'Editor.duplicateSelection',
-    flags: None$1,
+    flags: None,
     id: 'duplicateSelection',
     label: duplicateSelection()
   }, menuEntrySeparator, {
     command: 'Editor.addCursorAbove',
-    flags: None$1,
+    flags: None,
     id: 'addCursorAbove',
     label: addCursorAbove()
   }, {
     command: 'Editor.addCursorBelow',
-    flags: None$1,
+    flags: None,
     id: 'addCursorBelow',
     label: addCursorBelow()
   }, {
     command: 'Editor.addCursorsToLineEnds',
-    flags: None$1,
+    flags: None,
     id: 'addCursorsToLineEnds',
     label: addCursorsToLineEnds()
   }, {
     command: 'Editor.addNextOccurrence',
-    flags: None$1,
+    flags: None,
     id: 'addNextOccurrence',
     label: addNextOccurrence()
   }, {
     command: 'Editor.addPreviousOccurrence',
-    flags: None$1,
+    flags: None,
     id: 'addPreviousOccurrence',
     label: addPreviousOccurrence()
   }, {
     command: 'Editor.selectAllOccurrences',
-    flags: None$1,
+    flags: None,
     id: 'selectAllOccurrences',
     label: selectAllOccurrences()
   }];
@@ -2242,7 +2239,7 @@ const getMenuEntries$5 = () => {
   return [{
     args: ['Terminal'],
     command: 'Layout.togglePanel',
-    flags: None$1,
+    flags: None,
     id: 'newTerminal',
     label: i18nString(NewTerminal)
   }];
@@ -2298,32 +2295,32 @@ const getMenuEntries$4 = () => {
 const getMenuEntries$3 = () => {
   return [{
     command: '',
-    flags: None$1,
+    flags: None,
     id: File$1,
     label: file()
   }, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: Edit,
     label: edit()
   }, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: Selection,
     label: selection()
   }, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: View,
     label: view()
   }, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: Go,
     label: go()
   }, {
     command: '',
-    flags: None$1,
+    flags: None,
     id: Help$1,
     label: help()
   }];
@@ -2411,7 +2408,7 @@ const FileMenu = 'fileMenu';
 const EditMenu = 'editMenu';
 
 // based on https://www.electronjs.org/docs/latest/api/menu-item#new-menuitemoptions
-const Separator$1 = 'separator';
+const Separator = 'separator';
 const SubMenu = 'submenu';
 
 const toElectronMenuItem = entry => {
@@ -2476,9 +2473,9 @@ const toElectronMenuItem = entry => {
       };
   }
   switch (entry.flags) {
-    case Separator$2:
+    case Separator$1:
       return {
-        type: Separator$1
+        type: Separator
       };
     case SubMenu$1:
       return {
@@ -2553,29 +2550,6 @@ const hydrate = async state => {
   };
 };
 
-const Menu$1 = 'menu';
-const MenuBar = 'menubar';
-const MenuItem$1 = 'menuitem';
-const MenuItemCheckBox = 'menuitemcheckbox';
-const None = 'none';
-const Separator = 'separator';
-
-const Button = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-const I = 16;
-const Img = 17;
-
-const Escape = 8;
-const Space = 9;
-const End = 255;
-const Home = 12;
-const LeftArrow = 13;
-const UpArrow = 14;
-const RightArrow = 15;
-const DownArrow = 16;
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -2586,44 +2560,44 @@ const px = value => {
 
 const text = data => {
   return {
-    type: Text,
+    childCount: 0,
     text: data,
-    childCount: 0
+    type: Text
   };
 };
 
 const getKeyBindings = () => {
   return [{
     command: 'TitleBar.handleKeyArrowDown',
-    key: DownArrow,
+    key: DownArrow$1,
     when: FocusTitleBarMenuBar
   }, {
     command: 'TitleBar.handleKeyArrowUp',
-    key: UpArrow,
+    key: UpArrow$1,
     when: FocusTitleBarMenuBar
   }, {
     command: 'TitleBar.handleKeyArrowRight',
-    key: RightArrow,
+    key: RightArrow$1,
     when: FocusTitleBarMenuBar
   }, {
     command: 'TitleBar.handleKeyArrowLeft',
-    key: LeftArrow,
+    key: LeftArrow$1,
     when: FocusTitleBarMenuBar
   }, {
     command: 'TitleBar.handleKeySpace',
-    key: Space,
+    key: Space$1,
     when: FocusTitleBarMenuBar
   }, {
     command: 'TitleBar.handleKeyHome',
-    key: Home,
+    key: Home$1,
     when: FocusTitleBarMenuBar
   }, {
     command: 'TitleBar.handleKeyEnd',
-    key: End,
+    key: End$1,
     when: FocusTitleBarMenuBar
   }, {
     command: 'TitleBar.handleKeyEscape',
-    key: Escape,
+    key: Escape$1,
     when: FocusTitleBarMenuBar
   }];
 };
@@ -2732,7 +2706,7 @@ const getMenuHeight = items => {
   let height = CONTEXT_MENU_PADDING;
   for (const item of items) {
     switch (item.flags) {
-      case Separator$2:
+      case Separator$1:
         height += CONTEXT_MENU_SEPARATOR_HEIGHT;
         break;
       default:
@@ -2789,7 +2763,7 @@ const getIndexToFocusPrevious = menu => {
 const canBeFocused = item => {
   switch (item.flags) {
     case Disabled:
-    case Separator$2:
+    case Separator$1:
       return false;
     default:
       return true;
@@ -2986,7 +2960,6 @@ const measureTextWidths2 = async (texts, fontWeight, fontSize, fontFamily, lette
   await using rpc = await launchTextMeasurementWorker();
   const isMonospaceFont = false;
   const charWidth = 0;
-  // @ts-ignore
   const result = await rpc.invoke('TextMeasurement.measureTextWidths', texts, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
   return result;
 };
@@ -3080,11 +3053,18 @@ const loadContent2 = async state => {
   };
 };
 
+const renderFocusContext = (oldState, newState) => {
+  const {
+    uid
+  } = newState;
+  return [SetFocusContext, uid, FocusTitleBarMenuBar];
+};
+
 const renderFocusedIndex = (oldState, newState) => {
   if (newState.focusedIndex === -1) {
     return [];
   }
-  return ['Viewlet.focusSelector', '.ViewletTitleBarMenuBar'];
+  return [FocusSelector, '.ViewletTitleBarMenuBar'];
 };
 
 const MaskIconCheck = 'MaskIconCheck';
@@ -3195,7 +3175,7 @@ const getMenuItemsNoopDom = () => {
 const separator = {
   childCount: 1,
   className: MenuItemSeparator,
-  role: Separator,
+  role: Separator$2,
   type: Div
 };
 const separatorLine = {
@@ -3255,10 +3235,10 @@ const getMenuItemRenderer = flags => {
     case Disabled:
       return getMenuItemDisabledDom;
     case Ignore:
-    case None$1:
+    case None:
     case RestoreFocus:
       return getMenuItemDefaultDom;
-    case Separator$2:
+    case Separator$1:
       return getMenuItemSeparatorDom;
     case SubMenu$1:
       return getMenuItemSubMenuDom;
@@ -3353,7 +3333,7 @@ const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
     className: `MaskIcon MaskIcon${icon}`,
-    role: None,
+    role: None$1,
     type
   };
 };
@@ -3370,7 +3350,7 @@ const createTitleBarButton = button => {
     childCount: 1,
     className: `TitleBarButton TitleBarButton${id}`,
     onClick,
-    type: Button
+    type: Button$1
   }, getIconVirtualDom(icon, I)];
   return dom;
 };
@@ -3427,7 +3407,7 @@ const getItemVirtualDom = item => {
     name: label,
     // TODO have separate name attribute
     role: MenuItem$1,
-    type: Button
+    type: Button$1
   }, ...(isFocused ? [{
     childCount: 1,
     className: TitleBarTopLevelEntryLabel,
@@ -3453,7 +3433,7 @@ const getTitleBarMenuBarVirtualDom = (menuBarEnabled, visibleItems, focusedIndex
     onMouseDown: HandleClick,
     onPointerOut: HandlePointerOut,
     onPointerOver: HandlePointerOver,
-    role: MenuBar,
+    role: MenuBar$1,
     tabIndex: 0,
     type: Div
   }, ...getTitleBarMenuBarItemsVirtualDom(visibleItems)];
@@ -3462,7 +3442,7 @@ const getTitleBarMenuBarVirtualDom = (menuBarEnabled, visibleItems, focusedIndex
 const parentNode = {
   childCount: 1,
   className: 'TitleBarTitle',
-  type: Div$1
+  type: Div
 };
 const getTitleVirtualDom = (titleBarTitleEnabled, title) => {
   if (!titleBarTitleEnabled) {
@@ -3530,7 +3510,7 @@ const getTitleBarVirtualDom = state => {
   if (platform === Electron$1 && !titleBarStyleCustom) {
     return [{
       childCount: 0,
-      type: Div$1
+      type: Div
     }];
   }
   const iconSrc = getIcon(assetDir);
@@ -3542,19 +3522,21 @@ const getTitleBarVirtualDom = state => {
     className: 'Viewlet TitleBar',
     id: 'TitleBar',
     role: ContentInfo,
-    type: Div$1
+    type: Div
   }, ...getTitleBarIconVirtualDom(titleBarIconEnabled, iconSrc), ...getTitleBarMenuBarVirtualDom(titleBarMenuBarEnabled, visibleEntries, focusedIndex), ...getTitleVirtualDom(titleBarTitleEnabled, title), ...getTitleBarButtonsVirtualDom(titleBarButtonsEnabled, titleBarButtons)];
 };
 
 const renderTitleBar = (oldState, newState) => {
   const dom = getTitleBarVirtualDom(newState);
-  return ['Viewlet.setDom2', newState.uid, dom];
+  return [SetDom2, newState.uid, dom];
 };
 
 const getRenderer3 = diffType => {
   switch (diffType) {
     case RenderEntries:
       return renderTitleBar;
+    case RenderFocusContext:
+      return renderFocusContext;
     case RenderFocusedIndex:
       return renderFocusedIndex;
     case RenderMenus:
@@ -3587,7 +3569,7 @@ const renderEventListeners = () => {
     params: ['handleClickMinimize']
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', Button$1, ClientX, ClientY]
+    params: ['handleContextMenu', Button, ClientX, ClientY]
   }, {
     name: HandleClickClose,
     params: ['handleClickClose']
@@ -3605,7 +3587,7 @@ const renderEventListeners = () => {
     params: ['handleMenuMouseOver', ClientX, ClientY]
   }, {
     name: HandleClick,
-    params: ['handleClickAt', Button$1, ClientX, ClientY]
+    params: ['handleClickAt', Button, ClientX, ClientY]
   }, {
     name: HandlePointerOut,
     params: ['handlePointerOut', ClientX, ClientY]
@@ -3795,13 +3777,11 @@ const handleClickAt = async (state, button, eventX, eventY) => {
   return handleClick(state, button, index);
 };
 
-const setFocus = async focusKey => {
-  await invoke('Focus.setFocus', focusKey);
-};
-
 const handleFocus = async state => {
-  await setFocus(FocusTitleBarMenuBar);
-  return state;
+  return {
+    ...state,
+    focused: true
+  };
 };
 
 const handleFocusOut = async state => {
@@ -4131,7 +4111,7 @@ const handleMenuClick = async (state, level, index) => {
   switch (item.flags) {
     case Ignore:
       return selectIndexIgnore(state, item);
-    case None$1:
+    case None:
       return selectIndexNone(state, item);
     case RestoreFocus:
       return selectIndexRestoreFocus(state, item);
@@ -4246,7 +4226,6 @@ const commandMap = {
   'TitleBar.closeMenu': closeMenu,
   'TitleBar.create': create,
   'TitleBar.create3': create3,
-  'TitleBar.diff2': diff2,
   'TitleBar.diff3': diff3,
   'TitleBar.focus': wrapCommand(focus),
   'TitleBar.focusFirst': wrapCommand(focusFirst),

package/package.json

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