@lvce-editor/title-bar-worker 3.4.0 → 3.6.0

package/dist/titleBarWorkerMain.js

@@ -1629,23 +1629,42 @@ const diff3 = uid => {
   return diffResult;
 };
 
-const getEntryMap = async modules => {
-  const map = Object.create(null);
-  for (const module of modules) {
-    const {
-      id
-    } = module;
-    const entries = await module.getMenuEntries();
-    map[id] = entries;
-  }
-  return map;
-};
+const Separator$2 = 1;
+const None$1 = 0;
+const SubMenu$1 = 4;
+const Checked = 2;
+const Unchecked = 3;
+const Disabled = 5;
+const RestoreFocus = 6;
+const Ignore = 7;
 
-// TODO cache window id
+const getMenuEntriesTitleBarContextMenu = async state => {
+  const {
+    commandCenterEnabled,
+    titleBarMenuBarEnabled
+  } = state;
+  // TODO checked state should be depending on whether or not that feature is currently visible or not
+  return [{
+    command: titleBarMenuBarEnabled ? 'TitleBar.hideMenuBar' : 'TitleBar.showMenuBar',
+    flags: titleBarMenuBarEnabled ? Checked : Unchecked,
+    id: 'MenuBar',
+    label: menuBar()
+  }, {
+    command: commandCenterEnabled ? 'TitleBar.hideCommandCenter' : 'TitleBar.showCommandCenter',
+    flags: commandCenterEnabled ? Checked : Unchecked,
+    id: 'Command center',
+    label: commandCenter()
+  }, {
+    command: '',
+    flags: Checked,
+    id: 'layout controls',
+    label: 'layout controls'
+  }];
+};
 
-const getWindowId = async () => {
-  const windowId = await invoke('GetWindowId.getWindowId');
-  return windowId;
+const MenuIdTitleBarContextMenu = 50;
+const getMenuIds = () => {
+  return [Edit$2, File$3, Go$2, Help$3, OpenRecent$1, Run$2, Selection$2, Terminal$2, TitleBar$1, View$2, MenuIdTitleBarContextMenu, TitleBarContextMenu];
 };
 
 const cut = () => {
@@ -1712,15 +1731,6 @@ const selectAllOccurrences = () => {
   return i18nString(SelectAllOccurrences);
 };
 
-const Separator$2 = 1;
-const None$1 = 0;
-const SubMenu$1 = 4;
-const Checked = 2;
-const Unchecked = 3;
-const Disabled = 5;
-const RestoreFocus = 6;
-const Ignore = 7;
-
 const menuEntrySeparator = {
   command: '',
   flags: Separator$2,
@@ -1767,11 +1777,6 @@ const getMenuEntries$c = () => {
   }];
 };
 
-const MenuEntriesEdit = {
-  __proto__: null,
-  getMenuEntries: getMenuEntries$c
-};
-
 /**
  * @enum {string}
  */
@@ -1868,20 +1873,10 @@ const getMenuEntries$b = platform => {
   return entries;
 };
 
-const MenuEntriesFile = {
-  __proto__: null,
-  getMenuEntries: getMenuEntries$b
-};
-
 const getMenuEntries$a = () => {
   return [];
 };
 
-const MenuEntriesGo = {
-  __proto__: null,
-  getMenuEntries: getMenuEntries$a
-};
-
 const toggleDeveloperTools = () => {
   return i18nString(ToggleDeveloperTools);
 };
@@ -1938,21 +1933,70 @@ const getMenuEntries$9 = async platform => {
   return entries;
 };
 
-const MenuEntriesHelp = {
-  __proto__: null,
-  getMenuEntries: getMenuEntries$9
+const getRecentlyOpened = () => {
+  return invoke(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
 };
 
-const getMenuEntries$8 = () => {
-  return [];
+const File = 'file://';
+
+const getTitle$1 = (homeDir, uri) => {
+  if (!uri) {
+    return '';
+  }
+  if (uri.startsWith(File)) {
+    return uri.slice(File.length);
+  }
+  return uri;
 };
 
-const MenuEntriesRun = {
-  __proto__: null,
-  getMenuEntries: getMenuEntries$8
+const moreDot = () => {
+  return i18nString(MoreDot);
+};
+const clearRecentlyOpened = () => {
+  return i18nString(ClearRecentlyOpened);
+};
+
+const getHomeDir = () => {
+  return '';
+};
+
+const MAX_MENU_RECENT_ENTRIES = 10;
+const toMenuItem = folder => {
+  const homeDir = getHomeDir();
+  const label = getTitle$1(homeDir, folder);
+  return {
+    args: [folder],
+    command: 'Workspace.setPath',
+    flags: None$1,
+    label
+  };
+};
+const getMenuEntries$8 = async () => {
+  const allItems = await getRecentlyOpened();
+  const itemsToShow = allItems.slice(0, MAX_MENU_RECENT_ENTRIES);
+  const items = [];
+  if (itemsToShow.length > 0) {
+    items.push(...itemsToShow.map(toMenuItem), menuEntrySeparator);
+  }
+  items.push({
+    command: 'QuickPick.showRecent',
+    flags: None$1,
+    id: 'more',
+    label: moreDot()
+  }, menuEntrySeparator, {
+    command: 'RecentlyOpened.clearRecentlyOpened',
+    flags: None$1,
+    id: 'clearRecentlyOpened',
+    label: clearRecentlyOpened()
+  });
+  return items;
 };
 
 const getMenuEntries$7 = () => {
+  return [];
+};
+
+const getMenuEntries$6 = () => {
   return [{
     command: 'Editor.selectAll',
     flags: None$1,
@@ -2026,12 +2070,7 @@ const getMenuEntries$7 = () => {
   }];
 };
 
-const MenuEntriesSelection = {
-  __proto__: null,
-  getMenuEntries: getMenuEntries$7
-};
-
-const getMenuEntries$6 = () => {
+const getMenuEntries$5 = () => {
   return [{
     args: ['Terminal'],
     command: 'Layout.togglePanel',
@@ -2041,18 +2080,151 @@ const getMenuEntries$6 = () => {
   }];
 };
 
-const MenuEntriesTerminal = {
-  __proto__: null,
-  getMenuEntries: getMenuEntries$6
+const getMenuEntries$4 = () => {
+  return [{
+    command: '',
+    flags: SubMenu$1,
+    id: File$1,
+    label: file()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Edit,
+    label: edit()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Selection,
+    label: selection()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: View,
+    label: view()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Go,
+    label: go()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Run,
+    keyboardShortCut: 'Alt+r',
+    label: run()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Terminal,
+    keyboardShortCut: 'Alt+t',
+    label: terminal()
+  }, {
+    command: '',
+    flags: SubMenu$1,
+    id: Help$1,
+    keyboardShortCut: 'Alt+h',
+    label: help()
+  }];
 };
 
-const getMenuEntries$5 = () => {
+const getMenuEntries$3 = () => {
+  return [{
+    command: '',
+    flags: None$1,
+    id: File$1,
+    label: file()
+  }, {
+    command: '',
+    flags: None$1,
+    id: Edit,
+    label: edit()
+  }, {
+    command: '',
+    flags: None$1,
+    id: Selection,
+    label: selection()
+  }, {
+    command: '',
+    flags: None$1,
+    id: View,
+    label: view()
+  }, {
+    command: '',
+    flags: None$1,
+    id: Go,
+    label: go()
+  }, {
+    command: '',
+    flags: None$1,
+    id: Help$1,
+    label: help()
+  }];
+};
+
+const getFn$1 = platform => {
+  switch (platform) {
+    case Web:
+      return getMenuEntries$3;
+    default:
+      return getMenuEntries$4;
+  }
+};
+const getMenuEntries$2 = async platform => {
+  const fn = getFn$1(platform);
+  return fn();
+};
+
+const getMenuEntries$1 = () => {
   return [];
 };
 
-const MenuEntriesView = {
-  __proto__: null,
-  getMenuEntries: getMenuEntries$5
+const getMenuEntries2 = async (state, props) => {
+  switch (props.menuId) {
+    case Edit$2:
+      return getMenuEntries$c();
+    case File$3:
+      return getMenuEntries$b(props.platform);
+    case Go$2:
+      return getMenuEntries$a();
+    case Help$3:
+      return getMenuEntries$9(props.platform);
+    case OpenRecent$1:
+      return getMenuEntries$8();
+    case Run$2:
+      return getMenuEntries$7();
+    case Selection$2:
+      return getMenuEntries$6();
+    case Terminal$2:
+      return getMenuEntries$5();
+    case TitleBar$1:
+      return getMenuEntries$2(props.platform);
+    case TitleBarContextMenu:
+    case MenuIdTitleBarContextMenu:
+      return getMenuEntriesTitleBarContextMenu(state);
+    case View$2:
+      return getMenuEntries$1();
+    default:
+      return [];
+  }
+};
+
+const getEntryMap = async (state, menuIds) => {
+  const map = Object.create(null);
+  for (const id of menuIds) {
+    const entries = await getMenuEntries2(state, {
+      // @ts-ignore
+      menuId: id
+    });
+    map[id] = entries;
+  }
+  return map;
+};
+
+// TODO cache window id
+
+const getWindowId = async () => {
+  const windowId = await invoke('GetWindowId.getWindowId');
+  return windowId;
 };
 
 // based on https://www.electronjs.org/docs/latest/api/menu-item#new-menuitemoptions
@@ -2188,15 +2360,13 @@ const toElectronMenu = (map, rootId) => {
   };
 };
 
-const menuEntries = [MenuEntriesFile, MenuEntriesEdit, MenuEntriesSelection, MenuEntriesView, MenuEntriesGo, MenuEntriesRun, MenuEntriesTerminal, MenuEntriesHelp
-// MenuEntriesTitleBar,
-];
 const setItems = async items => {
   const windowId = await getWindowId();
-  return invoke('ElectronApplicationMenu.setItems', windowId, items);
+  return invoke('WebView.compatSharedProcessInvoke', 'ElectronApplicationMenu.setItems', windowId, items);
 };
 const hydrate = async state => {
-  const map = await getEntryMap(menuEntries);
+  const ids = getMenuIds();
+  const map = await getEntryMap(state, ids);
   const {
     commandMap,
     electronMenu
@@ -2286,122 +2456,6 @@ const getKeyBindings = () => {
   }];
 };
 
-const getMenuEntriesTitleBarContextMenu = async state => {
-  const {
-    commandCenterEnabled,
-    titleBarMenuBarEnabled
-  } = state;
-  // TODO checked state should be depending on whether or not that feature is currently visible or not
-  return [{
-    command: titleBarMenuBarEnabled ? 'TitleBar.hideMenuBar' : 'TitleBar.showMenuBar',
-    flags: titleBarMenuBarEnabled ? Checked : Unchecked,
-    id: 'MenuBar',
-    label: menuBar()
-  }, {
-    command: commandCenterEnabled ? 'TitleBar.hideCommandCenter' : 'TitleBar.showCommandCenter',
-    flags: commandCenterEnabled ? Checked : Unchecked,
-    id: 'Command center',
-    label: commandCenter()
-  }, {
-    command: '',
-    flags: Checked,
-    id: 'layout controls',
-    label: 'layout controls'
-  }];
-};
-
-const MenuIdTitleBarContextMenu = 50;
-const getMenuIds = () => {
-  return [Edit$2, File$3, Go$2, Help$3, OpenRecent$1, Run$2, Selection$2, Terminal$2, TitleBar$1, View$2, MenuIdTitleBarContextMenu, TitleBarContextMenu];
-};
-
-const getRecentlyOpened = () => {
-  return invoke(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
-};
-
-const File = 'file://';
-
-const getTitle$1 = (homeDir, uri) => {
-  if (!uri) {
-    return '';
-  }
-  if (uri.startsWith(File)) {
-    return uri.slice(File.length);
-  }
-  return uri;
-};
-
-const moreDot = () => {
-  return i18nString(MoreDot);
-};
-const clearRecentlyOpened = () => {
-  return i18nString(ClearRecentlyOpened);
-};
-
-const getHomeDir = () => {
-  return '';
-};
-
-const MAX_MENU_RECENT_ENTRIES = 10;
-const toMenuItem = folder => {
-  const homeDir = getHomeDir();
-  const label = getTitle$1(homeDir, folder);
-  return {
-    args: [folder],
-    command: 'Workspace.setPath',
-    flags: None$1,
-    label
-  };
-};
-const getMenuEntries$4 = async () => {
-  const allItems = await getRecentlyOpened();
-  const itemsToShow = allItems.slice(0, MAX_MENU_RECENT_ENTRIES);
-  const items = [];
-  if (itemsToShow.length > 0) {
-    items.push(...itemsToShow.map(toMenuItem), menuEntrySeparator);
-  }
-  items.push({
-    command: 'QuickPick.showRecent',
-    flags: None$1,
-    id: 'more',
-    label: moreDot()
-  }, menuEntrySeparator, {
-    command: 'RecentlyOpened.clearRecentlyOpened',
-    flags: None$1,
-    id: 'clearRecentlyOpened',
-    label: clearRecentlyOpened()
-  });
-  return items;
-};
-
-const getMenuEntries2 = async (state, props) => {
-  switch (props.menuId) {
-    case Edit$2:
-      return getMenuEntries$c();
-    case File$3:
-      return getMenuEntries$b(props.platform);
-    case Go$2:
-      return getMenuEntries$a();
-    case Help$3:
-      return getMenuEntries$9(props.platform);
-    case OpenRecent$1:
-      return getMenuEntries$4();
-    case Run$2:
-      return getMenuEntries$8();
-    case Selection$2:
-      return getMenuEntries$7();
-    case Terminal$2:
-      return getMenuEntries$6();
-    case TitleBarContextMenu:
-    case MenuIdTitleBarContextMenu:
-      return getMenuEntriesTitleBarContextMenu(state);
-    case View$2:
-      return getMenuEntries$5();
-    default:
-      return [];
-  }
-};
-
 const maximize = async () => {
   await invoke('ElectronWindow.maximize');
 };
@@ -2788,100 +2842,6 @@ const getTitle = workspaceUri => {
   return baseName;
 };
 
-const getMenuEntries$3 = () => {
-  return [{
-    command: '',
-    flags: SubMenu$1,
-    id: File$1,
-    label: file()
-  }, {
-    command: '',
-    flags: SubMenu$1,
-    id: Edit,
-    label: edit()
-  }, {
-    command: '',
-    flags: SubMenu$1,
-    id: Selection,
-    label: selection()
-  }, {
-    command: '',
-    flags: SubMenu$1,
-    id: View,
-    label: view()
-  }, {
-    command: '',
-    flags: SubMenu$1,
-    id: Go,
-    label: go()
-  }, {
-    command: '',
-    flags: SubMenu$1,
-    id: Run,
-    keyboardShortCut: 'Alt+r',
-    label: run()
-  }, {
-    command: '',
-    flags: SubMenu$1,
-    id: Terminal,
-    keyboardShortCut: 'Alt+t',
-    label: terminal()
-  }, {
-    command: '',
-    flags: SubMenu$1,
-    id: Help$1,
-    keyboardShortCut: 'Alt+h',
-    label: help()
-  }];
-};
-
-const getMenuEntries$2 = () => {
-  return [{
-    command: '',
-    flags: None$1,
-    id: File$1,
-    label: file()
-  }, {
-    command: '',
-    flags: None$1,
-    id: Edit,
-    label: edit()
-  }, {
-    command: '',
-    flags: None$1,
-    id: Selection,
-    label: selection()
-  }, {
-    command: '',
-    flags: None$1,
-    id: View,
-    label: view()
-  }, {
-    command: '',
-    flags: None$1,
-    id: Go,
-    label: go()
-  }, {
-    command: '',
-    flags: None$1,
-    id: Help$1,
-    label: help()
-  }];
-};
-
-const getFn$1 = platform => {
-  switch (platform) {
-    case Web:
-      return getMenuEntries$2;
-    default:
-      return getMenuEntries$3;
-  }
-};
-const getMenuEntries$1 = async platform => {
-  const fn = getFn$1(platform);
-  return fn();
-};
-
 const loadContent2 = async state => {
   const {
     controlsOverlayEnabled,
@@ -2893,12 +2853,15 @@ const loadContent2 = async state => {
     platform,
     titleBarStyleCustom
   } = state;
-  const titleBarEntries = await getMenuEntries$1(platform);
+  const titleBarEntries = await getMenuEntries$2(platform);
   const withWidths = 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) {
+    return hydrate(state);
+  }
   return {
     ...state,
     buttons,
@@ -3363,9 +3326,16 @@ const getTitleBarVirtualDom = state => {
     titleBarEntries,
     titleBarIconEnabled,
     titleBarMenuBarEnabled,
+    titleBarStyleCustom,
     titleBarTitleEnabled,
     width
   } = state;
+  if (titleBarStyleCustom) {
+    return [{
+      childCount: 0,
+      type: Div$1
+    }];
+  }
   const iconSrc = getIcon(assetDir);
   const visibleEntries = getVisibleTitleBarEntries(titleBarEntries, width, focusedIndex, isMenuOpen);
   return [{
@@ -3723,17 +3693,17 @@ const getFn = id => {
     case Help$3:
       return getMenuEntries$9;
     case OpenRecent$1:
-      return getMenuEntries$4;
-    case Run$2:
       return getMenuEntries$8;
-    case Selection$2:
+    case Run$2:
       return getMenuEntries$7;
-    case Terminal$2:
+    case Selection$2:
       return getMenuEntries$6;
+    case Terminal$2:
+      return getMenuEntries$5;
     case TitleBar$1:
-      return getMenuEntries$1;
+      return getMenuEntries$2;
     case View$2:
-      return getMenuEntries$5;
+      return getMenuEntries$1;
     default:
       return undefined;
   }

package/package.json

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