@lvce-editor/title-bar-worker 2.7.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';
@@ -3028,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) {
@@ -3052,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;
 };
@@ -3109,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,
@@ -3859,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.7.0",
+  "version": "2.8.0",
   "description": "Title Bar Worker",
   "repository": {
     "type": "git",