@lvce-editor/title-bar-worker 4.28.1 → 4.28.3

package/dist/titleBarWorkerMain.js

@@ -1165,7 +1165,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$5 = (id, rpc) => {
+const set$6 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -1198,7 +1198,7 @@ const create$2 = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$5(rpcId, mockRpc);
+      set$6(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -1207,7 +1207,7 @@ const create$2 = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$5(rpcId, rpc);
+      set$6(rpcId, rpc);
     }
   };
 };
@@ -1640,18 +1640,18 @@ const FocusTitleBarMenuBar = 26;
 
 const {
   invoke: invoke$3,
-  set: set$4
+  set: set$5
 } = create$2(MainProcess);
 
 const {
   invoke: invoke$2,
-  set: set$3
+  set: set$4
 } = create$2(RendererProcess);
 
 const {
   invoke: invoke$1,
   invokeAndTransfer,
-  set: set$2
+  set: set$3
 } = create$2(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
@@ -1945,6 +1945,7 @@ const createDefaultState = (uid = DEFAULT_UID) => ({
   mainAreaUid: DEFAULT_MAIN_AREA_UID,
   menus: [],
   platform: Electron,
+  showSideBarThings: true,
   title: '',
   titleBarButtons: [],
   titleBarButtonsEnabled: true,
@@ -2193,7 +2194,7 @@ const {
   get,
   getCommandIds,
   registerCommands,
-  set: set$1,
+  set: set$2,
   wrapCommand: wrapNotification,
   wrapGetter,
   wrapSerialCommand: wrapCommand
@@ -2230,11 +2231,11 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
     x,
     y
   };
-  set$1(id, state, state);
+  set$2(id, state, state);
 };
 
 const isEqual$3 = (oldState, newState) => {
-  return oldState.commandCenterEnabled === newState.commandCenterEnabled && oldState.titleBarEntries === newState.titleBarEntries && oldState.titleBarMenuBarEnabled === newState.titleBarMenuBarEnabled && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen && oldState.title === newState.title && oldState.workspaceUri === newState.workspaceUri;
+  return oldState.commandCenterEnabled === newState.commandCenterEnabled && oldState.titleBarEntries === newState.titleBarEntries && oldState.titleBarMenuBarEnabled === newState.titleBarMenuBarEnabled && oldState.showSideBarThings === newState.showSideBarThings && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen && oldState.title === newState.title && oldState.workspaceUri === newState.workspaceUri;
 };
 
 const isEqual$2 = (oldState, newState) => {
@@ -3316,7 +3317,7 @@ const initializeMainProcess = async () => {
     commandMap: {},
     send
   });
-  set$4(rpc);
+  set$5(rpc);
 };
 
 // based on https://www.electronjs.org/docs/latest/api/menu-item#new-menuitemoptions
@@ -3745,6 +3746,7 @@ const getTitleBarVirtualDom = state => {
     focusedIndex,
     isMenuOpen,
     platform,
+    showSideBarThings,
     title,
     titleBarButtons,
     titleBarButtonsEnabled,
@@ -3761,7 +3763,8 @@ const getTitleBarVirtualDom = state => {
   const iconSrc = getIcon(assetDir);
   const visibleEntries = getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
   const titleEnabled = titleBarTitleEnabled && !commandCenterEnabled;
-  const childCount = Number(titleBarIconEnabled) + Number(titleBarMenuBarEnabled) + Number(commandCenterEnabled) + Number(titleEnabled) + Number(titleBarButtonsEnabled);
+  const showSideBar = showSideBarThings !== false;
+  const childCount = Number(showSideBar && titleBarIconEnabled) + Number(showSideBar && titleBarMenuBarEnabled) + Number(showSideBar && commandCenterEnabled) + Number(showSideBar && titleEnabled) + Number(titleBarButtonsEnabled);
   return [{
     ariaLabel: titleBar(),
     childCount,
@@ -3770,7 +3773,7 @@ const getTitleBarVirtualDom = state => {
     onContextMenu: HandleTitleBarContextMenu,
     role: ContentInfo,
     type: Div
-  }, ...getTitleBarIconVirtualDom(titleBarIconEnabled, iconSrc), ...getTitleBarMenuBarVirtualDom(titleBarMenuBarEnabled, visibleEntries, focusedIndex), ...getCommandCenterVirtualDom(commandCenterEnabled), ...getTitleVirtualDom(titleEnabled, title), ...getTitleBarButtonsVirtualDom(titleBarButtonsEnabled, titleBarButtons)];
+  }, ...getTitleBarIconVirtualDom(showSideBar && titleBarIconEnabled, iconSrc), ...getTitleBarMenuBarVirtualDom(showSideBar && titleBarMenuBarEnabled, visibleEntries, focusedIndex), ...getCommandCenterVirtualDom(showSideBar && commandCenterEnabled), ...getTitleVirtualDom(showSideBar && titleEnabled, title), ...getTitleBarButtonsVirtualDom(titleBarButtonsEnabled, titleBarButtons)];
 };
 
 const renderTitleBar = (oldState, newState) => {
@@ -4199,8 +4202,8 @@ const isConnected = () => {
 const invoke = (method, ...params) => {
   return invoke$2(method, ...params);
 };
-const set = rpc => {
-  set$3(rpc);
+const set$1 = rpc => {
+  set$4(rpc);
   state.connected = true;
 };
 
@@ -4237,7 +4240,7 @@ const handleMessagePort = async (port, viewletCommandMap, setAsRendererProcess =
     messagePort: port
   });
   if (setAsRendererProcess) {
-    set(rpc);
+    set$1(rpc);
   }
 };
 
@@ -4376,10 +4379,38 @@ const getRemoteSshWorkspace = workspaceUri => {
     return undefined;
   }
 };
-const getWorkspaceTitle = (workspacePath, titleTemplate, appName) => {
+const getDevContainerWorkspace = workspaceUri => {
+  // Workspace title-change events currently carry the resolved path, where
+  // devcontainer paths end in a marker instead of retaining their URI scheme.
+  if (workspaceUri.endsWith('!')) {
+    return {
+      path: workspaceUri
+    };
+  }
+  try {
+    const url = new URL(workspaceUri);
+    if (url.protocol !== 'devcontainers:') {
+      return undefined;
+    }
+    return {
+      path: url.pathname
+    };
+  } catch {
+    return undefined;
+  }
+};
+const getWorkspaceTitle = (workspacePath, titleTemplate, appName, decodeFolderName = false) => {
   const endIndex = getEndIndex(workspacePath);
   const slashIndex = Math.max(workspacePath.lastIndexOf('/', endIndex - 1), workspacePath.lastIndexOf('\\', endIndex - 1));
-  const folderName = workspacePath.slice(slashIndex + 1, endIndex);
+  const encodedFolderName = workspacePath.slice(slashIndex + 1, endIndex);
+  let folderName = encodedFolderName;
+  if (decodeFolderName) {
+    try {
+      folderName = decodeURIComponent(encodedFolderName);
+    } catch {
+      // Keep malformed URI segments visible rather than failing title rendering.
+    }
+  }
 
   // If titleTemplate is empty, return folderName directly
   if (!titleTemplate) {
@@ -4397,14 +4428,26 @@ const getTitle = (workspaceUri, titleTemplate, appName) => {
     return appName;
   }
   const remoteSshWorkspace = getRemoteSshWorkspace(workspaceUri);
-  const workspacePath = remoteSshWorkspace?.path ?? getPath(workspaceUri);
-  const title = getWorkspaceTitle(workspacePath, titleTemplate, appName);
+  const devContainerWorkspace = getDevContainerWorkspace(workspaceUri);
+  const workspacePath = remoteSshWorkspace?.path ?? devContainerWorkspace?.path ?? getPath(workspaceUri);
+  const displayWorkspacePath = getDevContainerDisplayPath(devContainerWorkspace, workspacePath);
+  const title = getWorkspaceTitle(displayWorkspacePath, titleTemplate, appName, Boolean(devContainerWorkspace));
+  if (devContainerWorkspace) {
+    const devContainerSuffix = '[devcontainer]';
+    return title ? `${title} ${devContainerSuffix}` : devContainerSuffix;
+  }
   if (!remoteSshWorkspace) {
     return title || appName;
   }
   const remoteSuffix = `[SSH: ${remoteSshWorkspace.host}]`;
   return title ? `${title} ${remoteSuffix}` : remoteSuffix;
 };
+const getDevContainerDisplayPath = (devContainerWorkspace, workspacePath) => {
+  if (!devContainerWorkspace || !workspacePath.endsWith('!')) {
+    return workspacePath;
+  }
+  return workspacePath.slice(0, -1);
+};
 
 const launchTextMeasurementWorker = async () => {
   const rpc = await create$5({
@@ -4565,7 +4608,7 @@ const loadContent2Command = async uid => {
     titleWidth: latest.newState.titleWidth,
     workspaceUri: latest.newState.workspaceUri
   };
-  set$1(uid, latest.oldState, nextState, nextState);
+  set$2(uid, latest.oldState, nextState, nextState);
 };
 
 const renderFocusContext = (oldState, newState) => {
@@ -4891,7 +4934,7 @@ const render3 = async (uid, diffResult) => {
     newState,
     oldState
   } = get(uid);
-  set$1(uid, newState, newState);
+  set$2(uid, newState, newState);
   const commands = [];
   for (const item of numbers) {
     if (!pendingDiffs.has(item)) {
@@ -5009,6 +5052,28 @@ const setPlatform = (state, platform) => {
   };
 };
 
+const setShowSideBarThings = (state, showSideBarThings) => {
+  const {
+    focused,
+    focusedIndex,
+    isMenuOpen,
+    menus,
+    showSideBarThings: currentShowSideBarThings
+  } = state;
+  if (showSideBarThings === currentShowSideBarThings) {
+    return state;
+  }
+  return {
+    ...state,
+    focused: showSideBarThings && focused,
+    focusedIndex: showSideBarThings ? focusedIndex : -1,
+    isMenuOpen: showSideBarThings && isMenuOpen,
+    menus: showSideBarThings ? menus : [],
+    showSideBarThings
+  };
+};
+const set = wrapCommand(setShowSideBarThings);
+
 const setTitleTemplate = async (state, titleTemplate) => {
   const {
     applicationName,
@@ -5085,7 +5150,7 @@ const create = (id, uri, x, y, width, height) => {
     x,
     y
   };
-  set$1(id, state, state);
+  set$2(id, state, state);
   return state;
 };
 
@@ -5405,7 +5470,7 @@ const selectIndexNone = async (state, item) => {
     menus: []
   };
   if (storedState) {
-    set$1(uid, storedState.oldState, closedState, closedState);
+    set$2(uid, storedState.oldState, closedState, closedState);
     if (latestState.menus.length > 0) {
       const [command, ...args] = renderMenus(latestState, closedState);
       await invoke$2(command, ...args);
@@ -5420,7 +5485,7 @@ const selectIndexNone = async (state, item) => {
     menus: []
   };
   if (storedState) {
-    set$1(uid, finalState, finalState, finalState);
+    set$2(uid, finalState, finalState, finalState);
   }
   return finalState;
 };
@@ -5690,7 +5755,7 @@ const toggleMenu = async state => {
 };
 
 const wakeUp = sleepState => {
-  set$1(sleepState.uid, sleepState, sleepState);
+  set$2(sleepState.uid, sleepState, sleepState);
 };
 
 const handleDirectMessagePort = (port, setAsRendererProcess = true) => handleMessagePort(port, commandMap, setAsRendererProcess);
@@ -5756,6 +5821,7 @@ const commandMap = {
   'TitleBar.saveState': wrapGetter(saveState),
   'TitleBar.setComponentState': setComponentState,
   'TitleBar.setPlatform': wrapCommand(setPlatform),
+  'TitleBar.setShowSideBarThings': set,
   'TitleBar.setTitleTemplate': wrapCommand(setTitleTemplate),
   'TitleBar.setWidth': wrapCommand(setWidth),
   'TitleBar.showCommandCenter': wrapCommand(showCommandCenter),
@@ -5772,7 +5838,7 @@ const listen = async () => {
   const rpc = await create$3({
     commandMap: commandMap
   });
-  set$2(rpc);
+  set$3(rpc);
 };
 
 const main = async () => {

package/package.json

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