@lvce-editor/title-bar-worker 2.25.0 → 2.27.0

package/dist/titleBarWorkerMain.js

@@ -1029,7 +1029,9 @@ const createDefaultState = (uid = DEFAULT_UID) => ({
   uid,
   width: 800,
   x: 0,
-  y: 0
+  y: 0,
+  layoutControlsEnabled: false,
+  commandCenterEnabled: false
 });
 
 const emptyObject = {};
@@ -1048,6 +1050,8 @@ const About = 'About';
 const CheckForUpdates = 'Check For Updates';
 const ClearRecentlyOpened = 'Clear Recently Opened';
 const Close = 'Close';
+const MenuBar$1 = 'Menu Bar';
+const CommandCenter = 'Command Center';
 const Edit$1 = 'Edit';
 const File$2 = 'File';
 const Go$1 = 'Go';
@@ -1096,6 +1100,12 @@ const maximize$1 = () => {
 const close$1 = () => {
   return i18nString(Close);
 };
+const menuBar = () => {
+  return i18nString(MenuBar$1);
+};
+const commandCenter = () => {
+  return i18nString(CommandCenter);
+};
 
 const getTitleBarButtonsElectron = (controlsOverlayEnabled, titleBarStyleCustom) => {
   if (controlsOverlayEnabled) {
@@ -1177,7 +1187,9 @@ const create3 = (id, uri, x, y, width, height, platform, controlsOverlayEnabled,
     controlsOverlayEnabled,
     titleBarStyleCustom,
     titleBarButtons,
-    assetDir
+    assetDir,
+    layoutControlsEnabled: false,
+    commandCenterEnabled: false
   };
   set$3(id, state, state);
 };
@@ -1242,6 +1254,7 @@ const diff3 = uid => {
   return diffResult;
 };
 
+const ContentInfo = 'contentinfo';
 const Menu$1 = 'menu';
 const MenuBar = 'menubar';
 const MenuItem$1 = 'menuitem';
@@ -1527,6 +1540,8 @@ const getKeyCodeString = keyCode => {
   }
 };
 
+const Script = 2;
+
 const CtrlCmd = 1 << 11 >>> 0;
 const Shift = 1 << 10 >>> 0;
 
@@ -1601,6 +1616,39 @@ const getKeyBindings$1 = () => {
   }];
 };
 
+const Separator = 1;
+const None = 0;
+const SubMenu = 4;
+const Checked = 2;
+const Unchecked = 3;
+const Disabled = 5;
+const RestoreFocus = 6;
+const Ignore = 7;
+
+const getMenuEntriesTitleBarContextMenu = async state => {
+  const {
+    titleBarMenuBarEnabled,
+    commandCenterEnabled
+  } = state;
+  // TODO checked state should be depending on whether or not that feature is currently visible or not
+  return [{
+    id: 'MenuBar',
+    label: menuBar(),
+    flags: titleBarMenuBarEnabled ? Checked : Unchecked,
+    command: titleBarMenuBarEnabled ? 'TitleBar.hideMenuBar' : 'TitleBar.showMenuBar'
+  }, {
+    id: 'Command center',
+    label: commandCenter(),
+    flags: commandCenterEnabled ? Checked : Unchecked,
+    command: commandCenterEnabled ? 'TitleBar.hideCommandCenter' : 'TitleBar.showCommandCenter'
+  }, {
+    id: 'layout controls',
+    label: 'layout controls',
+    flags: Checked,
+    command: ''
+  }];
+};
+
 /**
  * @enum {string}
  */
@@ -1665,15 +1713,6 @@ const Terminal = 14;
 const TitleBar = 15;
 const View = 16;
 
-const Separator = 1;
-const None = 0;
-const SubMenu = 4;
-const Checked = 2;
-const Unchecked = 3;
-const Disabled = 5;
-const RestoreFocus = 6;
-const Ignore = 7;
-
 const menuEntrySeparator = {
   id: 'separator',
   label: '',
@@ -1941,6 +1980,10 @@ const getFilePathElectron = async file => {
 const showContextMenu = async (x, y, id, ...args) => {
   return invoke$1('ContextMenu.show', x, y, id, ...args);
 };
+const showContextMenu2 = async (uid, menuId, x, y, args) => {
+  // @ts-ignore
+  await invoke$1('ContextMenu.show2', uid, menuId, x, y, args);
+};
 const getElectronVersion = async () => {
   return invoke$1('Process.getElectronVersion');
 };
@@ -2170,7 +2213,7 @@ const openExtensionSearch = async () => {
 };
 const setExtensionsSearchValue = async searchValue => {
   // @ts-ignore
-  return invoke$1('Extensions.handleInput', searchValue);
+  return invoke$1('Extensions.handleInput', searchValue, Script);
 };
 const openExternal = async uri => {
   // @ts-ignore
@@ -2272,6 +2315,7 @@ const RendererWorker = {
   setWebViewPort,
   setWorkspacePath,
   showContextMenu,
+  showContextMenu2,
   showErrorDialog,
   showMessageBox,
   showSaveFilePicker,
@@ -2420,38 +2464,46 @@ const getMenuEntries$5 = () => {
   return [{
     id: File$1,
     label: file(),
-    flags: SubMenu
+    flags: SubMenu,
+    command: ''
   }, {
     id: Edit,
     label: edit(),
-    flags: SubMenu
+    flags: SubMenu,
+    command: ''
   }, {
     id: Selection,
     label: selection(),
-    flags: SubMenu
+    flags: SubMenu,
+    command: ''
   }, {
     id: View,
     label: view(),
-    flags: SubMenu
+    flags: SubMenu,
+    command: ''
   }, {
     id: Go,
     label: go(),
-    flags: SubMenu
+    flags: SubMenu,
+    command: ''
   }, {
     id: Run,
     label: run(),
     keyboardShortCut: 'Alt+r',
-    flags: SubMenu
+    flags: SubMenu,
+    command: ''
   }, {
     id: Terminal,
     label: terminal(),
     keyboardShortCut: 'Alt+t',
-    flags: SubMenu
+    flags: SubMenu,
+    command: ''
   }, {
     id: Help,
     label: help(),
     keyboardShortCut: 'Alt+h',
-    flags: SubMenu
+    flags: SubMenu,
+    command: ''
   }];
 };
 
@@ -2459,27 +2511,33 @@ const getMenuEntries$4 = () => {
   return [{
     id: File$1,
     label: file(),
-    flags: None
+    flags: None,
+    command: ''
   }, {
     id: Edit,
     label: edit(),
-    flags: None
+    flags: None,
+    command: ''
   }, {
     id: Selection,
     label: selection(),
-    flags: None
+    flags: None,
+    command: ''
   }, {
     id: View,
     label: view(),
-    flags: None
+    flags: None,
+    command: ''
   }, {
     id: Go,
     label: go(),
-    flags: None
+    flags: None,
+    command: ''
   }, {
     id: Help,
     label: help(),
-    flags: None
+    flags: None,
+    command: ''
   }];
 };
 
@@ -2516,8 +2574,9 @@ const MenuEntriesView = {
 
 const menus$1 = [MenuEntriesEdit, MenuEntriesFile, MenuEntriesGo, MenuEntriesHelp, MenuEntriesRun, MenuEntriesSelection, MenuEntriesTerminal, MenuEntriesTitleBar, MenuEntriesView, MenuEntriesOpenRecent];
 
+const MenuIdTitleBarContextMenu = 50;
 const getMenuIds = () => {
-  return menus$1.map(menu => menu.id);
+  return [...menus$1.map(menu => menu.id), MenuIdTitleBarContextMenu];
 };
 const getMenuEntries$1 = async (id, platform) => {
   const menu = menus$1.find(item => item.id === id);
@@ -2527,6 +2586,14 @@ const getMenuEntries$1 = async (id, platform) => {
   return menu.getMenuEntries(platform);
 };
 
+const getMenuEntries2 = async (state, props) => {
+  if (props.menuId === MenuIdTitleBarContextMenu) {
+    return getMenuEntriesTitleBarContextMenu(state);
+  }
+  // TODO
+  return [];
+};
+
 const maximize = async () => {
   await invoke('ElectronWindow.maximize');
 };
@@ -2567,7 +2634,18 @@ const handleClick$1 = async (state, className) => {
   return state;
 };
 
-const handleContextMenu = async state => {
+const show2 = async (uid, menuId, x, y, args) => {
+  // @ts-ignore
+  await invoke$1('ContextMenu.show2', uid, menuId, x, y, args);
+};
+
+const handleContextMenu = async (state, button, eventX, eventY) => {
+  const {
+    uid
+  } = state;
+  await show2(uid, MenuIdTitleBarContextMenu, eventX, eventY, {
+    menuId: MenuIdTitleBarContextMenu
+  });
   return state;
 };
 
@@ -2827,6 +2905,18 @@ const handlePointerOver = (state, name) => {
   return handleMouseOver(state, index);
 };
 
+const hideCommandCenter = async state => {
+  // TODO
+  return state;
+};
+
+const hideMenuBar = async state => {
+  return {
+    ...state,
+    titleBarMenuBarEnabled: false
+  };
+};
+
 const createTextMeasureContext = (letterSpacing, font) => {
   const canvas = new OffscreenCanvas(0, 0);
   const ctx = canvas.getContext('2d');
@@ -3240,6 +3330,7 @@ const HandlePointerOut = 7;
 const HandlePointerOver = 8;
 const HandleMenuClick = 9;
 const HandleMenuMouseOver = 10;
+const HandleContextMenu = 11;
 
 const getItemVirtualDom = item => {
   // @ts-ignore
@@ -3362,7 +3453,7 @@ const getTitleBarVirtualDom = state => {
     type: Div,
     className: 'Viewlet TitleBar',
     id: 'TitleBar',
-    role: 'contentinfo',
+    role: ContentInfo,
     ariaLabel: 'Title Bar',
     childCount: 4
   }];
@@ -3434,6 +3525,9 @@ const renderEventListeners = () => {
   return [{
     name: HandleClickMinimize,
     params: ['handleClickMinimize']
+  }, {
+    name: HandleContextMenu,
+    params: ['handleContextMenu', Button, ClientX, ClientY]
   }, {
     name: HandleClickToggleClose,
     params: ['handleClickClose']
@@ -3495,6 +3589,18 @@ const saveState = state => {
   };
 };
 
+const showCommandCenter = async state => {
+  // TODO
+  return state;
+};
+
+const showMenuBar = async state => {
+  return {
+    ...state,
+    titleBarMenuBarEnabled: true
+  };
+};
+
 const create = (id, uri, x, y, width, height) => {
   const state = {
     ...createDefaultState(),
@@ -4008,16 +4114,17 @@ const commandMap = {
   'TitleBar.diff2': diff2,
   'TitleBar.diff3': diff3,
   'TitleBar.focus': wrapCommand(focus),
-  'TitleBar.focusMenuBar': wrapCommand(focus),
   'TitleBar.focusFirst': wrapCommand(focusFirst),
   'TitleBar.focusIndex': wrapCommand(focusLast),
   'TitleBar.focusLast': wrapCommand(focusIndex),
+  'TitleBar.focusMenuBar': wrapCommand(focus),
   'TitleBar.focusNext': wrapCommand(focusNext),
   'TitleBar.focusPrevious': wrapCommand(focusPrevious),
   'TitleBar.getCommandIds': getCommandIds,
   'TitleBar.getCommands': getCommandIds,
   'TitleBar.getKeyBindings': getKeyBindings$1,
   'TitleBar.getMenuEntries': getMenuEntries$1,
+  'TitleBar.getMenuEntries2': getMenuEntries2,
   'TitleBar.getMenuIds': getMenuIds,
   'TitleBar.getMenus': getMenus,
   'TitleBar.handleButtonsClick': handleClick$1,
@@ -4026,7 +4133,7 @@ const commandMap = {
   'TitleBar.handleClickClose': wrapCommand(handleClickClose),
   'TitleBar.handleClickMinimize': wrapCommand(handleClickMinimize),
   'TitleBar.handleClickToggleMaximize': wrapCommand(handleClickToggleMaximize),
-  'TitleBar.handleContextMenu': handleContextMenu,
+  'TitleBar.handleContextMenu': wrapCommand(handleContextMenu),
   'TitleBar.handleFocus': wrapCommand(handleFocus),
   'TitleBar.handleFocusOut': wrapCommand(handleFocusOut),
   'TitleBar.handleKeyArrowDown': wrapCommand(handleKeyArrowDown),
@@ -4044,11 +4151,15 @@ const commandMap = {
   'TitleBar.handleMouseOver': wrapCommand(handleMouseOver),
   'TitleBar.handlePointerOut': wrapCommand(handlePointerOut),
   'TitleBar.handlePointerOver': wrapCommand(handlePointerOver),
+  'TitleBar.hideCommandCenter': wrapCommand(hideCommandCenter),
+  'TitleBar.hideMenuBar': wrapCommand(hideMenuBar),
   'TitleBar.loadContent2': wrapCommand(loadContent2),
   'TitleBar.render3': render3,
   'TitleBar.renderEventListeners': renderEventListeners,
   'TitleBar.resize': wrapCommand(resize),
   'TitleBar.saveState': wrapGetter(saveState),
+  'TitleBar.showCommandCenter': wrapCommand(showCommandCenter),
+  'TitleBar.showMenuBar': wrapCommand(showMenuBar),
   'TitleBar.terminate': terminate,
   'TitleBar.toggleIndex': wrapCommand(toggleIndex),
   'TitleBar.toggleMenu': wrapCommand(toggleMenu)

package/package.json

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