@lvce-editor/title-bar-worker 4.9.1 → 4.10.0

package/dist/titleBarWorkerMain.js

@@ -3968,6 +3968,7 @@ const renderFocusedIndex = (oldState, newState) => {
 };
 
 const MaskIconCheck = 'MaskIconCheck';
+const MaskIcon = 'MaskIcon';
 const Menu = 'Menu';
 const MenuItem = 'MenuItem';
 const MenuItemCheckMark = 'MenuItemCheckMark';
@@ -3979,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';
@@ -4030,16 +4032,17 @@ const getKeyLabel = (keyCode, fallback) => {
 };
 
 const altKeyMask = 1 << 9;
+const keyBindingNode = {
+  childCount: 1,
+  className: MenuItemKeyBinding,
+  type: Span
+};
 const getKeyDom = key => {
   const parsedKey = parseKey(key);
   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,
-    type: Span
-  }, text(keyBindingsString)];
+  return [keyBindingNode, text(keyBindingsString)];
 };
 
 const checkMark = {
@@ -4273,7 +4276,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
   };
@@ -4289,7 +4292,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
@@ -4326,6 +4329,11 @@ const getTitleBarIconVirtualDom = (titleBarIconEnabled, iconSrc) => {
   }];
 };
 
+const activeEntryLabelNode = {
+  childCount: 1,
+  className: TitleBarTopLevelEntryLabel,
+  type: Div
+};
 const getItemVirtualDom = item => {
   // @ts-ignore
   const {
@@ -4335,10 +4343,7 @@ const getItemVirtualDom = item => {
     keyboardShortCut,
     label
   } = item;
-  let className = TitleBarTopLevelEntry;
-  if (isFocused) {
-    className += ' ' + TitleBarEntryActive;
-  }
+  const className = isFocused ? mergeClassNames(TitleBarTopLevelEntry, TitleBarEntryActive) : TitleBarTopLevelEntry;
   return [{
     ariaExpanded: isOpen,
     ariaHasPopup: true,
@@ -4352,11 +4357,7 @@ const getItemVirtualDom = item => {
     // TODO have separate name attribute
     role: MenuItem$1,
     type: Button$1
-  }, ...(isFocused ? [{
-    childCount: 1,
-    className: TitleBarTopLevelEntryLabel,
-    type: Div
-  }] : []), text(label)];
+  }, ...(isFocused ? [activeEntryLabelNode] : []), text(label)];
 };
 const getTitleBarMenuBarItemsVirtualDom = visibleItems => {
   const dom = visibleItems.flatMap(getItemVirtualDom);
@@ -4396,6 +4397,10 @@ const getTitleVirtualDom = (titleBarTitleEnabled, title) => {
   return [parentNode, text(title)];
 };
 
+const emptyTitleBarNode = {
+  childCount: 0,
+  type: Div
+};
 const getTitleBarVirtualDom = state => {
   const {
     assetDir,
@@ -4413,10 +4418,7 @@ const getTitleBarVirtualDom = state => {
     width
   } = state;
   if (platform === Electron$1 && !titleBarStyleCustom) {
-    return [{
-      childCount: 0,
-      type: Div
-    }];
+    return [emptyTitleBarNode];
   }
   const iconSrc = getIcon(assetDir);
   const visibleEntries = getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
@@ -4617,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,

package/package.json

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