@lvce-editor/static-server 0.70.2 → 0.70.4

package/static/{1b632a9 → 8c1fe09}/packages/title-bar-worker/dist/titleBarWorkerMain.js

@@ -237,8 +237,8 @@ const getModuleNotFoundError = stderr => {
   const messageIndex = lines.findIndex(isModuleNotFoundMessage);
   const message = lines[messageIndex];
   return {
-    message,
-    code: ERR_MODULE_NOT_FOUND
+    code: ERR_MODULE_NOT_FOUND,
+    message
   };
 };
 const isModuleNotFoundError = stderr => {
@@ -261,14 +261,14 @@ const isUnhelpfulNativeModuleError = stderr => {
 const getNativeModuleErrorMessage = stderr => {
   const message = getMessageCodeBlock(stderr);
   return {
-    message: `Incompatible native node module: ${message}`,
-    code: E_INCOMPATIBLE_NATIVE_MODULE
+    code: E_INCOMPATIBLE_NATIVE_MODULE,
+    message: `Incompatible native node module: ${message}`
   };
 };
 const getModuleSyntaxError = () => {
   return {
-    message: `ES Modules are not supported in electron`,
-    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON
+    code: E_MODULES_NOT_SUPPORTED_IN_ELECTRON,
+    message: `ES Modules are not supported in electron`
   };
 };
 const getHelpfulChildProcessError = (stdout, stderr) => {
@@ -287,8 +287,8 @@ const getHelpfulChildProcessError = (stdout, stderr) => {
     rest
   } = getDetails(lines);
   return {
-    message: actualMessage,
     code: '',
+    message: actualMessage,
     stack: rest
   };
 };
@@ -298,8 +298,8 @@ class IpcError extends VError {
     if (stdout || stderr) {
       // @ts-ignore
       const {
-        message,
         code,
+        message,
         stack
       } = getHelpfulChildProcessError(stdout, stderr);
       const cause = new Error(message);
@@ -360,8 +360,8 @@ const wrap$f = global => {
 };
 const waitForFirstMessage = async port => {
   const {
-    resolve,
-    promise
+    promise,
+    resolve
   } = Promise.withResolvers();
   port.addEventListener('message', resolve, {
     once: true
@@ -381,8 +381,8 @@ const listen$6 = async () => {
   const type = firstMessage.params[0];
   if (type === 'message-port') {
     parentIpc.send({
-      jsonrpc: '2.0',
       id: firstMessage.id,
+      jsonrpc: '2.0',
       result: null
     });
     parentIpc.dispose();
@@ -423,9 +423,103 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   listen: listen$6,
   wrap: wrap$e
 };
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
+};
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
+};
+const getFirstEvent = (eventEmitter, eventMap) => {
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  const listenerMap = Object.create(null);
+  const cleanup = value => {
+    for (const event of Object.keys(eventMap)) {
+      removeListener(eventEmitter, event, listenerMap[event]);
+    }
+    resolve(value);
+  };
+  for (const [event, type] of Object.entries(eventMap)) {
+    const listener = event => {
+      cleanup({
+        event,
+        type
+      });
+    };
+    addListener(eventEmitter, event, listener);
+    listenerMap[event] = listener;
+  }
+  return promise;
+};
+const Message$1 = 3;
+const create$5$1 = async ({
+  isMessagePortOpen,
+  messagePort
+}) => {
+  if (!isMessagePort(messagePort)) {
+    throw new IpcError('port must be of type MessagePort');
+  }
+  if (isMessagePortOpen) {
+    return messagePort;
+  }
+  const eventPromise = getFirstEvent(messagePort, {
+    message: Message$1
+  });
+  messagePort.start();
+  const {
+    event,
+    type
+  } = await eventPromise;
+  if (type !== Message$1) {
+    throw new IpcError('Failed to wait for ipc message');
+  }
+  if (event.data !== readyMessage) {
+    throw new IpcError('unexpected first message');
+  }
+  return messagePort;
+};
+const signal$1 = messagePort => {
+  messagePort.start();
+};
+class IpcParentWithMessagePort extends Ipc {
+  getData = getData$2;
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    this._rawIpc.close();
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
+  onClose(callback) {}
+}
+const wrap$5 = messagePort => {
+  return new IpcParentWithMessagePort(messagePort);
+};
+const IpcParentWithMessagePort$1 = {
+  __proto__: null,
+  create: create$5$1,
+  signal: signal$1,
+  wrap: wrap$5
+};
 
 const Two = '2.0';
-const create$4 = (method, params) => {
+const create$4$1 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -680,7 +774,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$6 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -689,7 +783,7 @@ const create$5 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$6(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -794,13 +888,13 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   return unwrapJsonRpcResult(responseMessage);
 };
 const send = (transport, method, ...params) => {
-  const message = create$4(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 = (ipc, method, ...params) => {
+const invokeAndTransfer$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -839,7 +933,7 @@ const createRpc = ipc => {
       return invoke$1(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer(ipc, method, ...params);
+      return invokeAndTransfer$1(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -877,7 +971,41 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+const create$5 = async ({
+  commandMap,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    messagePort,
+    isMessagePortOpen: true
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  messagePort.start();
+  return rpc;
+};
 const create$3 = async ({
+  commandMap,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$5({
+    commandMap,
+    messagePort: port2
+  });
+};
+const TransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$3
+};
+const create$4 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -889,25 +1017,14 @@ const create$3 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$3
+  create: create$4
 };
 
 const ContentInfo = 'contentinfo';
-const Menu$1 = 'menu';
-const MenuBar$1 = 'menubar';
-const MenuItem$1 = 'menuitem';
-const MenuItemCheckBox = 'menuitemcheckbox';
-const None$1 = 'none';
-const Separator$1 = 'separator';
 
-const Button$1 = 1;
-const Div = 4;
-const Span = 8;
-const Text = 12;
-const I = 16;
-const Img = 17;
+const Div$1 = 4;
 
-const Button = 'event.button';
+const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 const TargetName = 'event.target.name';
@@ -915,16 +1032,16 @@ const TargetName = 'event.target.name';
 const Backspace$1 = 1;
 const Tab$1 = 2;
 const Enter$1 = 3;
-const Escape$1 = 8;
-const Space$1 = 9;
+const Escape$2 = 8;
+const Space$2 = 9;
 const PageUp$1 = 10;
 const PageDown$1 = 11;
-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 End$2 = 255;
+const Home$2 = 12;
+const LeftArrow$2 = 13;
+const UpArrow$2 = 14;
+const RightArrow$2 = 15;
+const DownArrow$2 = 16;
 const Insert$1 = 17;
 const Delete$1 = 18;
 const Digit0$1 = 19;
@@ -981,16 +1098,16 @@ const Unknown = 'Unknown';
 const Backspace = 'Backspace';
 const Tab = 'Tab';
 const Enter = 'Enter';
-const Escape = 'Escape';
-const Space = 'Space';
+const Escape$1 = 'Escape';
+const Space$1 = 'Space';
 const PageUp = 'PageUp';
 const PageDown = 'PageDown';
-const End = 'End';
-const Home = 'Home';
-const LeftArrow = 'LeftArrow';
-const UpArrow = 'UpArrow';
-const RightArrow = 'RightArrow';
-const DownArrow = 'DownArrow';
+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 Insert = 'Insert';
 const Delete = 'Delete';
 const Digit0 = '0';
@@ -1045,34 +1162,14 @@ const Plus = '+';
 
 const getKeyCodeString = keyCode => {
   switch (keyCode) {
+    case Backquote$1:
+      return Backquote;
+    case Backslash$1:
+      return Backslash;
     case Backspace$1:
       return Backspace;
-    case Tab$1:
-      return Tab;
-    case Escape$1:
-      return Escape;
-    case Enter$1:
-      return Enter;
-    case Space$1:
-      return Space;
-    case PageUp$1:
-      return PageUp;
-    case PageDown$1:
-      return PageDown;
-    case End$1:
-      return End;
-    case Home$1:
-      return Home;
-    case LeftArrow$1:
-      return LeftArrow;
-    case UpArrow$1:
-      return UpArrow;
-    case RightArrow$1:
-      return RightArrow;
-    case DownArrow$1:
-      return DownArrow;
-    case Insert$1:
-      return Insert;
+    case Comma$1:
+      return Comma;
     case Delete$1:
       return Delete;
     case Digit0$1:
@@ -1095,6 +1192,32 @@ const getKeyCodeString = keyCode => {
       return Digit8;
     case Digit9$1:
       return Digit9;
+    case DownArrow$2:
+      return DownArrow$1;
+    case End$2:
+      return End$1;
+    case Enter$1:
+      return Enter;
+    case Equal$1:
+      return Equal;
+    case Escape$2:
+      return Escape$1;
+    case F1$1:
+      return F1;
+    case F2$1:
+      return F2;
+    case F3$1:
+      return F3;
+    case F4$1:
+      return F4;
+    case F5$1:
+      return F5;
+    case F6$1:
+      return F6;
+    case Home$2:
+      return Home$1;
+    case Insert$1:
+      return Insert;
     case KeyA$1:
       return KeyA;
     case KeyB$1:
@@ -1147,32 +1270,26 @@ const getKeyCodeString = keyCode => {
       return KeyY;
     case KeyZ$1:
       return KeyZ;
-    case F1$1:
-      return F1;
-    case F2$1:
-      return F2;
-    case F3$1:
-      return F3;
-    case F4$1:
-      return F4;
-    case F5$1:
-      return F5;
-    case F6$1:
-      return F6;
-    case Backslash$1:
-      return Backslash;
-    case Equal$1:
-      return Equal;
-    case Comma$1:
-      return Comma;
-    case Backquote$1:
-      return Backquote;
+    case LeftArrow$2:
+      return LeftArrow$1;
+    case Minus$1:
+      return Minus;
+    case PageDown$1:
+      return PageDown;
+    case PageUp$1:
+      return PageUp;
     case Plus$1:
       return Plus;
+    case RightArrow$2:
+      return RightArrow$1;
+    case Space$2:
+      return Space$1;
     case Star$1:
       return Star;
-    case Minus$1:
-      return Minus;
+    case Tab$1:
+      return Tab;
+    case UpArrow$2:
+      return UpArrow$1;
     default:
       return Unknown;
   }
@@ -1184,27 +1301,31 @@ const Shift = 1 << 10 >>> 0;
 const Edit$2 = 2;
 const File$3 = 5;
 const Go$2 = 6;
-const Help$2 = 7;
+const Help$3 = 7;
 const OpenRecent$1 = 9;
 const Run$2 = 10;
 const Selection$2 = 11;
 const Terminal$2 = 14;
-const TitleBar = 15;
+const TitleBar$1 = 15;
 const View$2 = 16;
 const TitleBarContextMenu = 90;
 
+const SubMenu$2 = 4;
+
 const parseKey = rawKey => {
   const isCtrl = Boolean(rawKey & CtrlCmd);
   const isShift = Boolean(rawKey & Shift);
   const keyCode = rawKey & 0x00_00_00_ff;
   const key = getKeyCodeString(keyCode);
   return {
-    key,
     isCtrl,
-    isShift
+    isShift,
+    key
   };
 };
 
+const Electron$1 = 2;
+
 const RendererWorker = 1;
 
 const FocusTitleBarMenuBar = 26;
@@ -1219,6 +1340,10 @@ const get$1 = id => {
 
 const create$2 = rpcId => {
   return {
+    async dispose() {
+      const rpc = get$1(rpcId);
+      await rpc.dispose();
+    },
     // @ts-ignore
     invoke(method, ...params) {
       const rpc = get$1(rpcId);
@@ -1233,17 +1358,40 @@ const create$2 = rpcId => {
     },
     set(rpc) {
       set$2(rpcId, rpc);
-    },
-    async dispose() {
-      const rpc = get$1(rpcId);
-      await rpc.dispose();
     }
   };
 };
 
 const {
   invoke,
-  set: set$1} = create$2(RendererWorker);
+  invokeAndTransfer,
+  set: set$1
+} = create$2(RendererWorker);
+const showContextMenu2 = async (uid, menuId, x, y, args) => {
+  number(uid);
+  number(menuId);
+  number(x);
+  number(y);
+  // @ts-ignore
+  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+};
+const sendMessagePortToTextMeasurementWorker = async port => {
+  const command = 'TextMeasurement.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
+};
+const minimizeWindow = async () => {
+  // @ts-ignore
+  return invoke('ElectronWindow.minimize');
+};
+const maximizeWindow = async () => {
+  // @ts-ignore
+  return invoke('ElectronWindow.maximize');
+};
+const closeWindow = async () => {
+  // @ts-ignore
+  return invoke('ElectronWindow.close');
+};
 
 const toCommandId = key => {
   const dotIndex = key.indexOf('.');
@@ -1339,6 +1487,7 @@ const createDefaultState = (uid = DEFAULT_UID) => ({
   assetDir: '',
   buttons: [],
   commandCenterEnabled: false,
+  commandMap: {},
   controlsOverlayEnabled: false,
   focusedIndex: -1,
   height: 30,
@@ -1369,6 +1518,18 @@ const createDefaultState = (uid = DEFAULT_UID) => ({
   y: 0
 });
 
+const HandleClick = 1;
+const HandleClickMinimize = 2;
+const HandleClickClose = 3;
+const HandleClickToggleMaximize = 4;
+const HandleFocusIn = 5;
+const HandleFocusOut = 6;
+const HandlePointerOut = 7;
+const HandlePointerOver = 8;
+const HandleMenuClick = 9;
+const HandleMenuMouseOver = 10;
+const HandleContextMenu = 11;
+
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -1385,12 +1546,13 @@ const About = 'About';
 const CheckForUpdates = 'Check For Updates';
 const ClearRecentlyOpened = 'Clear Recently Opened';
 const Close = 'Close';
-const MenuBar = 'Menu Bar';
+const Exit = 'Exit';
+const MenuBar$1 = 'Menu Bar';
 const CommandCenter = 'Command Center';
 const Edit$1 = 'Edit';
 const File$2 = 'File';
 const Go$1 = 'Go';
-const Help$1 = 'Help';
+const Help$2 = 'Help';
 const Maximize = 'Maximize';
 const Minimize = 'Minimize';
 const MoreDot = 'More ...';
@@ -1406,22 +1568,22 @@ const AddCursorBelow = 'Add Cursor Below';
 const AddCursorsToLineEnds = 'Add Cursors to Line ends';
 const AddNextOccurrence = 'Add Next Occurrence';
 const AddPreviousOccurrence = 'Add Previous Occurrence';
-const Copy = 'Copy';
+const Copy$1 = 'Copy';
 const CopyLineDown = 'Copy Line Down';
 const CopyLineUp = 'Copy Line Up';
-const Cut = 'Cut';
+const Cut$1 = 'Cut';
 const DuplicateSelection = 'Duplicate Selection';
 const ExpandSelection = 'Expand Selection';
 const MoveLineDown = 'Move Line Down';
 const MoveLineUp = 'Move Line Up';
-const Paste = 'Paste';
-const Redo = 'Redo';
-const SelectAll = 'Select All';
+const Paste$1 = 'Paste';
+const Redo$1 = 'Redo';
+const SelectAll$1 = 'Select All';
 const SelectAllOccurrences = 'Select All Occurrences';
 const ShrinkSelection = 'Shrink Selection';
 const ToggleBlockComment = 'Toggle Block Comment';
 const ToggleLineComment = 'Toggle Line Comment';
-const Undo = 'Undo';
+const Undo$1 = 'Undo';
 
 const file = () => {
   return i18nString(File$2);
@@ -1445,7 +1607,7 @@ const terminal = () => {
   return i18nString(Terminal$1);
 };
 const help = () => {
-  return i18nString(Help$1);
+  return i18nString(Help$2);
 };
 const minimize$1 = () => {
   return i18nString(Minimize);
@@ -1457,11 +1619,35 @@ const close$1 = () => {
   return i18nString(Close);
 };
 const menuBar = () => {
-  return i18nString(MenuBar);
+  return i18nString(MenuBar$1);
 };
 const commandCenter = () => {
   return i18nString(CommandCenter);
 };
+const copy$1 = () => {
+  return i18nString(Copy$1);
+};
+const cut$1 = () => {
+  return i18nString(Cut$1);
+};
+const exit$1 = () => {
+  return i18nString(Exit);
+};
+const paste$1 = () => {
+  return i18nString(Paste$1);
+};
+const redo$1 = () => {
+  return i18nString(Redo$1);
+};
+const selectAll$1 = () => {
+  return i18nString(SelectAll$1);
+};
+const toggleDeveloperTools$1 = () => {
+  return i18nString(ToggleDeveloperTools);
+};
+const undo$1 = () => {
+  return i18nString(Undo$1);
+};
 
 const getTitleBarButtonsElectron = (controlsOverlayEnabled, titleBarStyleCustom) => {
   if (controlsOverlayEnabled) {
@@ -1473,17 +1659,17 @@ const getTitleBarButtonsElectron = (controlsOverlayEnabled, titleBarStyleCustom)
       icon: 'Minimize',
       id: 'Minimize',
       label: minimize$1(),
-      onClick: 'handleClickMinimize'
+      onClick: HandleClickMinimize
     }, {
       icon: 'Maximize',
       id: 'ToggleMaximize',
       label: maximize$1(),
-      onClick: 'handleClickToggleMaximize'
+      onClick: HandleClickToggleMaximize
     }, {
       icon: 'ChromeClose',
       id: 'Close',
       label: close$1(),
-      onClick: 'handleClickClose'
+      onClick: HandleClickClose
     }];
   }
   return [];
@@ -1525,6 +1711,7 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
     ...createDefaultState(),
     assetDir,
     commandCenterEnabled: false,
+    commandMap: {},
     controlsOverlayEnabled,
     focusedIndex: -1,
     height,
@@ -1610,61 +1797,9 @@ const diff3 = uid => {
   return diffResult;
 };
 
-const mergeClassNames = (...classNames) => {
-  return classNames.filter(Boolean).join(' ');
-};
-
-const px = value => {
-  return `${value}px`;
-};
-
-const text = data => {
-  return {
-    type: Text,
-    text: data,
-    childCount: 0
-  };
-};
-
-const getKeyBindings = () => {
-  return [{
-    command: 'TitleBar.handleKeyArrowDown',
-    key: DownArrow$1,
-    when: FocusTitleBarMenuBar
-  }, {
-    command: 'TitleBar.handleKeyArrowUp',
-    key: UpArrow$1,
-    when: FocusTitleBarMenuBar
-  }, {
-    command: 'TitleBar.handleKeyArrowRight',
-    key: RightArrow$1,
-    when: FocusTitleBarMenuBar
-  }, {
-    command: 'TitleBar.handleKeyArrowLeft',
-    key: LeftArrow$1,
-    when: FocusTitleBarMenuBar
-  }, {
-    command: 'TitleBar.handleKeySpace',
-    key: Space$1,
-    when: FocusTitleBarMenuBar
-  }, {
-    command: 'TitleBar.handleKeyHome',
-    key: Home$1,
-    when: FocusTitleBarMenuBar
-  }, {
-    command: 'TitleBar.handleKeyEnd',
-    key: End$1,
-    when: FocusTitleBarMenuBar
-  }, {
-    command: 'TitleBar.handleKeyEscape',
-    key: Escape$1,
-    when: FocusTitleBarMenuBar
-  }];
-};
-
-const Separator = 1;
-const None = 0;
-const SubMenu = 4;
+const Separator$2 = 1;
+const None$1 = 0;
+const SubMenu$1 = 4;
 const Checked = 2;
 const Unchecked = 3;
 const Disabled = 5;
@@ -1697,23 +1832,23 @@ const getMenuEntriesTitleBarContextMenu = async state => {
 
 const MenuIdTitleBarContextMenu = 50;
 const getMenuIds = () => {
-  return [Edit$2, File$3, Go$2, Help$2, OpenRecent$1, Run$2, Selection$2, Terminal$2, TitleBar, View$2, MenuIdTitleBarContextMenu, TitleBarContextMenu];
+  return [Edit$2, File$3, Go$2, Help$3, OpenRecent$1, Run$2, Selection$2, Terminal$2, TitleBar$1, View$2, MenuIdTitleBarContextMenu, TitleBarContextMenu];
 };
 
 const cut = () => {
-  return i18nString(Cut);
+  return i18nString(Cut$1);
 };
 const copy = () => {
-  return i18nString(Copy);
+  return i18nString(Copy$1);
 };
 const paste = () => {
-  return i18nString(Paste);
+  return i18nString(Paste$1);
 };
 const undo = () => {
-  return i18nString(Undo);
+  return i18nString(Undo$1);
 };
 const redo = () => {
-  return i18nString(Redo);
+  return i18nString(Redo$1);
 };
 const toggleLineComment = () => {
   return i18nString(ToggleLineComment);
@@ -1722,7 +1857,7 @@ const toggleBlockComment = () => {
   return i18nString(ToggleBlockComment);
 };
 const selectAll = () => {
-  return i18nString(SelectAll);
+  return i18nString(SelectAll$1);
 };
 const expandSelection = () => {
   return i18nString(ExpandSelection);
@@ -1766,7 +1901,7 @@ const selectAllOccurrences = () => {
 
 const menuEntrySeparator = {
   command: '',
-  flags: Separator,
+  flags: Separator$2,
   id: 'separator',
   label: ''
 };
@@ -1774,37 +1909,37 @@ const menuEntrySeparator = {
 const getMenuEntries$c = () => {
   return [{
     command: /* TODO */'-1',
-    flags: None,
+    flags: None$1,
     id: 'undo',
     label: undo()
   }, {
     command: /* TODO */'-1',
-    flags: None,
+    flags: None$1,
     id: 'redo',
     label: redo()
   }, menuEntrySeparator, {
     command: /* Editor.cut */'Editor.cut',
-    flags: None,
+    flags: None$1,
     id: 'cut',
     label: cut()
   }, {
     command: /* Editor.copy */'Editor.copy',
-    flags: None,
+    flags: None$1,
     id: 'copy',
     label: copy()
   }, {
     command: /* Editor.paste */'Editor.paste',
-    flags: None,
+    flags: None$1,
     id: 'paste',
     label: paste()
   }, menuEntrySeparator, {
     command: /* Editor.toggleLineComment */'Editor.toggleLineComment',
-    flags: None,
+    flags: None$1,
     id: 'toggle-line-comment',
     label: toggleLineComment()
   }, {
     command: /* Editor.toggleBlockComment */'Editor.toggleBlockComment',
-    flags: None,
+    flags: None$1,
     id: 'toggle-block-comment',
     label: toggleBlockComment()
   }];
@@ -1850,27 +1985,28 @@ const exit = () => {
 const Edit = 2;
 const File$1 = 5;
 const Go = 6;
-const Help = 7;
+const Help$1 = 7;
 const OpenRecent = 9;
 const Run = 10;
 const Selection = 11;
 const Terminal = 14;
+const TitleBar = 15;
 const View = 16;
 
 const getMenuEntries$b = platform => {
   const entries = [{
     command: '-1',
-    flags: None,
+    flags: None$1,
     id: 'newFile',
     label: newFile()
   }, {
     command: 'Window.openNew',
-    flags: None,
+    flags: None$1,
     id: 'newWindow',
     label: newWindow()
   }, menuEntrySeparator, {
     command: 'Dialog.openFile',
-    flags: None,
+    flags: None$1,
     id: 'openFile',
     label: openFile()
   }, {
@@ -1880,17 +2016,17 @@ const getMenuEntries$b = platform => {
     label: openFolder()
   }, {
     command: '',
-    flags: SubMenu,
+    flags: SubMenu$1,
     id: OpenRecent,
     label: openRecent()
   }, menuEntrySeparator, {
     command: 'Main.save',
-    flags: None,
+    flags: None$1,
     id: 'save',
     label: save()
   }, {
     command: 'Main.saveAll',
-    flags: None,
+    flags: None$1,
     id: 'saveAll',
     label: saveAll()
   }];
@@ -1935,7 +2071,7 @@ const getMenuEntries$9 = async platform => {
   if (platform !== Web) {
     entries.push({
       command: 'Developer.toggleDeveloperTools',
-      flags: None,
+      flags: None$1,
       id: 'toggleDeveloperTools',
       label: toggleDeveloperTools()
     }, {
@@ -1958,7 +2094,7 @@ const getMenuEntries$9 = async platform => {
   }
   entries.push({
     command: 'About.showAbout',
-    flags: None,
+    flags: None$1,
     id: 'about',
     label: about()
   });
@@ -1999,7 +2135,7 @@ const toMenuItem = folder => {
   return {
     args: [folder],
     command: 'Workspace.setPath',
-    flags: None,
+    flags: None$1,
     label
   };
 };
@@ -2012,12 +2148,12 @@ const getMenuEntries$8 = async () => {
   }
   items.push({
     command: 'QuickPick.showRecent',
-    flags: None,
+    flags: None$1,
     id: 'more',
     label: moreDot()
   }, menuEntrySeparator, {
     command: 'RecentlyOpened.clearRecentlyOpened',
-    flags: None,
+    flags: None$1,
     id: 'clearRecentlyOpened',
     label: clearRecentlyOpened()
   });
@@ -2031,72 +2167,72 @@ const getMenuEntries$7 = () => {
 const getMenuEntries$6 = () => {
   return [{
     command: 'Editor.selectAll',
-    flags: None,
+    flags: None$1,
     id: 'selectAll',
     label: selectAll()
   }, {
     command: 'Editor.expandSelection',
-    flags: None,
+    flags: None$1,
     id: 'expandSelection',
     label: expandSelection()
   }, {
     command: 'Editor.shrinkSelection',
-    flags: None,
+    flags: None$1,
     id: 'shrinkSelection',
     label: shrinkSelection()
   }, menuEntrySeparator, {
     command: 'Editor.copyLineUp',
-    flags: None,
+    flags: None$1,
     id: 'copyLineUp',
     label: copyLineUp()
   }, {
     command: 'Editor.copyLineDown',
-    flags: None,
+    flags: None$1,
     id: 'copyLineDown',
     label: copyLineDown()
   }, {
     command: 'Editor.moveLineUp',
-    flags: None,
+    flags: None$1,
     id: 'moveLineUp',
     label: moveLineUp()
   }, {
     command: 'Editor.moveLineDown',
-    flags: None,
+    flags: None$1,
     id: 'moveLineDown',
     label: moveLineDown()
   }, {
     command: 'Editor.duplicateSelection',
-    flags: None,
+    flags: None$1,
     id: 'duplicateSelection',
     label: duplicateSelection()
   }, menuEntrySeparator, {
     command: 'Editor.addCursorAbove',
-    flags: None,
+    flags: None$1,
     id: 'addCursorAbove',
     label: addCursorAbove()
   }, {
     command: 'Editor.addCursorBelow',
-    flags: None,
+    flags: None$1,
     id: 'addCursorBelow',
     label: addCursorBelow()
   }, {
     command: 'Editor.addCursorsToLineEnds',
-    flags: None,
+    flags: None$1,
     id: 'addCursorsToLineEnds',
     label: addCursorsToLineEnds()
   }, {
     command: 'Editor.addNextOccurrence',
-    flags: None,
+    flags: None$1,
     id: 'addNextOccurrence',
     label: addNextOccurrence()
   }, {
     command: 'Editor.addPreviousOccurrence',
-    flags: None,
+    flags: None$1,
     id: 'addPreviousOccurrence',
     label: addPreviousOccurrence()
   }, {
     command: 'Editor.selectAllOccurrences',
-    flags: None,
+    flags: None$1,
     id: 'selectAllOccurrences',
     label: selectAllOccurrences()
   }];
@@ -2106,52 +2242,400 @@ const getMenuEntries$5 = () => {
   return [{
     args: ['Terminal'],
     command: 'Layout.togglePanel',
-    flags: None,
+    flags: None$1,
     id: 'newTerminal',
     label: i18nString(NewTerminal)
   }];
 };
 
 const getMenuEntries$4 = () => {
-  return [];
-};
-
-const getMenuEntries2 = async (state, props) => {
-  switch (props.menuId) {
-    case Edit$2:
-      return getMenuEntries$c();
-    case File$3:
-      return getMenuEntries$b(props.platform);
-    case Go$2:
-      return getMenuEntries$a();
-    case Help$2:
-      return getMenuEntries$9(props.platform);
-    case OpenRecent$1:
-      return getMenuEntries$8();
-    case Run$2:
-      return getMenuEntries$7();
-    case Selection$2:
-      return getMenuEntries$6();
-    case Terminal$2:
-      return getMenuEntries$5();
-    case TitleBarContextMenu:
-    case MenuIdTitleBarContextMenu:
-      return getMenuEntriesTitleBarContextMenu(state);
-    case View$2:
-      return getMenuEntries$4();
-    default:
-      return [];
-  }
-};
-
+  return [{
+    command: '',
+    flags: SubMenu$1,
+    id: File$1,
+    label: file()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Edit,
+    label: edit()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Selection,
+    label: selection()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: View,
+    label: view()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Go,
+    label: go()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Run,
+    keyboardShortCut: 'Alt+r',
+    label: run()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Terminal,
+    keyboardShortCut: 'Alt+t',
+    label: terminal()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Help$1,
+    keyboardShortCut: 'Alt+h',
+    label: help()
+  }];
+};
+
+const getMenuEntries$3 = () => {
+  return [{
+    command: '',
+    flags: None$1,
+    id: File$1,
+    label: file()
+  }, {
+    command: '',
+    flags: None$1,
+    id: Edit,
+    label: edit()
+  }, {
+    command: '',
+    flags: None$1,
+    id: Selection,
+    label: selection()
+  }, {
+    command: '',
+    flags: None$1,
+    id: View,
+    label: view()
+  }, {
+    command: '',
+    flags: None$1,
+    id: Go,
+    label: go()
+  }, {
+    command: '',
+    flags: None$1,
+    id: Help$1,
+    label: help()
+  }];
+};
+
+const getFn$1 = platform => {
+  switch (platform) {
+    case Web:
+      return getMenuEntries$3;
+    default:
+      return getMenuEntries$4;
+  }
+};
+const getMenuEntries$2 = async platform => {
+  const fn = getFn$1(platform);
+  return fn();
+};
+
+const getMenuEntries$1 = () => {
+  return [];
+};
+
+const getMenuEntries2 = async (state, props) => {
+  switch (props.menuId) {
+    case Edit$2:
+      return getMenuEntries$c();
+    case File$3:
+      return getMenuEntries$b(props.platform);
+    case Go$2:
+      return getMenuEntries$a();
+    case Help$3:
+      return getMenuEntries$9(props.platform);
+    case OpenRecent$1:
+      return getMenuEntries$8();
+    case Run$2:
+      return getMenuEntries$7();
+    case Selection$2:
+      return getMenuEntries$6();
+    case Terminal$2:
+      return getMenuEntries$5();
+    case TitleBar$1:
+      return getMenuEntries$2(props.platform);
+    case TitleBarContextMenu:
+    case MenuIdTitleBarContextMenu:
+      return getMenuEntriesTitleBarContextMenu(state);
+    case View$2:
+      return getMenuEntries$1();
+    default:
+      return [];
+  }
+};
+
+const getEntryMap = async (state, menuIds, platform) => {
+  const map = Object.create(null);
+  for (const id of menuIds) {
+    const entries = await getMenuEntries2(state, {
+      // @ts-ignore
+      menuId: id,
+      platform
+    });
+    map[id] = entries;
+  }
+  return map;
+};
+
+// TODO cache window id
+
+const getWindowId = async () => {
+  const windowId = await invoke('GetWindowId.getWindowId');
+  return windowId;
+};
+
+// based on https://www.electronjs.org/docs/latest/api/menu-item#new-menuitemoptions
+
+const Undo = 'undo';
+const Redo = 'redo';
+const Cut = 'cut';
+const Copy = 'copy';
+const Paste = 'paste';
+const SelectAll = 'selectAll';
+const ToggleDevTools = 'toggleDevTools';
+const Help = 'help';
+const Quit = 'quit';
+const FileMenu = 'fileMenu';
+const EditMenu = 'editMenu';
+
+// based on https://www.electronjs.org/docs/latest/api/menu-item#new-menuitemoptions
+const Separator$1 = 'separator';
+const SubMenu = 'submenu';
+
+const toElectronMenuItem = entry => {
+  switch (entry.label) {
+    case copy$1():
+      return {
+        label: entry.label,
+        role: Copy
+      };
+    case cut$1():
+      return {
+        label: entry.label,
+        role: Cut
+      };
+    case edit():
+      return {
+        label: entry.label,
+        role: EditMenu,
+        submenu: []
+      };
+    case exit$1():
+      return {
+        label: entry.label,
+        role: Quit
+      };
+    case file():
+      return {
+        label: entry.label,
+        role: FileMenu,
+        submenu: []
+      };
+    case help():
+      return {
+        label: entry.label,
+        role: Help,
+        submenu: []
+      };
+    case paste$1():
+      return {
+        label: entry.label,
+        role: Paste
+      };
+    case redo$1():
+      return {
+        label: entry.label,
+        role: Redo
+      };
+    case selectAll$1():
+      return {
+        label: entry.label,
+        role: SelectAll
+      };
+    case toggleDeveloperTools$1():
+      return {
+        label: entry.label,
+        role: ToggleDevTools
+      };
+    case undo$1():
+      return {
+        label: entry.label,
+        role: Undo
+      };
+  }
+  switch (entry.flags) {
+    case Separator$2:
+      return {
+        type: Separator$1
+      };
+    case SubMenu$1:
+      return {
+        label: entry.label,
+        submenu: [],
+        type: SubMenu
+      };
+    default:
+      return {
+        label: entry.label
+      };
+  }
+};
+
+const toElectronMenuInternal = (commandMap, map, id, electronMenu) => {
+  object(commandMap);
+  object(map);
+  number(id);
+  array(electronMenu);
+  const entries = map[id];
+  array(entries);
+  for (const entry of entries) {
+    if (entry.command) {
+      commandMap[entry.label] = {
+        args: entry.args,
+        command: entry.command
+      };
+    }
+    const electronEntry = toElectronMenuItem(entry);
+    if (entry.flags === SubMenu$2) {
+      toElectronMenuInternal(commandMap, map, entry.id, electronEntry.submenu);
+    }
+    electronMenu.push(electronEntry);
+  }
+  return {
+    commandMap,
+    electronMenu
+  };
+};
+
+const toElectronMenu = (map, rootId) => {
+  const electronMenu = [];
+  const commandMap = Object.create(null);
+  toElectronMenuInternal(commandMap, map, rootId, electronMenu);
+  return {
+    commandMap,
+    electronMenu
+  };
+};
+
+const setItems = async items => {
+  const windowId = await getWindowId();
+  return invoke('WebView.compatSharedProcessInvoke', 'ElectronApplicationMenu.setItems', windowId, items);
+};
+const hydrate = async state => {
+  const {
+    platform
+  } = state;
+  const ids = getMenuIds();
+  const map = await getEntryMap(state, ids, platform);
+  const {
+    commandMap,
+    electronMenu
+  } = toElectronMenu(map, TitleBar);
+  await setItems(electronMenu);
+  // TODO get all menu items
+  // TODO send menu items to electron
+  // TODO add listener for when menu items change
+  return {
+    ...state,
+    commandMap
+  };
+};
+
+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(' ');
+};
+
+const px = value => {
+  return `${value}px`;
+};
+
+const text = data => {
+  return {
+    type: Text,
+    text: data,
+    childCount: 0
+  };
+};
+
+const getKeyBindings = () => {
+  return [{
+    command: 'TitleBar.handleKeyArrowDown',
+    key: DownArrow,
+    when: FocusTitleBarMenuBar
+  }, {
+    command: 'TitleBar.handleKeyArrowUp',
+    key: UpArrow,
+    when: FocusTitleBarMenuBar
+  }, {
+    command: 'TitleBar.handleKeyArrowRight',
+    key: RightArrow,
+    when: FocusTitleBarMenuBar
+  }, {
+    command: 'TitleBar.handleKeyArrowLeft',
+    key: LeftArrow,
+    when: FocusTitleBarMenuBar
+  }, {
+    command: 'TitleBar.handleKeySpace',
+    key: Space,
+    when: FocusTitleBarMenuBar
+  }, {
+    command: 'TitleBar.handleKeyHome',
+    key: Home,
+    when: FocusTitleBarMenuBar
+  }, {
+    command: 'TitleBar.handleKeyEnd',
+    key: End,
+    when: FocusTitleBarMenuBar
+  }, {
+    command: 'TitleBar.handleKeyEscape',
+    key: Escape,
+    when: FocusTitleBarMenuBar
+  }];
+};
+
 const maximize = async () => {
-  await invoke('ElectronWindow.maximize');
+  await maximizeWindow();
 };
 const minimize = async () => {
-  await invoke('ElectronWindow.minimize');
+  await minimizeWindow();
 };
 const close = async () => {
-  await invoke('ElectronWindow.close');
+  await closeWindow();
 };
 
 const handleClickClose = async state => {
@@ -2185,8 +2669,7 @@ const handleClick$1 = async (state, className) => {
 };
 
 const show2 = async (uid, menuId, x, y, args) => {
-  // @ts-ignore
-  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+  await showContextMenu2(uid, menuId, x, y, args);
 };
 
 const handleContextMenu = async (state, button, eventX, eventY) => {
@@ -2199,6 +2682,22 @@ const handleContextMenu = async (state, button, eventX, eventY) => {
   return state;
 };
 
+const handleElectronMenuClick = async (state, label) => {
+  const {
+    commandMap
+  } = state;
+  const commandPair = commandMap[label];
+  if (!commandPair) {
+    throw new Error(`no command found for ${label}`);
+  }
+  const {
+    args = [],
+    command
+  } = commandPair;
+  await invoke(command, ...args);
+  return state;
+};
+
 const getMenuOffset = (x, clientX, iconWidth) => {
   return clientX - x - iconWidth;
 };
@@ -2233,7 +2732,7 @@ const getMenuHeight = items => {
   let height = CONTEXT_MENU_PADDING;
   for (const item of items) {
     switch (item.flags) {
-      case Separator:
+      case Separator$2:
         height += CONTEXT_MENU_SEPARATOR_HEIGHT;
         break;
       default:
@@ -2290,7 +2789,7 @@ const getIndexToFocusPrevious = menu => {
 const canBeFocused = item => {
   switch (item.flags) {
     case Disabled:
-    case Separator:
+    case Separator$2:
       return false;
     default:
       return true;
@@ -2465,7 +2964,34 @@ const getFontString = (fontWeight, fontSize, fontFamily) => {
   return `${fontWeight} ${fontSize}px ${fontFamily}`;
 };
 
-const measureTextWidths = (texts, fontWeight, fontSize, fontFamily, letterSpacing) => {
+const launchTextMeasurementWorker = async () => {
+  const rpc = await TransferMessagePortRpcParent.create({
+    commandMap: {},
+    async send(port) {
+      await sendMessagePortToTextMeasurementWorker(port);
+    }
+  });
+  return {
+    invoke: rpc.invoke.bind(rpc),
+    async [Symbol.asyncDispose]() {
+      await rpc.dispose();
+    }
+  };
+};
+
+const measureTextWidths2 = async (texts, fontWeight, fontSize, fontFamily, letterSpacing) => {
+  if (typeof letterSpacing !== 'number') {
+    throw new TypeError('letterSpacing must be of type number');
+  }
+  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;
+};
+
+const measureTextWidthsOld = async (texts, fontWeight, fontSize, fontFamily, letterSpacing) => {
   if (typeof letterSpacing !== 'number') {
     throw new TypeError('letterSpacing must be of type number');
   }
@@ -2482,13 +3008,20 @@ const measureTextWidths = (texts, fontWeight, fontSize, fontFamily, letterSpacin
   }
   return widths;
 };
+const measureTextWidths = async (texts, fontWeight, fontSize, fontFamily, letterSpacing) => {
+  try {
+    return measureTextWidths2(texts, fontWeight, fontSize, fontFamily, letterSpacing);
+  } catch {
+    return measureTextWidthsOld(texts, fontWeight, fontSize, fontFamily, letterSpacing);
+  }
+};
 
 const getLabel = entry => {
   return entry.label;
 };
-const addWidths = (entries, labelPadding, fontWeight, fontSize, fontFamily, letterSpacing) => {
+const addWidths = async (entries, labelPadding, fontWeight, fontSize, fontFamily, letterSpacing) => {
   const labels = entries.map(getLabel);
-  const widths = measureTextWidths(labels, fontWeight, fontSize, fontFamily, letterSpacing);
+  const widths = await measureTextWidths(labels, fontWeight, fontSize, fontFamily, letterSpacing);
   const withWidths = [];
   for (let i = 0; i < entries.length; i++) {
     const entry = entries[i];
@@ -2514,100 +3047,6 @@ const getTitle = workspaceUri => {
   return baseName;
 };
 
-const getMenuEntries$3 = () => {
-  return [{
-    command: '',
-    flags: SubMenu,
-    id: File$1,
-    label: file()
-  }, {
-    command: '',
-    flags: SubMenu,
-    id: Edit,
-    label: edit()
-  }, {
-    command: '',
-    flags: SubMenu,
-    id: Selection,
-    label: selection()
-  }, {
-    command: '',
-    flags: SubMenu,
-    id: View,
-    label: view()
-  }, {
-    command: '',
-    flags: SubMenu,
-    id: Go,
-    label: go()
-  }, {
-    command: '',
-    flags: SubMenu,
-    id: Run,
-    keyboardShortCut: 'Alt+r',
-    label: run()
-  }, {
-    command: '',
-    flags: SubMenu,
-    id: Terminal,
-    keyboardShortCut: 'Alt+t',
-    label: terminal()
-  }, {
-    command: '',
-    flags: SubMenu,
-    id: Help,
-    keyboardShortCut: 'Alt+h',
-    label: help()
-  }];
-};
-
-const getMenuEntries$2 = () => {
-  return [{
-    command: '',
-    flags: None,
-    id: File$1,
-    label: file()
-  }, {
-    command: '',
-    flags: None,
-    id: Edit,
-    label: edit()
-  }, {
-    command: '',
-    flags: None,
-    id: Selection,
-    label: selection()
-  }, {
-    command: '',
-    flags: None,
-    id: View,
-    label: view()
-  }, {
-    command: '',
-    flags: None,
-    id: Go,
-    label: go()
-  }, {
-    command: '',
-    flags: None,
-    id: Help,
-    label: help()
-  }];
-};
-
-const getFn$1 = platform => {
-  switch (platform) {
-    case Web:
-      return getMenuEntries$2;
-    default:
-      return getMenuEntries$3;
-  }
-};
-const getMenuEntries$1 = async platform => {
-  const fn = getFn$1(platform);
-  return fn();
-};
-
 const loadContent2 = async state => {
   const {
     controlsOverlayEnabled,
@@ -2619,12 +3058,18 @@ const loadContent2 = async state => {
     platform,
     titleBarStyleCustom
   } = state;
-  const titleBarEntries = await getMenuEntries$1(platform);
-  const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
+  const titleBarEntries = await getMenuEntries$2(platform);
+  const withWidths = await addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
   const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
   const workspaceUri = await invoke('Workspace.getUri');
   const title = getTitle(workspaceUri);
   const iconWidth = 30;
+
+  // TODO load preferences here
+
+  if (titleBarStyleCustom === false && platform === Electron$1) {
+    return hydrate(state);
+  }
   return {
     ...state,
     buttons,
@@ -2750,7 +3195,7 @@ const getMenuItemsNoopDom = () => {
 const separator = {
   childCount: 1,
   className: MenuItemSeparator,
-  role: Separator$1,
+  role: Separator,
   type: Div
 };
 const separatorLine = {
@@ -2810,12 +3255,12 @@ const getMenuItemRenderer = flags => {
     case Disabled:
       return getMenuItemDisabledDom;
     case Ignore:
-    case None:
+    case None$1:
     case RestoreFocus:
       return getMenuItemDefaultDom;
-    case Separator:
+    case Separator$2:
       return getMenuItemSeparatorDom;
-    case SubMenu:
+    case SubMenu$1:
       return getMenuItemSubMenuDom;
     case Unchecked:
       return getMenuItemUncheckedDom;
@@ -2908,7 +3353,7 @@ const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
     className: `MaskIcon MaskIcon${icon}`,
-    role: None$1,
+    role: None,
     type
   };
 };
@@ -2925,7 +3370,7 @@ const createTitleBarButton = button => {
     childCount: 1,
     className: `TitleBarButton TitleBarButton${id}`,
     onClick,
-    type: Button$1
+    type: Button
   }, getIconVirtualDom(icon, I)];
   return dom;
 };
@@ -2959,18 +3404,6 @@ const getTitleBarIconVirtualDom = (titleBarIconEnabled, iconSrc) => {
   }];
 };
 
-const HandleClick = 1;
-const HandleClickMinimize = 2;
-const HandleClickToggleClose = 3;
-const HandleClickToggleMaximize = 4;
-const HandleFocusIn = 5;
-const HandleFocusOut = 6;
-const HandlePointerOut = 7;
-const HandlePointerOver = 8;
-const HandleMenuClick = 9;
-const HandleMenuMouseOver = 10;
-const HandleContextMenu = 11;
-
 const getItemVirtualDom = item => {
   // @ts-ignore
   const {
@@ -2994,7 +3427,7 @@ const getItemVirtualDom = item => {
     name: label,
     // TODO have separate name attribute
     role: MenuItem$1,
-    type: Button$1
+    type: Button
   }, ...(isFocused ? [{
     childCount: 1,
     className: TitleBarTopLevelEntryLabel,
@@ -3020,7 +3453,7 @@ const getTitleBarMenuBarVirtualDom = (menuBarEnabled, visibleItems, focusedIndex
     onMouseDown: HandleClick,
     onPointerOut: HandlePointerOut,
     onPointerOver: HandlePointerOver,
-    role: MenuBar$1,
+    role: MenuBar,
     tabIndex: 0,
     type: Div
   }, ...getTitleBarMenuBarItemsVirtualDom(visibleItems)];
@@ -3029,7 +3462,7 @@ const getTitleBarMenuBarVirtualDom = (menuBarEnabled, visibleItems, focusedIndex
 const parentNode = {
   childCount: 1,
   className: 'TitleBarTitle',
-  type: Div
+  type: Div$1
 };
 const getTitleVirtualDom = (titleBarTitleEnabled, title) => {
   if (!titleBarTitleEnabled) {
@@ -3089,9 +3522,16 @@ const getTitleBarVirtualDom = state => {
     titleBarEntries,
     titleBarIconEnabled,
     titleBarMenuBarEnabled,
+    titleBarStyleCustom,
     titleBarTitleEnabled,
     width
   } = state;
+  if (!titleBarStyleCustom) {
+    return [{
+      childCount: 0,
+      type: Div$1
+    }];
+  }
   const iconSrc = getIcon(assetDir);
   const visibleEntries = getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
   return [{
@@ -3101,7 +3541,7 @@ const getTitleBarVirtualDom = state => {
     className: 'Viewlet TitleBar',
     id: 'TitleBar',
     role: ContentInfo,
-    type: Div
+    type: Div$1
   }, ...getTitleBarIconVirtualDom(titleBarIconEnabled, iconSrc), ...getTitleBarMenuBarVirtualDom(titleBarMenuBarEnabled, visibleEntries, focusedIndex), ...getTitleVirtualDom(titleBarTitleEnabled, title), ...getTitleBarButtonsVirtualDom(titleBarButtonsEnabled, titleBarButtons)];
 };
 
@@ -3146,9 +3586,9 @@ const renderEventListeners = () => {
     params: ['handleClickMinimize']
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', Button, ClientX, ClientY]
+    params: ['handleContextMenu', Button$1, ClientX, ClientY]
   }, {
-    name: HandleClickToggleClose,
+    name: HandleClickClose,
     params: ['handleClickClose']
   }, {
     name: HandleClickToggleMaximize,
@@ -3164,7 +3604,7 @@ const renderEventListeners = () => {
     params: ['handleMenuMouseOver', ClientX, ClientY]
   }, {
     name: HandleClick,
-    params: ['handleClickAt', Button, ClientX, ClientY]
+    params: ['handleClickAt', Button$1, ClientX, ClientY]
   }, {
     name: HandlePointerOut,
     params: ['handlePointerOut', ClientX, ClientY]
@@ -3446,7 +3886,7 @@ const getFn = id => {
       return getMenuEntries$b;
     case Go$2:
       return getMenuEntries$a;
-    case Help$2:
+    case Help$3:
       return getMenuEntries$9;
     case OpenRecent$1:
       return getMenuEntries$8;
@@ -3456,10 +3896,10 @@ const getFn = id => {
       return getMenuEntries$6;
     case Terminal$2:
       return getMenuEntries$5;
-    case TitleBar:
-      return getMenuEntries$1;
+    case TitleBar$1:
+      return getMenuEntries$2;
     case View$2:
-      return getMenuEntries$4;
+      return getMenuEntries$1;
     default:
       return undefined;
   }
@@ -3494,7 +3934,7 @@ const handleKeyArrowRightMenuOpen = async state => {
     return focusNext(state);
   }
   const item = items[focusedIndex];
-  if (item.flags === SubMenu && item.id !== undefined) {
+  if (item.flags === SubMenu$1 && item.id !== undefined) {
     const subMenuEntries = await getMenuEntries(item.id);
     const subMenu = {
       focusedIndex: 0,
@@ -3690,11 +4130,11 @@ const handleMenuClick = async (state, level, index) => {
   switch (item.flags) {
     case Ignore:
       return selectIndexIgnore(state, item);
-    case None:
+    case None$1:
       return selectIndexNone(state, item);
     case RestoreFocus:
       return selectIndexRestoreFocus(state, item);
-    case SubMenu:
+    case SubMenu$1:
       return selectIndexSubMenu(state, menu, index);
     default:
       return state;
@@ -3717,7 +4157,7 @@ const getNewMenus = async (menus, level, index, flags) => {
     if (index === -1) {
       return menus;
     }
-    if (item.flags === SubMenu && level === menus.length - 2) {
+    if (item.flags === SubMenu$1 && level === menus.length - 2) {
       const subMenu = menus[level + 1];
       if (subMenu.focusedIndex !== -1) {
         const newSubMenu = {
@@ -3737,7 +4177,7 @@ const getNewMenus = async (menus, level, index, flags) => {
     }];
     return newMenus;
   }
-  if (item.flags === SubMenu) {
+  if (item.flags === SubMenu$1) {
     const item = items[index];
     if (!item.id) {
       return menus;
@@ -3826,6 +4266,7 @@ const commandMap = {
   'TitleBar.handleClickMinimize': wrapCommand(handleClickMinimize),
   'TitleBar.handleClickToggleMaximize': wrapCommand(handleClickToggleMaximize),
   'TitleBar.handleContextMenu': wrapCommand(handleContextMenu),
+  'TitleBar.handleElectronMenuClick': wrapCommand(handleElectronMenuClick),
   'TitleBar.handleFocus': wrapCommand(handleFocus),
   'TitleBar.handleFocusOut': wrapCommand(handleFocusOut),
   'TitleBar.handleKeyArrowDown': wrapCommand(handleKeyArrowDown),
@@ -3845,6 +4286,7 @@ const commandMap = {
   'TitleBar.handlePointerOver': wrapCommand(handlePointerOver),
   'TitleBar.hideCommandCenter': wrapCommand(hideCommandCenter),
   'TitleBar.hideMenuBar': wrapCommand(hideMenuBar),
+  'TitleBar.hydrateElectronApplicationMenu': wrapCommand(hydrate),
   'TitleBar.loadContent2': wrapCommand(loadContent2),
   'TitleBar.render3': render3,
   'TitleBar.renderEventListeners': renderEventListeners,