@lvce-editor/title-bar-worker 2.16.0 → 2.18.0

package/dist/titleBarWorkerMain.js

@@ -1149,10 +1149,11 @@ const {
   set: set$3,
   getCommandIds,
   registerCommands,
-  wrapCommand
+  wrapCommand,
+  wrapGetter
 } = create$2();
 
-const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled, titleBarStyleCustom) => {
+const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled, titleBarStyleCustom, assetDir) => {
   const titleBarButtons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
   const state = {
     ...createDefaultState(),
@@ -1175,10 +1176,10 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
     platform,
     controlsOverlayEnabled,
     titleBarStyleCustom,
-    titleBarButtons
+    titleBarButtons,
+    assetDir
   };
   set$3(id, state, state);
-  return state;
 };
 
 const RenderEntries = 1;
@@ -1189,12 +1190,10 @@ const isEqual$3 = (oldState, newState) => {
   return oldState.titleBarEntries === newState.titleBarEntries && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
 };
 
-const diffType$2 = RenderFocusedIndex;
 const isEqual$2 = (oldState, newState) => {
   return oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen;
 };
 
-const diffType$1 = RenderMenus;
 const isEqual$1 = (oldState, newState) => {
   return oldState.menus === newState.menus;
 };
@@ -1221,13 +1220,12 @@ const diff2 = uid => {
   return diff(oldState, newState);
 };
 
-const diffType = RenderEntries;
 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;
 };
 
 const modules = [isEqual, isEqual$2, isEqual$1];
-const numbers = [diffType, diffType$2, diffType$1];
+const numbers = [RenderEntries, RenderFocusedIndex, RenderMenus];
 
 const diff3 = uid => {
   const {
@@ -1262,229 +1260,498 @@ const Button = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
 
-const Escape$2 = 8;
-const Space$2 = 9;
-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 CtrlCmd = 1 << 11 >>> 0;
-const Shift = 1 << 10 >>> 0;
-
-const TitleBar$1 = 15;
-
-const DebugWorker = 55;
-const RendererWorker$1 = 1;
-
-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 FocusTitleBarMenuBar = 26;
-
-const getKeyBindings$1 = () => {
-  return [{
-    key: DownArrow$2,
-    command: 'TitleBar.handleKeyArrowDown',
-    when: FocusTitleBarMenuBar
-  }, {
-    key: UpArrow$2,
-    command: 'TitleBar.handleKeyArrowUp',
-    when: FocusTitleBarMenuBar
-  }, {
-    key: RightArrow$2,
-    command: 'TitleBar.handleKeyArrowRight',
-    when: FocusTitleBarMenuBar
-  }, {
-    key: LeftArrow$2,
-    command: 'TitleBar.handleKeyArrowLeft',
-    when: FocusTitleBarMenuBar
-  }, {
-    key: Space$2,
-    command: 'TitleBar.handleKeySpace',
-    when: FocusTitleBarMenuBar
-  }, {
-    key: Home$2,
-    command: 'TitleBar.handleKeyHome',
-    when: FocusTitleBarMenuBar
-  }, {
-    key: End$2,
-    command: 'TitleBar.handleKeyEnd',
-    when: FocusTitleBarMenuBar
-  }, {
-    key: Escape$2,
-    command: 'TitleBar.handleKeyEscape',
-    when: FocusTitleBarMenuBar
-  }];
-};
-
-/**
- * @enum {string}
- */
-const UiStrings$1 = {
-  Copy: 'Copy',
-  CopyLineDown: 'Copy Line Down',
-  CopyLineUp: 'Copy Line Up',
-  Cut: 'Cut',
-  MoveLineDown: 'Move Line Down',
-  MoveLineUp: 'Move Line Up',
-  Paste: 'Paste',
-  Redo: 'Redo',
-  SelectAll: 'Select All',
-  ToggleBlockComment: 'Toggle Block Comment',
-  ToggleLineComment: 'Toggle Line Comment',
-  Undo: 'Undo'};
-const cut = () => {
-  return i18nString(UiStrings$1.Cut);
-};
-const copy = () => {
-  return i18nString(UiStrings$1.Copy);
-};
-const paste = () => {
-  return i18nString(UiStrings$1.Paste);
-};
-const undo = () => {
-  return i18nString(UiStrings$1.Undo);
-};
-const redo = () => {
-  return i18nString(UiStrings$1.Redo);
-};
-const toggleLineComment = () => {
-  return i18nString(UiStrings$1.ToggleLineComment);
-};
-const toggleBlockComment = () => {
-  return i18nString(UiStrings$1.ToggleBlockComment);
-};
-const selectAll = () => {
-  return i18nString(UiStrings$1.SelectAll);
-};
-const copyLineUp = () => {
-  return i18nString(UiStrings$1.CopyLineUp);
-};
-const copyLineDown = () => {
-  return i18nString(UiStrings$1.CopyLineDown);
-};
-const moveLineUp = () => {
-  return i18nString(UiStrings$1.MoveLineUp);
-};
-const moveLineDown = () => {
-  return i18nString(UiStrings$1.MoveLineDown);
-};
+const Backspace$1 = 1;
+const Tab$1 = 2;
+const Enter$1 = 3;
+const Escape$1 = 8;
+const Space$1 = 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 Insert$1 = 17;
+const Delete$1 = 18;
+const Digit0$1 = 19;
+const Digit1$1 = 20;
+const Digit2$1 = 21;
+const Digit3$1 = 22;
+const Digit4$1 = 23;
+const Digit5$1 = 24;
+const Digit6$1 = 25;
+const Digit7$1 = 26;
+const Digit8$1 = 27;
+const Digit9$1 = 28;
+const KeyA$1 = 29;
+const KeyB$1 = 30;
+const KeyC$1 = 31;
+const KeyD$1 = 32;
+const KeyE$1 = 33;
+const KeyF$1 = 34;
+const KeyG$1 = 35;
+const KeyH$1 = 36;
+const KeyI$1 = 37;
+const KeyJ$1 = 38;
+const KeyK$1 = 39;
+const KeyL$1 = 40;
+const KeyM$1 = 41;
+const KeyN$1 = 42;
+const KeyO$1 = 43;
+const KeyP$1 = 44;
+const KeyQ$1 = 45;
+const KeyR$1 = 46;
+const KeyS$1 = 47;
+const KeyT$1 = 48;
+const KeyU$1 = 49;
+const KeyV$1 = 50;
+const KeyW$1 = 51;
+const KeyX$1 = 52;
+const KeyY$1 = 53;
+const KeyZ$1 = 54;
+const F1$1 = 57;
+const F2$1 = 58;
+const F3$1 = 59;
+const F4$1 = 60;
+const F5$1 = 61;
+const F6$1 = 62;
+const Equal$1 = 84;
+const Comma$1 = 85;
+const Minus$1 = 86;
+const Backquote$1 = 89;
+const Backslash$1 = 91;
+const Star$1 = 131;
+const Plus$1 = 132;
 
-const Edit = 2;
-const File$1 = 5;
-const Go = 6;
-const Help = 7;
-const OpenRecent = 9;
-const Run = 10;
-const Selection = 11;
-const Terminal = 14;
-const TitleBar = 15;
-const View = 16;
+const Unknown = 'Unknown';
+const Backspace = 'Backspace';
+const Tab = 'Tab';
+const Enter = 'Enter';
+const Escape = 'Escape';
+const Space = '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 Insert = 'Insert';
+const Delete = 'Delete';
+const Digit0 = '0';
+const Digit1 = '1';
+const Digit2 = '2';
+const Digit3 = '3';
+const Digit4 = '4';
+const Digit5 = '5';
+const Digit6 = '6';
+const Digit7 = '7';
+const Digit8 = '8';
+const Digit9 = '9';
+const KeyA = 'a';
+const KeyB = 'b';
+const KeyC = 'c';
+const KeyD = 'd';
+const KeyE = 'e';
+const KeyF = 'f';
+const KeyG = 'g';
+const KeyH = 'h';
+const KeyI = 'i';
+const KeyJ = 'j';
+const KeyK = 'k';
+const KeyL = 'l';
+const KeyM = 'm';
+const KeyN = 'n';
+const KeyO = 'o';
+const KeyP = 'p';
+const KeyQ = 'q';
+const KeyR = 'r';
+const KeyS = 's';
+const KeyT = 't';
+const KeyU = 'u';
+const KeyV = 'v';
+const KeyW = 'w';
+const KeyX = 'x';
+const KeyY = 'y';
+const KeyZ = 'z';
+const F1 = 'F1';
+const F2 = 'F2';
+const F3 = 'F3';
+const F4 = 'F4';
+const F5 = 'F5';
+const F6 = 'F6';
+const Equal = '=';
+const Comma = ',';
+const Minus = 'Minus';
+const Backquote = 'Backquote';
+const Backslash = 'Backslash';
+const Star = '*';
+const Plus = '+';
 
-const Separator = 1;
-const None = 0;
-const SubMenu = 4;
-const Checked = 2;
-const Unchecked = 3;
-const Disabled = 5;
-const RestoreFocus = 6;
-const Ignore = 7;
+const getKeyCodeString = keyCode => {
+  switch (keyCode) {
+    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 Delete$1:
+      return Delete;
+    case Digit0$1:
+      return Digit0;
+    case Digit1$1:
+      return Digit1;
+    case Digit2$1:
+      return Digit2;
+    case Digit3$1:
+      return Digit3;
+    case Digit4$1:
+      return Digit4;
+    case Digit5$1:
+      return Digit5;
+    case Digit6$1:
+      return Digit6;
+    case Digit7$1:
+      return Digit7;
+    case Digit8$1:
+      return Digit8;
+    case Digit9$1:
+      return Digit9;
+    case KeyA$1:
+      return KeyA;
+    case KeyB$1:
+      return KeyB;
+    case KeyC$1:
+      return KeyC;
+    case KeyD$1:
+      return KeyD;
+    case KeyE$1:
+      return KeyE;
+    case KeyF$1:
+      return KeyF;
+    case KeyG$1:
+      return KeyG;
+    case KeyH$1:
+      return KeyH;
+    case KeyI$1:
+      return KeyI;
+    case KeyJ$1:
+      return KeyJ;
+    case KeyK$1:
+      return KeyK;
+    case KeyL$1:
+      return KeyL;
+    case KeyM$1:
+      return KeyM;
+    case KeyN$1:
+      return KeyN;
+    case KeyO$1:
+      return KeyO;
+    case KeyP$1:
+      return KeyP;
+    case KeyQ$1:
+      return KeyQ;
+    case KeyR$1:
+      return KeyR;
+    case KeyS$1:
+      return KeyS;
+    case KeyT$1:
+      return KeyT;
+    case KeyU$1:
+      return KeyU;
+    case KeyV$1:
+      return KeyV;
+    case KeyW$1:
+      return KeyW;
+    case KeyX$1:
+      return KeyX;
+    case KeyY$1:
+      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 Plus$1:
+      return Plus;
+    case Star$1:
+      return Star;
+    case Minus$1:
+      return Minus;
+    default:
+      return Unknown;
+  }
+};
 
-const menuEntrySeparator = {
-  id: 'separator',
-  label: '',
-  flags: Separator,
-  command: ''
+const CtrlCmd = 1 << 11 >>> 0;
+const Shift = 1 << 10 >>> 0;
+
+const TitleBar$1 = 15;
+
+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
+  };
 };
 
-const id$9 = Edit;
-const getMenuEntries$d = () => {
+const DebugWorker = 55;
+const RendererWorker$1 = 1;
+
+const FocusTitleBarMenuBar = 26;
+
+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$1 = () => {
   return [{
-    id: 'undo',
-    label: undo(),
-    flags: Disabled,
-    command: /* TODO */'-1'
+    key: DownArrow$1,
+    command: 'TitleBar.handleKeyArrowDown',
+    when: FocusTitleBarMenuBar
   }, {
-    id: 'redo',
-    label: redo(),
-    flags: Disabled,
-    command: /* TODO */'-1'
-  }, menuEntrySeparator, {
-    id: 'cut',
-    label: cut(),
-    flags: None,
-    command: /* Editor.cut */'Editor.cut'
+    key: UpArrow$1,
+    command: 'TitleBar.handleKeyArrowUp',
+    when: FocusTitleBarMenuBar
   }, {
-    id: 'copy',
-    label: copy(),
-    flags: None,
-    command: /* Editor.copy */'Editor.copy'
+    key: RightArrow$1,
+    command: 'TitleBar.handleKeyArrowRight',
+    when: FocusTitleBarMenuBar
   }, {
-    id: 'paste',
-    label: paste(),
-    flags: None,
-    command: /* Editor.paste */'Editor.paste'
-  }, menuEntrySeparator, {
-    id: 'toggle-line-comment',
-    label: toggleLineComment(),
-    flags: None,
-    command: /* Editor.toggleLineComment */'Editor.toggleLineComment'
+    key: LeftArrow$1,
+    command: 'TitleBar.handleKeyArrowLeft',
+    when: FocusTitleBarMenuBar
   }, {
-    id: 'toggle-block-comment',
-    label: toggleBlockComment(),
-    flags: None,
-    command: /* Editor.toggleBlockComment */'Editor.toggleBlockComment'
+    key: Space$1,
+    command: 'TitleBar.handleKeySpace',
+    when: FocusTitleBarMenuBar
+  }, {
+    key: Home$1,
+    command: 'TitleBar.handleKeyHome',
+    when: FocusTitleBarMenuBar
+  }, {
+    key: End$1,
+    command: 'TitleBar.handleKeyEnd',
+    when: FocusTitleBarMenuBar
+  }, {
+    key: Escape$1,
+    command: 'TitleBar.handleKeyEscape',
+    when: FocusTitleBarMenuBar
   }];
 };
 
-const MenuEntriesEdit = {
-  __proto__: null,
-  getMenuEntries: getMenuEntries$d,
-  id: id$9
-};
-
 /**
  * @enum {string}
  */
-const UiStrings = {
-  NewFile: 'New File',
-  NewWindow: 'New Window',
-  OpenFile: 'Open File',
-  OpenFolder: 'Open Folder',
-  OpenRecent: 'Open Recent',
-  Exit: 'Exit',
-  Save: 'Save',
-  SaveAll: 'Save All'
-};
-const newFile = () => {
-  return i18nString(UiStrings.NewFile);
-};
-const newWindow = () => {
-  return i18nString(UiStrings.NewWindow);
-};
-const openFile = () => {
-  return i18nString(UiStrings.OpenFile);
-};
-const openFolder = () => {
-  return i18nString(UiStrings.OpenFolder);
-};
-const openRecent = () => {
+const UiStrings$1 = {
+  Copy: 'Copy',
+  CopyLineDown: 'Copy Line Down',
+  CopyLineUp: 'Copy Line Up',
+  Cut: 'Cut',
+  MoveLineDown: 'Move Line Down',
+  MoveLineUp: 'Move Line Up',
+  Paste: 'Paste',
+  Redo: 'Redo',
+  SelectAll: 'Select All',
+  ToggleBlockComment: 'Toggle Block Comment',
+  ToggleLineComment: 'Toggle Line Comment',
+  Undo: 'Undo'};
+const cut = () => {
+  return i18nString(UiStrings$1.Cut);
+};
+const copy = () => {
+  return i18nString(UiStrings$1.Copy);
+};
+const paste = () => {
+  return i18nString(UiStrings$1.Paste);
+};
+const undo = () => {
+  return i18nString(UiStrings$1.Undo);
+};
+const redo = () => {
+  return i18nString(UiStrings$1.Redo);
+};
+const toggleLineComment = () => {
+  return i18nString(UiStrings$1.ToggleLineComment);
+};
+const toggleBlockComment = () => {
+  return i18nString(UiStrings$1.ToggleBlockComment);
+};
+const selectAll = () => {
+  return i18nString(UiStrings$1.SelectAll);
+};
+const copyLineUp = () => {
+  return i18nString(UiStrings$1.CopyLineUp);
+};
+const copyLineDown = () => {
+  return i18nString(UiStrings$1.CopyLineDown);
+};
+const moveLineUp = () => {
+  return i18nString(UiStrings$1.MoveLineUp);
+};
+const moveLineDown = () => {
+  return i18nString(UiStrings$1.MoveLineDown);
+};
+
+const Edit = 2;
+const File$1 = 5;
+const Go = 6;
+const Help = 7;
+const OpenRecent = 9;
+const Run = 10;
+const Selection = 11;
+const Terminal = 14;
+const TitleBar = 15;
+const View = 16;
+
+const Separator = 1;
+const None = 0;
+const SubMenu = 4;
+const Checked = 2;
+const Unchecked = 3;
+const Disabled = 5;
+const RestoreFocus = 6;
+const Ignore = 7;
+
+const menuEntrySeparator = {
+  id: 'separator',
+  label: '',
+  flags: Separator,
+  command: ''
+};
+
+const id$9 = Edit;
+const getMenuEntries$d = () => {
+  return [{
+    id: 'undo',
+    label: undo(),
+    flags: Disabled,
+    command: /* TODO */'-1'
+  }, {
+    id: 'redo',
+    label: redo(),
+    flags: Disabled,
+    command: /* TODO */'-1'
+  }, menuEntrySeparator, {
+    id: 'cut',
+    label: cut(),
+    flags: None,
+    command: /* Editor.cut */'Editor.cut'
+  }, {
+    id: 'copy',
+    label: copy(),
+    flags: None,
+    command: /* Editor.copy */'Editor.copy'
+  }, {
+    id: 'paste',
+    label: paste(),
+    flags: None,
+    command: /* Editor.paste */'Editor.paste'
+  }, menuEntrySeparator, {
+    id: 'toggle-line-comment',
+    label: toggleLineComment(),
+    flags: None,
+    command: /* Editor.toggleLineComment */'Editor.toggleLineComment'
+  }, {
+    id: 'toggle-block-comment',
+    label: toggleBlockComment(),
+    flags: None,
+    command: /* Editor.toggleBlockComment */'Editor.toggleBlockComment'
+  }];
+};
+
+const MenuEntriesEdit = {
+  __proto__: null,
+  getMenuEntries: getMenuEntries$d,
+  id: id$9
+};
+
+/**
+ * @enum {string}
+ */
+const UiStrings = {
+  NewFile: 'New File',
+  NewWindow: 'New Window',
+  OpenFile: 'Open File',
+  OpenFolder: 'Open Folder',
+  OpenRecent: 'Open Recent',
+  Exit: 'Exit',
+  Save: 'Save',
+  SaveAll: 'Save All'
+};
+const newFile = () => {
+  return i18nString(UiStrings.NewFile);
+};
+const newWindow = () => {
+  return i18nString(UiStrings.NewWindow);
+};
+const openFile = () => {
+  return i18nString(UiStrings.OpenFile);
+};
+const openFolder = () => {
+  return i18nString(UiStrings.OpenFolder);
+};
+const openRecent = () => {
   return i18nString(UiStrings.OpenRecent);
 };
 const save = () => {
@@ -2251,7 +2518,7 @@ const menus$1 = [MenuEntriesEdit, MenuEntriesFile, MenuEntriesGo, MenuEntriesHel
 const getMenuIds = () => {
   return menus$1.map(menu => menu.id);
 };
-const getMenuEntries$1 = (id, platform) => {
+const getMenuEntries$1 = async (id, platform) => {
   const menu = menus$1.find(item => item.id === id);
   if (!menu) {
     return [];
@@ -2274,7 +2541,7 @@ const TitleBarButtons = 'TitleBarButtons';
 const TitleBarEntryActive = 'TitleBarEntryActive';
 const TitleBarIcon = 'TitleBarIcon';
 const TitleBarIconIcon = 'TitleBarIconIcon';
-const TitleBarMenuBar$1 = 'TitleBarMenuBar';
+const TitleBarMenuBar = 'TitleBarMenuBar';
 const TitleBarTopLevelEntry = 'TitleBarTopLevelEntry';
 const TitleBarTopLevelEntryLabel = 'TitleBarTopLevelEntryLabel';
 const Viewlet = 'Viewlet';
@@ -2384,7 +2651,7 @@ const activeId = 'TitleBarEntryActive';
 const getTitleBarMenuBarVirtualDom = (visibleItems, focusedIndex) => {
   return [{
     type: Div,
-    className: mergeClassNames(Viewlet, TitleBarMenuBar$1),
+    className: mergeClassNames(Viewlet, TitleBarMenuBar),
     role: MenuBar,
     tabIndex: 0,
     childCount: visibleItems.length,
@@ -2642,535 +2909,256 @@ const focusIndex = async (state, index) => {
   return {
     ...state,
     focusedIndex: index
-  };
-};
-
-const handleMouseOutMenuClosed = state => {
-  return focusIndex(state, -1);
-};
-
-const handleMouseOutMenuOpen = state => {
-  return state;
-};
-
-const ifElse = (menuOpenFunction, menuClosedFunction) => {
-  const ifElseFunction = (state, ...args) => {
-    const {
-      isMenuOpen
-    } = state;
-    if (isMenuOpen) {
-      return menuOpenFunction(state, ...args);
-    }
-    return menuClosedFunction(state, ...args);
-  };
-  return ifElseFunction;
-};
-
-const handleMouseOut = ifElse(handleMouseOutMenuOpen, handleMouseOutMenuClosed);
-
-const handlePointerOut = (state, clientX, clientY) => {
-  const {
-    x,
-    iconWidth,
-    titleBarEntries
-  } = state;
-  const menuX = getMenuOffset(x, clientX, iconWidth);
-  const index = getTitleBarIndexFromPosition(titleBarEntries, menuX);
-  if (index === -1) {
-    return state;
-  }
-  return handleMouseOut(state);
-};
-
-const handleMouseOverMenuClosed = (state, index) => {
-  return focusIndex(state, index);
-};
-
-const handleMouseOverMenuOpen = async (state, index) => {
-  if (index === -1) {
-    return state;
-  }
-  return focusIndex(state, index);
-};
-
-const handleMouseOver = ifElse(handleMouseOverMenuOpen, handleMouseOverMenuClosed);
-
-const handlePointerOver = (state, clientX, clientY) => {
-  const {
-    titleBarEntries,
-    x,
-    iconWidth
-  } = state;
-  const menuOffset = getMenuOffset(x, clientX, iconWidth);
-  const index = getTitleBarIndexFromPosition(titleBarEntries, menuOffset);
-  if (index === -1) {
-    return state;
-  }
-  return handleMouseOver(state, index);
-};
-
-const createTextMeasureContext = (letterSpacing, font) => {
-  const canvas = new OffscreenCanvas(0, 0);
-  const ctx = canvas.getContext('2d');
-  if (!ctx) {
-    throw new Error('Failed to get canvas context 2d');
-  }
-  ctx.letterSpacing = letterSpacing;
-  ctx.font = font;
-  return ctx;
-};
-
-const getFontString = (fontWeight, fontSize, fontFamily) => {
-  return `${fontWeight} ${fontSize}px ${fontFamily}`;
-};
-
-const measureTextWidths = (texts, fontWeight, fontSize, fontFamily, letterSpacing) => {
-  if (typeof letterSpacing !== 'number') {
-    throw new TypeError('letterSpacing must be of type number');
-  }
-  const letterSpacingString = px(letterSpacing);
-  const fontString = getFontString(fontWeight, fontSize, fontFamily);
-  const ctx = createTextMeasureContext(letterSpacingString, fontString);
-  const widths = [];
-  for (const text of texts) {
-    const metrics = ctx.measureText(text);
-    const {
-      width
-    } = metrics;
-    widths.push(width);
-  }
-  return widths;
-};
-
-const getLabel = entry => {
-  return entry.label;
-};
-const addWidths = (entries, labelPadding, fontWeight, fontSize, fontFamily, letterSpacing) => {
-  const labels = entries.map(getLabel);
-  const widths = measureTextWidths(labels, fontWeight, fontSize, fontFamily, letterSpacing);
-  const withWidths = [];
-  for (let i = 0; i < entries.length; i++) {
-    const entry = entries[i];
-    const textWidth = widths[i];
-    const width = textWidth + labelPadding * 2;
-    withWidths.push({
-      ...entry,
-      width
-    });
-  }
-  return withWidths;
-};
-
-const loadContent2 = async state => {
-  const {
-    platform,
-    controlsOverlayEnabled,
-    titleBarStyleCustom,
-    labelFontFamily,
-    labelFontSize,
-    labelFontWeight,
-    labelLetterSpacing,
-    labelPadding
-  } = state;
-  const titleBarEntries = await getMenuEntries(TitleBar$1);
-  const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
-  const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
-  const title = 'test';
-  const iconWidth = 30;
-  return {
-    ...state,
-    titleBarEntries: withWidths,
-    buttons,
-    title,
-    iconWidth
-  };
-};
-
-const loadContent = async (state, titleBarEntries) => {
-  const {
-    platform,
-    controlsOverlayEnabled,
-    titleBarStyleCustom,
-    labelFontFamily,
-    labelFontSize,
-    labelFontWeight,
-    labelLetterSpacing,
-    labelPadding
-  } = state;
-  const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
-  const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
-  const title = 'test';
-  return {
-    ...state,
-    titleBarEntries: withWidths,
-    buttons,
-    title
-  };
-};
-
-const Ellipsis = 'Ellipsis';
-
-const getVisibleTitleBarEntries = (entries, width, focusedIndex, isMenuOpen) => {
-  array(entries);
-  number(width);
-  let total = 0;
-  const visible = [];
-  for (let i = 0; i < entries.length; i++) {
-    const entry = entries[i];
-    total += entry.width;
-    if (total >= width) {
-      break;
-    }
-    const isOpen = i === focusedIndex && isMenuOpen;
-    const isFocused = i === focusedIndex;
-    visible.push({
-      ...entry,
-      isOpen,
-      isFocused
-    });
-  }
-  const hasOverflow = visible.length < entries.length;
-  if (hasOverflow) {
-    const padding = 8;
-    const moreIconWidth = 22;
-    const totalPadding = padding * 2;
-    const hasStillOverflow = total + moreIconWidth + totalPadding > width;
-    if (hasStillOverflow) {
-      visible.pop();
-    }
-    visible.push({
-      ariaLabel: moreDot(),
-      icon: Ellipsis,
-      label: '',
-      width: moreIconWidth + totalPadding
-    });
-  }
-  return visible;
-};
-
-const renderEntries = (oldState, newState) => {
-  const visibleEntries = getVisibleTitleBarEntries(newState.titleBarEntries, newState.width, newState.focusedIndex, newState.isMenuOpen);
-  const dom = getTitleBarMenuBarVirtualDom(visibleEntries, newState.focusedIndex);
-  return ['Viewlet.setDom2', newState.uid, dom];
-};
-
-const renderFocusedIndex = (oldState, newState) => {
-  if (newState.focusedIndex === -1) {
-    return [];
-  }
-  return ['Viewlet.focusSelector', '.ViewletTitleBarMenuBar'];
-};
-
-const checkboxChecked = {
-  type: Div,
-  className: mergeClassNames(MenuItem, MenuItemCheckMark),
-  role: MenuItemCheckBox,
-  ariaChecked: true,
-  tabIndex: -1,
-  childCount: 2
-};
-const checkMark = {
-  type: Div,
-  className: mergeClassNames(MenuItemCheckmarkIcon, MaskIconCheck)
-};
-const getMenuItemCheckedDom = menuItem => {
-  const {
-    label
-  } = menuItem;
-  return [checkboxChecked, checkMark, text(label)];
-};
-
-const getKeyBindingString = (key, altKey, ctrlKey, shiftKey, metaKey) => {
-  let string = '';
-  if (ctrlKey) {
-    string += 'Ctrl+';
-  }
-  if (shiftKey) {
-    string += 'Shift+';
-  }
-  string += key.toUpperCase();
-  return string;
-};
-
-const Backspace$1 = 1;
-const Tab$1 = 2;
-const Enter$1 = 3;
-const Escape$1 = 8;
-const Space$1 = 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 Insert$1 = 17;
-const Delete$1 = 18;
-const Digit0$1 = 19;
-const Digit1$1 = 20;
-const Digit2$1 = 21;
-const Digit3$1 = 22;
-const Digit4$1 = 23;
-const Digit5$1 = 24;
-const Digit6$1 = 25;
-const Digit7$1 = 26;
-const Digit8$1 = 27;
-const Digit9$1 = 28;
-const KeyA$1 = 29;
-const KeyB$1 = 30;
-const KeyC$1 = 31;
-const KeyD$1 = 32;
-const KeyE$1 = 33;
-const KeyF$1 = 34;
-const KeyG$1 = 35;
-const KeyH$1 = 36;
-const KeyI$1 = 37;
-const KeyJ$1 = 38;
-const KeyK$1 = 39;
-const KeyL$1 = 40;
-const KeyM$1 = 41;
-const KeyN$1 = 42;
-const KeyO$1 = 43;
-const KeyP$1 = 44;
-const KeyQ$1 = 45;
-const KeyR$1 = 46;
-const KeyS$1 = 47;
-const KeyT$1 = 48;
-const KeyU$1 = 49;
-const KeyV$1 = 50;
-const KeyW$1 = 51;
-const KeyX$1 = 52;
-const KeyY$1 = 53;
-const KeyZ$1 = 54;
-const F1$1 = 57;
-const F2$1 = 58;
-const F3$1 = 59;
-const F4$1 = 60;
-const F5$1 = 61;
-const F6$1 = 62;
-const Equal$1 = 84;
-const Comma$1 = 85;
-const Minus$1 = 86;
-const Backquote$1 = 89;
-const Backslash$1 = 91;
-const Star$1 = 131;
-const Plus$1 = 132;
-
-const Unknown = 'Unknown';
-const Backspace = 'Backspace';
-const Tab = 'Tab';
-const Enter = 'Enter';
-const Escape = 'Escape';
-const Space = '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 Insert = 'Insert';
-const Delete = 'Delete';
-const Digit0 = '0';
-const Digit1 = '1';
-const Digit2 = '2';
-const Digit3 = '3';
-const Digit4 = '4';
-const Digit5 = '5';
-const Digit6 = '6';
-const Digit7 = '7';
-const Digit8 = '8';
-const Digit9 = '9';
-const KeyA = 'a';
-const KeyB = 'b';
-const KeyC = 'c';
-const KeyD = 'd';
-const KeyE = 'e';
-const KeyF = 'f';
-const KeyG = 'g';
-const KeyH = 'h';
-const KeyI = 'i';
-const KeyJ = 'j';
-const KeyK = 'k';
-const KeyL = 'l';
-const KeyM = 'm';
-const KeyN = 'n';
-const KeyO = 'o';
-const KeyP = 'p';
-const KeyQ = 'q';
-const KeyR = 'r';
-const KeyS = 's';
-const KeyT = 't';
-const KeyU = 'u';
-const KeyV = 'v';
-const KeyW = 'w';
-const KeyX = 'x';
-const KeyY = 'y';
-const KeyZ = 'z';
-const F1 = 'F1';
-const F2 = 'F2';
-const F3 = 'F3';
-const F4 = 'F4';
-const F5 = 'F5';
-const F6 = 'F6';
-const Equal = '=';
-const Comma = ',';
-const Minus = 'Minus';
-const Backquote = 'Backquote';
-const Backslash = 'Backslash';
-const Star = '*';
-const Plus = '+';
-
-const getKeyCodeString = keyCode => {
-  switch (keyCode) {
-    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 Delete$1:
-      return Delete;
-    case Digit0$1:
-      return Digit0;
-    case Digit1$1:
-      return Digit1;
-    case Digit2$1:
-      return Digit2;
-    case Digit3$1:
-      return Digit3;
-    case Digit4$1:
-      return Digit4;
-    case Digit5$1:
-      return Digit5;
-    case Digit6$1:
-      return Digit6;
-    case Digit7$1:
-      return Digit7;
-    case Digit8$1:
-      return Digit8;
-    case Digit9$1:
-      return Digit9;
-    case KeyA$1:
-      return KeyA;
-    case KeyB$1:
-      return KeyB;
-    case KeyC$1:
-      return KeyC;
-    case KeyD$1:
-      return KeyD;
-    case KeyE$1:
-      return KeyE;
-    case KeyF$1:
-      return KeyF;
-    case KeyG$1:
-      return KeyG;
-    case KeyH$1:
-      return KeyH;
-    case KeyI$1:
-      return KeyI;
-    case KeyJ$1:
-      return KeyJ;
-    case KeyK$1:
-      return KeyK;
-    case KeyL$1:
-      return KeyL;
-    case KeyM$1:
-      return KeyM;
-    case KeyN$1:
-      return KeyN;
-    case KeyO$1:
-      return KeyO;
-    case KeyP$1:
-      return KeyP;
-    case KeyQ$1:
-      return KeyQ;
-    case KeyR$1:
-      return KeyR;
-    case KeyS$1:
-      return KeyS;
-    case KeyT$1:
-      return KeyT;
-    case KeyU$1:
-      return KeyU;
-    case KeyV$1:
-      return KeyV;
-    case KeyW$1:
-      return KeyW;
-    case KeyX$1:
-      return KeyX;
-    case KeyY$1:
-      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 Plus$1:
-      return Plus;
-    case Star$1:
-      return Star;
-    case Minus$1:
-      return Minus;
-    default:
-      return Unknown;
+  };
+};
+
+const handleMouseOutMenuClosed = state => {
+  return focusIndex(state, -1);
+};
+
+const handleMouseOutMenuOpen = state => {
+  return state;
+};
+
+const ifElse = (menuOpenFunction, menuClosedFunction) => {
+  const ifElseFunction = (state, ...args) => {
+    const {
+      isMenuOpen
+    } = state;
+    if (isMenuOpen) {
+      return menuOpenFunction(state, ...args);
+    }
+    return menuClosedFunction(state, ...args);
+  };
+  return ifElseFunction;
+};
+
+const handleMouseOut = ifElse(handleMouseOutMenuOpen, handleMouseOutMenuClosed);
+
+const handlePointerOut = (state, clientX, clientY) => {
+  const {
+    x,
+    iconWidth,
+    titleBarEntries
+  } = state;
+  const menuX = getMenuOffset(x, clientX, iconWidth);
+  const index = getTitleBarIndexFromPosition(titleBarEntries, menuX);
+  if (index === -1) {
+    return state;
   }
+  return handleMouseOut(state);
 };
 
-const parseKey = rawKey => {
-  number(rawKey);
-  const isCtrl = Boolean(rawKey & CtrlCmd);
-  const isShift = Boolean(rawKey & Shift);
-  const keyCode = rawKey & 0x00_00_00_ff;
-  const key = getKeyCodeString(keyCode);
+const handleMouseOverMenuClosed = (state, index) => {
+  return focusIndex(state, index);
+};
+
+const handleMouseOverMenuOpen = async (state, index) => {
+  if (index === -1) {
+    return state;
+  }
+  return focusIndex(state, index);
+};
+
+const handleMouseOver = ifElse(handleMouseOverMenuOpen, handleMouseOverMenuClosed);
+
+const handlePointerOver = (state, clientX, clientY) => {
+  const {
+    titleBarEntries,
+    x,
+    iconWidth
+  } = state;
+  const menuOffset = getMenuOffset(x, clientX, iconWidth);
+  const index = getTitleBarIndexFromPosition(titleBarEntries, menuOffset);
+  if (index === -1) {
+    return state;
+  }
+  return handleMouseOver(state, index);
+};
+
+const createTextMeasureContext = (letterSpacing, font) => {
+  const canvas = new OffscreenCanvas(0, 0);
+  const ctx = canvas.getContext('2d');
+  if (!ctx) {
+    throw new Error('Failed to get canvas context 2d');
+  }
+  ctx.letterSpacing = letterSpacing;
+  ctx.font = font;
+  return ctx;
+};
+
+const getFontString = (fontWeight, fontSize, fontFamily) => {
+  return `${fontWeight} ${fontSize}px ${fontFamily}`;
+};
+
+const measureTextWidths = (texts, fontWeight, fontSize, fontFamily, letterSpacing) => {
+  if (typeof letterSpacing !== 'number') {
+    throw new TypeError('letterSpacing must be of type number');
+  }
+  const letterSpacingString = px(letterSpacing);
+  const fontString = getFontString(fontWeight, fontSize, fontFamily);
+  const ctx = createTextMeasureContext(letterSpacingString, fontString);
+  const widths = [];
+  for (const text of texts) {
+    const metrics = ctx.measureText(text);
+    const {
+      width
+    } = metrics;
+    widths.push(width);
+  }
+  return widths;
+};
+
+const getLabel = entry => {
+  return entry.label;
+};
+const addWidths = (entries, labelPadding, fontWeight, fontSize, fontFamily, letterSpacing) => {
+  const labels = entries.map(getLabel);
+  const widths = measureTextWidths(labels, fontWeight, fontSize, fontFamily, letterSpacing);
+  const withWidths = [];
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i];
+    const textWidth = widths[i];
+    const width = textWidth + labelPadding * 2;
+    withWidths.push({
+      ...entry,
+      width
+    });
+  }
+  return withWidths;
+};
+
+const loadContent2 = async state => {
+  const {
+    platform,
+    controlsOverlayEnabled,
+    titleBarStyleCustom,
+    labelFontFamily,
+    labelFontSize,
+    labelFontWeight,
+    labelLetterSpacing,
+    labelPadding
+  } = state;
+  const titleBarEntries = await getMenuEntries(TitleBar$1);
+  const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
+  const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
+  const title = 'test';
+  const iconWidth = 30;
   return {
-    key,
-    isCtrl,
-    isShift
+    ...state,
+    titleBarEntries: withWidths,
+    buttons,
+    title,
+    iconWidth
+  };
+};
+
+const loadContent = async (state, titleBarEntries) => {
+  const {
+    platform,
+    controlsOverlayEnabled,
+    titleBarStyleCustom,
+    labelFontFamily,
+    labelFontSize,
+    labelFontWeight,
+    labelLetterSpacing,
+    labelPadding
+  } = state;
+  const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
+  const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
+  const title = 'test';
+  return {
+    ...state,
+    titleBarEntries: withWidths,
+    buttons,
+    title
   };
 };
 
+const Ellipsis = 'Ellipsis';
+
+const getVisibleTitleBarEntries = (entries, width, focusedIndex, isMenuOpen) => {
+  array(entries);
+  number(width);
+  let total = 0;
+  const visible = [];
+  for (let i = 0; i < entries.length; i++) {
+    const entry = entries[i];
+    total += entry.width;
+    if (total >= width) {
+      break;
+    }
+    const isOpen = i === focusedIndex && isMenuOpen;
+    const isFocused = i === focusedIndex;
+    visible.push({
+      ...entry,
+      isOpen,
+      isFocused
+    });
+  }
+  const hasOverflow = visible.length < entries.length;
+  if (hasOverflow) {
+    const padding = 8;
+    const moreIconWidth = 22;
+    const totalPadding = padding * 2;
+    const hasStillOverflow = total + moreIconWidth + totalPadding > width;
+    if (hasStillOverflow) {
+      visible.pop();
+    }
+    visible.push({
+      ariaLabel: moreDot(),
+      icon: Ellipsis,
+      label: '',
+      width: moreIconWidth + totalPadding
+    });
+  }
+  return visible;
+};
+
+const renderEntries = (oldState, newState) => {
+  const visibleEntries = getVisibleTitleBarEntries(newState.titleBarEntries, newState.width, newState.focusedIndex, newState.isMenuOpen);
+  const dom = getTitleBarMenuBarVirtualDom(visibleEntries, newState.focusedIndex);
+  return ['Viewlet.setDom2', newState.uid, dom];
+};
+
+const renderFocusedIndex = (oldState, newState) => {
+  if (newState.focusedIndex === -1) {
+    return [];
+  }
+  return ['Viewlet.focusSelector', '.ViewletTitleBarMenuBar'];
+};
+
+const checkboxChecked = {
+  type: Div,
+  className: mergeClassNames(MenuItem, MenuItemCheckMark),
+  role: MenuItemCheckBox,
+  ariaChecked: true,
+  tabIndex: -1,
+  childCount: 2
+};
+const checkMark = {
+  type: Div,
+  className: mergeClassNames(MenuItemCheckmarkIcon, MaskIconCheck)
+};
+const getMenuItemCheckedDom = menuItem => {
+  const {
+    label
+  } = menuItem;
+  return [checkboxChecked, checkMark, text(label)];
+};
+
+const getKeyBindingString = (key, altKey, ctrlKey, shiftKey, metaKey) => {
+  let string = '';
+  if (ctrlKey) {
+    string += 'Ctrl+';
+  }
+  if (shiftKey) {
+    string += 'Shift+';
+  }
+  string += key.toUpperCase();
+  return string;
+};
+
 const getKeyDom = key => {
   const parsedKey = parseKey(key);
   const keyBindingsString = getKeyBindingString(parsedKey.key, false, parsedKey.isCtrl, parsedKey.isShift);
@@ -3550,9 +3538,12 @@ const resize = async (state, dimensions) => {
   };
 };
 
-const saveState = uid => {
+const saveState = state => {
+  const {
+    focusedIndex
+  } = state;
   return {
-    x: 1
+    focusedIndex
   };
 };
 
@@ -3685,11 +3676,8 @@ const setFocus = async focusKey => {
   await invoke('Focus.setFocus', focusKey);
 };
 
-// TODO remove this file and merge with whenExpressions
-const TitleBarMenuBar = FocusTitleBarMenuBar;
-
 const handleFocus = async state => {
-  await setFocus(TitleBarMenuBar);
+  await setFocus(FocusTitleBarMenuBar);
   return state;
 };
 
@@ -4119,7 +4107,7 @@ const commandMap = {
   'TitleBar.render3': render3,
   'TitleBar.renderEventListeners': renderEventListeners,
   'TitleBar.resize': wrapCommand(resize),
-  'TitleBar.saveState': saveState,
+  'TitleBar.saveState': wrapGetter(saveState),
   'TitleBar.terminate': terminate,
   'TitleBar.toggleIndex': wrapCommand(toggleIndex),
   'TitleBar.toggleMenu': wrapCommand(toggleMenu)