@lvce-editor/activity-bar-worker 2.2.0 → 3.0.0

package/dist/activityBarWorkerMain.js

@@ -912,6 +912,8 @@ const Unchecked = 3;
 
 const LeftClick = 0;
 
+const Web = 1;
+
 const RendererWorker = 1;
 
 const SetCss = 'Viewlet.setCss';
@@ -1072,7 +1074,7 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     height,
     itemHeight: 48,
     numberOfVisibleItems: 0,
-    platform: 0,
+    platform,
     scrollBarHeight: 0,
     selectedIndex: -1,
     sideBarLocation: 0,
@@ -1224,6 +1226,10 @@ const ActivityBar$2 = 'Activity Bar';
 const MoveSideBarLeft = 'Move Side Bar Left';
 const MoveSideBarRight = 'Move Side Bar Right';
 const HideActivityBar = 'Hide Activity Bar';
+const CheckForUpdates = 'Check For Updates';
+const ColorTheme = 'Color Theme';
+const CommandPalette = 'Command Palette';
+const KeyboardShortcuts = 'Keyboard Shortcuts';
 
 const explorer = () => {
   return i18nString(Explorer$1);
@@ -1240,7 +1246,7 @@ const runAndDebug = () => {
 const extensions = () => {
   return i18nString(Extensions$2);
 };
-const settings$1 = () => {
+const settings = () => {
   return i18nString(Settings);
 };
 const additionalViews = () => {
@@ -1258,6 +1264,18 @@ const moveSideBarLeft = () => {
 const hideActivityBar = () => {
   return i18nString(HideActivityBar);
 };
+const checkForUpdates = () => {
+  return i18nString(CheckForUpdates);
+};
+const commandPalette = () => {
+  return i18nString(CommandPalette);
+};
+const keyboardShortcuts = () => {
+  return i18nString(KeyboardShortcuts);
+};
+const colorTheme = () => {
+  return i18nString(ColorTheme);
+};
 
 const Left = 1;
 const Right = 2;
@@ -1345,34 +1363,12 @@ const getMenuEntriesAdditionalViews = state => {
   return hiddenActivityBarItems.map(toContextMenuItem);
 };
 
-/**
- * @enum {string}
- */
-const UiStrings = {
-  CheckForUpdates: 'Check For Updates',
-  ColorTheme: 'Color Theme',
-  CommandPalette: 'Command Palette',
-  KeyboardShortcuts: 'Keyboard Shortcuts',
-  Settings: 'Settings'};
-const checkForUpdates = () => {
-  return i18nString(UiStrings.CheckForUpdates);
-};
-const commandPalette = () => {
-  return i18nString(UiStrings.CommandPalette);
-};
-const settings = () => {
-  return i18nString(UiStrings.Settings);
-};
-const keyboardShortcuts = () => {
-  return i18nString(UiStrings.KeyboardShortcuts);
-};
-const colorTheme = () => {
-  return i18nString(UiStrings.ColorTheme);
-};
-
 const keyBindingsUri = 'app://keybindings';
-const getMenuEntriesSettings = () => {
-  return [{
+const getMenuEntriesSettings = state => {
+  const {
+    platform
+  } = state;
+  const items = [{
     command: 'QuickPick.showEverything',
     flags: None,
     id: 'commandPalette',
@@ -1393,12 +1389,16 @@ const getMenuEntriesSettings = () => {
     flags: None,
     id: 'colorTheme',
     label: colorTheme()
-  }, menuEntrySeparator, {
-    command: 'AutoUpdater.checkForUpdates',
-    flags: None,
-    id: 'checkForUpdates',
-    label: checkForUpdates()
   }];
+  if (platform !== Web) {
+    items.push(menuEntrySeparator, {
+      command: 'AutoUpdater.checkForUpdates',
+      flags: None,
+      id: 'checkForUpdates',
+      label: checkForUpdates()
+    });
+  }
+  return items;
 };
 
 const getMenuEntries = (state, options) => {
@@ -1411,7 +1411,7 @@ const getMenuEntries = (state, options) => {
     case ActivityBarAdditionalViews:
       return getMenuEntriesAdditionalViews(state);
     case Settings$1:
-      return getMenuEntriesSettings();
+      return getMenuEntriesSettings(state);
     default:
       return [];
   }
@@ -1770,18 +1770,27 @@ const getActivityBarItems = () => {
     icon: SettingsGear,
     id: 'Settings',
     keyShortcuts: '',
-    title: settings$1()
+    title: settings()
   }];
 };
 
+const getActiveView = async () => {
+  try {
+    const activeView = await invoke('Layout.getActiveSideBarView');
+    return activeView;
+  } catch {
+    return Explorer;
+  }
+};
 const loadContent = async (state, savedState) => {
   const {
     height,
     itemHeight
   } = state;
   const items = getActivityBarItems();
-  const explorerIndex = 0;
-  const itemsWithSelected = markSelected(items, explorerIndex);
+  const activeView = await getActiveView();
+  const index = items.findIndex(item => item.id === activeView);
+  const itemsWithSelected = markSelected(items, index);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
   const newItems = await updateItemsWithBadgeCount(filteredItems);
   return {
@@ -1789,7 +1798,7 @@ const loadContent = async (state, savedState) => {
     activityBarItems: itemsWithSelected,
     currentViewletId: Explorer,
     filteredItems: newItems,
-    selectedIndex: explorerIndex,
+    selectedIndex: index,
     sideBarLocation: Left,
     sideBarVisible: true
   };

package/package.json

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