@lvce-editor/title-bar-worker 4.13.1 → 4.14.1

package/dist/titleBarWorkerMain.js

@@ -1134,6 +1134,7 @@ const create$2 = rpcId => {
   };
 };
 
+const Button$2 = 'button';
 const ContentInfo = 'contentinfo';
 const Menu$1 = 'menu';
 const MenuBar$1 = 'menubar';
@@ -1314,6 +1315,7 @@ const VirtualDomElements = {
 const Button = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
+const Key = 'event.key';
 const TargetName = 'event.target.name';
 
 const Backspace$1 = 1;
@@ -1891,6 +1893,8 @@ const HandleMenuClick = 9;
 const HandleMenuMouseOver = 10;
 const HandleContextMenu = 11;
 const HandleTitleBarContextMenu = 12;
+const HandleCommandCenterClick = 13;
+const HandleCommandCenterKeyDown = 14;
 
 const emptyObject = {};
 const i18nString = (key, placeholders = emptyObject) => {
@@ -2023,6 +2027,9 @@ const menuBar = () => {
 const commandCenter = () => {
   return i18nString(CommandCenter);
 };
+const search = () => {
+  return i18nString(Search);
+};
 const layoutControls = () => {
   return i18nString(LayoutControls);
 };
@@ -2142,7 +2149,7 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
 };
 
 const isEqual$3 = (oldState, newState) => {
-  return oldState.titleBarEntries === newState.titleBarEntries && oldState.titleBarMenuBarEnabled === newState.titleBarMenuBarEnabled && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen && oldState.title === newState.title && oldState.workspaceUri === newState.workspaceUri;
+  return oldState.commandCenterEnabled === newState.commandCenterEnabled && oldState.titleBarEntries === newState.titleBarEntries && oldState.titleBarMenuBarEnabled === newState.titleBarMenuBarEnabled && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen && oldState.title === newState.title && oldState.workspaceUri === newState.workspaceUri;
 };
 
 const isEqual$2 = (oldState, newState) => {
@@ -3391,6 +3398,48 @@ const handleClick$1 = async (state, buttonName) => {
   return state;
 };
 
+const commandCenterItems = [{
+  command: 'QuickPick.showFile',
+  label: 'Go to File'
+}, {
+  command: 'QuickPick.showCommands',
+  label: 'Show and Run Commands'
+}, {
+  args: ['Search'],
+  command: 'Layout.openSideBarViewlet',
+  label: 'Search for Text'
+}, {
+  args: ['symbol'],
+  command: 'QuickPick.show',
+  label: 'Go to Symbol in Editor'
+}, {
+  args: ['Run And Debug'],
+  command: 'Layout.openSideBarViewlet',
+  label: 'Start Debugging'
+}, {
+  command: 'QuickPick.showCommands',
+  label: 'Run Task'
+}, {
+  command: 'QuickPick.showEverything',
+  label: 'More'
+}];
+const handleCommandCenterClick = async state => {
+  await invoke('QuickPick.show', 'custom', commandCenterItems, undefined, {
+    executeItemCommand: true,
+    mode: 'quickPick',
+    placeholder: 'Search files by name (append : to go to line or @ to go to symbol)',
+    waitUntil: 'visible'
+  });
+  return state;
+};
+
+const handleCommandCenterKeyDown = async (state, key) => {
+  if (key !== 'Enter' && key !== ' ' && key !== 'Space') {
+    return state;
+  }
+  return handleCommandCenterClick(state);
+};
+
 const show2 = async (uid, menuId, x, y, args) => {
   await showContextMenu2(uid, menuId, x, y, args);
 };
@@ -3436,6 +3485,21 @@ const getTotalWidth$1 = entries => {
   }
   return total;
 };
+const createOverflowEntry = (hiddenEntries, overflowIndex, focusedIndex, isMenuOpen) => {
+  return {
+    ariaLabel: moreDot(),
+    hiddenEntries,
+    icon: Ellipsis,
+    id: OverflowMenuId,
+    isFocused: overflowIndex === focusedIndex,
+    isOpen: overflowIndex === focusedIndex && isMenuOpen,
+    label: '...',
+    width: MoreEntryWidth
+  };
+};
+const isOverflowTitleBarEntry = entry => {
+  return entry.id === OverflowMenuId;
+};
 const getVisibleTitleBarEntries = (entries, width, focusedIndex, isMenuOpen) => {
   array(entries);
   number(width);
@@ -3464,23 +3528,11 @@ const getVisibleTitleBarEntries = (entries, width, focusedIndex, isMenuOpen) =>
     }
     const hiddenEntries = entries.slice(visible.length);
     const overflowIndex = visible.length;
-    visible.push({
-      ariaLabel: moreDot(),
-      hiddenEntries,
-      icon: Ellipsis,
-      id: OverflowMenuId,
-      isFocused: overflowIndex === focusedIndex,
-      isOpen: overflowIndex === focusedIndex && isMenuOpen,
-      label: '...',
-      width: MoreEntryWidth
-    });
+    visible.push(createOverflowEntry(hiddenEntries, overflowIndex, focusedIndex, isMenuOpen));
   }
   return visible;
 };
 
-const hasOverflowEntry = entries => {
-  return entries.some(entry => entry?.id === OverflowMenuId);
-};
 const getNavigableTitleBarEntries = state => {
   const {
     focusedIndex,
@@ -3488,9 +3540,6 @@ const getNavigableTitleBarEntries = state => {
     titleBarEntries,
     width
   } = state;
-  if (hasOverflowEntry(titleBarEntries)) {
-    return titleBarEntries;
-  }
   return getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
 };
 
@@ -3643,14 +3692,28 @@ const openMenuAtIndex = async (state, index, shouldBeFocused) => {
   if (!titleBarEntry) {
     return state;
   }
-  const {
-    id
-  } = titleBarEntry;
-  const rawItems = id === OverflowMenuId ? getOverflowMenuItems(titleBarEntry.hiddenEntries || []) : await getMenuEntries2(state, {
-    menuId: id,
-    platform
-  });
-  const items = id === OverflowMenuId ? rawItems : await addMenuEntryKeyBindings(rawItems);
+  let rawItems;
+  let menuId;
+  const isOverflow = isOverflowTitleBarEntry(titleBarEntry);
+  if (isOverflow) {
+    rawItems = getOverflowMenuItems(titleBarEntry.hiddenEntries);
+    menuId = undefined;
+  } else {
+    if (titleBarEntry.id === undefined) {
+      return {
+        ...state,
+        focusedIndex: index,
+        isMenuOpen: true,
+        menus: []
+      };
+    }
+    rawItems = await getMenuEntries2(state, {
+      menuId: titleBarEntry.id,
+      platform
+    });
+    menuId = titleBarEntry.id;
+  }
+  const items = isOverflow ? rawItems : await addMenuEntryKeyBindings(rawItems);
   const relevantEntries = titleBarEntries.slice(0, index);
   const totalWidths = getTotalWidth(relevantEntries);
   const offset = totalWidths;
@@ -3664,7 +3727,7 @@ const openMenuAtIndex = async (state, index, shouldBeFocused) => {
   const menu = {
     focusedIndex: menuFocusedIndex,
     height,
-    id: id === OverflowMenuId ? undefined : id,
+    id: menuId,
     items,
     level: 0,
     width,
@@ -3990,6 +4053,7 @@ const MenuItemSubMenuArrowRight = 'MenuItemSubMenuArrowRight';
 const TitleBar = 'TitleBar';
 const TitleBarButton = 'TitleBarButton';
 const TitleBarButtons = 'TitleBarButtons';
+const TitleBarCommandCenter = 'TitleBarCommandCenter';
 const TitleBarEntryActive = 'TitleBarEntryActive';
 const TitleBarIcon = 'TitleBarIcon';
 const TitleBarIconIcon = 'TitleBarIconIcon';
@@ -4277,6 +4341,24 @@ const renderMenus = (oldState, newState) => {
   return ['Viewlet.send', uid, /* method */SetMenus, /* changes */changes, uid];
 };
 
+const Focusable = 0;
+
+const getCommandCenterVirtualDom = commandCenterEnabled => {
+  if (!commandCenterEnabled) {
+    return [];
+  }
+  return [{
+    ariaLabel: commandCenter(),
+    childCount: 1,
+    className: TitleBarCommandCenter,
+    onClick: HandleCommandCenterClick,
+    onKeyDown: HandleCommandCenterKeyDown,
+    role: Button$2,
+    tabIndex: Focusable,
+    type: Div
+  }, text(search())];
+};
+
 const getIcon = assetDir => {
   return `${assetDir}/icons/icon.svg`;
 };
@@ -4349,7 +4431,6 @@ const getActiveEntryLabelDom = isFocused => {
   return [activeEntryLabelNode];
 };
 const getItemVirtualDom = item => {
-  // @ts-ignore
   const {
     ariaLabel,
     isFocused,
@@ -4418,6 +4499,7 @@ const emptyTitleBarNode = {
 const getTitleBarVirtualDom = state => {
   const {
     assetDir,
+    commandCenterEnabled,
     focusedIndex,
     isMenuOpen,
     platform,
@@ -4436,7 +4518,8 @@ const getTitleBarVirtualDom = state => {
   }
   const iconSrc = getIcon(assetDir);
   const visibleEntries = getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
-  const childCount = Number(titleBarIconEnabled) + Number(titleBarMenuBarEnabled) + Number(titleBarTitleEnabled) + Number(titleBarButtonsEnabled);
+  const titleEnabled = titleBarTitleEnabled && !commandCenterEnabled;
+  const childCount = Number(titleBarIconEnabled) + Number(titleBarMenuBarEnabled) + Number(commandCenterEnabled) + Number(titleEnabled) + Number(titleBarButtonsEnabled);
   return [{
     ariaLabel: titleBar(),
     childCount,
@@ -4445,7 +4528,7 @@ const getTitleBarVirtualDom = state => {
     onContextMenu: HandleTitleBarContextMenu,
     role: ContentInfo,
     type: Div
-  }, ...getTitleBarIconVirtualDom(titleBarIconEnabled, iconSrc), ...getTitleBarMenuBarVirtualDom(titleBarMenuBarEnabled, visibleEntries, focusedIndex), ...getTitleVirtualDom(titleBarTitleEnabled, title), ...getTitleBarButtonsVirtualDom(titleBarButtonsEnabled, titleBarButtons)];
+  }, ...getTitleBarIconVirtualDom(titleBarIconEnabled, iconSrc), ...getTitleBarMenuBarVirtualDom(titleBarMenuBarEnabled, visibleEntries, focusedIndex), ...getCommandCenterVirtualDom(commandCenterEnabled), ...getTitleVirtualDom(titleEnabled, title), ...getTitleBarButtonsVirtualDom(titleBarButtonsEnabled, titleBarButtons)];
 };
 
 const renderTitleBar = (oldState, newState) => {
@@ -4503,6 +4586,12 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickToggleMaximize,
     params: ['handleClickToggleMaximize']
+  }, {
+    name: HandleCommandCenterClick,
+    params: ['handleCommandCenterClick']
+  }, {
+    name: HandleCommandCenterKeyDown,
+    params: ['handleCommandCenterKeyDown', Key]
   }, {
     name: HandleFocusIn,
     params: ['handleFocus']
@@ -5230,6 +5319,8 @@ const commandMap = {
   'TitleBar.handleClickClose': wrapCommand(handleClickClose),
   'TitleBar.handleClickMinimize': wrapCommand(handleClickMinimize),
   'TitleBar.handleClickToggleMaximize': wrapCommand(handleClickToggleMaximize),
+  'TitleBar.handleCommandCenterClick': wrapCommand(handleCommandCenterClick),
+  'TitleBar.handleCommandCenterKeyDown': wrapCommand(handleCommandCenterKeyDown),
   'TitleBar.handleContextMenu': wrapCommand(handleContextMenu),
   'TitleBar.handleElectronMenuClick': wrapCommand(handleElectronMenuClick),
   'TitleBar.handleFocus': wrapCommand(handleFocus),

package/package.json

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