@lvce-editor/activity-bar-worker 7.5.0 → 7.7.0

package/dist/activityBarWorkerMain.js

@@ -151,7 +151,9 @@ const create$9 = (id, uri, x, y, width, height, args, parentUid, platform = 0) =
     uid: id,
     updateProgress: 0,
     updateState: '',
+    userLoginProvider: 'GitHub',
     userLoginState: 'logged out',
+    userName: '',
     width,
     x,
     y
@@ -251,6 +253,7 @@ const Reference = 100;
 const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
 const ClientY = 'event.clientY';
+const TargetName = 'event.target.name';
 
 const Enter = 3;
 const Space = 9;
@@ -267,6 +270,7 @@ const ActivityBarAdditionalViews = 17;
 
 const Separator = 1;
 const None = 0;
+const SubMenu = 4;
 const Checked = 2;
 const Unchecked = 3;
 
@@ -324,7 +328,24 @@ const getKeyBindings = () => {
   }];
 };
 
+const ACCOUNT_SUBMENU_ID = 32_123;
+const getAccountLabel = state => {
+  const name = state.userName || 'Account';
+  const provider = state.userLoginProvider || 'GitHub';
+  return `${name} (${provider})`;
+};
 const getMenuEntriesAccountLoggedIn = state => {
+  return [{
+    args: [{
+      menuId: ACCOUNT_SUBMENU_ID
+    }],
+    command: '',
+    flags: SubMenu,
+    id: ACCOUNT_SUBMENU_ID,
+    label: getAccountLabel(state)
+  }];
+};
+const getMenuEntriesAccountSubMenu = state => {
   const {
     userLoginState
   } = state;
@@ -1768,6 +1789,8 @@ const getMenuEntries = (state, options) => {
   switch (menuId) {
     case ACCOUNT_MENU_ID:
       return getMenuEntriesAccount(state);
+    case ACCOUNT_SUBMENU_ID:
+      return getMenuEntriesAccountSubMenu(state);
     case ActivityBar$3:
       return getMenuEntriesActivityBar(state);
     case ActivityBarAdditionalViews:
@@ -1780,7 +1803,7 @@ const getMenuEntries = (state, options) => {
 };
 
 const getMenuEntryIds = () => {
-  return [ActivityBar$3, ActivityBarAdditionalViews, Settings$1, ACCOUNT_MENU_ID];
+  return [ActivityBar$3, ActivityBarAdditionalViews, Settings$1, ACCOUNT_MENU_ID, ACCOUNT_SUBMENU_ID];
 };
 
 const updateItemsWithBadgeCount = async items => {
@@ -1800,16 +1823,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 {
@@ -2015,14 +2060,21 @@ const handleClickIndex = async (state, button, index, x, y) => {
   }
 };
 
-const handleClick = async (state, button, eventX, eventY) => {
+const getIndexFromTarget = (state, targetName) => {
+  if (!targetName) {
+    return -1;
+  }
+  return state.filteredItems.findIndex(item => item.id === targetName);
+};
+const handleClick = async (state, button, eventX, eventY, targetName = '') => {
   const {
     filteredItems,
     height,
     itemHeight,
     y
   } = state;
-  const index = getIndexFromPosition(y, eventX, eventY, itemHeight, filteredItems, height);
+  const targetIndex = getIndexFromTarget(state, targetName);
+  const index = targetIndex === -1 ? getIndexFromPosition(y, eventX, eventY, itemHeight, filteredItems, height) : targetIndex;
   return handleClickIndex(state, button, index, eventX, eventY);
 };
 
@@ -2175,12 +2227,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
   };
 };
 
@@ -2243,12 +2295,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
   };
 };
@@ -2336,6 +2388,30 @@ const handleUpdateStateChange = async (state, config) => {
   };
 };
 
+const providerKeys = ['userLoginProvider', 'loginProvider', 'authProvider', 'provider'];
+const getUserLoginProvider = userInfo => {
+  if (!userInfo || typeof userInfo !== 'object') {
+    return 'GitHub';
+  }
+  const record = userInfo;
+  for (const key of providerKeys) {
+    if (typeof record[key] === 'string' && record[key]) {
+      return record[key];
+    }
+  }
+  return 'GitHub';
+};
+
+const getUserName = userInfo => {
+  if (!userInfo || typeof userInfo !== 'object') {
+    return '';
+  }
+  if (!('userName' in userInfo) || typeof userInfo.userName !== 'string') {
+    return '';
+  }
+  return userInfo.userName;
+};
+
 const getUserState = userInfo => {
   if (!userInfo || typeof userInfo !== 'object') {
     return undefined;
@@ -2406,19 +2482,21 @@ const loadContent = async state => {
   const newState = {
     ...state,
     accountEnabled: accountEnabledNew,
-    userLoginState: toUserLoginState(getUserState(userInfo))
+    userLoginProvider: getUserLoginProvider(userInfo),
+    userLoginState: toUserLoginState(getUserState(userInfo)),
+    userName: getUserName(userInfo)
   };
   const items = getActivityBarItems(newState, contributedViews);
   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,
@@ -2852,6 +2930,7 @@ const getActivityBarItemWithBadgeDom = item => {
   const {
     badgeText,
     flags,
+    id,
     title
   } = item;
   if (!badgeText) {
@@ -2873,17 +2952,20 @@ const getActivityBarItemWithBadgeDom = item => {
     ariaSelected,
     childCount: 2,
     className,
+    name: id,
     role,
     title,
     type: Div
   }, {
     childCount: 0,
     className: mergeClassNames(Icon, getIconClass(item, 'MaskIcon')),
+    name: id,
     role: None$1,
     type: Div
   }, {
     childCount: 1,
     className: ActivityBarItemBadge,
+    name: id,
     type: Div
   }, text(badgeText)];
 };
@@ -2902,6 +2984,7 @@ const getActivityBarItemVirtualDom = item => {
     badgeText,
     flags,
     icon,
+    id,
     title
   } = item;
   const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
@@ -2920,10 +3003,14 @@ const getActivityBarItemVirtualDom = item => {
       ariaSelected,
       childCount: 1,
       className,
+      name: id,
       role,
       title,
       type: Div
-    }, getIconVirtualDom(icon, Div, item.customIconClass)];
+    }, {
+      ...getIconVirtualDom(icon, Div, item.customIconClass),
+      name: id
+    }];
   }
 
   // TODO support progress on selected activity bar item
@@ -2939,6 +3026,7 @@ const getActivityBarItemVirtualDom = item => {
     ariaSelected,
     childCount: 0,
     className: mergeClassNames(className, getIconClass(item, 'Icon')),
+    name: id,
     role,
     title,
     type: Div
@@ -3043,7 +3131,7 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleMouseDown,
-    params: ['handleClick', Button$1, ClientX, ClientY],
+    params: ['handleClick', Button$1, ClientX, ClientY, TargetName],
     preventDefault: false,
     stopPropagation: false
   }];
@@ -3073,10 +3161,12 @@ const setAccountEnabled = (state, enabled) => {
   };
 };
 
-const setUserLoginState = (state, userLoginState) => {
+const setUserLoginState = (state, userLoginState, userInfo) => {
   return {
     ...state,
-    userLoginState
+    userLoginProvider: getUserLoginProvider(userInfo),
+    userLoginState,
+    userName: getUserName(userInfo)
   };
 };
 

package/package.json

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