@lvce-editor/title-bar-worker 4.14.0 → 4.15.0

package/dist/titleBarWorkerMain.js

@@ -54,61 +54,6 @@ class VError extends Error {
   }
 }
 
-class AssertionError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'AssertionError';
-  }
-}
-const Object$1 = 1;
-const Number$1 = 2;
-const Array$1 = 3;
-const String$1 = 4;
-const Boolean$1 = 5;
-const Function = 6;
-const Null = 7;
-const Unknown$1 = 8;
-const getType = value => {
-  switch (typeof value) {
-    case 'number':
-      return Number$1;
-    case 'function':
-      return Function;
-    case 'string':
-      return String$1;
-    case 'object':
-      if (value === null) {
-        return Null;
-      }
-      if (Array.isArray(value)) {
-        return Array$1;
-      }
-      return Object$1;
-    case 'boolean':
-      return Boolean$1;
-    default:
-      return Unknown$1;
-  }
-};
-const object = value => {
-  const type = getType(value);
-  if (type !== Object$1) {
-    throw new AssertionError('expected value to be of type object');
-  }
-};
-const number = value => {
-  const type = getType(value);
-  if (type !== Number$1) {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
-const array = value => {
-  const type = getType(value);
-  if (type !== Array$1) {
-    throw new AssertionError('expected value to be of type array');
-  }
-};
-
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
 };
@@ -1383,7 +1328,7 @@ const Backslash$2 = 91;
 const Star$1 = 131;
 const Plus$1 = 132;
 
-const Unknown = 'Unknown';
+const Unknown$1 = 'Unknown';
 const Backspace = 'Backspace';
 const Tab = 'Tab';
 const Enter = 'Enter';
@@ -1516,7 +1461,7 @@ const keyCodeStringMap = {
   [UpArrow$1]: UpArrow
 };
 const getKeyCodeString = keyCode => {
-  return keyCodeStringMap[keyCode] || Unknown;
+  return keyCodeStringMap[keyCode] || Unknown$1;
 };
 
 const CtrlCmd = 1 << 11 >>> 0;
@@ -1558,6 +1503,61 @@ const SetFocusContext = 'Viewlet.setFocusContext';
 
 const FocusTitleBarMenuBar = 26;
 
+class AssertionError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'AssertionError';
+  }
+}
+const Object$1 = 1;
+const Number$1 = 2;
+const Array$1 = 3;
+const String$1 = 4;
+const Boolean$1 = 5;
+const Function = 6;
+const Null = 7;
+const Unknown = 8;
+const getType = value => {
+  switch (typeof value) {
+    case 'number':
+      return Number$1;
+    case 'function':
+      return Function;
+    case 'string':
+      return String$1;
+    case 'object':
+      if (value === null) {
+        return Null;
+      }
+      if (Array.isArray(value)) {
+        return Array$1;
+      }
+      return Object$1;
+    case 'boolean':
+      return Boolean$1;
+    default:
+      return Unknown;
+  }
+};
+const object = value => {
+  const type = getType(value);
+  if (type !== Object$1) {
+    throw new AssertionError('expected value to be of type object');
+  }
+};
+const number = value => {
+  const type = getType(value);
+  if (type !== Number$1) {
+    throw new AssertionError('expected value to be of type number');
+  }
+};
+const array = value => {
+  const type = getType(value);
+  if (type !== Array$1) {
+    throw new AssertionError('expected value to be of type array');
+  }
+};
+
 const {
   invoke,
   invokeAndTransfer,
@@ -3031,48 +3031,55 @@ const getMenuEntries$1 = () => {
     id: 'editorLayout',
     label: i18nString(EditorLayout)
   }, menuEntrySeparator, {
-    command: 'Explorer.focus',
+    args: ['Explorer'],
+    command: 'Layout.openSideBarViewlet',
     flags: None,
     id: 'explorer',
     label: i18nString(Explorer)
   }, {
-    command: 'Search.focus',
+    args: ['Search'],
+    command: 'Layout.openSideBarViewlet',
     flags: None,
     id: 'search',
     label: i18nString(Search)
   }, {
-    command: 'SourceControl.focus',
+    args: ['Source Control'],
+    command: 'Layout.openSideBarViewlet',
     flags: None,
     id: 'sourceControl',
     label: i18nString(SourceControl)
   }, {
-    command: 'Run.focus',
+    args: ['Run And Debug'],
+    command: 'Layout.openSideBarViewlet',
     flags: None,
     id: 'run',
     label: i18nString(Run$1)
   }, {
-    command: 'Extensions.focus',
+    args: ['Extensions'],
+    command: 'Layout.openSideBarViewlet',
     flags: None,
     id: 'extensions',
     label: i18nString(Extensions)
   }, menuEntrySeparator, {
-    command: 'Chat.focus',
+    command: 'Layout.openChat',
     flags: None,
     id: 'chat',
     label: i18nString(Chat)
   }, menuEntrySeparator, {
-    command: 'Problems.toggle',
+    args: ['Problems'],
+    command: 'Layout.showPanel',
     flags: None,
     id: 'problems',
     label: i18nString(Problems)
   }, {
-    command: 'Output.toggle',
+    args: ['Output'],
+    command: 'Layout.showPanel',
     flags: None,
     id: 'output',
     label: i18nString(Output)
   }, {
-    args: ['Terminal'],
-    command: 'Layout.togglePanel',
+    args: ['Terminals'],
+    command: 'Layout.showPanel',
     flags: None,
     id: 'terminal',
     label: i18nString(Terminal$1)
@@ -3399,29 +3406,33 @@ const handleClick$1 = async (state, buttonName) => {
 };
 
 const commandCenterItems = [{
-  label: 'Go to File',
-  value: 'file'
+  command: 'QuickPick.showFile',
+  label: 'Go to File'
 }, {
-  label: 'Show and Run Commands',
-  value: 'commands'
+  command: 'QuickPick.showCommands',
+  label: 'Show and Run Commands'
 }, {
-  label: 'Search for Text',
-  value: 'search'
+  args: ['Search'],
+  command: 'Layout.openSideBarViewlet',
+  label: 'Search for Text'
 }, {
-  label: 'Go to Symbol in Editor',
-  value: 'symbol'
+  args: ['symbol'],
+  command: 'QuickPick.show',
+  label: 'Go to Symbol in Editor'
 }, {
-  label: 'Start Debugging',
-  value: 'debug'
+  args: ['Run And Debug'],
+  command: 'Layout.openSideBarViewlet',
+  label: 'Start Debugging'
 }, {
-  label: 'Run Task',
-  value: 'task'
+  command: 'QuickPick.showCommands',
+  label: 'Run Task'
 }, {
-  label: 'More',
-  value: 'more'
+  command: 'QuickPick.showEverything',
+  label: 'More'
 }];
 const handleCommandCenterClick = async state => {
-  await invoke('QuickPick.showCustom', commandCenterItems, {
+  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'
@@ -3481,6 +3492,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);
@@ -3509,23 +3535,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,
@@ -3533,9 +3547,6 @@ const getNavigableTitleBarEntries = state => {
     titleBarEntries,
     width
   } = state;
-  if (hasOverflowEntry(titleBarEntries)) {
-    return titleBarEntries;
-  }
   return getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
 };
 
@@ -3688,14 +3699,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;
@@ -3709,7 +3734,7 @@ const openMenuAtIndex = async (state, index, shouldBeFocused) => {
   const menu = {
     focusedIndex: menuFocusedIndex,
     height,
-    id: id === OverflowMenuId ? undefined : id,
+    id: menuId,
     items,
     level: 0,
     width,
@@ -4413,7 +4438,6 @@ const getActiveEntryLabelDom = isFocused => {
   return [activeEntryLabelNode];
 };
 const getItemVirtualDom = item => {
-  // @ts-ignore
   const {
     ariaLabel,
     isFocused,

package/package.json

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