@lvce-editor/activity-bar-worker 1.8.0 → 1.10.0

package/dist/activityBarWorkerMain.js

@@ -742,7 +742,7 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke$2 = (ipc, method, ...params) => {
+const invoke$1 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer$1 = (ipc, method, ...params) => {
@@ -781,7 +781,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$2(ipc, method, ...params);
+      return invoke$1(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer$1(ipc, method, ...params);
@@ -1073,6 +1073,10 @@ const Home = 12;
 const UpArrow = 14;
 const DownArrow = 16;
 
+const ActivityBar$3 = 1;
+const Settings$1 = 12;
+const ActivityBarAdditionalViews = 17;
+
 const LeftClick = 0;
 
 const DebugWorker = 55;
@@ -1136,15 +1140,6 @@ const getIndexFromPosition = (y, eventX, eventY, itemHeight, itemCount) => {
   return index;
 };
 
-const show = async (x, y, id, ...args) => {
-  // TODO
-};
-
-const handleClickAdditionalViews = async (state, x, y, viewletId) => {
-  await show();
-  return state;
-};
-
 const rpcs = Object.create(null);
 const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1178,51 +1173,51 @@ const create = rpcId => {
 };
 
 const {
-  invoke: invoke$1,
+  invoke,
   invokeAndTransfer,
   set: set$1,
   dispose
 } = create(RendererWorker$1);
 const searchFileHtml = async uri => {
-  return invoke$1('ExtensionHost.searchFileWithHtml', uri);
+  return invoke('ExtensionHost.searchFileWithHtml', uri);
 };
 const getFilePathElectron = async file => {
-  return invoke$1('FileSystemHandle.getFilePathElectron', file);
+  return invoke('FileSystemHandle.getFilePathElectron', file);
 };
 const showContextMenu = async (x, y, id, ...args) => {
-  return invoke$1('ContextMenu.show', x, y, id, ...args);
+  return invoke('ContextMenu.show', x, y, id, ...args);
 };
 const getElectronVersion = async () => {
-  return invoke$1('Process.getElectronVersion');
+  return invoke('Process.getElectronVersion');
 };
 const applyBulkReplacement = async bulkEdits => {
-  await invoke$1('BulkReplacement.applyBulkReplacement', bulkEdits);
+  await invoke('BulkReplacement.applyBulkReplacement', bulkEdits);
 };
 const setColorTheme = async id => {
   // @ts-ignore
-  return invoke$1(/* ColorTheme.setColorTheme */'ColorTheme.setColorTheme', /* colorThemeId */id);
+  return invoke(/* ColorTheme.setColorTheme */'ColorTheme.setColorTheme', /* colorThemeId */id);
 };
 const getNodeVersion = async () => {
-  return invoke$1('Process.getNodeVersion');
+  return invoke('Process.getNodeVersion');
 };
 const getChromeVersion = async () => {
-  return invoke$1('Process.getChromeVersion');
+  return invoke('Process.getChromeVersion');
 };
 const getV8Version = async () => {
-  return invoke$1('Process.getV8Version');
+  return invoke('Process.getV8Version');
 };
 const getFileHandles = async fileIds => {
-  const files = await invoke$1('FileSystemHandle.getFileHandles', fileIds);
+  const files = await invoke('FileSystemHandle.getFileHandles', fileIds);
   return files;
 };
 const setWorkspacePath = async path => {
-  await invoke$1('Workspace.setPath', path);
+  await invoke('Workspace.setPath', path);
 };
 const registerWebViewInterceptor = async (id, port) => {
   await invokeAndTransfer('WebView.registerInterceptor', id, port);
 };
 const unregisterWebViewInterceptor = async id => {
-  await invoke$1('WebView.unregisterInterceptor', id);
+  await invoke('WebView.unregisterInterceptor', id);
 };
 const sendMessagePortToEditorWorker = async (port, rpcId) => {
   const command = 'HandleMessagePort.handleMessagePort';
@@ -1250,41 +1245,41 @@ const sendMessagePortToFileSystemWorker = async (port, rpcId) => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToFileSystemWorker', port, command, rpcId);
 };
 const readFile = async uri => {
-  return invoke$1('FileSystem.readFile', uri);
+  return invoke('FileSystem.readFile', uri);
 };
 const getWebViewSecret = async key => {
   // @ts-ignore
-  return invoke$1('WebView.getSecret', key);
+  return invoke('WebView.getSecret', key);
 };
 const setWebViewPort = async (uid, port, origin, portType) => {
   return invokeAndTransfer('WebView.setPort', uid, port, origin, portType);
 };
 const setFocus = key => {
-  return invoke$1('Focus.setFocus', key);
+  return invoke('Focus.setFocus', key);
 };
 const getFileIcon = async options => {
-  return invoke$1('IconTheme.getFileIcon', options);
+  return invoke('IconTheme.getFileIcon', options);
 };
 const getColorThemeNames = async () => {
-  return invoke$1('ColorTheme.getColorThemeNames');
+  return invoke('ColorTheme.getColorThemeNames');
 };
 const disableExtension = async id => {
   // @ts-ignore
-  return invoke$1('ExtensionManagement.disable', id);
+  return invoke('ExtensionManagement.disable', id);
 };
 const enableExtension = async id => {
   // @ts-ignore
-  return invoke$1('ExtensionManagement.enable', id);
+  return invoke('ExtensionManagement.enable', id);
 };
 const handleDebugChange = async params => {
   // @ts-ignore
-  return invoke$1('Run And Debug.handleChange', params);
+  return invoke('Run And Debug.handleChange', params);
 };
 const getFolderIcon = async options => {
-  return invoke$1('IconTheme.getFolderIcon', options);
+  return invoke('IconTheme.getFolderIcon', options);
 };
 const closeWidget = async widgetId => {
-  return invoke$1('Viewlet.closeWidget', widgetId);
+  return invoke('Viewlet.closeWidget', widgetId);
 };
 const sendMessagePortToExtensionHostWorker = async (port, rpcId = 0) => {
   const command = 'HandleMessagePort.handleMessagePort2';
@@ -1295,55 +1290,55 @@ const sendMessagePortToSearchProcess = async port => {
 };
 const confirm = async (message, options) => {
   // @ts-ignore
-  const result = await invoke$1('ConfirmPrompt.prompt', message, options);
+  const result = await invoke('ConfirmPrompt.prompt', message, options);
   return result;
 };
 const getRecentlyOpened = async () => {
-  return invoke$1(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
+  return invoke(/* RecentlyOpened.getRecentlyOpened */'RecentlyOpened.getRecentlyOpened');
 };
 const getKeyBindings = async () => {
-  return invoke$1('KeyBindingsInitial.getKeyBindings');
+  return invoke('KeyBindingsInitial.getKeyBindings');
 };
 const writeClipBoardText = async text => {
-  await invoke$1('ClipBoard.writeText', /* text */text);
+  await invoke('ClipBoard.writeText', /* text */text);
 };
 const writeClipBoardImage = async blob => {
   // @ts-ignore
-  await invoke$1('ClipBoard.writeImage', /* text */blob);
+  await invoke('ClipBoard.writeImage', /* text */blob);
 };
 const searchFileMemory = async uri => {
   // @ts-ignore
-  return invoke$1('ExtensionHost.searchFileWithMemory', uri);
+  return invoke('ExtensionHost.searchFileWithMemory', uri);
 };
 const searchFileFetch = async uri => {
-  return invoke$1('ExtensionHost.searchFileWithFetch', uri);
+  return invoke('ExtensionHost.searchFileWithFetch', uri);
 };
 const showMessageBox = async options => {
-  return invoke$1('ElectronDialog.showMessageBox', options);
+  return invoke('ElectronDialog.showMessageBox', options);
 };
 const handleDebugResumed = async params => {
-  await invoke$1('Run And Debug.handleResumed', params);
+  await invoke('Run And Debug.handleResumed', params);
 };
 const openWidget = async name => {
-  await invoke$1('Viewlet.openWidget', name);
+  await invoke('Viewlet.openWidget', name);
 };
 const getIcons = async requests => {
-  const icons = await invoke$1('IconTheme.getIcons', requests);
+  const icons = await invoke('IconTheme.getIcons', requests);
   return icons;
 };
 const activateByEvent = event => {
-  return invoke$1('ExtensionHostManagement.activateByEvent', event);
+  return invoke('ExtensionHostManagement.activateByEvent', event);
 };
 const setAdditionalFocus = focusKey => {
   // @ts-ignore
-  return invoke$1('Focus.setAdditionalFocus', focusKey);
+  return invoke('Focus.setAdditionalFocus', focusKey);
 };
 const getActiveEditorId = () => {
   // @ts-ignore
-  return invoke$1('GetActiveEditor.getActiveEditorId');
+  return invoke('GetActiveEditor.getActiveEditorId');
 };
 const getWorkspacePath = () => {
-  return invoke$1('Workspace.getPath');
+  return invoke('Workspace.getPath');
 };
 const sendMessagePortToRendererProcess = async port => {
   const command = 'HandleMessagePort.handleMessagePort';
@@ -1351,20 +1346,20 @@ const sendMessagePortToRendererProcess = async port => {
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToRendererProcess', port, command, DebugWorker);
 };
 const getPreference = async key => {
-  return await invoke$1('Preferences.get', key);
+  return await invoke('Preferences.get', key);
 };
 const getAllExtensions = async () => {
-  return invoke$1('ExtensionManagement.getAllExtensions');
+  return invoke('ExtensionManagement.getAllExtensions');
 };
 const rerenderEditor = async key => {
   // @ts-ignore
-  return invoke$1('Editor.rerender', key);
+  return invoke('Editor.rerender', key);
 };
 const handleDebugPaused = async params => {
-  await invoke$1('Run And Debug.handlePaused', params);
+  await invoke('Run And Debug.handlePaused', params);
 };
 const openUri = async (uri, focus, options) => {
-  await invoke$1('Main.openUri', uri, focus, options);
+  await invoke('Main.openUri', uri, focus, options);
 };
 const sendMessagePortToSyntaxHighlightingWorker = async port => {
   await invokeAndTransfer(
@@ -1372,76 +1367,76 @@ const sendMessagePortToSyntaxHighlightingWorker = async port => {
   'SendMessagePortToSyntaxHighlightingWorker.sendMessagePortToSyntaxHighlightingWorker', port, 'HandleMessagePort.handleMessagePort2');
 };
 const handleDebugScriptParsed = async script => {
-  await invoke$1('Run And Debug.handleScriptParsed', script);
+  await invoke('Run And Debug.handleScriptParsed', script);
 };
 const getWindowId = async () => {
-  return invoke$1('GetWindowId.getWindowId');
+  return invoke('GetWindowId.getWindowId');
 };
 const getBlob = async uri => {
   // @ts-ignore
-  return invoke$1('FileSystem.getBlob', uri);
+  return invoke('FileSystem.getBlob', uri);
 };
 const getExtensionCommands = async () => {
-  return invoke$1('ExtensionHost.getCommands');
+  return invoke('ExtensionHost.getCommands');
 };
 const showErrorDialog = async errorInfo => {
   // @ts-ignore
-  await invoke$1('ErrorHandling.showErrorDialog', errorInfo);
+  await invoke('ErrorHandling.showErrorDialog', errorInfo);
 };
 const getFolderSize = async uri => {
   // @ts-ignore
-  return await invoke$1('FileSystem.getFolderSize', uri);
+  return await invoke('FileSystem.getFolderSize', uri);
 };
 const getExtension = async id => {
   // @ts-ignore
-  return invoke$1('ExtensionManagement.getExtension', id);
+  return invoke('ExtensionManagement.getExtension', id);
 };
 const getMarkdownDom = async html => {
   // @ts-ignore
-  return invoke$1('Markdown.getVirtualDom', html);
+  return invoke('Markdown.getVirtualDom', html);
 };
 const renderMarkdown = async (markdown, options) => {
   // @ts-ignore
-  return invoke$1('Markdown.renderMarkdown', markdown, options);
+  return invoke('Markdown.renderMarkdown', markdown, options);
 };
 const openNativeFolder = async uri => {
   // @ts-ignore
-  await invoke$1('OpenNativeFolder.openNativeFolder', uri);
+  await invoke('OpenNativeFolder.openNativeFolder', uri);
 };
 const uninstallExtension = async id => {
-  return invoke$1('ExtensionManagement.uninstall', id);
+  return invoke('ExtensionManagement.uninstall', id);
 };
 const installExtension = async id => {
   // @ts-ignore
-  return invoke$1('ExtensionManagement.install', id);
+  return invoke('ExtensionManagement.install', id);
 };
 const openExtensionSearch = async () => {
   // @ts-ignore
-  return invoke$1('SideBar.openViewlet', 'Extensions');
+  return invoke('SideBar.openViewlet', 'Extensions');
 };
 const setExtensionsSearchValue = async searchValue => {
   // @ts-ignore
-  return invoke$1('Extensions.handleInput', searchValue);
+  return invoke('Extensions.handleInput', searchValue);
 };
 const openExternal = async uri => {
   // @ts-ignore
-  await invoke$1('Open.openExternal', uri);
+  await invoke('Open.openExternal', uri);
 };
 const openUrl = async uri => {
   // @ts-ignore
-  await invoke$1('Open.openUrl', uri);
+  await invoke('Open.openUrl', uri);
 };
 const getAllPreferences = async () => {
   // @ts-ignore
-  return invoke$1('Preferences.getAll');
+  return invoke('Preferences.getAll');
 };
 const showSaveFilePicker = async () => {
   // @ts-ignore
-  return invoke$1('FilePicker.showSaveFilePicker');
+  return invoke('FilePicker.showSaveFilePicker');
 };
 const getLogsDir = async () => {
   // @ts-ignore
-  return invoke$1('PlatformPaths.getLogsDir');
+  return invoke('PlatformPaths.getLogsDir');
 };
 const registerMockRpc = commandMap => {
   const mockRpc = createMockRpc({
@@ -1490,7 +1485,7 @@ const RendererWorker = {
   handleDebugResumed,
   handleDebugScriptParsed,
   installExtension,
-  invoke: invoke$1,
+  invoke,
   invokeAndTransfer,
   openExtensionSearch,
   openExternal,
@@ -1532,34 +1527,42 @@ const RendererWorker = {
   writeClipBoardText
 };
 
-const {
-  set,
-  invoke
-} = RendererWorker;
+const show$1 = async (x, y, id, ...args) => {
+  await showContextMenu(x, y, id, args);
+};
 
-const handleClickOther = async (state, x, y, viewletId) => {
-  // TODO ask renderer worker asynchronously if sidebar is visible
+const handleClickAdditionalViews = async (state, x, y, viewletId) => {
+  await show$1(x, y, ActivityBarAdditionalViews);
+  return state;
+};
+
+const show = async id => {
+  // @ts-ignore
+  await invoke('Layout.showSideBar', /* id */id);
+};
+const hide = async () => {
+  await invoke('Layout.hideSideBar');
+};
 
+const handleClickOther = async (state, x, y, viewletId) => {
   const {
     sideBarVisible,
     currentViewletId
   } = state;
   if (sideBarVisible) {
     if (currentViewletId === viewletId) {
-      await invoke('Layout.hideSideBar');
+      await hide();
     } else {
-      await invoke(/* SideBar.show */'SideBar.show', /* id */viewletId);
+      await show(viewletId);
     }
   } else {
-    // TODO should show side bar with viewletId
-    // @ts-ignore
-    await invoke('Layout.showSideBar');
+    await show(currentViewletId);
   }
   return state;
 };
 
 const handleClickSettings = async (state, x, y, viewletId) => {
-  await show();
+  await show$1(x, y, Settings$1);
   return state;
 };
 
@@ -1577,9 +1580,9 @@ const handleClickIndex = async (state, button, index, x, y) => {
   const viewletId = item.id;
   switch (viewletId) {
     case 'Settings':
-      return handleClickSettings(state);
+      return handleClickSettings(state, x, y);
     case 'Additional Views':
-      return handleClickAdditionalViews(state);
+      return handleClickAdditionalViews(state, x, y);
     default:
       return handleClickOther(state, x, y, viewletId);
   }
@@ -1596,7 +1599,7 @@ const handleClick = async (state, button, eventX, eventY) => {
 };
 
 const handleContextMenu = async (state, button, x, y) => {
-  await show();
+  await show$1(x, y, ActivityBar$3);
   return state;
 };
 
@@ -1614,10 +1617,14 @@ const findIndex = (activityBarItems, id) => {
 };
 
 const handleSideBarViewletChange = (state, id, ...args) => {
-  const index = findIndex(state.activityBarItems, id);
+  const {
+    activityBarItems
+  } = state;
+  const index = findIndex(activityBarItems, id);
   return {
     ...state,
-    selectedIndex: index
+    selectedIndex: index,
+    currentViewletId: id
   };
 };
 
@@ -1941,7 +1948,8 @@ const renderEventListeners = () => {
     params: ['handleFocus']
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', Button$1, ClientX, ClientY]
+    params: ['handleContextMenu', Button$1, ClientX, ClientY],
+    preventDefault: true
   }, {
     name: HandleMouseDown,
     params: ['handleClick', Button$1, ClientX, ClientY],
@@ -1983,6 +1991,9 @@ const commandMap = {
   'ActivityBar.terminate': terminate
 };
 
+const {
+  set} = RendererWorker;
+
 const listen = async () => {
   registerCommands(commandMap);
   const rpc = await WebWorkerRpcClient.create({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/activity-bar-worker",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",