@lvce-editor/activity-bar-worker 7.14.2 → 7.15.1

package/dist/activityBarWorkerMain.js

@@ -846,79 +846,6 @@ const getMenuEntriesActivityBar = state => {
   }];
 };
 
-const getNumberOfVisibleItems = state => {
-  const {
-    height,
-    itemHeight
-  } = state;
-  const numberOfVisibleItemsTop = Math.floor(height / itemHeight);
-  return numberOfVisibleItemsTop;
-};
-const getHiddenItems = state => {
-  const {
-    activityBarItems
-  } = state;
-  const numberOfVisibleItems = getNumberOfVisibleItems(state);
-  const items = activityBarItems.filter(item => item.flags & Enabled);
-  if (numberOfVisibleItems >= items.length) {
-    return [];
-  }
-  return items.slice(numberOfVisibleItems - 2, -1);
-};
-
-const toContextMenuItem = activityBarItem => {
-  return {
-    command: '-1',
-    // TODO
-    flags: None,
-    id: '8000',
-    // TODO
-    label: activityBarItem.title
-  };
-};
-const getMenuEntriesAdditionalViews = state => {
-  const hiddenActivityBarItems = getHiddenItems(state);
-  return hiddenActivityBarItems.map(toContextMenuItem);
-};
-
-const keyBindingsUri = 'app://keybindings';
-const getMenuEntriesSettings = state => {
-  const {
-    platform
-  } = state;
-  const items = [{
-    command: 'QuickPick.showEverything',
-    flags: None,
-    id: 'commandPalette',
-    label: commandPalette()
-  }, menuEntrySeparator, {
-    command: 'Preferences.openSettingsJson',
-    flags: None,
-    id: 'settings',
-    label: settings()
-  }, {
-    args: [keyBindingsUri],
-    command: 'Main.openUri',
-    flags: None,
-    id: 'keyboardShortcuts',
-    label: keyboardShortcuts()
-  }, {
-    command: 'QuickPick.showColorTheme',
-    flags: None,
-    id: 'colorTheme',
-    label: colorTheme()
-  }];
-  if (platform === Electron) {
-    items.push(menuEntrySeparator, {
-      command: 'AutoUpdater.checkForUpdates',
-      flags: None,
-      id: 'checkForUpdates',
-      label: checkForUpdates()
-    });
-  }
-  return items;
-};
-
 const normalizeLine = line => {
   if (line.startsWith('Error: ')) {
     return line.slice('Error: '.length);
@@ -2129,6 +2056,89 @@ const handleClickAccount = async (state, eventX, eventY, viewletId) => {
   return state;
 };
 
+const getNumberOfVisibleItems = state => {
+  const {
+    height,
+    itemHeight
+  } = state;
+  const numberOfVisibleItemsTop = Math.floor(height / itemHeight);
+  return numberOfVisibleItemsTop;
+};
+const getHiddenItems = state => {
+  const {
+    activityBarItems
+  } = state;
+  const numberOfVisibleItems = getNumberOfVisibleItems(state);
+  const items = activityBarItems.filter(item => item.flags & Enabled);
+  if (numberOfVisibleItems >= items.length) {
+    return [];
+  }
+  return items.slice(numberOfVisibleItems - 2, -1);
+};
+
+const toContextMenuItem = activityBarItem => {
+  if (activityBarItem.id === 'Account') {
+    return {
+      args: [{
+        menuId: ACCOUNT_MENU_ID
+      }],
+      command: '',
+      flags: SubMenu,
+      id: ACCOUNT_MENU_ID,
+      label: activityBarItem.title
+    };
+  }
+  return {
+    args: [activityBarItem.id],
+    command: 'ActivityBar.handleClickOther',
+    flags: None,
+    id: `open-${activityBarItem.id}`,
+    label: activityBarItem.title
+  };
+};
+const getMenuEntriesAdditionalViews = state => {
+  const hiddenActivityBarItems = getHiddenItems(state);
+  return hiddenActivityBarItems.map(toContextMenuItem);
+};
+
+const keyBindingsUri = 'app://keybindings';
+const getMenuEntriesSettings = state => {
+  const {
+    platform
+  } = state;
+  const items = [{
+    command: 'QuickPick.showEverything',
+    flags: None,
+    id: 'commandPalette',
+    label: commandPalette()
+  }, menuEntrySeparator, {
+    command: 'Preferences.openSettingsJson',
+    flags: None,
+    id: 'settings',
+    label: settings()
+  }, {
+    args: [keyBindingsUri],
+    command: 'Main.openUri',
+    flags: None,
+    id: 'keyboardShortcuts',
+    label: keyboardShortcuts()
+  }, {
+    command: 'QuickPick.showColorTheme',
+    flags: None,
+    id: 'colorTheme',
+    label: colorTheme()
+  }];
+  if (platform === Electron) {
+    items.push(menuEntrySeparator, {
+      command: 'AutoUpdater.checkForUpdates',
+      flags: None,
+      id: 'checkForUpdates',
+      label: checkForUpdates()
+    });
+  }
+  return items;
+};
+
 const getMenuEntries = (state, options) => {
   const {
     menuId
@@ -2275,10 +2285,12 @@ const getIndexFromPosition = (y, _eventX, eventY, itemHeight, items, height) =>
 
 const handleClickAdditionalViews = async (state, eventX, eventY, viewletId) => {
   const {
+    sideBarLocation,
     uid
   } = state;
   await show2(uid, ActivityBarAdditionalViews, eventX, eventY, {
     menuId: ActivityBarAdditionalViews,
+    openSubMenuToLeft: sideBarLocation === Right,
     viewletId
   });
   return state;
@@ -3693,6 +3705,7 @@ const commandMap = {
   'ActivityBar.handleClickAccount': wrapCommand(handleClickAccount),
   'ActivityBar.handleClickAdditionalViews': wrapCommand(handleClickAdditionalViews),
   'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),
+  'ActivityBar.handleClickOther': wrapCommand(handleClickOther),
   'ActivityBar.handleClickSettings': wrapCommand(handleClickSettings),
   'ActivityBar.handleClickSignIn': wrapCommand(handleClickSignIn),
   'ActivityBar.handleClickSignOut': wrapCommand(handleClickSignOut),

package/package.json

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