@lvce-editor/title-bar-worker 3.7.0 → 3.8.0

package/dist/titleBarWorkerMain.js

@@ -423,9 +423,103 @@ const IpcChildWithModuleWorkerAndMessagePort$1 = {
   listen: listen$6,
   wrap: wrap$e
 };
+const addListener = (emitter, type, callback) => {
+  if ('addEventListener' in emitter) {
+    emitter.addEventListener(type, callback);
+  } else {
+    emitter.on(type, callback);
+  }
+};
+const removeListener = (emitter, type, callback) => {
+  if ('removeEventListener' in emitter) {
+    emitter.removeEventListener(type, callback);
+  } else {
+    emitter.off(type, callback);
+  }
+};
+const getFirstEvent = (eventEmitter, eventMap) => {
+  const {
+    promise,
+    resolve
+  } = Promise.withResolvers();
+  const listenerMap = Object.create(null);
+  const cleanup = value => {
+    for (const event of Object.keys(eventMap)) {
+      removeListener(eventEmitter, event, listenerMap[event]);
+    }
+    resolve(value);
+  };
+  for (const [event, type] of Object.entries(eventMap)) {
+    const listener = event => {
+      cleanup({
+        event,
+        type
+      });
+    };
+    addListener(eventEmitter, event, listener);
+    listenerMap[event] = listener;
+  }
+  return promise;
+};
+const Message$1 = 3;
+const create$5$1 = async ({
+  isMessagePortOpen,
+  messagePort
+}) => {
+  if (!isMessagePort(messagePort)) {
+    throw new IpcError('port must be of type MessagePort');
+  }
+  if (isMessagePortOpen) {
+    return messagePort;
+  }
+  const eventPromise = getFirstEvent(messagePort, {
+    message: Message$1
+  });
+  messagePort.start();
+  const {
+    event,
+    type
+  } = await eventPromise;
+  if (type !== Message$1) {
+    throw new IpcError('Failed to wait for ipc message');
+  }
+  if (event.data !== readyMessage) {
+    throw new IpcError('unexpected first message');
+  }
+  return messagePort;
+};
+const signal$1 = messagePort => {
+  messagePort.start();
+};
+class IpcParentWithMessagePort extends Ipc {
+  getData = getData$2;
+  send(message) {
+    this._rawIpc.postMessage(message);
+  }
+  sendAndTransfer(message) {
+    const transfer = getTransferrables(message);
+    this._rawIpc.postMessage(message, transfer);
+  }
+  dispose() {
+    this._rawIpc.close();
+  }
+  onMessage(callback) {
+    this._rawIpc.addEventListener('message', callback);
+  }
+  onClose(callback) {}
+}
+const wrap$5 = messagePort => {
+  return new IpcParentWithMessagePort(messagePort);
+};
+const IpcParentWithMessagePort$1 = {
+  __proto__: null,
+  create: create$5$1,
+  signal: signal$1,
+  wrap: wrap$5
+};
 
 const Two = '2.0';
-const create$4 = (method, params) => {
+const create$4$1 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -680,7 +774,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$5 = (message, result) => {
+const create$6 = (message, result) => {
   return {
     jsonrpc: Two,
     id: message.id,
@@ -689,7 +783,7 @@ const create$5 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$5(message, resultProperty);
+  return create$6(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -794,13 +888,13 @@ const invokeHelper = async (ipc, method, params, useSendAndTransfer) => {
   return unwrapJsonRpcResult(responseMessage);
 };
 const send = (transport, method, ...params) => {
-  const message = create$4(method, params);
+  const message = create$4$1(method, params);
   transport.send(message);
 };
 const invoke$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
-const invokeAndTransfer = (ipc, method, ...params) => {
+const invokeAndTransfer$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
@@ -839,7 +933,7 @@ const createRpc = ipc => {
       return invoke$1(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
-      return invokeAndTransfer(ipc, method, ...params);
+      return invokeAndTransfer$1(ipc, method, ...params);
     },
     async dispose() {
       await ipc?.dispose();
@@ -877,7 +971,41 @@ const listen$1 = async (module, options) => {
   const ipc = module.wrap(rawIpc);
   return ipc;
 };
+const create$5 = async ({
+  commandMap,
+  messagePort
+}) => {
+  // TODO create a commandMap per rpc instance
+  register(commandMap);
+  const rawIpc = await IpcParentWithMessagePort$1.create({
+    messagePort,
+    isMessagePortOpen: true
+  });
+  const ipc = IpcParentWithMessagePort$1.wrap(rawIpc);
+  handleIpc(ipc);
+  const rpc = createRpc(ipc);
+  messagePort.start();
+  return rpc;
+};
 const create$3 = async ({
+  commandMap,
+  send
+}) => {
+  const {
+    port1,
+    port2
+  } = new MessageChannel();
+  await send(port1);
+  return create$5({
+    commandMap,
+    messagePort: port2
+  });
+};
+const TransferMessagePortRpcParent = {
+  __proto__: null,
+  create: create$3
+};
+const create$4 = async ({
   commandMap
 }) => {
   // TODO create a commandMap per rpc instance
@@ -889,7 +1017,7 @@ const create$3 = async ({
 };
 const WebWorkerRpcClient = {
   __proto__: null,
-  create: create$3
+  create: create$4
 };
 
 const ContentInfo = 'contentinfo';
@@ -1196,6 +1324,8 @@ const parseKey = rawKey => {
   };
 };
 
+const Electron$1 = 2;
+
 const RendererWorker = 1;
 
 const FocusTitleBarMenuBar = 26;
@@ -1234,6 +1364,7 @@ const create$2 = rpcId => {
 
 const {
   invoke,
+  invokeAndTransfer,
   set: set$1
 } = create$2(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
@@ -1244,6 +1375,11 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   // @ts-ignore
   await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
+const sendMessagePortToTextMeasurementWorker = async port => {
+  const command = 'TextMeasurement.handleMessagePort';
+  // @ts-ignore
+  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
+};
 const minimizeWindow = async () => {
   // @ts-ignore
   return invoke('ElectronWindow.minimize');
@@ -2228,12 +2364,13 @@ const getMenuEntries2 = async (state, props) => {
   }
 };
 
-const getEntryMap = async (state, menuIds) => {
+const getEntryMap = async (state, menuIds, platform) => {
   const map = Object.create(null);
   for (const id of menuIds) {
     const entries = await getMenuEntries2(state, {
       // @ts-ignore
-      menuId: id
+      menuId: id,
+      platform
     });
     map[id] = entries;
   }
@@ -2385,8 +2522,11 @@ const setItems = async items => {
   return invoke('WebView.compatSharedProcessInvoke', 'ElectronApplicationMenu.setItems', windowId, items);
 };
 const hydrate = async state => {
+  const {
+    platform
+  } = state;
   const ids = getMenuIds();
-  const map = await getEntryMap(state, ids);
+  const map = await getEntryMap(state, ids, platform);
   const {
     commandMap,
     electronMenu
@@ -2812,7 +2952,34 @@ const getFontString = (fontWeight, fontSize, fontFamily) => {
   return `${fontWeight} ${fontSize}px ${fontFamily}`;
 };
 
-const measureTextWidths = (texts, fontWeight, fontSize, fontFamily, letterSpacing) => {
+const launchTextMeasurementWorker = async () => {
+  const rpc = await TransferMessagePortRpcParent.create({
+    commandMap: {},
+    async send(port) {
+      await sendMessagePortToTextMeasurementWorker(port);
+    }
+  });
+  return {
+    invoke: rpc.invoke.bind(rpc),
+    async [Symbol.asyncDispose]() {
+      await rpc.dispose();
+    }
+  };
+};
+
+const measureTextWidths2 = async (texts, fontWeight, fontSize, fontFamily, letterSpacing) => {
+  if (typeof letterSpacing !== 'number') {
+    throw new TypeError('letterSpacing must be of type number');
+  }
+  await using rpc = await launchTextMeasurementWorker();
+  const isMonospaceFont = false;
+  const charWidth = 0;
+  // @ts-ignore
+  const result = await rpc.invoke('TextMeasurement.measureTextWidths', texts, fontWeight, fontSize, fontFamily, letterSpacing, isMonospaceFont, charWidth);
+  return result;
+};
+
+const measureTextWidthsOld = async (texts, fontWeight, fontSize, fontFamily, letterSpacing) => {
   if (typeof letterSpacing !== 'number') {
     throw new TypeError('letterSpacing must be of type number');
   }
@@ -2829,13 +2996,20 @@ const measureTextWidths = (texts, fontWeight, fontSize, fontFamily, letterSpacin
   }
   return widths;
 };
+const measureTextWidths = async (texts, fontWeight, fontSize, fontFamily, letterSpacing) => {
+  try {
+    return measureTextWidths2(texts, fontWeight, fontSize, fontFamily, letterSpacing);
+  } catch {
+    return measureTextWidthsOld(texts, fontWeight, fontSize, fontFamily, letterSpacing);
+  }
+};
 
 const getLabel = entry => {
   return entry.label;
 };
-const addWidths = (entries, labelPadding, fontWeight, fontSize, fontFamily, letterSpacing) => {
+const addWidths = async (entries, labelPadding, fontWeight, fontSize, fontFamily, letterSpacing) => {
   const labels = entries.map(getLabel);
-  const widths = measureTextWidths(labels, fontWeight, fontSize, fontFamily, letterSpacing);
+  const widths = await measureTextWidths(labels, fontWeight, fontSize, fontFamily, letterSpacing);
   const withWidths = [];
   for (let i = 0; i < entries.length; i++) {
     const entry = entries[i];
@@ -2873,12 +3047,12 @@ const loadContent2 = async state => {
     titleBarStyleCustom
   } = state;
   const titleBarEntries = await getMenuEntries$2(platform);
-  const withWidths = addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
+  const withWidths = await addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
   const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
   const workspaceUri = await invoke('Workspace.getUri');
   const title = getTitle(workspaceUri);
   const iconWidth = 30;
-  if (titleBarStyleCustom === false) {
+  if (titleBarStyleCustom === false && platform === Electron$1) {
     return hydrate(state);
   }
   return {
@@ -3349,7 +3523,7 @@ const getTitleBarVirtualDom = state => {
     titleBarTitleEnabled,
     width
   } = state;
-  if (titleBarStyleCustom) {
+  if (!titleBarStyleCustom) {
     return [{
       childCount: 0,
       type: Div$1

package/package.json

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