@lvce-editor/activity-bar-worker 7.6.0 → 7.8.0

package/dist/activityBarWorkerMain.js

@@ -1774,10 +1774,12 @@ const show2 = async (uid, menuId, x, y, args) => {
 const ACCOUNT_MENU_ID = 32_122;
 const handleClickAccount = async (state, eventX, eventY, viewletId) => {
   const {
+    sideBarLocation,
     uid
   } = state;
   await show2(uid, ACCOUNT_MENU_ID, eventX, eventY, {
-    menuId: ACCOUNT_MENU_ID
+    menuId: ACCOUNT_MENU_ID,
+    openSubMenuToLeft: sideBarLocation === Right
   });
   return state;
 };
@@ -1823,16 +1825,38 @@ const updateItemsWithBadgeCount = async items => {
   }
 };
 
-const handleBadgeCountChange = async state => {
-  const {
-    filteredItems
-  } = state;
-  const newItems = await updateItemsWithBadgeCount(filteredItems);
+const updateStateItems = (state, activityBarItems) => {
+  const itemById = new Map(activityBarItems.map(item => [item.id, item]));
+  const filteredItems = state.filteredItems.map(item => itemById.get(item.id) || item);
   return {
     ...state,
-    filteredItems: newItems
+    activityBarItems,
+    filteredItems
   };
 };
+const applyBadgeCountChanges = (state, badgeCounts) => {
+  const activityBarItems = state.activityBarItems.map(item => {
+    if (!Object.hasOwn(badgeCounts, item.id)) {
+      return item;
+    }
+    const badgeCount = badgeCounts[item.id];
+    return {
+      ...item,
+      badgeText: badgeCount ? String(badgeCount) : ''
+    };
+  });
+  return updateStateItems(state, activityBarItems);
+};
+const handleBadgeCountChange = async (state, badgeCounts) => {
+  if (badgeCounts) {
+    return applyBadgeCountChanges(state, badgeCounts);
+  }
+  const newActivityBarItems = await updateItemsWithBadgeCount(state.activityBarItems);
+  if (newActivityBarItems === state.activityBarItems) {
+    return state;
+  }
+  return updateStateItems(state, newActivityBarItems);
+};
 
 const handleBlur = state => {
   return {
@@ -2205,12 +2229,12 @@ const handleExtensionsChanged = async state => {
   const contributedViews = await getContributedViews(state.platform);
   const items = getActivityBarItems(state, contributedViews);
   const itemsWithSelected = markSelected(items, selectedIndex);
-  const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
-  const newItems = await updateItemsWithBadgeCount(filteredItems);
+  const activityBarItems = await updateItemsWithBadgeCount(itemsWithSelected);
+  const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
   return {
     ...state,
-    activityBarItems: itemsWithSelected,
-    filteredItems: newItems
+    activityBarItems,
+    filteredItems
   };
 };
 
@@ -2273,12 +2297,12 @@ const handleSettingsChanged = async state => {
   };
   const items = getActivityBarItems(newState, contributedViews);
   const itemsWithSelected = markSelected(items, selectedIndex);
-  const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
-  const newItems = await updateItemsWithBadgeCount(filteredItems);
+  const activityBarItems = await updateItemsWithBadgeCount(itemsWithSelected);
+  const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
   return {
     ...newState,
-    activityBarItems: itemsWithSelected,
-    filteredItems: newItems,
+    activityBarItems,
+    filteredItems,
     sideBarLocation: sidebarLocation
   };
 };
@@ -2468,13 +2492,13 @@ const loadContent = async state => {
   const index = items.findIndex(item => item.id === activeView);
   const selectedIndex = sideBarVisible ? index : -1;
   const itemsWithSelected = markSelected(items, selectedIndex);
-  const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
-  const newItems = await updateItemsWithBadgeCount(filteredItems);
+  const activityBarItems = await updateItemsWithBadgeCount(itemsWithSelected);
+  const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
   return {
     ...newState,
-    activityBarItems: itemsWithSelected,
+    activityBarItems,
     currentViewletId: Explorer,
-    filteredItems: newItems,
+    filteredItems,
     initial: false,
     selectedIndex,
     sideBarLocation: sidebarLocation,

package/package.json

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