@lvce-editor/title-bar-worker 3.13.0 → 3.14.0

package/dist/titleBarWorkerMain.js

@@ -1452,42 +1452,68 @@ const create$1 = () => {
   const states = Object.create(null);
   const commandMapRef = {};
   return {
-    get(uid) {
-      return states[uid];
+    clear() {
+      for (const key of Object.keys(states)) {
+        delete states[key];
+      }
     },
-    set(uid, oldState, newState) {
-      states[uid] = {
-        oldState,
-        newState
-      };
+    diff(uid, modules, numbers) {
+      const {
+        newState,
+        oldState
+      } = states[uid];
+      const diffResult = [];
+      for (let i = 0; i < modules.length; i++) {
+        const fn = modules[i];
+        if (!fn(oldState, newState)) {
+          diffResult.push(numbers[i]);
+        }
+      }
+      return diffResult;
     },
     dispose(uid) {
       delete states[uid];
     },
+    get(uid) {
+      return states[uid];
+    },
+    getCommandIds() {
+      const keys = Object.keys(commandMapRef);
+      const ids = keys.map(toCommandId);
+      return ids;
+    },
     getKeys() {
       return Object.keys(states).map(key => {
         return Number.parseInt(key);
       });
     },
-    clear() {
-      for (const key of Object.keys(states)) {
-        delete states[key];
-      }
+    registerCommands(commandMap) {
+      Object.assign(commandMapRef, commandMap);
+    },
+    set(uid, oldState, newState) {
+      states[uid] = {
+        newState,
+        oldState
+      };
     },
     wrapCommand(fn) {
       const wrapped = async (uid, ...args) => {
         const {
-          oldState,
-          newState
+          newState,
+          oldState
         } = states[uid];
         const newerState = await fn(newState, ...args);
         if (oldState === newerState || newState === newerState) {
           return;
         }
-        const latest = states[uid];
+        const latestOld = states[uid];
+        const latestNew = {
+          ...latestOld.newState,
+          ...newerState
+        };
         states[uid] = {
-          oldState: latest.oldState,
-          newState: newerState
+          newState: latestNew,
+          oldState: latestOld.oldState
         };
       };
       return wrapped;
@@ -1500,28 +1526,6 @@ const create$1 = () => {
         return fn(newState, ...args);
       };
       return wrapped;
-    },
-    diff(uid, modules, numbers) {
-      const {
-        oldState,
-        newState
-      } = states[uid];
-      const diffResult = [];
-      for (let i = 0; i < modules.length; i++) {
-        const fn = modules[i];
-        if (!fn(oldState, newState)) {
-          diffResult.push(numbers[i]);
-        }
-      }
-      return diffResult;
-    },
-    getCommandIds() {
-      const keys = Object.keys(commandMapRef);
-      const ids = keys.map(toCommandId);
-      return ids;
-    },
-    registerCommands(commandMap) {
-      Object.assign(commandMapRef, commandMap);
     }
   };
 };
@@ -1564,6 +1568,7 @@ const createDefaultState = (uid = DEFAULT_UID) => ({
   titleBarMenuBarEnabled: true,
   titleBarStyleCustom: true,
   titleBarTitleEnabled: true,
+  titleTemplate: '${folderName}',
   uid,
   width: 800,
   workspaceUri: '',
@@ -1793,7 +1798,7 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
 };
 
 const isEqual$3 = (oldState, newState) => {
-  return oldState.titleBarEntries === newState.titleBarEntries && oldState.width === newState.width && oldState.focusedIndex === newState.focusedIndex && oldState.isMenuOpen === newState.isMenuOpen && oldState.title === newState.title;
+  return oldState.titleBarEntries === newState.titleBarEntries && 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) => {
@@ -2946,7 +2951,22 @@ const handlePointerOver = (state, name) => {
   return handleMouseOver(state, index);
 };
 
-const getTitle = workspaceUri => {
+/**
+ * Parses a title template string and replaces special variables with their values.
+ * Supported variables:
+ * - ${folderName} - The name of the workspace folder
+ * - ${appName} - The name of the application
+ *
+ * @param template - The template string to parse
+ * @param folderName - The name of the workspace folder
+ * @param appName - The name of the application
+ * @returns The parsed title string
+ */
+const parseTitleTemplate = (template, folderName, appName) => {
+  return template.replaceAll('${folderName}', folderName).replaceAll('${appName}', appName);
+};
+
+const getTitle = (workspaceUri, titleTemplate, appName) => {
   if (!workspaceUri) {
     return '';
   }
@@ -2954,13 +2974,25 @@ const getTitle = workspaceUri => {
   if (slashIndex === -1) {
     return '';
   }
-  const baseName = workspaceUri.slice(slashIndex + 1);
-  return baseName;
+  const folderName = workspaceUri.slice(slashIndex + 1);
+
+  // If titleTemplate is empty, return folderName directly
+  if (!titleTemplate) {
+    return folderName;
+  }
+
+  // If titleTemplate doesn't contain variables, return the template itself
+  if (!titleTemplate.includes('${')) {
+    return titleTemplate;
+  }
+  return parseTitleTemplate(titleTemplate, folderName, appName);
 };
 
+const APP_NAME$1 = 'Lvce Editor';
+
 // TODO in the future, it could also be a multi-root workspace
 const handleWorkspaceChange = async (state, uri) => {
-  const title = getTitle(uri);
+  const title = getTitle(uri, state.titleTemplate, APP_NAME$1);
   return {
     ...state,
     title,
@@ -3071,6 +3103,7 @@ const getWorkspaceUri = () => {
   return invoke('Workspace.getUri');
 };
 
+const APP_NAME = 'Lvce Editor';
 const loadContent2 = async state => {
   const {
     controlsOverlayEnabled,
@@ -3086,7 +3119,7 @@ const loadContent2 = async state => {
   const withWidths = await addWidths(titleBarEntries, labelPadding, labelFontWeight, labelFontSize, labelFontFamily, labelLetterSpacing);
   const buttons = getTitleBarButtons(platform, controlsOverlayEnabled, titleBarStyleCustom);
   const workspaceUri = await getWorkspaceUri();
-  const title = getTitle(workspaceUri);
+  const title = getTitle(workspaceUri, state.titleTemplate, APP_NAME);
   const iconWidth = 30;
 
   // TODO load preferences here
@@ -3689,6 +3722,13 @@ const setPlatform = (state, platform) => {
   };
 };
 
+const setTitleTemplate = (state, titleTemplate) => {
+  return {
+    ...state,
+    titleTemplate
+  };
+};
+
 const showCommandCenter = async state => {
   return {
     ...state,
@@ -4325,6 +4365,7 @@ const commandMap = {
   'TitleBar.resize': wrapCommand(resize),
   'TitleBar.saveState': wrapGetter(saveState),
   'TitleBar.setPlatform': wrapCommand(setPlatform),
+  'TitleBar.setTitleTemplate': wrapCommand(setTitleTemplate),
   'TitleBar.showCommandCenter': wrapCommand(showCommandCenter),
   'TitleBar.showMenuBar': wrapCommand(showMenuBar),
   'TitleBar.terminate': terminate,

package/package.json

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