@lvce-editor/title-bar-worker 2.12.0 → 2.14.0

package/dist/titleBarWorkerMain.js

@@ -2450,6 +2450,10 @@ const handleContextMenu = state => {
   return state;
 };
 
+const getMenuOffset = (x, clientX, iconWidth) => {
+  return clientX - x - iconWidth;
+};
+
 const getTitleBarIndexFromPosition = (titleBarEntries, x, y) => {
   let currentX = 0;
   for (let i = 0; i < titleBarEntries.length; i++) {
@@ -2581,7 +2585,8 @@ const openMenuAtIndex = async (state, index, shouldBeFocused) => {
   const {
     titleBarEntries,
     titleBarHeight,
-    x
+    x,
+    iconWidth
   } = state;
   // TODO race conditions
   // TODO send renderer process
@@ -2597,7 +2602,7 @@ const openMenuAtIndex = async (state, index, shouldBeFocused) => {
   const offset = totalWidths;
   // TODO race condition: another menu might already be open at this point
 
-  const menuX = x + offset;
+  const menuX = x + offset + iconWidth;
   const menuY = titleBarHeight;
   const width = getMenuWidth();
   const height = getMenuHeight(items);
@@ -2664,7 +2669,13 @@ 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 menuX = getMenuOffset(x, clientX, iconWidth);
+  const index = getTitleBarIndexFromPosition(titleBarEntries, menuX);
   if (index === -1) {
     return state;
   }
@@ -2685,7 +2696,13 @@ 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 menuOffset = getMenuOffset(x, clientX, iconWidth);
+  const index = getTitleBarIndexFromPosition(titleBarEntries, menuOffset);
   if (index === -1) {
     return state;
   }
@@ -2759,11 +2776,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
   };
 };
 
@@ -3625,8 +3644,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);
+const handleClickAt = async (state, button, eventX, eventY) => {
+  const {
+    titleBarEntries,
+    x,
+    iconWidth
+  } = state;
+  const menuOffset = getMenuOffset(x, eventX, iconWidth);
+  const index = getTitleBarIndexFromPosition(titleBarEntries, menuOffset);
   if (index === -1) {
     return state;
   }
@@ -4018,61 +4043,73 @@ const toggleMenu = async state => {
 };
 
 const commandMap = {
+  'TitleBar.closeMenu': closeMenu,
+  'TitleBar.create': create,
   'TitleBar.create3': create3,
+  'TitleBar.diff2': diff2,
   'TitleBar.diff3': diff3,
+  'TitleBar.focus': wrapCommand(focus),
+  'TitleBar.focusFirst': wrapCommand(focusFirst),
+  'TitleBar.focusIndex': wrapCommand(focusLast),
+  'TitleBar.focusLast': wrapCommand(focusIndex),
+  'TitleBar.focusNext': wrapCommand(focusNext),
+  'TitleBar.focusPrevious': wrapCommand(focusPrevious),
   'TitleBar.getButtonsVirtualDom': getTitleBarButtonsVirtualDom,
+  'TitleBar.getCommandIds': getCommandIds,
+  'TitleBar.getCommands': getCommandIds,
   'TitleBar.getIconVirtualDom': getTitleBarIconVirtualDom,
+  'TitleBar.getKeyBindings': getKeyBindings$1,
   'TitleBar.getMenuEntries': getMenuEntries$1,
   'TitleBar.getMenuIds': getMenuIds,
+  'TitleBar.getMenus': getMenus,
+  'TitleBar.getTitleBarButtons': getTitleBarButtons,
   'TitleBar.getTitleVirtualDom': getTitleVirtualDom,
-  'TitleBar.loadContent2': wrapCommand(loadContent2),
+  'TitleBar.getVirtualDom': getTitleBarMenuBarVirtualDom,
   'TitleBar.handleButtonsClick': handleClick$1,
+  'TitleBar.handleClick': wrapCommand(handleClick),
+  'TitleBar.handleClickAt': wrapCommand(handleClickAt),
   'TitleBar.handleClickClose': wrapCommand(handleClickClose),
   'TitleBar.handleClickMinimize': wrapCommand(handleClickMinimize),
   'TitleBar.handleClickToggleMaximize': wrapCommand(handleClickToggleMaximize),
   'TitleBar.handleContextMenu': handleContextMenu,
+  'TitleBar.handleFocus': wrapCommand(handleFocus),
+  'TitleBar.handleFocusOut': wrapCommand(handleFocusOut),
+  'TitleBar.handleKeyArrowDown': wrapCommand(handleKeyArrowDown),
+  'TitleBar.handleKeyArrowLeft': wrapCommand(handleKeyArrowLeft),
+  'TitleBar.handleKeyArrowRight': wrapCommand(handleKeyArrowRight),
+  'TitleBar.handleKeyArrowUp': wrapCommand(handleKeyArrowUp),
+  'TitleBar.handleKeyEnd': wrapCommand(handleKeyEnd),
+  'TitleBar.handleKeyEnter': wrapCommand(handleKeyEnter),
+  'TitleBar.handleKeyEscape': wrapCommand(handleKeyEscape),
+  'TitleBar.handleKeyHome': wrapCommand(handleKeyHome),
+  'TitleBar.handleKeySpace': wrapCommand(handleKeySpace),
+  'TitleBar.handleMenuClick': wrapCommand(handleMenuClick),
+  'TitleBar.handleMenuMouseOver': wrapCommand(handleMenuMouseOver),
+  'TitleBar.handleMouseOut': wrapCommand(handleMouseOut),
+  'TitleBar.handleMouseOver': wrapCommand(handleMouseOver),
+  'TitleBar.handlePointerOut': wrapCommand(handlePointerOut),
+  'TitleBar.handlePointerOver': wrapCommand(handlePointerOver),
+  'TitleBar.loadContent': wrapCommand(loadContent),
+  'TitleBar.loadContent2': wrapCommand(loadContent2),
+  'TitleBar.render2': render2,
   'TitleBar.render3': render3,
   'TitleBar.renderEventListeners': renderEventListeners,
-  'TitleBarMenuBar.closeMenu': closeMenu,
-  'TitleBarMenuBar.create': create,
-  'TitleBarMenuBar.diff2': diff2,
-  'TitleBarMenuBar.focus': wrapCommand(focus),
-  'TitleBarMenuBar.focusFirst': wrapCommand(focusFirst),
-  'TitleBarMenuBar.focusIndex': wrapCommand(focusLast),
-  'TitleBarMenuBar.focusLast': wrapCommand(focusIndex),
-  'TitleBarMenuBar.focusNext': wrapCommand(focusNext),
-  'TitleBarMenuBar.focusPrevious': wrapCommand(focusPrevious),
-  'TitleBarMenuBar.getCommands': getCommandIds,
-  'TitleBarMenuBar.getKeyBindings': getKeyBindings$1,
-  'TitleBarMenuBar.getMenus': getMenus,
-  'TitleBarMenuBar.getTitleBarButtons': getTitleBarButtons,
-  'TitleBarMenuBar.getVirtualDom': getTitleBarMenuBarVirtualDom,
-  'TitleBarMenuBar.handleClick': wrapCommand(handleClick),
-  'TitleBarMenuBar.handleClickAt': wrapCommand(handleClickAt),
-  'TitleBarMenuBar.handleFocus': wrapCommand(handleFocus),
-  'TitleBarMenuBar.handleFocusOut': wrapCommand(handleFocusOut),
-  'TitleBarMenuBar.handleKeyArrowDown': wrapCommand(handleKeyArrowDown),
-  'TitleBarMenuBar.handleKeyArrowLeft': wrapCommand(handleKeyArrowLeft),
-  'TitleBarMenuBar.handleKeyArrowRight': wrapCommand(handleKeyArrowRight),
-  'TitleBarMenuBar.handleKeyArrowUp': wrapCommand(handleKeyArrowUp),
-  'TitleBarMenuBar.handleKeyEnd': wrapCommand(handleKeyEnd),
-  'TitleBarMenuBar.handleKeyEnter': wrapCommand(handleKeyEnter),
-  'TitleBarMenuBar.handleKeyEscape': wrapCommand(handleKeyEscape),
-  'TitleBarMenuBar.handleKeyHome': wrapCommand(handleKeyHome),
-  'TitleBarMenuBar.handleKeySpace': wrapCommand(handleKeySpace),
-  'TitleBarMenuBar.handleMenuClick': wrapCommand(handleMenuClick),
-  'TitleBarMenuBar.handleMenuMouseOver': wrapCommand(handleMenuMouseOver),
-  'TitleBarMenuBar.handleMouseOut': wrapCommand(handleMouseOut),
-  'TitleBarMenuBar.handleMouseOver': wrapCommand(handleMouseOver),
-  'TitleBarMenuBar.handlePointerOut': wrapCommand(handlePointerOut),
-  'TitleBarMenuBar.handlePointerOver': wrapCommand(handlePointerOver),
-  'TitleBarMenuBar.loadContent': wrapCommand(loadContent),
-  'TitleBarMenuBar.render2': render2,
-  'TitleBarMenuBar.saveState': saveState,
-  'TitleBarMenuBar.terminate': terminate,
-  'TitleBarMenuBar.toggleIndex': wrapCommand(toggleIndex),
-  'TitleBarMenuBar.toggleMenu': wrapCommand(toggleMenu)
-};
+  'TitleBar.saveState': saveState,
+  'TitleBar.terminate': terminate,
+  'TitleBar.toggleIndex': wrapCommand(toggleIndex),
+  'TitleBar.toggleMenu': wrapCommand(toggleMenu)
+};
+
+// deprecated, can be removed in the future.
+// currently enabled for backwards compatability
+for (const [key, value] of Object.entries(commandMap)) {
+  const [prefix, name] = key.split('.');
+  if (prefix === 'TitleBar') {
+    const alternate = `TitleBarMenuBar.${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.12.0",
+  "version": "2.14.0",
   "description": "Title Bar Worker",
   "repository": {
     "type": "git",