@lvce-editor/activity-bar-worker 7.10.0 → 7.11.0

package/dist/activityBarWorkerMain.js

@@ -276,7 +276,7 @@ const create$9 = (id, uri, x, y, width, height, args, parentUid, platform = 0) =
     uid: id,
     updateProgress: 0,
     updateState: '',
-    userLoginProvider: 'GitHub',
+    userLoginProvider: 'Lvce Editor',
     userLoginState: 'logged out',
     userName: '',
     width,
@@ -345,15 +345,29 @@ const focusIndex = (state, index) => {
 };
 
 const focusFirst = state => {
-  return focusIndex(state, -1);
+  const {
+    filteredItems
+  } = state;
+  return focusIndex(state, filteredItems.length === 0 ? -1 : 0);
 };
 
 const focusLast = state => {
-  return focusIndex(state, -1);
+  const {
+    filteredItems
+  } = state;
+  return focusIndex(state, filteredItems.length - 1);
 };
 
 const focusNext = state => {
-  return focusIndex(state, -1);
+  const {
+    filteredItems,
+    focusedIndex
+  } = state;
+  const lastIndex = filteredItems.length - 1;
+  if (focusedIndex >= lastIndex) {
+    return state;
+  }
+  return focusIndex(state, focusedIndex + 1);
 };
 
 const focusNone = state => {
@@ -366,6 +380,16 @@ const focusNone = state => {
   return focusIndex(state, -1);
 };
 
+const focusPrevious = state => {
+  const {
+    focusedIndex
+  } = state;
+  if (focusedIndex <= 0) {
+    return state;
+  }
+  return focusIndex(state, focusedIndex - 1);
+};
+
 const Button$3 = 'button';
 const None$1 = 'none';
 const Tab$1 = 'tab';
@@ -625,7 +649,7 @@ const getAccountLabel = state => {
     userName
   } = state;
   const name = userName || 'Account';
-  const provider = userLoginProvider || 'GitHub';
+  const provider = userLoginProvider || 'Lvce Editor';
   return `${name} (${provider})`;
 };
 const getMenuEntriesAccountLoggedIn = state => {
@@ -1479,7 +1503,10 @@ const constructError = (message, type, name) => {
   if (ErrorConstructor === Error) {
     const error = new Error(message);
     if (name && name !== 'VError') {
-      error.name = name;
+      Object.defineProperty(error, 'name', {
+        configurable: true,
+        value: name
+      });
     }
     return error;
   }
@@ -1510,31 +1537,45 @@ const getParentStack = error => {
 };
 const MethodNotFound = -32601;
 const Custom = -32001;
+const setStack = (error, stack) => {
+  const descriptor = Object.getOwnPropertyDescriptor(error, 'stack');
+  if (descriptor) {
+    if (!descriptor.configurable && !descriptor.writable) {
+      return;
+    }
+    if (!descriptor.configurable && descriptor.writable) {
+      error.stack = stack;
+      return;
+    }
+  }
+  Object.defineProperty(error, 'stack', {
+    configurable: true,
+    value: stack,
+    writable: true
+  });
+};
 const restoreExistingError = (error, currentStack) => {
   if (typeof error.stack === 'string') {
-    error.stack = error.stack + NewLine + currentStack;
+    setStack(error, `${error.stack}${NewLine}${currentStack}`);
   }
   return error;
 };
 const restoreMethodNotFoundError = (error, currentStack) => {
   const restoredError = new JsonRpcError(error.message);
   const parentStack = getParentStack(error);
-  restoredError.stack = parentStack + NewLine + currentStack;
+  setStack(restoredError, `${parentStack}${NewLine}${currentStack}`);
   return restoredError;
 };
 const restoreStackFromData = (restoredError, error, currentStack) => {
   if (error.data.stack && error.data.type && error.message) {
-    restoredError.stack = error.data.type + ': ' + error.message + NewLine + error.data.stack + NewLine + currentStack;
+    setStack(restoredError, `${error.data.type}: ${error.message}${NewLine}${error.data.stack}${NewLine}${currentStack}`);
     return;
   }
   if (error.data.stack) {
-    restoredError.stack = error.data.stack;
+    setStack(restoredError, error.data.stack);
   }
 };
 const applyDataProperties = (restoredError, error) => {
-  if (!error.data) {
-    return;
-  }
   restoreStackFromData(restoredError, error, getCurrentStack());
   if (error.data.codeFrame) {
     // @ts-ignore
@@ -1555,7 +1596,7 @@ const applyDirectProperties = (restoredError, error) => {
     const indexNewLine = getNewLineIndex(lowerStack);
     const parentStack = getParentStack(error);
     // @ts-ignore
-    restoredError.stack = parentStack + lowerStack.slice(indexNewLine);
+    setStack(restoredError, `${parentStack}${lowerStack.slice(indexNewLine)}`);
   }
   if (error.codeFrame) {
     // @ts-ignore
@@ -2108,12 +2149,21 @@ const getMenuEntryIds = () => {
   return [ActivityBar$3, ActivityBarAdditionalViews, Settings$1, ACCOUNT_MENU_ID, ACCOUNT_SUBMENU_ID];
 };
 
+const getBadgeText = badgeCount => {
+  if (badgeCount <= 999) {
+    return badgeCount ? String(badgeCount) : '';
+  }
+  const thousands = badgeCount / 1000;
+  const roundedDown = Math.floor(thousands);
+  return thousands > roundedDown ? `${roundedDown}K+` : `${roundedDown}K`;
+};
+
 const updateItemsWithBadgeCount = async items => {
   try {
     const badgeCounts = await invoke('Layout.getBadgeCounts');
     const newItems = items.map(item => {
       const badgeCount = badgeCounts[item.id] || 0;
-      const badgeText = badgeCount ? String(badgeCount) : '';
+      const badgeText = getBadgeText(badgeCount);
       return {
         ...item,
         badgeText
@@ -2174,14 +2224,14 @@ const handleBlur = state => {
   };
 };
 
-const isBottomItem = item => {
+const isBottomItem$1 = 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;
+  return items.filter(isBottomItem$1).length;
 };
 const getItemCount = items => {
   if (typeof items === 'number') {
@@ -2556,10 +2606,25 @@ const handleExtensionsChanged = async state => {
   };
 };
 
+const getFocusedIndex = state => {
+  const {
+    filteredItems,
+    focusedIndex
+  } = state;
+  if (focusedIndex >= 0 && focusedIndex < filteredItems.length) {
+    return focusedIndex;
+  }
+  const selectedIndex = filteredItems.findIndex(item => item.flags & Selected);
+  if (selectedIndex !== -1) {
+    return selectedIndex;
+  }
+  return filteredItems.length === 0 ? -1 : 0;
+};
 const handleFocus = state => {
   return {
     ...state,
-    focused: true
+    focused: true,
+    focusedIndex: getFocusedIndex(state)
   };
 };
 
@@ -3320,16 +3385,22 @@ const getActivityBarVirtualDom = visibleItems => {
   }, ...getVirtualDom(visibleItems)];
 };
 
+const getVisibleActivityBarItems = (items, focusedIndex) => {
+  return items.map((item, index) => setFlag(item, Focused, index === focusedIndex));
+};
+
 const renderItems = (oldState, newState) => {
   const {
     filteredItems,
+    focusedIndex,
     initial,
     uid
   } = newState;
   if (initial) {
     return [SetDom2, uid, []];
   }
-  const dom = getActivityBarVirtualDom(filteredItems);
+  const visibleItems = getVisibleActivityBarItems(filteredItems, focusedIndex);
+  const dom = getActivityBarVirtualDom(visibleItems);
   return [SetDom2, uid, dom];
 };
 
@@ -3405,6 +3476,40 @@ const saveState = state => {
   return {};
 };
 
+const isBottomItem = id => {
+  return id === 'Account' || id === 'Settings';
+};
+const getItemPosition = (state, index) => {
+  const {
+    filteredItems,
+    height,
+    itemHeight,
+    width,
+    x,
+    y
+  } = state;
+  const item = filteredItems[index];
+  const bottomItems = filteredItems.filter(({
+    id
+  }) => isBottomItem(id));
+  const bottomIndex = bottomItems.findIndex(({
+    id
+  }) => id === item.id);
+  const itemY = bottomIndex === -1 ? y + index * itemHeight : y + height - (bottomItems.length - bottomIndex) * itemHeight;
+  return [x + width / 2, itemY + itemHeight / 2];
+};
+const selectCurrent = async state => {
+  const {
+    filteredItems,
+    focusedIndex
+  } = state;
+  if (focusedIndex < 0 || focusedIndex >= filteredItems.length) {
+    return state;
+  }
+  const [x, y] = getItemPosition(state, focusedIndex);
+  return handleClickIndex(state, LeftClick, focusedIndex, x, y);
+};
+
 const setAccountEnabled = (state, enabled) => {
   const {
     height,
@@ -3428,7 +3533,7 @@ const setAccountEnabled = (state, enabled) => {
 const providerKeys = ['userLoginProvider', 'loginProvider', 'authProvider', 'provider'];
 const getUserLoginProvider = userInfo => {
   if (!userInfo || typeof userInfo !== 'object') {
-    return 'GitHub';
+    return 'Lvce Editor';
   }
   const record = userInfo;
   for (const key of providerKeys) {
@@ -3436,7 +3541,7 @@ const getUserLoginProvider = userInfo => {
       return record[key];
     }
   }
-  return 'GitHub';
+  return 'Lvce Editor';
 };
 
 const getUserName = userInfo => {
@@ -3491,6 +3596,7 @@ const commandMap = {
   'ActivityBar.focusLast': wrapCommand(focusLast),
   'ActivityBar.focusNext': wrapCommand(focusNext),
   'ActivityBar.focusNone': wrapCommand(focusNone),
+  'ActivityBar.focusPrevious': wrapCommand(focusPrevious),
   'ActivityBar.getCommandIds': getCommandIds,
   'ActivityBar.getKeyBindings': getKeyBindings,
   'ActivityBar.getMenuEntries': wrapGetter(getMenuEntries),
@@ -3516,6 +3622,7 @@ const commandMap = {
   'ActivityBar.renderEventListeners': renderEventListeners,
   'ActivityBar.resize': wrapCommand(handleResize),
   'ActivityBar.saveState': wrapGetter(saveState),
+  'ActivityBar.selectCurrent': wrapCommand(selectCurrent),
   'ActivityBar.setAccountEnabled': wrapCommand(setAccountEnabled),
   'ActivityBar.setUserLoginState': wrapCommand(setUserLoginState),
   'ActivityBar.terminate': terminate,

package/package.json

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