@lvce-editor/title-bar-worker 2.20.0 → 2.22.0

package/dist/titleBarWorkerMain.js

@@ -1259,6 +1259,7 @@ const Img = 17;
 const Button = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
+const TargetName = 'event.target.name';
 
 const Backspace$1 = 1;
 const Tab$1 = 2;
@@ -2815,14 +2816,11 @@ const handleMouseOverMenuOpen = async (state, index) => {
 
 const handleMouseOver = ifElse(handleMouseOverMenuOpen, handleMouseOverMenuClosed);
 
-const handlePointerOver = (state, clientX, clientY) => {
+const handlePointerOver = (state, name) => {
   const {
-    titleBarEntries,
-    x,
-    iconWidth
+    titleBarEntries
   } = state;
-  const menuOffset = getMenuOffset(x, clientX, iconWidth);
-  const index = getTitleBarIndexFromPosition(titleBarEntries, menuOffset);
+  const index = titleBarEntries.findIndex(item => item.label === name);
   if (index === -1) {
     return state;
   }
@@ -2886,7 +2884,10 @@ const getTitle = workspaceUri => {
     return '';
   }
   const slashIndex = workspaceUri.lastIndexOf('/');
-  const baseName = workspaceUri.slice(slashIndex);
+  if (slashIndex === -1) {
+    return '';
+  }
+  const baseName = workspaceUri.slice(slashIndex + 1);
   return baseName;
 };
 
@@ -3249,16 +3250,16 @@ const getItemVirtualDom = item => {
     isFocused
   } = item;
   // TODO avoid mutation
-  const dom = [];
-  dom.push({
-    type: Div,
+  const dom = [{
+    type: Button$1,
     className: TitleBarTopLevelEntry,
     ariaHasPopup: true,
     ariaExpanded: isOpen,
     role: MenuItem$1,
     childCount: 1,
-    ariaKeyShortcuts: keyboardShortCut
-  });
+    ariaKeyShortcuts: keyboardShortCut,
+    name: label // TODO have separate name attribute
+  }];
   if (isOpen) {
     // @ts-ignore
     dom[0].ariaOwns = 'Menu-0';
@@ -3357,15 +3358,14 @@ const getTitleBarVirtualDom = state => {
     title,
     titleBarButtons
   } = state;
-  const dom = [];
-  dom.push({
+  const dom = [{
     type: Div,
     className: 'Viewlet TitleBar',
     id: 'TitleBar',
     role: 'contentinfo',
     ariaLabel: 'Title Bar',
     childCount: 4
-  });
+  }];
 
   // Add icon if enabled
   if (state.titleBarIconEnabled) {
@@ -3457,7 +3457,7 @@ const renderEventListeners = () => {
     params: ['handlePointerOut', ClientX, ClientY]
   }, {
     name: HandlePointerOver,
-    params: ['handlePointerOver', ClientX, ClientY]
+    params: ['handlePointerOver', TargetName]
   }, {
     name: HandleFocusOut,
     params: ['handleFocusOut', ClientX, ClientY] // TODO maybe check relatedTarget

package/package.json

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