@lvce-editor/title-bar-worker 2.24.0 → 2.26.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 = {};
@@ -1177,7 +1179,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 +1246,7 @@ const diff3 = uid => {
   return diffResult;
 };
 
+const ContentInfo = 'contentinfo';
 const Menu$1 = 'menu';
 const MenuBar = 'menubar';
 const MenuItem$1 = 'menuitem';
@@ -1527,6 +1532,8 @@ const getKeyCodeString = keyCode => {
   }
 };
 
+const Script = 2;
+
 const CtrlCmd = 1 << 11 >>> 0;
 const Shift = 1 << 10 >>> 0;
 
@@ -1601,6 +1608,35 @@ 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 => {
+  // TODO checked state should be depending on whether or not that feature is currently visible or not
+  return [{
+    id: 'MenuBar',
+    label: 'menu bar',
+    flags: Checked,
+    command: ''
+  }, {
+    id: 'Command center',
+    label: 'command center',
+    flags: Checked,
+    command: ''
+  }, {
+    id: 'layout controls',
+    label: 'layout controls',
+    flags: Checked,
+    command: ''
+  }];
+};
+
 /**
  * @enum {string}
  */
@@ -1665,15 +1701,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 +1968,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 +2201,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 +2303,7 @@ const RendererWorker = {
   setWebViewPort,
   setWorkspacePath,
   showContextMenu,
+  showContextMenu2,
   showErrorDialog,
   showMessageBox,
   showSaveFilePicker,
@@ -2420,38 +2452,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 +2499,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 +2562,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 +2574,14 @@ const getMenuEntries$1 = async (id, platform) => {
   return menu.getMenuEntries(platform);
 };
 
+const getMenuEntries2 = async (state, props) => {
+  if (props.menuId === MenuIdTitleBarContextMenu) {
+    return getMenuEntriesTitleBarContextMenu();
+  }
+  // TODO
+  return [];
+};
+
 const maximize = async () => {
   await invoke('ElectronWindow.maximize');
 };
@@ -2567,7 +2622,18 @@ const handleClick$1 = async (state, className) => {
   return state;
 };
 
-const handleContextMenu = 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 +2893,11 @@ const handlePointerOver = (state, name) => {
   return handleMouseOver(state, index);
 };
 
+const hideMenuBar = async state => {
+  // TODO
+  return state;
+};
+
 const createTextMeasureContext = (letterSpacing, font) => {
   const canvas = new OffscreenCanvas(0, 0);
   const ctx = canvas.getContext('2d');
@@ -3240,6 +3311,7 @@ const HandlePointerOut = 7;
 const HandlePointerOver = 8;
 const HandleMenuClick = 9;
 const HandleMenuMouseOver = 10;
+const HandleContextMenu = 11;
 
 const getItemVirtualDom = item => {
   // @ts-ignore
@@ -3362,7 +3434,7 @@ const getTitleBarVirtualDom = state => {
     type: Div,
     className: 'Viewlet TitleBar',
     id: 'TitleBar',
-    role: 'contentinfo',
+    role: ContentInfo,
     ariaLabel: 'Title Bar',
     childCount: 4
   }];
@@ -3434,6 +3506,9 @@ const renderEventListeners = () => {
   return [{
     name: HandleClickMinimize,
     params: ['handleClickMinimize']
+  }, {
+    name: HandleContextMenu,
+    params: ['handleContextMenu', Button, ClientX, ClientY]
   }, {
     name: HandleClickToggleClose,
     params: ['handleClickClose']
@@ -3495,6 +3570,11 @@ const saveState = state => {
   };
 };
 
+const showMenuBar = async state => {
+  // TODO
+  return state;
+};
+
 const create = (id, uri, x, y, width, height) => {
   const state = {
     ...createDefaultState(),
@@ -4008,16 +4088,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,
@@ -4044,11 +4125,13 @@ const commandMap = {
   'TitleBar.handleMouseOver': wrapCommand(handleMouseOver),
   'TitleBar.handlePointerOut': wrapCommand(handlePointerOut),
   'TitleBar.handlePointerOver': wrapCommand(handlePointerOver),
+  'TitleBar.hideMenuBar': wrapCommand(hideMenuBar),
   'TitleBar.loadContent2': wrapCommand(loadContent2),
   'TitleBar.render3': render3,
   'TitleBar.renderEventListeners': renderEventListeners,
   'TitleBar.resize': wrapCommand(resize),
   'TitleBar.saveState': wrapGetter(saveState),
+  '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.24.0",
+  "version": "2.26.0",
   "description": "Title Bar Worker",
   "repository": {
     "type": "git",