@lvce-editor/title-bar-worker 2.11.0 → 2.13.0

package/dist/titleBarWorkerMain.js

@@ -2313,13 +2313,13 @@ const getTitleBarButtonsVirtualDom = buttons => {
   }, ...buttons.flatMap(createTitleBarButton)];
 };
 
-const parentNode = {
+const parentNode$1 = {
   type: Div,
   className: mergeClassNames(Viewlet, TitleBarIcon),
   childCount: 1
 };
 const getTitleBarIconVirtualDom = iconSrc => {
-  return [parentNode, {
+  return [parentNode$1, {
     type: Img,
     className: TitleBarIconIcon,
     src: iconSrc,
@@ -2397,8 +2397,13 @@ const getTitleBarMenuBarVirtualDom = (visibleItems, focusedIndex) => {
   }, ...getTitleBarMenuBarItemsVirtualDom(visibleItems)];
 };
 
+const parentNode = {
+  type: Div,
+  className: 'TitleBarTitle',
+  childCount: 1
+};
 const getTitleVirtualDom = title => {
-  return [text(title)];
+  return [parentNode, text(title)];
 };
 
 const maximize = async () => {
@@ -2659,7 +2664,12 @@ const ifElse = (menuOpenFunction, menuClosedFunction) => {
 const handleMouseOut = ifElse(handleMouseOutMenuOpen, handleMouseOutMenuClosed);
 
 const handlePointerOut = (state, clientX, clientY) => {
-  const index = getTitleBarIndexFromPosition(state.titleBarEntries, clientX - state.x);
+  const {
+    x,
+    iconWidth,
+    titleBarEntries
+  } = state;
+  const index = getTitleBarIndexFromPosition(titleBarEntries, clientX - x - iconWidth);
   if (index === -1) {
     return state;
   }
@@ -2680,7 +2690,12 @@ const handleMouseOverMenuOpen = async (state, index) => {
 const handleMouseOver = ifElse(handleMouseOverMenuOpen, handleMouseOverMenuClosed);
 
 const handlePointerOver = (state, clientX, clientY) => {
-  const index = getTitleBarIndexFromPosition(state.titleBarEntries, clientX - state.x);
+  const {
+    titleBarEntries,
+    x,
+    iconWidth
+  } = state;
+  const index = getTitleBarIndexFromPosition(titleBarEntries, clientX - x - iconWidth);
   if (index === -1) {
     return state;
   }
@@ -2754,11 +2769,13 @@ const loadContent2 = async state => {
   const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
   const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
   const title = 'test';
+  const iconWidth = 30;
   return {
     ...state,
     titleBarEntries: withWidths,
     buttons,
-    title
+    title,
+    iconWidth
   };
 };
 
@@ -3397,6 +3414,14 @@ const getTitleBarVirtualDom = state => {
     titleBarButtons
   } = state;
   const dom = [];
+  dom.push({
+    type: Div,
+    className: 'Viewlet TitleBar',
+    id: 'TitleBar',
+    role: 'contentinfo',
+    ariaLabel: 'Title Bar',
+    childCount: 4
+  });
 
   // Add icon if enabled
   if (state.titleBarIconEnabled) {
@@ -4030,6 +4055,7 @@ const commandMap = {
   'TitleBarMenuBar.focusNext': wrapCommand(focusNext),
   'TitleBarMenuBar.focusPrevious': wrapCommand(focusPrevious),
   'TitleBarMenuBar.getCommands': getCommandIds,
+  'TitleBarMenuBar.getCommandIds': getCommandIds,
   'TitleBarMenuBar.getKeyBindings': getKeyBindings$1,
   'TitleBarMenuBar.getMenus': getMenus,
   'TitleBarMenuBar.getTitleBarButtons': getTitleBarButtons,
@@ -4060,6 +4086,14 @@ const commandMap = {
   'TitleBarMenuBar.toggleIndex': wrapCommand(toggleIndex),
   'TitleBarMenuBar.toggleMenu': wrapCommand(toggleMenu)
 };
+for (const [key, value] of Object.entries(commandMap)) {
+  const [prefix, name] = key.split('.');
+  if (prefix === 'TitleBarMenuBar') {
+    const alternate = `TitleBar.${name}`;
+    // @ts-ignore
+    commandMap[alternate] = value;
+  }
+}
 
 const listen = async () => {
   registerCommands(commandMap);

package/package.json

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