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

package/dist/titleBarWorkerMain.js

@@ -913,6 +913,34 @@ const diff = (oldState, newState) => {
   return diffResult;
 };
 
+const create$1 = () => {
+  const states = Object.create(null);
+  return {
+    get(uid) {
+      return states[uid];
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        oldState,
+        newState
+      };
+    }
+  };
+};
+
+const {
+  get,
+  set
+} = create$1();
+
+const diff2 = uid => {
+  const {
+    oldState,
+    newState
+  } = get(uid);
+  return diff(oldState, newState);
+};
+
 const Menu$1 = 'menu';
 const MenuBar = 'menubar';
 const MenuItem$1 = 'menuitem';
@@ -997,7 +1025,8 @@ const getTitleBarMenuBarItemsVirtualDom = visibleItems => {
   return dom;
 };
 
-const getTitleBarMenuBarVirtualDom = visibleItems => {
+const activeId = 'TitleBarEntryActive';
+const getTitleBarMenuBarVirtualDom = (visibleItems, focusedIndex) => {
   return [{
     type: Div,
     className: 'Viewlet TitleBarMenuBar',
@@ -1008,7 +1037,8 @@ const getTitleBarMenuBarVirtualDom = visibleItems => {
     onFocusOut: HandleFocusOut,
     onFocusIn: HandleFocusIn,
     onPointerOver: HandlePointerOver,
-    onPointerOut: HandlePointerOut
+    onPointerOut: HandlePointerOut,
+    ariaActivedescendant: focusedIndex === -1 ? '' : activeId
   }, ...getTitleBarMenuBarItemsVirtualDom(visibleItems)];
 };
 
@@ -1088,7 +1118,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];
 };
 
@@ -1628,26 +1658,6 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
-const create$1 = () => {
-  const states = Object.create(null);
-  return {
-    get(uid) {
-      return states[uid];
-    },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
-    }
-  };
-};
-
-const {
-  get,
-  set
-} = create$1();
-
 const doRender = async uid => {
   const {
     oldState,
@@ -2681,6 +2691,15 @@ const loadContent = async (state, titleBarEntries) => {
   };
 };
 
+const render2 = async (uid, diffResult) => {
+  const {
+    oldState,
+    newState
+  } = get(uid);
+  const commands = applyRender(oldState, newState, diffResult);
+  return commands;
+};
+
 const renderEventListeners = () => {
   return [{
     name: HandleClickMinimize,
@@ -2693,7 +2712,7 @@ const renderEventListeners = () => {
     params: ['handleClickToggleMaximize']
   }, {
     name: HandleFocusIn,
-    params: ['handlefocus']
+    params: ['handleFocus']
   }, {
     name: HandleMenuClick,
     params: ['handleMenuClick', 'event.clientX', 'event.clientY']
@@ -2702,7 +2721,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 +2853,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;
 
@@ -3232,6 +3259,8 @@ const commandMap = {
   'TitleBarMenuBar.closeMenu': closeMenu,
   'TitleBarMenuBar.create': create,
   'TitleBarMenuBar.focus': wrapCommand(focus),
+  'TitleBarMenuBar.diff2': diff2,
+  'TitleBarMenuBar.render2': render2,
   'TitleBarMenuBar.focusFirst': wrapCommand(focusFirst),
   'TitleBarMenuBar.focusIndex': wrapCommand(focusLast),
   'TitleBarMenuBar.focusLast': wrapCommand(focusIndex),
@@ -3240,7 +3269,6 @@ const commandMap = {
   'TitleBarMenuBar.getCommands': getCommandIds,
   'TitleBarMenuBar.getKeyBindings': getKeyBindings,
   'TitleBarMenuBar.getMenus': getMenus,
-  'TitleBarMenuBar.diff': diff,
   'TitleBarMenuBar.getVirtualDom': getTitleBarMenuBarVirtualDom,
   'TitleBarMenuBar.handleClick': wrapCommand(handleClick),
   'TitleBarMenuBar.handleFocus': wrapCommand(handleFocus),
@@ -3248,6 +3276,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),
@@ -3260,11 +3289,13 @@ const commandMap = {
   'TitleBarMenuBar.handleMouseOut': wrapCommand(handleMouseOut),
   'TitleBarMenuBar.handleMouseOver': wrapCommand(handleMouseOver),
   'TitleBarMenuBar.loadContent': wrapCommand(loadContent),
-  'TitleBarMenuBar.render': doRender,
   'TitleBarMenuBar.saveState': saveState,
   'TitleBarMenuBar.terminate': terminate,
   'TitleBarMenuBar.toggleIndex': wrapCommand(toggleIndex),
-  'TitleBarMenuBar.toggleMenu': wrapCommand(toggleMenu)
+  'TitleBarMenuBar.toggleMenu': wrapCommand(toggleMenu),
+  // deprecated
+  'TitleBarMenuBar.diff': diff,
+  'TitleBarMenuBar.render': doRender
 };
 
 const listen = async () => {

package/package.json

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