@lvce-editor/activity-bar-worker 7.25.0 → 7.27.0

package/dist/activityBarWorkerMain.js

@@ -2174,6 +2174,10 @@ const getActiveViewIds = items => {
   return items.filter(item => item.flags & Selected).map(item => item.id);
 };
 
+const Default = 0;
+const Preview = 1;
+const SideBar = 2;
+
 const Account = 'Account';
 const DebugAlt2 = 'DebugAlt2';
 const Extensions$1 = 'Extensions';
@@ -2194,10 +2198,17 @@ const getFilteredActivityBarItems = (items, height, itemHeight) => {
     return enabledItems;
   }
   const showMoreItem = {
+    badgeIcon: '',
+    badgeText: '',
+    customIconClass: '',
+    customIconUrl: '',
+    enabled: false,
     flags: Button,
+    hasPopup: false,
     icon: Ellipsis,
     id: 'Additional Views',
     keyShortcuts: '',
+    preferredLocation: Default,
     title: additionalViews()
   };
   return [...enabledItems.slice(0, numberOfVisibleItems - 2), showMoreItem, enabledItems.at(-1)];
@@ -2410,7 +2421,7 @@ const handleClickOther = async (state, viewletId) => {
   const selectedItem = activityBarItems.find(item => item.id === viewletId);
   const sideBarChange = getSideBarChange(sideBarVisible, currentViewletId, viewletId);
   await toggle(viewletId);
-  if (selectedItem?.preferredLocation === 'preview') {
+  if (selectedItem?.preferredLocation === Preview) {
     const isActive = activeViewIds.includes(viewletId);
     const newActiveViewIds = isActive ? activeViewIds.filter(id => id !== viewletId) : [...activeViewIds, viewletId];
     const newActivityBarItems = markActiveViews(activityBarItems, newActiveViewIds);
@@ -2576,27 +2587,24 @@ const Search = 'Search';
 const SourceControl = 'Source Control';
 
 const toActivityBarItem = view => {
+  const defaultLocation = view.preferredLocation === 'sideBar' ? SideBar : Default;
   const icon = view.icon || Extensions$1;
-  const customIconUrl = isCustomIconUrl(icon) ? icon : undefined;
-  const customIconClass = customIconUrl ? getCustomIconClass(view.id, customIconUrl) : undefined;
-  const item = {
+  const customIconUrl = isCustomIconUrl(icon) ? icon : '';
+  const customIconClass = customIconUrl ? getCustomIconClass(view.id, customIconUrl) : '';
+  return {
+    badgeIcon: '',
+    badgeText: '',
+    customIconClass,
+    customIconUrl,
+    enabled: false,
     flags: Tab | Enabled,
+    hasPopup: false,
     icon,
     id: view.id,
     keyShortcuts: '',
-    ...(view.preferredLocation === 'preview' && {
-      preferredLocation: 'preview'
-    }),
+    preferredLocation: view.preferredLocation === 'preview' ? Preview : defaultLocation,
     title: view.title || view.id
   };
-  if (customIconClass && customIconUrl) {
-    return {
-      ...item,
-      customIconClass,
-      customIconUrl
-    };
-  }
-  return item;
 };
 const getActivityBarItems = (state, contributedViews = []) => {
   const {
@@ -2608,58 +2616,114 @@ const getActivityBarItems = (state, contributedViews = []) => {
   const items = [
   // Top
   {
+    badgeIcon: '',
+    badgeText: '',
+    customIconClass: '',
+    customIconUrl: '',
+    enabled: false,
     flags: Tab | Enabled,
+    hasPopup: false,
     icon: Files,
     id: Explorer,
     keyShortcuts: 'Control+Shift+E',
+    preferredLocation: Default,
     title: explorer()
   }, {
+    badgeIcon: '',
+    badgeText: '',
+    customIconClass: '',
+    customIconUrl: '',
+    enabled: false,
     flags: Tab | Enabled,
+    hasPopup: false,
     icon: Search$1,
     id: Search,
     keyShortcuts: 'Control+Shift+F',
+    preferredLocation: Default,
     title: search()
   }, {
+    badgeIcon: '',
+    badgeText: '',
+    customIconClass: '',
+    customIconUrl: '',
+    enabled: false,
     flags: Tab | Enabled,
+    hasPopup: false,
     icon: SourceControl$1,
     id: SourceControl,
     keyShortcuts: 'Control+Shift+G',
+    preferredLocation: Default,
     title: sourceControl()
   }, {
+    badgeIcon: '',
+    badgeText: '',
+    customIconClass: '',
+    customIconUrl: '',
+    enabled: false,
     flags: Tab | Enabled,
+    hasPopup: false,
     icon: DebugAlt2,
     id: RunAndDebug,
     keyShortcuts: 'Control+Shift+D',
+    preferredLocation: Default,
     title: runAndDebug()
   }, {
+    badgeIcon: '',
+    badgeText: '',
+    customIconClass: '',
+    customIconUrl: '',
+    enabled: false,
     flags: Tab | Enabled,
+    hasPopup: false,
     icon: Extensions$1,
     id: Extensions,
     keyShortcuts: 'Control+Shift+X',
+    preferredLocation: Default,
     title: extensions()
   }, {
+    badgeIcon: '',
+    badgeText: '',
+    customIconClass: '',
+    customIconUrl: '',
+    enabled: false,
     flags: Tab | (referencesEnabled ? Enabled : 0),
+    hasPopup: false,
     icon: References$1,
     id: References,
     keyShortcuts: '',
+    preferredLocation: Default,
     title: references()
   }, ...contributedViews.map(toActivityBarItem)
   // Bottom
   ];
   if (accountEnabled) {
     items.push({
+      badgeIcon: '',
+      badgeText: '',
+      customIconClass: '',
+      customIconUrl: '',
+      enabled: false,
       flags: Button | Enabled | MarginTop,
+      hasPopup: true,
       icon: Account,
       id: 'Account',
       keyShortcuts: '',
+      preferredLocation: Default,
       title: account()
     });
   }
   items.push({
+    badgeIcon: '',
+    badgeText: '',
+    customIconClass: '',
+    customIconUrl: '',
+    enabled: false,
     flags: settingsFlags,
+    hasPopup: true,
     icon: SettingsGear,
     id: 'Settings',
     keyShortcuts: '',
+    preferredLocation: Default,
     title: settings()
   });
   return items;
@@ -2977,28 +3041,39 @@ const loadContent = async state => {
   };
 };
 
-const escapeCssUrl = url => {
-  return url.replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('\n', '\\a ').replaceAll('\r', '\\d ').replaceAll('\f', '\\c ');
-};
-
-const getCustomIconCss = items => {
+const getCustomIconItems = items => {
   const seen = new Set();
-  let css = '';
-  for (const item of items) {
+  return items.filter(item => {
     const {
       customIconClass,
       customIconUrl
     } = item;
     if (!customIconClass || !customIconUrl || seen.has(customIconClass)) {
-      continue;
+      return false;
     }
     seen.add(customIconClass);
-    css += `.${customIconClass} {
+    return true;
+  });
+};
+
+const escapeCssUrl = url => {
+  return url.replaceAll('\\', '\\\\').replaceAll('"', '\\"').replaceAll('\n', '\\a ').replaceAll('\r', '\\d ').replaceAll('\f', '\\c ');
+};
+
+const getCustomIconRule = item => {
+  const {
+    customIconClass,
+    customIconUrl
+  } = item;
+  return `.${customIconClass} {
   mask-image: url("${escapeCssUrl(customIconUrl)}");
-}
-`;
-  }
-  return css;
+}`;
+};
+
+const getCustomIconCss = items => {
+  const customIconItems = getCustomIconItems(items);
+  const cssRules = customIconItems.map(getCustomIconRule);
+  return cssRules.join('\n');
 };
 
 const getCss = (itemHeight, items = []) => {
@@ -3327,7 +3402,7 @@ const HandleFocus = 3;
 const HandleMouseDown = 4;
 
 const getActivityBarItemHasPopup = item => {
-  return item.id === 'Account' || item.id === 'Settings';
+  return item.hasPopup;
 };
 
 const getAriaSelected = (isTab, isSelected) => {

package/dist/settings.json

@@ -4,7 +4,7 @@
     "description": "Show the account item in the activity bar",
     "heading": "Account",
     "id": "activityBar.accountEnabled",
-    "type": 3,
+    "type": "boolean",
     "value": true
   }
 ]

package/package.json

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