@lvce-editor/activity-bar-worker 4.4.0 → 4.5.0

package/dist/activityBarWorkerMain.js

@@ -1274,16 +1274,21 @@ const getKeyBindings = () => {
 };
 
 const getMenuEntriesAccount = state => {
+  const signInLabel = state.userLoginState === 'logging in' ? 'Signing In...' : 'Sign In';
+  const signOutLabel = state.userLoginState === 'logging out' ? 'Signing Out...' : 'Sign Out';
+  if (state.userLoginState === 'logged in' || state.userLoginState === 'logging out') {
+    return [{
+      command: 'ActivityBar.handleClickSignOut',
+      flags: None,
+      id: 'signOut',
+      label: signOutLabel
+    }];
+  }
   return [{
-    command: 'Account.signIn',
+    command: 'ActivityBar.handleClickSignIn',
     flags: None,
     id: 'signIn',
-    label: 'Sign In'
-  }, {
-    command: 'Account.signOut',
-    flags: None,
-    id: 'signOut',
-    label: 'Sign Out'
+    label: signInLabel
   }];
 };
 
@@ -1495,15 +1500,28 @@ const getMenuEntriesSettings = state => {
   return items;
 };
 
-// Use a unique number for the Account menu ID
-const ACCOUNT_MENU_ID$1 = 1000;
+const show2 = async (uid, menuId, x, y, args) => {
+  await showContextMenu2(uid, menuId, x, y, args);
+};
+
+const ACCOUNT_MENU_ID = 32_122;
+const handleClickAccount = async (state, eventX, eventY, viewletId) => {
+  const {
+    uid
+  } = state;
+  await show2(uid, ACCOUNT_MENU_ID, eventX, eventY, {
+    menuId: ACCOUNT_MENU_ID
+  });
+  return state;
+};
+
 const getMenuEntries = (state, options) => {
   const {
     menuId
   } = options;
   switch (menuId) {
-    case ACCOUNT_MENU_ID$1:
-      return getMenuEntriesAccount();
+    case ACCOUNT_MENU_ID:
+      return getMenuEntriesAccount(state);
     case ActivityBar$3:
       return getMenuEntriesActivityBar(state);
     case ActivityBarAdditionalViews:
@@ -1516,7 +1534,7 @@ const getMenuEntries = (state, options) => {
 };
 
 const getMenuEntryIds = () => {
-  return [ActivityBar$3, ActivityBarAdditionalViews, Settings$1];
+  return [ActivityBar$3, ActivityBarAdditionalViews, Settings$1, ACCOUNT_MENU_ID];
 };
 
 const updateItemsWithBadgeCount = async items => {
@@ -1554,7 +1572,23 @@ const handleBlur = state => {
   };
 };
 
-const getIndexFromPosition = (y, eventX, eventY, itemHeight, itemCount, height) => {
+const isBottomItem = item => {
+  return item.id === 'Account' || item.id === 'Settings';
+};
+const getBottomItemCount = items => {
+  if (typeof items === 'number') {
+    return items > 1 ? 1 : 0;
+  }
+  return items.filter(isBottomItem).length;
+};
+const getItemCount = items => {
+  if (typeof items === 'number') {
+    return items;
+  }
+  return items.length;
+};
+const getIndexFromPosition = (y, eventX, eventY, itemHeight, items, height) => {
+  const itemCount = getItemCount(items);
   if (itemCount === 0) {
     return -1;
   }
@@ -1567,38 +1601,22 @@ const getIndexFromPosition = (y, eventX, eventY, itemHeight, itemCount, height)
     }
     return index;
   }
-  // Settings is always at the bottom (last item) when there are multiple items
-  const settingsBottomY = y + height;
-  const settingsTopY = settingsBottomY - itemHeight;
-  // Check if click is in the Settings area (bottom)
-  if (eventY >= settingsTopY && eventY < settingsBottomY) {
-    return itemCount - 1;
+  const bottomItemCount = getBottomItemCount(items);
+  const bottomItemsHeight = bottomItemCount * itemHeight;
+  const bottomItemsTopY = y + height - bottomItemsHeight;
+  if (bottomItemCount > 0 && eventY >= bottomItemsTopY && eventY < y + height) {
+    const relativeBottomY = eventY - bottomItemsTopY;
+    return itemCount - bottomItemCount + Math.floor(relativeBottomY / itemHeight);
   }
-  // Otherwise, calculate index from top items
+  const topItemCount = itemCount - bottomItemCount;
   const relativeY = eventY - y;
   const index = Math.floor(relativeY / itemHeight);
-  if (index < 0 || index >= itemCount - 1) {
+  if (index < 0 || index >= topItemCount) {
     return -1;
   }
   return index;
 };
 
-const show2 = async (uid, menuId, x, y, args) => {
-  await showContextMenu2(uid, menuId, x, y, args);
-};
-
-// Use a unique number for the Account menu ID
-const ACCOUNT_MENU_ID = 1000;
-const handleClickAccount = async (state, eventX, eventY, viewletId) => {
-  const {
-    uid
-  } = state;
-  await show2(uid, ACCOUNT_MENU_ID, eventX, eventY, {
-    menuId: ACCOUNT_MENU_ID
-  });
-  return state;
-};
-
 const handleClickAdditionalViews = async (state, eventX, eventY, viewletId) => {
   const {
     uid
@@ -1680,10 +1698,18 @@ const handleClick = async (state, button, eventX, eventY) => {
     itemHeight,
     y
   } = state;
-  const index = getIndexFromPosition(y, eventX, eventY, itemHeight, filteredItems.length, height);
+  const index = getIndexFromPosition(y, eventX, eventY, itemHeight, filteredItems, height);
   return handleClickIndex(state, button, index, eventX, eventY);
 };
 
+const handleClickSignIn = async state => {
+  return state;
+};
+
+const handleClickSignOut = async state => {
+  return state;
+};
+
 const handleContextMenu = async (state, button, eventX, eventY) => {
   const {
     uid
@@ -1750,6 +1776,15 @@ const handleResize = (state, dimensions) => {
   };
 };
 
+const getAccountEnabled = async defaultValue => {
+  try {
+    const value = await invoke('Preferences.get', 'activityBar.accountEnabled');
+    return typeof value === 'boolean' ? value : defaultValue;
+  } catch {
+    return defaultValue;
+  }
+};
+
 const Explorer = 'Explorer';
 const Extensions = 'Extensions';
 const RunAndDebug = 'Run And Debug';
@@ -1760,6 +1795,7 @@ const getActivityBarItems = state => {
   const {
     accountEnabled
   } = state;
+  const settingsFlags = Button | Enabled | (accountEnabled ? 0 : MarginTop);
   const items = [
   // Top
   {
@@ -1805,7 +1841,7 @@ const getActivityBarItems = state => {
     });
   }
   items.push({
-    flags: Button | Enabled | MarginTop,
+    flags: settingsFlags,
     icon: SettingsGear,
     id: 'Settings',
     keyShortcuts: '',
@@ -1842,13 +1878,17 @@ const handleSettingsChanged = async state => {
     itemHeight,
     selectedIndex
   } = state;
-  const items = getActivityBarItems(state);
+  const [accountEnabled, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getSideBarPosition()]);
+  const newState = {
+    ...state,
+    accountEnabled
+  };
+  const items = getActivityBarItems(newState);
   const itemsWithSelected = markSelected(items, selectedIndex);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
   const newItems = await updateItemsWithBadgeCount(filteredItems);
-  const sidebarLocation = await getSideBarPosition();
   return {
-    ...state,
+    ...newState,
     activityBarItems: itemsWithSelected,
     filteredItems: newItems,
     sideBarLocation: sidebarLocation
@@ -1967,15 +2007,19 @@ const loadContent = async state => {
     height,
     itemHeight
   } = state;
-  const items = getActivityBarItems(state);
-  const [activeView, sideBarVisible, sidebarLocation] = await Promise.all([getActiveView(), getSideBarVisible(), getSideBarPosition()]);
+  const [accountEnabled, activeView, sideBarVisible, sidebarLocation] = await Promise.all([getAccountEnabled(state.accountEnabled), getActiveView(), getSideBarVisible(), getSideBarPosition()]);
+  const newState = {
+    ...state,
+    accountEnabled
+  };
+  const items = getActivityBarItems(newState);
   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);
   return {
-    ...state,
+    ...newState,
     activityBarItems: itemsWithSelected,
     currentViewletId: Explorer,
     filteredItems: newItems,
@@ -2331,6 +2375,10 @@ const HandleMouseDown = 4;
 
 const ActivityBar = 'ActivityBar';
 
+const getActivityBarItemHasPopup = item => {
+  return item.id === 'Account' || item.id === 'Settings';
+};
+
 const getAriaSelected = (isTab, isSelected) => {
   if (!isTab) {
     return undefined;
@@ -2379,10 +2427,12 @@ const getActivityBarItemInProgressDom = item => {
   const isFocused = flags & Focused;
   const role = isTab ? Tab$1 : Button$2;
   const ariaSelected = getAriaSelected(isTab, isSelected);
+  const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
   const marginTop = flags & MarginTop;
   let className = getClassName(isFocused, marginTop, isSelected);
   className += ' ' + ActivityBarItemNested;
   return [{
+    ariaHasPopup,
     ariaLabel: '',
     ariaSelected,
     childCount: 2,
@@ -2414,10 +2464,12 @@ const getActivityBarItemWithBadgeDom = item => {
   const isFocused = flags & Focused;
   const role = isTab ? Tab$1 : Button$2;
   const ariaSelected = getAriaSelected(isTab, isSelected);
+  const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
   const marginTop = flags & MarginTop;
   let className = getClassName(isFocused, marginTop, isSelected);
   className += ' ' + ActivityBarItemNested;
   return [{
+    ariaHasPopup,
     ariaLabel: '',
     ariaSelected,
     childCount: 2,
@@ -2453,6 +2505,7 @@ const getActivityBarItemVirtualDom = item => {
     icon,
     title
   } = item;
+  const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
   const isTab = flags & Tab;
   const isSelected = flags & Selected;
   const isFocused = flags & Focused;
@@ -2463,6 +2516,7 @@ const getActivityBarItemVirtualDom = item => {
   const className = getClassName(isFocused, marginTop, isSelected);
   if (isSelected) {
     return [{
+      ariaHasPopup,
       ariaLabel: '',
       ariaSelected,
       childCount: 1,
@@ -2481,6 +2535,7 @@ const getActivityBarItemVirtualDom = item => {
     return getActivityBarItemWithBadgeDom(item);
   }
   return [{
+    ariaHasPopup,
     ariaLabel: '',
     ariaSelected,
     childCount: 0,
@@ -2624,6 +2679,13 @@ const setAccountEnabled = (state, enabled) => {
   };
 };
 
+const setUserLoginState = (state, userLoginState) => {
+  return {
+    ...state,
+    userLoginState
+  };
+};
+
 const toggleActivityBarItem = async (state, itemId) => {
   const {
     activityBarItems
@@ -2662,6 +2724,8 @@ const commandMap = {
   'ActivityBar.handleClick': wrapCommand(handleClick),
   'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),
   'ActivityBar.handleClickSettings': wrapCommand(handleClickSettings),
+  'ActivityBar.handleClickSignIn': wrapCommand(handleClickSignIn),
+  'ActivityBar.handleClickSignOut': wrapCommand(handleClickSignOut),
   'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
   'ActivityBar.handleFocus': wrapCommand(handleFocus),
   'ActivityBar.handleSettingsChanged': wrapCommand(handleSettingsChanged),
@@ -2674,6 +2738,7 @@ const commandMap = {
   'ActivityBar.resize': wrapCommand(handleResize),
   'ActivityBar.saveState': wrapGetter(saveState),
   'ActivityBar.setAccountEnabled': wrapCommand(setAccountEnabled),
+  'ActivityBar.setUserLoginState': wrapCommand(setUserLoginState),
   'ActivityBar.terminate': terminate,
   'ActivityBar.toggleActivityBarItem': wrapCommand(toggleActivityBarItem)
 };

package/package.json

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