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

package/dist/titleBarWorkerMain.js

@@ -4032,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 = {
@@ -4328,6 +4329,17 @@ const getTitleBarIconVirtualDom = (titleBarIconEnabled, iconSrc) => {
   }];
 };
 
+const activeEntryLabelNode = {
+  childCount: 1,
+  className: TitleBarTopLevelEntryLabel,
+  type: Div
+};
+const getActiveEntryLabelDom = isFocused => {
+  if (!isFocused) {
+    return [];
+  }
+  return [activeEntryLabelNode];
+};
 const getItemVirtualDom = item => {
   // @ts-ignore
   const {
@@ -4337,10 +4349,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,
@@ -4354,11 +4363,7 @@ const getItemVirtualDom = item => {
     // TODO have separate name attribute
     role: MenuItem$1,
     type: Button$1
-  }, ...(isFocused ? [{
-    childCount: 1,
-    className: TitleBarTopLevelEntryLabel,
-    type: Div
-  }] : []), text(label)];
+  }, ...getActiveEntryLabelDom(isFocused), text(label)];
 };
 const getTitleBarMenuBarItemsVirtualDom = visibleItems => {
   const dom = visibleItems.flatMap(getItemVirtualDom);
@@ -4398,6 +4403,10 @@ const getTitleVirtualDom = (titleBarTitleEnabled, title) => {
   return [parentNode, text(title)];
 };
 
+const emptyTitleBarNode = {
+  childCount: 0,
+  type: Div
+};
 const getTitleBarVirtualDom = state => {
   const {
     assetDir,
@@ -4415,10 +4424,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);

package/package.json

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