@lvce-editor/title-bar-worker 1.8.0 → 1.9.0

package/dist/titleBarWorkerMain.js

@@ -997,7 +997,8 @@ const getTitleBarMenuBarItemsVirtualDom = visibleItems => {
   return dom;
 };
 
-const getTitleBarMenuBarVirtualDom = visibleItems => {
+const activeId = 'TitleBarEntryActive';
+const getTitleBarMenuBarVirtualDom = (visibleItems, focusedIndex) => {
   return [{
     type: Div,
     className: 'Viewlet TitleBarMenuBar',
@@ -1008,7 +1009,8 @@ const getTitleBarMenuBarVirtualDom = visibleItems => {
     onFocusOut: HandleFocusOut,
     onFocusIn: HandleFocusIn,
     onPointerOver: HandlePointerOver,
-    onPointerOut: HandlePointerOut
+    onPointerOut: HandlePointerOut,
+    ariaActivedescendant: focusedIndex === -1 ? '' : activeId
   }, ...getTitleBarMenuBarItemsVirtualDom(visibleItems)];
 };
 
@@ -1088,7 +1090,7 @@ const getVisibleTitleBarEntries = (entries, width, focusedIndex, isMenuOpen) =>
 
 const renderEntries = (oldState, newState) => {
   const visibleEntries = getVisibleTitleBarEntries(newState.titleBarEntries, newState.width, newState.focusedIndex, newState.isMenuOpen);
-  const dom = getTitleBarMenuBarVirtualDom(visibleEntries);
+  const dom = getTitleBarMenuBarVirtualDom(visibleEntries, newState.focusedIndex);
   return ['Viewlet.setDom2', newState.uid, dom];
 };
 
@@ -2693,7 +2695,7 @@ const renderEventListeners = () => {
     params: ['handleClickToggleMaximize']
   }, {
     name: HandleFocusIn,
-    params: ['handlefocus']
+    params: ['handleFocus']
   }, {
     name: HandleMenuClick,
     params: ['handleMenuClick', 'event.clientX', 'event.clientY']
@@ -2702,7 +2704,7 @@ const renderEventListeners = () => {
     params: ['handleMenuMouseOver', 'event.clientX', 'event.clientY']
   }, {
     name: HandleClick,
-    params: ['handleClick', 'event.button', 'event.clientX', 'event.clientY']
+    params: ['handleClickAt', 'event.button', 'event.clientX', 'event.clientY']
   }, {
     name: HandlePointerOut,
     params: ['handlePointerOut', 'event.clientX', 'event.clientY']
@@ -2834,6 +2836,14 @@ const handleClick = async (state, button, index) => {
   return toggleIndex(state, index);
 };
 
+const handleClickAt = async (state, button, x, y) => {
+  const index = getTitleBarIndexFromPosition(state.titleBarEntries, x - state.x);
+  if (index === -1) {
+    return state;
+  }
+  return handleClick(state, button, index);
+};
+
 // TODO remove this file and merge with whenExpressions
 const TitleBarMenuBar = FocusTitleBarMenuBar;
 
@@ -3248,6 +3258,7 @@ const commandMap = {
   'TitleBarMenuBar.handleKeyArrowLeft': wrapCommand(handleKeyArrowLeft),
   'TitleBarMenuBar.handleKeyArrowRight': wrapCommand(handleKeyArrowRight),
   'TitleBarMenuBar.handleKeyArrowUp': wrapCommand(handleKeyArrowUp),
+  'TitleBarMenuBar.handleClickAt': wrapCommand(handleClickAt),
   'TitleBarMenuBar.handlePointerOver': wrapCommand(handlePointerOver),
   'TitleBarMenuBar.handleKeyEnd': wrapCommand(handleKeyEnd),
   'TitleBarMenuBar.handleKeyEnter': wrapCommand(handleKeyEnter),

package/package.json

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