@lvce-editor/title-bar-worker 4.9.0 → 4.9.2

package/dist/titleBarWorkerMain.js

@@ -598,7 +598,10 @@ const constructError = (message, type, name) => {
   if (ErrorConstructor === Error) {
     const error = new Error(message);
     if (name && name !== 'VError') {
-      error.name = name;
+      Object.defineProperty(error, 'name', {
+        configurable: true,
+        value: name
+      });
     }
     return error;
   }
@@ -629,31 +632,45 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
+const setStack = (error, stack) => {
+  const descriptor = Object.getOwnPropertyDescriptor(error, 'stack');
+  if (descriptor) {
+    if (!descriptor.configurable && !descriptor.writable) {
+      return;
+    }
+    if (!descriptor.configurable && descriptor.writable) {
+      error.stack = stack;
+      return;
+    }
+  }
+  Object.defineProperty(error, 'stack', {
+    configurable: true,
+    value: stack,
+    writable: true
+  });
+};
 const restoreExistingError = (error, currentStack) => {
   if (typeof error.stack === 'string') {
-    error.stack = error.stack + NewLine + currentStack;
+    setStack(error, `${error.stack}${NewLine}${currentStack}`);
   }
   return error;
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
   const parentStack = getParentStack(error);
-  restoredError.stack = parentStack + NewLine + currentStack;
+  setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
   return restoredError;
 };
 const restoreStackFromData = (restoredError, error, currentStack) => {
   if (error.data.stack && error.data.type && error.message) {
-    restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
+    setStack(restoredError, `${error.data.type}: ${error.message}${NewLine}${error.data.stack}${NewLine}${currentStack}`);
     return;
   }
   if (error.data.stack) {
-    restoredError.stack = error.data.stack;
+    setStack(restoredError, error.data.stack);
   }
 };
 const applyDataProperties = (restoredError, error) => {
-  if (!error.data) {
-    return;
-  }
   restoreStackFromData(restoredError, error, getCurrentStack());
   if (error.data.codeFrame) {
     // @ts-ignore
@@ -674,7 +691,7 @@ const applyDirectProperties = (restoredError, error) => {
     const indexNewLine = getNewLineIndex(lowerStack);
     const parentStack = getParentStack(error);
     // @ts-ignore
-    restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+    setStack(restoredError, `${parentStack}${lowerStack.slice(indexNewLine)}`);
   }
   if (error.codeFrame) {
     // @ts-ignore
@@ -1358,9 +1375,9 @@ 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 Minus$2 = 86;
+const Backquote$2 = 89;
+const Backslash$2 = 91;
 const Star$1 = 131;
 const Plus$1 = 132;
 
@@ -1424,15 +1441,15 @@ const F5 = 'F5';
 const F6 = 'F6';
 const Equal = '=';
 const Comma = ',';
-const Minus = 'Minus';
-const Backquote = 'Backquote';
-const Backslash = 'Backslash';
+const Minus$1 = 'Minus';
+const Backquote$1 = 'Backquote';
+const Backslash$1 = 'Backslash';
 const Star = '*';
 const Plus = '+';
 
 const keyCodeStringMap = {
-  [Backquote$1]: Backquote,
-  [Backslash$1]: Backslash,
+  [Backquote$2]: Backquote$1,
+  [Backslash$2]: Backslash$1,
   [Backspace$1]: Backspace,
   [Comma$1]: Comma,
   [Delete$1]: Delete,
@@ -1486,7 +1503,7 @@ const keyCodeStringMap = {
   [KeyY$1]: KeyY,
   [KeyZ$1]: KeyZ,
   [LeftArrow$1]: LeftArrow,
-  [Minus$1]: Minus,
+  [Minus$2]: Minus$1,
   [PageDown$1]: PageDown,
   [PageUp$1]: PageUp,
   [Plus$1]: Plus,
@@ -2342,12 +2359,12 @@ const selectAllOccurrences = () => {
 
 const getMenuEntries$d = () => {
   return [{
-    command: /* TODO */'-1',
+    command: 'Editor.undo',
     flags: None,
     id: 'undo',
     label: undo()
   }, {
-    command: /* TODO */'-1',
+    command: 'Editor.redo',
     flags: None,
     id: 'redo',
     label: redo()
@@ -2381,79 +2398,79 @@ const getMenuEntries$d = () => {
 
 const getMenuEntries$c = () => {
   return [{
-    command: 'MainArea.splitUp',
+    command: 'Main.splitUp',
     flags: None,
     id: 'splitUp',
     keyboardShortCut: 'Ctrl+K Ctrl+\\',
     label: i18nString(SplitUp)
   }, {
-    command: 'MainArea.splitDown',
+    command: 'Main.splitDown',
     flags: None,
     id: 'splitDown',
     label: i18nString(SplitDown)
   }, {
-    command: 'MainArea.splitLeft',
+    command: 'Main.splitLeft',
     flags: None,
     id: 'splitLeft',
     label: i18nString(SplitLeft)
   }, {
-    command: 'MainArea.splitRight',
+    command: 'Main.splitRight',
     flags: None,
     id: 'splitRight',
     label: i18nString(SplitRight)
   }, menuEntrySeparator, {
-    command: 'MainArea.moveIntoNewWindow',
+    command: 'Main.moveIntoNewWindow',
     flags: None,
     id: 'moveEditorIntoNewWindow',
     label: i18nString(MoveEditorIntoNewWindow)
   }, {
-    command: 'MainArea.copyIntoNewWindow',
+    command: 'Main.copyIntoNewWindow',
     flags: None,
     id: 'copyEditorIntoNewWindow',
     keyboardShortCut: 'Ctrl+K O',
     label: i18nString(CopyEditorIntoNewWindow)
   }, menuEntrySeparator, {
-    command: 'MainArea.setEditorLayoutSingle',
+    command: 'Main.setEditorLayoutSingle',
     flags: None,
     id: 'single',
     label: i18nString(Single)
   }, {
-    command: 'MainArea.setEditorLayoutTwoColumns',
+    command: 'Main.setEditorLayoutTwoColumns',
     flags: None,
     id: 'twoColumns',
     label: i18nString(TwoColumns)
   }, {
-    command: 'MainArea.setEditorLayoutThreeColumns',
+    command: 'Main.setEditorLayoutThreeColumns',
     flags: None,
     id: 'threeColumns',
     label: i18nString(ThreeColumns)
   }, {
-    command: 'MainArea.setEditorLayoutTwoRows',
+    command: 'Main.setEditorLayoutTwoRows',
     flags: None,
     id: 'twoRows',
     label: i18nString(TwoRows)
   }, {
-    command: 'MainArea.setEditorLayoutThreeRows',
+    command: 'Main.setEditorLayoutThreeRows',
     flags: None,
     id: 'threeRows',
     label: i18nString(ThreeRows)
   }, {
-    command: 'MainArea.setEditorLayoutGrid',
+    command: 'Main.setEditorLayoutGrid',
     flags: None,
     id: 'gridTwoByTwo',
     label: i18nString(GridTwoByTwo)
   }, {
-    command: 'MainArea.setEditorLayoutTwoRowsRight',
+    command: 'Main.setEditorLayoutTwoRowsRight',
     flags: None,
     id: 'twoRowsRight',
     label: i18nString(TwoRowsRight)
   }, {
-    command: 'MainArea.setEditorLayoutTwoColumnsBottom',
+    command: 'Main.setEditorLayoutTwoColumnsBottom',
     flags: None,
     id: 'twoColumnsBottom',
     label: i18nString(TwoColumnsBottom)
   }, menuEntrySeparator, {
-    command: 'MainArea.flipEditorLayout',
+    command: 'Main.flipEditorLayout',
     flags: None,
     id: 'flipLayout',
     keyboardShortCut: 'Shift+Alt+8',
@@ -3490,6 +3507,34 @@ const getTitleBarIndexFromPosition = (titleBarEntries, x, y) => {
   return -1;
 };
 
+const toCommandInfo = entry => {
+  return {
+    args: entry.args,
+    command: entry.command
+  };
+};
+const addMenuEntryKeyBindings = async entries => {
+  try {
+    const commands = entries.map(toCommandInfo);
+    const keys = await invoke('Layout.getKeyBindings', commands);
+    if (!keys.some(Boolean)) {
+      return entries;
+    }
+    return entries.map((entry, index) => {
+      const key = keys[index];
+      if (!key) {
+        return entry;
+      }
+      return {
+        ...entry,
+        key
+      };
+    });
+  } catch {
+    return entries;
+  }
+};
+
 const getTotalWidth = entries => {
   let total = 0;
   for (const entry of entries) {
@@ -3601,10 +3646,11 @@ const openMenuAtIndex = async (state, index, shouldBeFocused) => {
   const {
     id
   } = titleBarEntry;
-  const items = id === OverflowMenuId ? getOverflowMenuItems(titleBarEntry.hiddenEntries || []) : await getMenuEntries2(state, {
+  const rawItems = id === OverflowMenuId ? getOverflowMenuItems(titleBarEntry.hiddenEntries || []) : await getMenuEntries2(state, {
     menuId: id,
     platform
   });
+  const items = id === OverflowMenuId ? rawItems : await addMenuEntryKeyBindings(rawItems);
   const relevantEntries = titleBarEntries.slice(0, index);
   const totalWidths = getTotalWidth(relevantEntries);
   const offset = totalWidths;
@@ -3922,6 +3968,7 @@ const renderFocusedIndex = (oldState, newState) => {
 };
 
 const MaskIconCheck = 'MaskIconCheck';
+const MaskIcon = 'MaskIcon';
 const Menu = 'Menu';
 const MenuItem = 'MenuItem';
 const MenuItemCheckMark = 'MenuItemCheckMark';
@@ -3933,6 +3980,7 @@ const MenuItemSeparatorLine = 'MenuItemSeparatorLine';
 const MenuItemSubMenu = 'MenuItemSubMenu';
 const MenuItemSubMenuArrowRight = 'MenuItemSubMenuArrowRight';
 const TitleBar = 'TitleBar';
+const TitleBarButton = 'TitleBarButton';
 const TitleBarButtons = 'TitleBarButtons';
 const TitleBarEntryActive = 'TitleBarEntryActive';
 const TitleBarIcon = 'TitleBarIcon';
@@ -3942,42 +3990,53 @@ const TitleBarTopLevelEntry = 'TitleBarTopLevelEntry';
 const TitleBarTopLevelEntryLabel = 'TitleBarTopLevelEntryLabel';
 const Viewlet = 'Viewlet';
 
-const checkMark = {
-  className: mergeClassNames(MenuItemCheckmarkIcon, MaskIconCheck),
-  type: Div
-};
-const getMenuItemCheckedDom = menuItem => {
-  const {
-    isFocused,
-    label
-  } = menuItem;
-  const baseClassName = mergeClassNames(MenuItem, MenuItemCheckMark);
-  const className = isFocused ? mergeClassNames(baseClassName, MenuItemFocused) : baseClassName;
-  return [{
-    ariaChecked: true,
-    childCount: 2,
-    className,
-    role: MenuItemCheckBox,
-    tabIndex: -1,
-    type: Div
-  }, checkMark, text(label)];
-};
-
 const getKeyBindingString = (key, altKey, ctrlKey, shiftKey, metaKey) => {
   let string = '';
   if (ctrlKey) {
     string += 'Ctrl+';
   }
+  if (altKey) {
+    string += 'Alt+';
+  }
   if (shiftKey) {
     string += 'Shift+';
   }
-  string += key.toUpperCase();
+  string += key.length === 1 ? key.toUpperCase() : key;
   return string;
 };
 
+const F11 = 67;
+const Minus = 86;
+const Slash = 88;
+const Backquote = 89;
+const Backslash = 91;
+const Numpad0 = 96;
+
+const getKeyLabel = (keyCode, fallback) => {
+  switch (keyCode) {
+    case Backquote:
+      return '`';
+    case Backslash:
+      return '\\';
+    case F11:
+      return 'F11';
+    case Minus:
+      return '-';
+    case Numpad0:
+      return 'NumPad0';
+    case Slash:
+      return '/';
+    default:
+      return fallback;
+  }
+};
+
+const altKeyMask = 1 << 9;
 const getKeyDom = key => {
   const parsedKey = parseKey(key);
-  const keyBindingsString = getKeyBindingString(parsedKey.key, false, parsedKey.isCtrl, parsedKey.isShift);
+  const isAlt = Boolean(key & altKeyMask);
+  const keyLabel = getKeyLabel(key & 0xff, parsedKey.key);
+  const keyBindingsString = getKeyBindingString(keyLabel, isAlt, parsedKey.isCtrl, parsedKey.isShift);
   return [{
     childCount: 1,
     className: MenuItemKeyBinding,
@@ -3985,6 +4044,29 @@ const getKeyDom = key => {
   }, text(keyBindingsString)];
 };
 
+const checkMark = {
+  className: mergeClassNames(MenuItemCheckmarkIcon, MaskIconCheck),
+  type: Div
+};
+const getMenuItemCheckedDom = menuItem => {
+  const {
+    isFocused,
+    key,
+    label
+  } = menuItem;
+  const baseClassName = mergeClassNames(MenuItem, MenuItemCheckMark);
+  const className = isFocused ? mergeClassNames(baseClassName, MenuItemFocused) : baseClassName;
+  const keyDom = key ? getKeyDom(key) : [];
+  return [{
+    ariaChecked: true,
+    childCount: key ? 3 : 2,
+    className,
+    role: MenuItemCheckBox,
+    tabIndex: -1,
+    type: Div
+  }, checkMark, text(label), ...keyDom];
+};
+
 const classNameFocused = mergeClassNames(MenuItem, MenuItemFocused);
 const getMenuItemClassName = isFocused => {
   if (isFocused) {
@@ -4010,19 +4092,20 @@ const getMenuItemDefaultDom = menuItem => {
   }, text(label), ...keyDom];
 };
 
-const disabled = {
-  childCount: 1,
-  className: MenuItem,
-  disabled: true,
-  role: MenuItem$1,
-  tabIndex: -1,
-  type: Div
-};
 const getMenuItemDisabledDom = menuItem => {
   const {
+    key,
     label
   } = menuItem;
-  return [disabled, text(label)];
+  const keyDom = key ? getKeyDom(key) : [];
+  return [{
+    childCount: key ? 2 : 1,
+    className: MenuItem,
+    disabled: true,
+    role: MenuItem$1,
+    tabIndex: -1,
+    type: Div
+  }, text(label), ...keyDom];
 };
 
 const getMenuItemsNoopDom = () => {
@@ -4073,17 +4156,19 @@ const getMenuItemSubMenuDom = menuItem => {
 const getMenuItemUncheckedDom = menuItem => {
   const {
     isFocused,
+    key,
     label
   } = menuItem;
   const className = isFocused ? mergeClassNames(MenuItem, MenuItemFocused) : MenuItem;
+  const keyDom = key ? getKeyDom(key) : [];
   return [{
     ariaChecked: false,
-    childCount: 1,
+    childCount: key ? 2 : 1,
     className,
     role: MenuItemCheckBox,
     tabIndex: -1,
     type: Div
-  }, text(label)];
+  }, text(label), ...keyDom];
 };
 
 const getMenuItemRenderer = flags => {
@@ -4190,7 +4275,7 @@ const getIcon = assetDir => {
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     childCount: 0,
-    className: `MaskIcon MaskIcon${icon}`,
+    className: mergeClassNames(MaskIcon, `MaskIcon${icon}`),
     role: None$1,
     type
   };
@@ -4206,7 +4291,7 @@ const createTitleBarButton = button => {
   const dom = [{
     ariaLabel: label,
     childCount: 1,
-    className: `TitleBarButton TitleBarButton${id}`,
+    className: mergeClassNames(TitleBarButton, `TitleBarButton${id}`),
     name: id,
     onClick,
     type: Button$1
@@ -4534,12 +4619,17 @@ const create = (id, uri, x, y, width, height) => {
 
 const closeMenu = (state, keepFocus) => {
   const {
-    focusedIndex
+    focusedIndex,
+    isMenuOpen,
+    menus
   } = state;
   // TODO send to renderer process
   // 1. close menu
   // 2. focus top level entry
   const newFocusedIndex = keepFocus ? focusedIndex : -1;
+  if (!isMenuOpen && menus.length === 0 && focusedIndex === newFocusedIndex) {
+    return state;
+  }
   return {
     ...state,
     focusedIndex: newFocusedIndex,
@@ -4778,7 +4868,8 @@ const handleKeyArrowRightMenuOpen = async state => {
   }
   const item = items[focusedIndex];
   if (item.flags === SubMenu$1 && item.id !== undefined) {
-    const subMenuEntries = await getMenuEntries(item.id);
+    const rawSubMenuEntries = await getMenuEntries(item.id);
+    const subMenuEntries = await addMenuEntryKeyBindings(rawSubMenuEntries);
     const subMenu = {
       focusedIndex: 0,
       items: subMenuEntries,
@@ -4943,7 +5034,8 @@ const selectIndexSubMenu = async (state, menu, index) => {
   if (!item.id) {
     return state;
   }
-  const subMenuEntries = await getMenuEntries(item.id);
+  const rawSubMenuEntries = await getMenuEntries(item.id);
+  const subMenuEntries = await addMenuEntryKeyBindings(rawSubMenuEntries);
   const subMenu = {
     focusedIndex: -1,
     items: subMenuEntries,
@@ -5030,7 +5122,8 @@ const getNewMenus = async (menus, level, index, flags) => {
     if (!item.id) {
       return menus;
     }
-    const subMenuEntries = await getMenuEntries(item.id);
+    const rawSubMenuEntries = await getMenuEntries(item.id);
+    const subMenuEntries = await addMenuEntryKeyBindings(rawSubMenuEntries);
     const subMenu = {
       focusedIndex: -1,
       items: subMenuEntries,

package/package.json

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