@lvce-editor/title-bar-worker 2.6.0 → 2.8.0

package/dist/titleBarWorkerMain.js

@@ -1031,6 +1031,8 @@ const diff = (oldState, newState) => {
 const {
   get: get$1,
   set: set$3,
+  getCommandIds,
+  registerCommands,
   wrapCommand
 } = create$2();
 
@@ -1042,12 +1044,6 @@ const diff2 = uid => {
   return diff(oldState, newState);
 };
 
-const commandsIds = ['closeMenu', 'handleClickAt', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusPrevious', 'handleClick', 'handleFocus', 'handleFocusOut', 'handleKeyArrowDown', 'handleKeyArrowLeft', 'handleKeyArrowRight', 'handleKeyArrowUp', 'handleKeyEnd', 'handleKeyEnter', 'handleKeyEscape', 'handleKeyHome', 'handleKeySpace', 'handleMenuClick', 'handleMenuMouseOver', 'handleMouseOut', 'handleMouseOver', 'handlePointerOver', 'handlePointerOut', 'toggleIndex', 'toggleMenu'];
-
-const getCommandIds = () => {
-  return commandsIds;
-};
-
 const Menu$1 = 'menu';
 const MenuBar = 'menubar';
 const MenuItem$1 = 'menuitem';
@@ -1146,7 +1142,7 @@ const i18nString = (key, placeholders = emptyObject) => {
 /**
  * @enum {string}
  */
-const UiStrings$2 = {
+const UiStrings$1 = {
   Copy: 'Copy',
   CopyLineDown: 'Copy Line Down',
   CopyLineUp: 'Copy Line Up',
@@ -1160,40 +1156,40 @@ const UiStrings$2 = {
   ToggleLineComment: 'Toggle Line Comment',
   Undo: 'Undo'};
 const cut = () => {
-  return i18nString(UiStrings$2.Cut);
+  return i18nString(UiStrings$1.Cut);
 };
 const copy = () => {
-  return i18nString(UiStrings$2.Copy);
+  return i18nString(UiStrings$1.Copy);
 };
 const paste = () => {
-  return i18nString(UiStrings$2.Paste);
+  return i18nString(UiStrings$1.Paste);
 };
 const undo = () => {
-  return i18nString(UiStrings$2.Undo);
+  return i18nString(UiStrings$1.Undo);
 };
 const redo = () => {
-  return i18nString(UiStrings$2.Redo);
+  return i18nString(UiStrings$1.Redo);
 };
 const toggleLineComment = () => {
-  return i18nString(UiStrings$2.ToggleLineComment);
+  return i18nString(UiStrings$1.ToggleLineComment);
 };
 const toggleBlockComment = () => {
-  return i18nString(UiStrings$2.ToggleBlockComment);
+  return i18nString(UiStrings$1.ToggleBlockComment);
 };
 const selectAll = () => {
-  return i18nString(UiStrings$2.SelectAll);
+  return i18nString(UiStrings$1.SelectAll);
 };
 const copyLineUp = () => {
-  return i18nString(UiStrings$2.CopyLineUp);
+  return i18nString(UiStrings$1.CopyLineUp);
 };
 const copyLineDown = () => {
-  return i18nString(UiStrings$2.CopyLineDown);
+  return i18nString(UiStrings$1.CopyLineDown);
 };
 const moveLineUp = () => {
-  return i18nString(UiStrings$2.MoveLineUp);
+  return i18nString(UiStrings$1.MoveLineUp);
 };
 const moveLineDown = () => {
-  return i18nString(UiStrings$2.MoveLineDown);
+  return i18nString(UiStrings$1.MoveLineDown);
 };
 
 const Edit$1 = 2;
@@ -1272,7 +1268,7 @@ const MenuEntriesEdit = {
 /**
  * @enum {string}
  */
-const UiStrings$1 = {
+const UiStrings = {
   NewFile: 'New File',
   NewWindow: 'New Window',
   OpenFile: 'Open File',
@@ -1283,28 +1279,28 @@ const UiStrings$1 = {
   SaveAll: 'Save All'
 };
 const newFile = () => {
-  return i18nString(UiStrings$1.NewFile);
+  return i18nString(UiStrings.NewFile);
 };
 const newWindow = () => {
-  return i18nString(UiStrings$1.NewWindow);
+  return i18nString(UiStrings.NewWindow);
 };
 const openFile = () => {
-  return i18nString(UiStrings$1.OpenFile);
+  return i18nString(UiStrings.OpenFile);
 };
 const openFolder = () => {
-  return i18nString(UiStrings$1.OpenFolder);
+  return i18nString(UiStrings.OpenFolder);
 };
 const openRecent = () => {
-  return i18nString(UiStrings$1.OpenRecent);
+  return i18nString(UiStrings.OpenRecent);
 };
 const save = () => {
-  return i18nString(UiStrings$1.Save);
+  return i18nString(UiStrings.Save);
 };
 const saveAll = () => {
-  return i18nString(UiStrings$1.SaveAll);
+  return i18nString(UiStrings.SaveAll);
 };
 const exit = () => {
-  return i18nString(UiStrings$1.Exit);
+  return i18nString(UiStrings.Exit);
 };
 
 const Web = 1;
@@ -1388,6 +1384,7 @@ const Help = 'Help';
 const Maximize = 'Maximize';
 const Minimize = 'Minimize';
 const MoreDot = 'More ...';
+const NewTerminal = 'New Terminal';
 const OpenProcessExplorer = 'Open Process Explorer';
 const Run = 'Run';
 const Selection = 'Selection';
@@ -1963,21 +1960,11 @@ const MenuEntriesSelection = {
   id: id$3
 };
 
-/**
- * @enum {string}
- */
-const UiStrings = {
-  NewTerminal: 'New Terminal'
-};
-const newTerminal = () => {
-  return i18nString(UiStrings.NewTerminal);
-};
-
 const id$2 = Terminal$1;
 const getMenuEntries$6 = () => {
   return [{
     id: 'newTerminal',
-    label: newTerminal(),
+    label: i18nString(NewTerminal),
     flags: None,
     command: 'Layout.togglePanel',
     args: ['Terminal']
@@ -2135,12 +2122,6 @@ const getMenuEntries$1 = (id, platform) => {
   return menu.getMenuEntries(platform);
 };
 
-const getTitleBarButtonsWeb = () => {
-  return [];
-};
-const getTitleBarButtonsRemote = () => {
-  return [];
-};
 const getTitleBarButtonsElectron = (controlsOverlayEnabled, titleBarStyleCustom) => {
   if (controlsOverlayEnabled) {
     return [];
@@ -2166,6 +2147,15 @@ const getTitleBarButtonsElectron = (controlsOverlayEnabled, titleBarStyleCustom)
   }
   return [];
 };
+
+const getTitleBarButtonsRemote = () => {
+  return [];
+};
+
+const getTitleBarButtonsWeb = () => {
+  return [];
+};
+
 const getTitleBarButtons = (platform, controlsOverlayEnabled, titleBarStyleCustom) => {
   switch (platform) {
     case Electron:
@@ -2226,12 +2216,11 @@ const createTitleBarButton = button => {
 };
 
 const getTitleBarButtonsVirtualDom = buttons => {
-  const dom = [{
+  return [{
     type: Div,
     className: mergeClassNames(Viewlet, TitleBarButtons),
     childCount: buttons.length
   }, ...buttons.flatMap(createTitleBarButton)];
-  return dom;
 };
 
 const parentNode = {
@@ -3035,6 +3024,16 @@ const parseKey = rawKey => {
   };
 };
 
+const getKeyDom = key => {
+  const parsedKey = parseKey(key);
+  const keyBindingsString = getKeyBindingString(parsedKey.key, false, parsedKey.isCtrl, parsedKey.isShift);
+  return [{
+    type: Span,
+    className: MenuItemKeyBinding,
+    childCount: 1
+  }, text(keyBindingsString)];
+};
+
 const classNameFocused = mergeClassNames(MenuItem, MenuItemFocused);
 const getMenuItemClassName = isFocused => {
   if (isFocused) {
@@ -3059,13 +3058,8 @@ const getMenuItemDefaultDom = menuItem => {
   }, text(label));
   if (key) {
     dom[0].childCount++;
-    const parsedKey = parseKey(key);
-    const keyBindingsString = getKeyBindingString(parsedKey.key, false, parsedKey.isCtrl, parsedKey.isShift);
-    dom.push({
-      type: Span,
-      className: MenuItemKeyBinding,
-      childCount: 1
-    }, text(keyBindingsString));
+    const keyDom = getKeyDom(key);
+    dom.push(...keyDom);
   }
   return dom;
 };
@@ -3116,11 +3110,8 @@ const getMenuItemSubMenuDom = menuItem => {
     isExpanded,
     level
   } = menuItem;
-  let className = MenuItem;
-  className += ' ' + MenuItemSubMenu;
-  if (isFocused) {
-    className += ' ' + MenuItemFocused;
-  }
+  const baseClassName = mergeClassNames(MenuItem, MenuItemSubMenu);
+  const className = isFocused ? mergeClassNames(baseClassName, MenuItemFocused) : baseClassName;
   return [{
     type: Div,
     className,
@@ -3866,6 +3857,7 @@ const commandMap = {
 };
 
 const listen = async () => {
+  registerCommands(commandMap);
   const rpc = await WebWorkerRpcClient.create({
     commandMap: commandMap
   });

package/package.json

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