@lvce-editor/main-area-worker 1.10.0 → 1.11.0

package/dist/mainAreaWorkerMain.js

@@ -96,6 +96,12 @@ const object = value => {
     throw new AssertionError('expected value to be of type object');
   }
 };
+const number = value => {
+  const type = getType(value);
+  if (type !== Number$1) {
+    throw new AssertionError('expected value to be of type number');
+  }
+};
 
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
@@ -1028,14 +1034,22 @@ const createMockRpc = ({
   return mockRpc;
 };
 
-const Button = 1;
+const Button$1 = 1;
 const Div = 4;
 const Span = 8;
 const Text = 12;
 const Pre = 51;
 
+const Button = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
 const TargetName = 'event.target.name';
 
+const Tab = 13;
+
+const Separator = 1;
+const None = 0;
+
 const ExtensionHostWorker = 44;
 const RendererWorker = 1;
 
@@ -1094,9 +1108,18 @@ const {
 } = create$3(ExtensionHostWorker);
 
 const {
+  invoke,
   invokeAndTransfer,
   set: set$1
 } = create$3(RendererWorker);
+const showContextMenu2 = async (uid, menuId, x, y, args) => {
+  number(uid);
+  number(menuId);
+  number(x);
+  number(y);
+  // @ts-ignore
+  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+};
 const sendMessagePortToExtensionHostWorker$1 = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionHostWorker', port, command, rpcId);
@@ -1192,7 +1215,9 @@ const {
   getCommandIds,
   registerCommands,
   set,
-  wrapCommand} = create$2();
+  wrapCommand,
+  wrapGetter
+} = create$2();
 
 const create$1 = (uid, uri, x, y, width, height, platform, assetDir) => {
   const state = {
@@ -1237,6 +1262,10 @@ const diff2 = uid => {
   return result;
 };
 
+const getMenuIds = () => {
+  return [Tab];
+};
+
 const handleClick = async (state, name) => {
   if (!name) {
     return state;
@@ -1377,6 +1406,22 @@ const handleClickTab = async (state, groupIndexRaw, indexRaw) => {
   return selectTab(state, groupIndex, index);
 };
 
+const show2 = async (uid, menuId, x, y, args) => {
+  await showContextMenu2(uid, menuId, x, y, args);
+};
+
+const handleTabContextMenu = async (state, x, y) => {
+  number(x);
+  number(y);
+  const {
+    uid
+  } = state;
+  await show2(uid, Tab, x, y, {
+    menuId: Tab
+  });
+  return state;
+};
+
 const id = 7201;
 const sendMessagePortToExtensionHostWorker = async port => {
   await sendMessagePortToExtensionHostWorker$1(port, id);
@@ -1459,6 +1504,117 @@ const loadContent = async state => {
   };
 };
 
+const emptyObject = {};
+const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
+const i18nString = (key, placeholders = emptyObject) => {
+  if (placeholders === emptyObject) {
+    return key;
+  }
+  const replacer = (match, rest) => {
+    return placeholders[rest];
+  };
+  return key.replaceAll(RE_PLACEHOLDER, replacer);
+};
+
+/**
+ * @enum {string}
+ */
+const UiStrings = {
+  Close: 'Close',
+  CloseAll: 'Close All',
+  CloseOthers: 'Close Others',
+  CloseToTheRight: 'Close To The Right',
+  FindFileReferences: 'Find File References',
+  RevealInExplorer: 'Reveal in Explorer'};
+const close = () => {
+  return i18nString(UiStrings.Close);
+};
+const closeOthers = () => {
+  return i18nString(UiStrings.CloseOthers);
+};
+const closeAll = () => {
+  return i18nString(UiStrings.CloseAll);
+};
+const revealInExplorer = () => {
+  return i18nString(UiStrings.RevealInExplorer);
+};
+const closeToTheRight = () => {
+  return i18nString(UiStrings.CloseToTheRight);
+};
+const findFileReferences = () => {
+  return i18nString(UiStrings.FindFileReferences);
+};
+
+const menuEntrySeparator = {
+  command: '',
+  flags: Separator,
+  id: 'separator',
+  label: ''
+};
+
+// TODO should pass tab uri as argument or tab index
+const getMenuEntries$1 = state => {
+  const {
+    layout
+  } = state;
+  const {
+    activeGroupId,
+    groups
+  } = layout;
+  const group = groups[activeGroupId || 0];
+  const {
+    activeTabId,
+    tabs
+  } = group;
+  const tab = tabs[activeTabId || 0];
+  object(tab);
+  const {
+    path
+  } = tab;
+  return [{
+    command: 'Main.closeFocusedTab',
+    flags: None,
+    id: 'tabClose',
+    label: close()
+  }, {
+    command: 'Main.closeOthers',
+    flags: None,
+    id: 'tabCloseOthers',
+    label: closeOthers()
+  }, {
+    command: 'Main.closeTabsRight',
+    flags: None,
+    id: 'tabCloseToTheRight',
+    label: closeToTheRight()
+  }, {
+    command: 'Main.closeAllEditors',
+    flags: None,
+    id: 'tabCloseAll',
+    label: closeAll()
+  }, menuEntrySeparator, {
+    args: [path],
+    command: 'Explorer.revealItem',
+    flags: None,
+    id: 'revealInExplorer',
+    label: revealInExplorer()
+  }, menuEntrySeparator, {
+    args: [/* id */'References', /* focus */true, path],
+    command: 'SideBar.show',
+    flags: None,
+    id: 'findFileReferences',
+    label: findFileReferences()
+  }];
+};
+
+const getMenuEntries = async (state, props) => {
+  switch (props.menuId) {
+    case Tab:
+      return getMenuEntries$1(state);
+    default:
+      return [];
+  }
+};
+
 const findTabByUri = (state, uri) => {
   const {
     layout
@@ -1535,6 +1691,13 @@ const openTab = (state, groupId, tab) => {
   };
 };
 
+const getBasename = uri => {
+  const lastSlashIndex = uri.lastIndexOf('/');
+  if (lastSlashIndex === -1) {
+    return uri;
+  }
+  return uri.slice(lastSlashIndex + 1);
+};
 const getLabel = uri => {
   if (uri.startsWith('settings://')) {
     return 'Settings';
@@ -1542,8 +1705,7 @@ const getLabel = uri => {
   if (uri.startsWith('simple-browser://')) {
     return 'Simple Browser';
   }
-  return uri;
-  // return Workspace.pathBaseName(uri)
+  return getBasename(uri);
 };
 
 const switchTab = (state, groupId, tabId) => {
@@ -1574,12 +1736,16 @@ const switchTab = (state, groupId, tabId) => {
   };
 };
 
+/* eslint-disable prefer-destructuring */
+
 const openUri = async (state, options) => {
   object(state);
-  object(options);
-  const {
-    uri
-  } = options;
+  let uri = '';
+  if (typeof options === 'string') {
+    uri = options;
+  } else {
+    uri = options.uri;
+  }
 
   // Check if a tab with this URI already exists
   const existingTab = findTabByUri(state, uri);
@@ -1684,6 +1850,7 @@ const renderEditor = tab => {
 const HandleClick = 11;
 const HandleClickClose = 12;
 const HandleClickTab = 13;
+const HandleTabContextMenu = 14;
 
 const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   return [{
@@ -1692,7 +1859,9 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     'data-groupIndex': groupIndex,
     'data-index': tabIndex,
     onClick: HandleClickTab,
+    onContextMenu: HandleTabContextMenu,
     role: 'tab',
+    title: tab.path || tab.title,
     type: Div
   }, {
     childCount: 1,
@@ -1704,7 +1873,7 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     'data-groupIndex': groupIndex,
     'data-index': tabIndex,
     onClick: HandleClickClose,
-    type: Button
+    type: Button$1
   }, text('×')];
 };
 
@@ -1791,6 +1960,10 @@ const renderEventListeners = () => {
   }, {
     name: HandleClickTab,
     params: ['handleClickTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
+  }, {
+    name: HandleTabContextMenu,
+    params: ['handleTabContextMenu', Button, ClientX, ClientY],
+    preventDefault: true
   }];
 };
 
@@ -1814,9 +1987,12 @@ const commandMap = {
   'MainArea.create': create$1,
   'MainArea.diff2': diff2,
   'MainArea.getCommandIds': getCommandIds,
+  'MainArea.getMenuEntries': wrapGetter(getMenuEntries),
+  'MainArea.getMenuIds': getMenuIds,
   'MainArea.handleClick': wrapCommand(handleClick),
   'MainArea.handleClickCloseTab': wrapCommand(handleClickCloseTab),
   'MainArea.handleClickTab': wrapCommand(handleClickTab),
+  'MainArea.handleTabContextMenu': wrapCommand(handleTabContextMenu),
   'MainArea.initialize': initialize,
   'MainArea.loadContent': wrapCommand(loadContent),
   'MainArea.openUri': wrapCommand(openUri),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-area-worker",
-  "version": "1.10.0",
+  "version": "1.11.0",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",
@@ -11,6 +11,6 @@
   "type": "module",
   "main": "dist/mainAreaWorkerMain.js",
   "dependencies": {
-    "@lvce-editor/virtual-dom-worker": "^5.1.0"
+    "@lvce-editor/virtual-dom-worker": "^6.2.0"
   }
 }