@lvce-editor/activity-bar-worker 7.9.2 → 7.9.3

package/dist/activityBarWorkerMain.js

@@ -620,8 +620,12 @@ const getKeyBindings = () => {
 
 const ACCOUNT_SUBMENU_ID = 32_123;
 const getAccountLabel = state => {
-  const name = state.userName || 'Account';
-  const provider = state.userLoginProvider || 'GitHub';
+  const {
+    userLoginProvider,
+    userName
+  } = state;
+  const name = userName || 'Account';
+  const provider = userLoginProvider || 'GitHub';
   return `${name} (${provider})`;
 };
 const getMenuEntriesAccountLoggedIn = state => {
@@ -823,8 +827,11 @@ const getNumberOfVisibleItems = state => {
   return numberOfVisibleItemsTop;
 };
 const getHiddenItems = state => {
+  const {
+    activityBarItems
+  } = state;
   const numberOfVisibleItems = getNumberOfVisibleItems(state);
-  const items = state.activityBarItems.filter(item => item.flags & Enabled);
+  const items = activityBarItems.filter(item => item.flags & Enabled);
   if (numberOfVisibleItems >= items.length) {
     return [];
   }
@@ -2122,8 +2129,11 @@ const updateItemsWithBadgeCount = async items => {
 };
 
 const updateStateItems = (state, activityBarItems) => {
+  const {
+    filteredItems: currentFilteredItems
+  } = state;
   const itemById = new Map(activityBarItems.map(item => [item.id, item]));
-  const filteredItems = state.filteredItems.map(item => itemById.get(item.id) || item);
+  const filteredItems = currentFilteredItems.map(item => itemById.get(item.id) || item);
   return {
     ...state,
     activityBarItems,
@@ -2131,7 +2141,10 @@ const updateStateItems = (state, activityBarItems) => {
   };
 };
 const applyBadgeCountChanges = (state, badgeCounts) => {
-  const activityBarItems = state.activityBarItems.map(item => {
+  const {
+    activityBarItems: currentActivityBarItems
+  } = state;
+  const activityBarItems = currentActivityBarItems.map(item => {
     if (!Object.hasOwn(badgeCounts, item.id)) {
       return item;
     }
@@ -2147,8 +2160,11 @@ const handleBadgeCountChange = async (state, badgeCounts) => {
   if (badgeCounts) {
     return applyBadgeCountChanges(state, badgeCounts);
   }
-  const newActivityBarItems = await updateItemsWithBadgeCount(state.activityBarItems);
-  if (newActivityBarItems === state.activityBarItems) {
+  const {
+    activityBarItems
+  } = state;
+  const newActivityBarItems = await updateItemsWithBadgeCount(activityBarItems);
+  if (newActivityBarItems === activityBarItems) {
     return state;
   }
   return updateStateItems(state, newActivityBarItems);
@@ -2254,24 +2270,6 @@ const getFilteredActivityBarItems = (items, height, itemHeight) => {
   return [...enabledItems.slice(0, numberOfVisibleItems - 2), showMoreItem, enabledItems.at(-1)];
 };
 
-const setFlag = (item, flag, enabled) => {
-  return {
-    ...item,
-    flags: enabled ? item.flags | flag : item.flags & ~flag
-  };
-};
-
-const markSelected = (items, selectedIndex) => {
-  return items.map((item, index) => {
-    const isSelected = index === selectedIndex;
-    return setFlag(item, Selected, isSelected);
-  });
-};
-
-const toggle = async id => {
-  await invoke('Layout.toggleSideBarView', id);
-};
-
 const getSideBarChange = (sideBarVisible, currentViewletId, viewletId) => {
   if (sideBarVisible) {
     if (currentViewletId === viewletId) {
@@ -2290,6 +2288,25 @@ const getSideBarChange = (sideBarVisible, currentViewletId, viewletId) => {
     viewletId
   };
 };
+
+const setFlag = (item, flag, enabled) => {
+  return {
+    ...item,
+    flags: enabled ? item.flags | flag : item.flags & ~flag
+  };
+};
+
+const markSelected = (items, selectedIndex) => {
+  return items.map((item, index) => {
+    const isSelected = index === selectedIndex;
+    return setFlag(item, Selected, isSelected);
+  });
+};
+
+const toggle = async id => {
+  await invoke('Layout.toggleSideBarView', id);
+};
+
 const handleClickOther = async (state, viewletId) => {
   const {
     activityBarItems,
@@ -2362,7 +2379,10 @@ const getIndexFromTarget = (state, targetName) => {
   if (!targetName) {
     return -1;
   }
-  return state.filteredItems.findIndex(item => item.id === targetName);
+  const {
+    filteredItems
+  } = state;
+  return filteredItems.findIndex(item => item.id === targetName);
 };
 const handleClick = async (state, button, eventX, eventY, targetName = '') => {
   const {
@@ -2524,9 +2544,10 @@ const handleExtensionsChanged = async state => {
   const {
     height,
     itemHeight,
+    platform,
     selectedIndex
   } = state;
-  const contributedViews = await getContributedViews(state.platform);
+  const contributedViews = await getContributedViews(platform);
   const items = getActivityBarItems(state, contributedViews);
   const itemsWithSelected = markSelected(items, selectedIndex);
   const activityBarItems = await updateItemsWithBadgeCount(itemsWithSelected);
@@ -2586,11 +2607,13 @@ const getSideBarPosition = async () => {
 
 const handleSettingsChanged = async state => {
   const {
+    accountEnabled: currentAccountEnabled,
     height,
     itemHeight,
+    platform,
     selectedIndex
   } = state;
-  const [accountEnabled, contributedViews, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getContributedViews(state.platform), getSideBarPosition()]);
+  const [accountEnabled, contributedViews, sidebarLocation] = await Promise.all([getAccountEnabled(currentAccountEnabled), getContributedViews(platform), getSideBarPosition()]);
   const newState = {
     ...state,
     accountEnabled
@@ -2620,12 +2643,14 @@ const clearItem = item => {
   const withoutSelected = setFlag(item, Selected, false);
   return setFlag(withoutSelected, Focused, false);
 };
-const handleSideBarStateChange = async (state, id = state.currentViewletId, sideBarVisibleOverride) => {
+const handleSideBarStateChange = async (state, id, sideBarVisibleOverride) => {
   const {
     activityBarItems,
+    currentViewletId,
     height,
     itemHeight
   } = state;
+  const resolvedId = id === undefined ? currentViewletId : id;
   const sideBarVisible = typeof sideBarVisibleOverride === 'boolean' ? sideBarVisibleOverride : await getSideBarVisible();
   if (!sideBarVisible) {
     const itemsCleared = activityBarItems.map(clearItem);
@@ -2639,13 +2664,13 @@ const handleSideBarStateChange = async (state, id = state.currentViewletId, side
       sideBarVisible: false
     };
   }
-  const selectedIndex = findIndex(activityBarItems, id);
+  const selectedIndex = findIndex(activityBarItems, resolvedId);
   const newActivityBarItems = markSelected(activityBarItems, selectedIndex);
   const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
   return {
     ...state,
     activityBarItems: newActivityBarItems,
-    currentViewletId: id,
+    currentViewletId: resolvedId,
     filteredItems,
     selectedIndex,
     sideBarVisible
@@ -3215,7 +3240,6 @@ const getActivityBarItemInProgressDom = item => {
   className += ' ' + ActivityBarItemNested;
   return [{
     ariaHasPopup,
-    ariaLabel: '',
     ariaSelected,
     childCount: 2,
     className,
@@ -3252,7 +3276,6 @@ const getActivityBarItemWithBadgeDom = item => {
   className += ' ' + ActivityBarItemNested;
   return [{
     ariaHasPopup,
-    ariaLabel: '',
     ariaSelected,
     childCount: 2,
     className,
@@ -3303,7 +3326,6 @@ const getActivityBarItemVirtualDom = item => {
   if (isSelected && !badgeText) {
     return [{
       ariaHasPopup,
-      ariaLabel: '',
       ariaSelected,
       childCount: 1,
       className,
@@ -3326,7 +3348,6 @@ const getActivityBarItemVirtualDom = item => {
   }
   return [{
     ariaHasPopup,
-    ariaLabel: '',
     ariaSelected,
     childCount: 0,
     className: mergeClassNames(className, getIconClass(item, 'Icon')),
@@ -3342,6 +3363,8 @@ const getVirtualDom = visibleItems => {
   return dom;
 };
 
+const Focusable = 0;
+
 const className = mergeClassNames(Viewlet, ActivityBar$1);
 const getActivityBarVirtualDom = visibleItems => {
   return [{
@@ -3355,7 +3378,7 @@ const getActivityBarVirtualDom = visibleItems => {
     onFocus: HandleFocus,
     onMouseDown: HandleMouseDown,
     role: ToolBar,
-    tabIndex: 0,
+    tabIndex: Focusable,
     type: Div
   }, ...getVirtualDom(visibleItems)];
 };
@@ -3373,7 +3396,15 @@ const renderItems = (oldState, newState) => {
   return [SetDom2, uid, dom];
 };
 
+const hasSameItemIds = (oldState, newState) => {
+  const oldItems = oldState.filteredItems;
+  const newItems = newState.filteredItems;
+  return oldItems.length === newItems.length && oldItems.every((item, index) => item.id === newItems[index].id);
+};
 const renderIncremental = (oldState, newState) => {
+  if (!hasSameItemIds(oldState, newState)) {
+    return renderItems(oldState, newState);
+  }
   const oldDom = renderItems(oldState, oldState)[2];
   const newDom = renderItems(newState, newState)[2];
   const patches = diffTree(oldDom, newDom);

package/package.json

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