@lvce-editor/title-bar-worker 4.24.0 → 4.25.0

package/dist/titleBarWorkerMain.js

@@ -745,7 +745,7 @@ const getErrorResponse = (id, error, preparePrettyError, logError) => {
   const errorProperty = getErrorProperty(error, prettyError);
   return create$1$1(id, errorProperty);
 };
-const create$9 = (message, result) => {
+const create$a = (message, result) => {
   return {
     id: message.id,
     jsonrpc: Two$1,
@@ -754,7 +754,7 @@ const create$9 = (message, result) => {
 };
 const getSuccessResponse = (message, result) => {
   const resultProperty = result ?? null;
-  return create$9(message, resultProperty);
+  return create$a(message, resultProperty);
 };
 const getErrorResponseSimple = (id, error) => {
   return {
@@ -848,7 +848,7 @@ const handleJsonRpcMessage = async (...args) => {
 
 const Two = '2.0';
 
-const create$8 = (method, params) => {
+const create$9 = (method, params) => {
   return {
     jsonrpc: Two,
     method,
@@ -856,7 +856,7 @@ const create$8 = (method, params) => {
   };
 };
 
-const create$7 = (id, method, params) => {
+const create$8 = (id, method, params) => {
   const message = {
     id,
     jsonrpc: Two,
@@ -867,12 +867,12 @@ const create$7 = (id, method, params) => {
 };
 
 let id = 0;
-const create$6 = () => {
+const create$7 = () => {
   return ++id;
 };
 
 const registerPromise = map => {
-  const id = create$6();
+  const id = create$7();
   const {
     promise,
     resolve
@@ -889,7 +889,7 @@ const invokeHelper = async (callbacks, ipc, method, params, useSendAndTransfer)
     id,
     promise
   } = registerPromise(callbacks);
-  const message = create$7(id, method, params);
+  const message = create$8(id, method, params);
   if (useSendAndTransfer && ipc.sendAndTransfer) {
     ipc.sendAndTransfer(message);
   } else {
@@ -925,7 +925,7 @@ const createRpc = ipc => {
      * @deprecated
      */
     send(method, ...params) {
-      const message = create$8(method, params);
+      const message = create$9(method, params);
       ipc.send(message);
     }
   };
@@ -965,7 +965,7 @@ const listen$1 = async (module, options) => {
   return ipc;
 };
 
-const create$5 = async ({
+const create$6 = async ({
   commandMap,
   isMessagePortOpen = true,
   messagePort
@@ -983,7 +983,7 @@ const create$5 = async ({
   return rpc;
 };
 
-const create$4 = async ({
+const create$5 = async ({
   commandMap,
   isMessagePortOpen,
   send
@@ -993,13 +993,55 @@ const create$4 = async ({
     port2
   } = new MessageChannel();
   await send(port1);
-  return create$5({
+  return create$6({
     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$4 = async ({
+  commandMap,
+  isMessagePortOpen,
+  send
+}) => {
+  return createSharedLazyRpc(() => {
+    return create$5({
+      commandMap,
+      isMessagePortOpen,
+      send
+    });
+  });
+};
+
 const create$3 = async ({
   commandMap
 }) => {
@@ -1032,7 +1074,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$4 = (id, rpc) => {
+const set$5 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1065,7 +1107,7 @@ const create$2 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$4(rpcId, mockRpc);
+      set$5(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1074,7 +1116,7 @@ const create$2 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$4(rpcId, rpc);
+      set$5(rpcId, rpc);
     }
   };
 };
@@ -1495,6 +1537,7 @@ const parseKey = rawKey => {
 
 const Electron$1 = 2;
 
+const MainProcess = -5;
 const RendererProcess = 1670;
 const RendererWorker = 1;
 
@@ -1504,6 +1547,11 @@ const SetFocusContext = 'Viewlet.setFocusContext';
 
 const FocusTitleBarMenuBar = 26;
 
+const {
+  invoke: invoke$3,
+  set: set$4
+} = create$2(MainProcess);
+
 const {
   invoke: invoke$2,
   set: set$3
@@ -1580,9 +1628,6 @@ const sendMessagePortToTextMeasurementWorker = async port => {
   const command = 'TextMeasurement.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToTextMeasurementWorker', port, command, 0);
 };
-const getWindowId$1 = async () => {
-  return invoke$1('GetWindowId.getWindowId');
-};
 const minimizeWindow = async () => {
   return invoke$1('ElectronWindow.minimize');
 };
@@ -3203,11 +3248,18 @@ const getEntryMap = async (state, menuIds, platform) => {
   return map;
 };
 
-// TODO cache window id
-
-const getWindowId = async () => {
-  const windowId = await getWindowId$1();
-  return windowId;
+const send = async port => {
+  await invokeAndTransfer('SendMessagePortToMainProcess.sendMessagePortToMainProcess', port, 'HandleElectronMessagePort.handleElectronMessagePort', 0);
+};
+const initializeMainProcess = async () => {
+  if (get$1(MainProcess)) {
+    return;
+  }
+  const rpc = await create$4({
+    commandMap: {},
+    send
+  });
+  set$4(rpc);
 };
 
 // based on https://www.electronjs.org/docs/latest/api/menu-item#new-menuitemoptions
@@ -3349,8 +3401,8 @@ const toElectronMenu = (map, rootId) => {
 };
 
 const setItems = async items => {
-  const windowId = await getWindowId();
-  return invoke$1('WebView.compatSharedProcessInvoke', 'ElectronApplicationMenu.setItems', windowId, items);
+  await initializeMainProcess();
+  return invoke$3('ElectronApplicationMenu.setItems', items);
 };
 const hydrate = async state => {
   const {
@@ -3868,7 +3920,7 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
       }
     }
   };
-  const rpc = await create$5({
+  const rpc = await create$6({
     commandMap: {
       'Viewlet.executeViewletCommand': executeViewletCommand
     },
@@ -4242,7 +4294,7 @@ const getTitle = (workspaceUri, titleTemplate, appName) => {
 };
 
 const launchTextMeasurementWorker = async () => {
-  const rpc = await create$4({
+  const rpc = await create$5({
     commandMap: {},
     async send(port) {
       await sendMessagePortToTextMeasurementWorker(port);
@@ -4286,7 +4338,9 @@ const handleWorkspaceChange = async (state, uri) => {
     labelFontSize,
     labelFontWeight,
     labelLetterSpacing,
-    titleTemplate
+    titleTemplate,
+    titleWidth: oldTitleWidth,
+    width
   } = state;
   const title = getTitle(uri, titleTemplate, appName);
   const titleWidth = await measureTitleWidth(title, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
@@ -4294,6 +4348,8 @@ const handleWorkspaceChange = async (state, uri) => {
     ...state,
     title,
     titleWidth,
+    // The title is centered, so half its width change becomes available to the menu.
+    width: width + (oldTitleWidth - titleWidth) / 2,
     workspaceUri: uri
   };
 };
@@ -4842,6 +4898,8 @@ const setTitleTemplate = async (state, titleTemplate) => {
     labelFontSize,
     labelFontWeight,
     labelLetterSpacing,
+    titleWidth: oldTitleWidth,
+    width,
     workspaceUri
   } = state;
   const title = getTitle(workspaceUri, titleTemplate, appName);
@@ -4850,7 +4908,9 @@ const setTitleTemplate = async (state, titleTemplate) => {
     ...state,
     title,
     titleTemplate,
-    titleWidth
+    titleWidth,
+    // The title is centered, so half its width change becomes available to the menu.
+    width: width + (oldTitleWidth - titleWidth) / 2
   };
 };
 

package/package.json

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