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

package/dist/activityBarWorkerMain.js

@@ -249,7 +249,7 @@ const {
   get: get$2,
   getCommandIds,
   registerCommands,
-  set: set$4,
+  set: set$3,
   wrapCommand,
   wrapGetter
 } = create$a();
@@ -283,7 +283,7 @@ const create$9 = (id, uri, x, y, width, height, args, parentUid, platform = 0) =
     x,
     y
   };
-  set$4(id, state, state);
+  set$3(id, state, state);
   return state;
 };
 
@@ -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 [];
   }
@@ -1986,7 +1993,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$3 = (id, rpc) => {
+const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
@@ -2019,7 +2026,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$3(rpcId, mockRpc);
+      set$2(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -2028,15 +2035,11 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$3(rpcId, rpc);
+      set$2(rpcId, rpc);
     }
   };
 };
 
-const {
-  set: set$2
-} = create(6010);
-
 const {
   invoke: invoke$1,
   set: set$1
@@ -2054,10 +2057,6 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(y);
   await invoke('ContextMenu.show2', uid, menuId, x, y, args);
 };
-const sendMessagePortToAuthWorker = async (port, rpcId) => {
-  const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToAuthWorker', port, command, rpcId);
-};
 const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   const command = 'Extensions.handleMessagePort';
   await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToExtensionManagementWorker', port, command, rpcId);
@@ -2073,6 +2072,11 @@ const handleClickAccount = async (state, eventX, eventY, viewletId) => {
     sideBarLocation,
     uid
   } = state;
+  try {
+    await invoke('Layout.refreshAuthState');
+  } catch {
+    // Keep the account menu available when auth is unavailable.
+  }
   await show2(uid, ACCOUNT_MENU_ID, eventX, eventY, {
     menuId: ACCOUNT_MENU_ID,
     openSubMenuToLeft: sideBarLocation === Right
@@ -2122,8 +2126,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 +2138,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 +2157,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 +2267,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 +2285,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 +2376,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 +2541,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 +2604,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 +2640,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 +2661,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
@@ -2690,40 +2712,6 @@ 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;
-  }
-  if (!('userState' in userInfo)) {
-    return undefined;
-  }
-  return userInfo.userState;
-};
-
 const getActiveView = async () => {
   try {
     const activeView = await invoke('Layout.getActiveSideBarView');
@@ -2733,39 +2721,17 @@ const getActiveView = async () => {
   }
 };
 
-const getUserInfo = async () => {
-  try {
-    return await invoke('Layout.getUserInfo');
-  } catch {
-    return undefined;
-  }
-};
-
 const loadPreferences = async (accountEnabled, platform) => {
-  const [accountEnabledNew, activeView, contributedViews, sidebarLocation, sideBarVisible, userInfo] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getContributedViews(platform), getSideBarPosition(), getSideBarVisible(), getUserInfo()]);
+  const [accountEnabledNew, activeView, contributedViews, sidebarLocation, sideBarVisible] = await Promise.all([getAccountEnabled(accountEnabled), getActiveView(), getContributedViews(platform), getSideBarPosition(), getSideBarVisible()]);
   return {
     accountEnabled: accountEnabledNew,
     activeView,
     contributedViews,
     sidebarLocation,
-    sideBarVisible,
-    userInfo
+    sideBarVisible
   };
 };
 
-const toUserLoginState = userState => {
-  switch (userState) {
-    case 'loggedIn':
-      return 'logged in';
-    case 'loggingIn':
-      return 'logging in';
-    case 'loggingOut':
-      return 'logging out';
-    default:
-      return 'logged out';
-  }
-};
-
 const loadContent = async state => {
   const {
     accountEnabled,
@@ -2778,15 +2744,11 @@ const loadContent = async state => {
     activeView,
     contributedViews,
     sidebarLocation,
-    sideBarVisible,
-    userInfo
+    sideBarVisible
   } = await loadPreferences(accountEnabled, platform);
   const newState = {
     ...state,
-    accountEnabled: accountEnabledNew,
-    userLoginProvider: getUserLoginProvider(userInfo),
-    userLoginState: toUserLoginState(getUserState(userInfo)),
-    userName: getUserName(userInfo)
+    accountEnabled: accountEnabledNew
   };
   const items = getActivityBarItems(newState, contributedViews);
   const index = items.findIndex(item => item.id === activeView);
@@ -3215,7 +3177,6 @@ const getActivityBarItemInProgressDom = item => {
   className += ' ' + ActivityBarItemNested;
   return [{
     ariaHasPopup,
-    ariaLabel: '',
     ariaSelected,
     childCount: 2,
     className,
@@ -3252,7 +3213,6 @@ const getActivityBarItemWithBadgeDom = item => {
   className += ' ' + ActivityBarItemNested;
   return [{
     ariaHasPopup,
-    ariaLabel: '',
     ariaSelected,
     childCount: 2,
     className,
@@ -3303,7 +3263,6 @@ const getActivityBarItemVirtualDom = item => {
   if (isSelected && !badgeText) {
     return [{
       ariaHasPopup,
-      ariaLabel: '',
       ariaSelected,
       childCount: 1,
       className,
@@ -3326,7 +3285,6 @@ const getActivityBarItemVirtualDom = item => {
   }
   return [{
     ariaHasPopup,
-    ariaLabel: '',
     ariaSelected,
     childCount: 0,
     className: mergeClassNames(className, getIconClass(item, 'Icon')),
@@ -3342,6 +3300,8 @@ const getVirtualDom = visibleItems => {
   return dom;
 };
 
+const Focusable = 0;
+
 const className = mergeClassNames(Viewlet, ActivityBar$1);
 const getActivityBarVirtualDom = visibleItems => {
   return [{
@@ -3355,7 +3315,7 @@ const getActivityBarVirtualDom = visibleItems => {
     onFocus: HandleFocus,
     onMouseDown: HandleMouseDown,
     role: ToolBar,
-    tabIndex: 0,
+    tabIndex: Focusable,
     type: Div
   }, ...getVirtualDom(visibleItems)];
 };
@@ -3417,7 +3377,7 @@ const render2 = (uid, diffResult) => {
     newState,
     oldState
   } = get$2(uid);
-  set$4(uid, newState, newState);
+  set$3(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
   return commands;
 };
@@ -3465,6 +3425,30 @@ const setAccountEnabled = (state, enabled) => {
   };
 };
 
+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 setUserLoginState = (state, userLoginState, userInfo) => {
   return {
     ...state,
@@ -3538,18 +3522,6 @@ const commandMap = {
   'ActivityBar.toggleActivityBarItem': wrapCommand(toggleActivityBarItem)
 };
 
-const send$1 = async port => {
-  // @ts-ignore
-  await sendMessagePortToAuthWorker(port);
-};
-const initializeAuthWorker = async () => {
-  const rpc = await create$2({
-    commandMap: {},
-    send: send$1
-  });
-  set$2(rpc);
-};
-
 const send = async port => {
   await sendMessagePortToExtensionManagementWorker(port, 0);
 };
@@ -3570,7 +3542,7 @@ const initializeRendererWorker = async () => {
 
 const listen = async () => {
   registerCommands(commandMap);
-  await Promise.all([initializeRendererWorker(), initializeAuthWorker(), initializeExtensionManagementWorker()]);
+  await Promise.all([initializeRendererWorker(), initializeExtensionManagementWorker()]);
 };
 
 const main = async () => {

package/package.json

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