@lvce-editor/menu-worker 4.0.0 → 4.1.0

package/dist/menuWorkerMain.js

@@ -741,7 +741,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$8 = (message, result) => {
+const create$9 = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -750,7 +750,7 @@ const create$8 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$8(message, resultProperty);
+  return create$9(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -844,7 +844,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$7 = (method, params) => {
+const create$8 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -852,7 +852,7 @@ const create$7 = (method, params) => {
   };
 };
 
-const create$6 = (id, method, params) => {
+const create$7 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -863,12 +863,12 @@ const create$6 = (id, method, params) => {
 };
 
 let id$a = 0;
-const create$5 = () => {
+const create$6 = () => {
   return ++id$a;
 };
 
 const registerPromise = map => {
-  const id = create$5();
+  const id = create$6();
   const {
     promise,
     resolve
@@ -885,7 +885,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$6(id, method, params);
+  const message = create$7(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -921,7 +921,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$7(method, params);
+      const message = create$8(method, params);
       ipc.send(message);
     }
   };
@@ -961,7 +961,7 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
-const create$4 = async ({
+const create$5 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -979,7 +979,7 @@ const create$4 = async ({
   return rpc;
 };
 
-const create$3 = async ({
+const create$4 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -989,13 +989,55 @@ const create$3 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$4({
+  return create$5({
     commandMap,
     isMessagePortOpen,
     messagePort: port2
   });
 };
 
+const createSharedLazyRpc = factory => {
+  let rpcPromise;
+  const getOrCreate = () => {
+    if (!rpcPromise) {
+      rpcPromise = factory();
+    }
+    return rpcPromise;
+  };
+  return {
+    async dispose() {
+      const rpc = await getOrCreate();
+      await rpc.dispose();
+    },
+    async invoke(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invoke(method, ...params);
+    },
+    async invokeAndTransfer(method, ...params) {
+      const rpc = await getOrCreate();
+      return rpc.invokeAndTransfer(method, ...params);
+    },
+    async send(method, ...params) {
+      const rpc = await getOrCreate();
+      rpc.send(method, ...params);
+    }
+  };
+};
+
+const create$3 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$4({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
+};
+
 const create$2 = async ({
   commandMap
 }) => {
@@ -1392,23 +1434,28 @@ const sendMessagePortToRendererProcess = async port => {
   const command = 'HandleMessagePort.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToRendererProcess', port, command, DebugWorker);
 };
+const sendMessagePortToTextMeasurementWorker = async port => {
+  const command = 'TextMeasurement.handleMessagePort';
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
+};
 
 const RendererWorker = {
   __proto__: null,
   invoke: invoke$2,
   invokeAndTransfer,
   sendMessagePortToRendererProcess,
+  sendMessagePortToTextMeasurementWorker,
   set: set$2
 };
 
-const send = port => {
+const send$1 = port => {
   return sendMessagePortToRendererProcess(port);
 };
 const createRendererProcessRpc = async () => {
   try {
-    const rpc = await create$3({
+    const rpc = await create$4({
       commandMap: {},
-      send
+      send: send$1
     });
     return rpc;
   } catch (error) {
@@ -1470,6 +1517,54 @@ const closeSubMenu = async () => {
   await invoke$3(/* Menu.hideSubMenu */7903, /* parentIndex */parentMenu.focusedIndex);
 };
 
+const send = port => {
+  return sendMessagePortToTextMeasurementWorker(port);
+};
+const createTextMeasurementWorkerRpc = async () => {
+  try {
+    const rpc = await create$3({
+      commandMap: {},
+      send
+    });
+    return rpc;
+  } catch (error) {
+    throw new VError(error, `Failed to create text measurement worker rpc`);
+  }
+};
+
+let rpcPromise;
+const getRpc = () => {
+  rpcPromise ||= createTextMeasurementWorkerRpc();
+  return rpcPromise;
+};
+const measureTextWidths = async (texts, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth) => {
+  const rpc = await getRpc();
+  return rpc.invoke('TextMeasurement.measureTextWidths', texts, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
+};
+
+const FontWeight = 400;
+const FontSize = 13;
+const FontFamily = 'system-ui, Ubuntu, Droid Sans, sans-serif';
+const LetterSpacing = 0;
+const IsMonospaceFont = false;
+const CharWidth = 8;
+const getLabels = items => {
+  return items.map(item => item.label).filter(label => typeof label === 'string' && label);
+};
+const getMenuLabelWidths = async items => {
+  const labels = getLabels(items);
+  return measureTextWidths(labels, FontWeight, FontSize, FontFamily, LetterSpacing, IsMonospaceFont, CharWidth);
+};
+
+const MENU_MIN_WIDTH = 150;
+const MENU_ITEM_HORIZONTAL_PADDING = 56;
+const MENU_ITEM_HORIZONTAL_MARGIN = 8;
+const getMenuMeasuredWidth = async items => {
+  const labelWidths = await getMenuLabelWidths(items);
+  const maxLabelWidth = Math.max(0, ...labelWidths);
+  return Math.ceil(Math.max(MENU_MIN_WIDTH, maxLabelWidth + MENU_ITEM_HORIZONTAL_PADDING + MENU_ITEM_HORIZONTAL_MARGIN));
+};
+
 const Separator$1 = 1;
 const None = 0;
 const SubMenu = 4;
@@ -1480,7 +1575,7 @@ const RestoreFocus = 6;
 const Ignore = 7;
 
 // TODO lazyload menuEntries and use Command.execute (maybe)
-const CONTEXT_MENU_WIDTH$1 = 250;
+const MENU_TARGET_GAP = 5;
 
 // TODO difference between focusing with mouse or keyboard
 // with mouse -> open submenu
@@ -1511,8 +1606,8 @@ const getMenuHeight$1 = items => {
   }
   return height;
 };
-const getMenuBounds = (x, y, items) => {
-  const menuWidth = CONTEXT_MENU_WIDTH$1;
+const getMenuBounds = async (x, y, items) => {
+  const menuWidth = await getMenuMeasuredWidth(items);
   const menuHeight = getMenuHeight$1(items);
   const layoutState = {
     points: [0, 0]
@@ -1523,7 +1618,7 @@ const getMenuBounds = (x, y, items) => {
   // TODO what about separators?
 
   if (x + menuWidth > windowWidth) {
-    x -= menuWidth;
+    x -= menuWidth + MENU_TARGET_GAP;
     x = Math.max(x, 0);
   }
   if (y + menuHeight > windowHeight) {
@@ -1873,8 +1968,9 @@ const MenuEntriesHelp = {
   id: id$6
 };
 
-const getRecentlyOpened = () => {
-  return invoke$2(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
+const getRecentlyOpened = async () => {
+  const recentlyOpened = await invoke$2(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
+  return recentlyOpened;
 };
 
 const File = 'file://';
@@ -2464,7 +2560,7 @@ const MENU_WIDTH = 150;
 
 const show$2 = async (x, y, id, mouseBlocking = false, ...args) => {
   const items = await getMenuEntriesWithKeyBindings(id, ...args);
-  const bounds = getMenuBounds(x, y, items);
+  const bounds = await getMenuBounds(x, y, items);
   const menu = addMenuInternal({
     focusedIndex: -1,
     id,
@@ -2479,7 +2575,7 @@ const show$2 = async (x, y, id, mouseBlocking = false, ...args) => {
 };
 const show2$2 = async (uid, menuId, x, y, mouseBlocking = false, ...args) => {
   const items = await getMenuEntriesWithKeyBindings2(uid, menuId, ...args);
-  const bounds = getMenuBounds(x, y, items);
+  const bounds = await getMenuBounds(x, y, items);
   const menu = addMenuInternal({
     focusedIndex: -1,
     id: menuId,
@@ -2771,7 +2867,7 @@ const getMenuEntries = (id, platform) => {
 // TODO more tests
 
 const getMenuShowCommands = async (items, menuId, x, y, mouseBlocking = false) => {
-  const bounds = getMenuBounds(x, y, items);
+  const bounds = await getMenuBounds(x, y, items);
   const menu = addMenuInternal({
     focusedIndex: -1,
     id: menuId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/menu-worker",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Menu Worker",
   "repository": {
     "type": "git",