@lvce-editor/title-bar-worker 3.17.0 → 3.19.0

package/dist/titleBarWorkerMain.js

@@ -1041,10 +1041,21 @@ const createMockRpc = ({
 };
 
 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';
@@ -1052,16 +1063,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;
@@ -1118,16 +1129,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';
@@ -1212,16 +1223,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:
@@ -1234,8 +1245,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:
@@ -1290,8 +1301,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:
@@ -1300,16 +1311,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;
   }
@@ -1326,7 +1337,7 @@ const OpenRecent$1 = 9;
 const Run$2 = 10;
 const Selection$2 = 11;
 const Terminal$2 = 14;
-const TitleBar$1 = 15;
+const TitleBar$2 = 15;
 const View$2 = 16;
 const TitleBarContextMenu = 90;
 
@@ -1412,24 +1423,22 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   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 getWindowId$1 = async () => {
+  return invoke('GetWindowId.getWindowId');
+};
 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');
 };
 
@@ -1594,7 +1603,8 @@ const CheckForUpdates = 'Check For Updates';
 const ClearRecentlyOpened = 'Clear Recently Opened';
 const Close = 'Close';
 const Exit = 'Exit';
-const MenuBar$1 = 'Menu Bar';
+const TitleBar$1 = 'Title Bar';
+const MenuBar = 'Menu Bar';
 const CommandCenter = 'Command Center';
 const Edit$1 = 'Edit';
 const File$2 = 'File';
@@ -1665,8 +1675,11 @@ const maximize$1 = () => {
 const close$1 = () => {
   return i18nString(Close);
 };
+const titleBar = () => {
+  return i18nString(TitleBar$1);
+};
 const menuBar = () => {
-  return i18nString(MenuBar$1);
+  return i18nString(MenuBar);
 };
 const commandCenter = () => {
   return i18nString(CommandCenter);
@@ -1825,8 +1838,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;
@@ -1860,7 +1873,7 @@ const getMenuEntriesTitleBarContextMenu = async state => {
 
 const MenuIdTitleBarContextMenu = 50;
 const getMenuIds = () => {
-  return [Edit$2, File$3, Go$2, Help$3, OpenRecent$1, Run$2, Selection$2, Terminal$2, TitleBar$1, View$2, MenuIdTitleBarContextMenu, TitleBarContextMenu];
+  return [Edit$2, File$3, Go$2, Help$3, OpenRecent$1, Run$2, Selection$2, Terminal$2, TitleBar$2, View$2, MenuIdTitleBarContextMenu, TitleBarContextMenu];
 };
 
 const cut = () => {
@@ -1929,7 +1942,7 @@ const selectAllOccurrences = () => {
 
 const menuEntrySeparator = {
   command: '',
-  flags: Separator$2,
+  flags: Separator$1,
   id: 'separator',
   label: ''
 };
@@ -1937,37 +1950,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()
   }];
@@ -2023,18 +2036,18 @@ const View = 16;
 
 const getMenuEntries$b = platform => {
   const entries = [{
-    command: '-1',
-    flags: None$1,
+    command: 'Main.newFile',
+    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()
   }, {
@@ -2049,12 +2062,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()
   }];
@@ -2099,7 +2112,7 @@ const getMenuEntries$9 = async platform => {
   if (platform !== Web) {
     entries.push({
       command: 'Developer.toggleDeveloperTools',
-      flags: None$1,
+      flags: None,
       id: 'toggleDeveloperTools',
       label: toggleDeveloperTools()
     }, {
@@ -2122,7 +2135,7 @@ const getMenuEntries$9 = async platform => {
   }
   entries.push({
     command: 'About.showAbout',
-    flags: None$1,
+    flags: None,
     id: 'about',
     label: about()
   });
@@ -2163,7 +2176,7 @@ const toMenuItem = folder => {
   return {
     args: [folder],
     command: 'Workspace.setPath',
-    flags: None$1,
+    flags: None,
     label
   };
 };
@@ -2176,12 +2189,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()
   });
@@ -2195,72 +2208,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()
   }];
@@ -2270,7 +2283,7 @@ const getMenuEntries$5 = () => {
   return [{
     args: ['Terminal'],
     command: 'Layout.togglePanel',
-    flags: None$1,
+    flags: None,
     id: 'newTerminal',
     label: i18nString(NewTerminal)
   }];
@@ -2326,32 +2339,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()
   }];
@@ -2392,7 +2405,7 @@ const getMenuEntries2 = async (state, props) => {
       return getMenuEntries$6();
     case Terminal$2:
       return getMenuEntries$5();
-    case TitleBar$1:
+    case TitleBar$2:
       return getMenuEntries$2(props.platform);
     case TitleBarContextMenu:
     case MenuIdTitleBarContextMenu:
@@ -2420,7 +2433,7 @@ const getEntryMap = async (state, menuIds, platform) => {
 // TODO cache window id
 
 const getWindowId = async () => {
-  const windowId = await invoke('GetWindowId.getWindowId');
+  const windowId = await getWindowId$1();
   return windowId;
 };
 
@@ -2439,7 +2452,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 => {
@@ -2504,9 +2517,9 @@ const toElectronMenuItem = entry => {
       };
   }
   switch (entry.flags) {
-    case Separator$2:
+    case Separator$1:
       return {
-        type: Separator$1
+        type: Separator
       };
     case SubMenu$1:
       return {
@@ -2581,29 +2594,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(' ');
 };
@@ -2623,35 +2613,35 @@ const text = data => {
 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
   }];
 };
@@ -2682,15 +2672,14 @@ const handleClickToggleMaximize = async state => {
   return state;
 };
 
-// TODO use button name property
-const handleClick$1 = async (state, className) => {
-  if (className.includes('Minimize')) {
+const handleClick$1 = async (state, buttonName) => {
+  if (buttonName === 'Minimize') {
     return handleClickMinimize(state);
   }
-  if (className.includes('Maximize') || className.includes('Restore')) {
+  if (buttonName === 'ToggleMaximize') {
     return handleClickToggleMaximize(state);
   }
-  if (className.includes('Close')) {
+  if (buttonName === 'Close') {
     return handleClickClose(state);
   }
   return state;
@@ -2760,7 +2749,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:
@@ -2817,7 +2806,7 @@ const getIndexToFocusPrevious = menu => {
 const canBeFocused = item => {
   switch (item.flags) {
     case Disabled:
-    case Separator$2:
+    case Separator$1:
       return false;
     default:
       return true;
@@ -3271,7 +3260,7 @@ const getMenuItemsNoopDom = () => {
 const separator = {
   childCount: 1,
   className: MenuItemSeparator,
-  role: Separator,
+  role: Separator$2,
   type: Div
 };
 const separatorLine = {
@@ -3331,10 +3320,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;
@@ -3429,7 +3418,7 @@ const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
     className: `MaskIcon MaskIcon${icon}`,
-    role: None,
+    role: None$1,
     type
   };
 };
@@ -3445,8 +3434,9 @@ const createTitleBarButton = button => {
     ariaLabel: label,
     childCount: 1,
     className: `TitleBarButton TitleBarButton${id}`,
+    name: id,
     onClick,
-    type: Button
+    type: Button$1
   }, getIconVirtualDom(icon, I)];
   return dom;
 };
@@ -3503,7 +3493,7 @@ const getItemVirtualDom = item => {
     name: label,
     // TODO have separate name attribute
     role: MenuItem$1,
-    type: Button
+    type: Button$1
   }, ...(isFocused ? [{
     childCount: 1,
     className: TitleBarTopLevelEntryLabel,
@@ -3529,7 +3519,7 @@ const getTitleBarMenuBarVirtualDom = (menuBarEnabled, visibleItems, focusedIndex
     onMouseDown: HandleClick,
     onPointerOut: HandlePointerOut,
     onPointerOver: HandlePointerOver,
-    role: MenuBar,
+    role: MenuBar$1,
     tabIndex: 0,
     type: Div
   }, ...getTitleBarMenuBarItemsVirtualDom(visibleItems)];
@@ -3538,7 +3528,7 @@ const getTitleBarMenuBarVirtualDom = (menuBarEnabled, visibleItems, focusedIndex
 const parentNode = {
   childCount: 1,
   className: 'TitleBarTitle',
-  type: Div$1
+  type: Div
 };
 const getTitleVirtualDom = (titleBarTitleEnabled, title) => {
   if (!titleBarTitleEnabled) {
@@ -3606,19 +3596,18 @@ const getTitleBarVirtualDom = state => {
   if (platform === Electron$1 && !titleBarStyleCustom) {
     return [{
       childCount: 0,
-      type: Div$1
+      type: Div
     }];
   }
   const iconSrc = getIcon(assetDir);
   const visibleEntries = getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
   return [{
-    ariaLabel: 'Title Bar',
-    // TODO i18n string
+    ariaLabel: titleBar(),
     childCount: 4,
     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)];
 };
 
@@ -3665,7 +3654,7 @@ const renderEventListeners = () => {
     params: ['handleClickMinimize']
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', Button$1, ClientX, ClientY]
+    params: ['handleContextMenu', Button, ClientX, ClientY]
   }, {
     name: HandleClickClose,
     params: ['handleClickClose']
@@ -3683,7 +3672,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]
@@ -3983,7 +3972,7 @@ const getFn = id => {
       return getMenuEntries$6;
     case Terminal$2:
       return getMenuEntries$5;
-    case TitleBar$1:
+    case TitleBar$2:
       return getMenuEntries$2;
     case View$2:
       return getMenuEntries$1;
@@ -4217,7 +4206,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);

package/package.json

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