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

package/dist/activityBarWorkerMain.js

@@ -305,7 +305,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.activityBarItems === newState.activityBarItems && oldState.filteredItems === newState.filteredItems && oldState.focusedIndex === newState.focusedIndex && oldState.sideBarLocation === newState.sideBarLocation && oldState.sideBarVisible === newState.sideBarVisible && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
+  return oldState.activityBarItems === newState.activityBarItems && oldState.filteredItems === newState.filteredItems && oldState.focused === newState.focused && oldState.focusedIndex === newState.focusedIndex && oldState.sideBarLocation === newState.sideBarLocation && oldState.sideBarVisible === newState.sideBarVisible && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
 };
 
 const RenderItems = 4;
@@ -2406,19 +2406,24 @@ const handleClickIndex = async (state, button, index, x, y) => {
     return state;
   }
   const {
-    filteredItems
+    filteredItems,
+    focused
   } = state;
+  const clickState = focused ? {
+    ...state,
+    focused: false
+  } : state;
   const item = filteredItems[index];
   const viewletId = item.id;
   switch (viewletId) {
     case 'Account':
-      return handleClickAccount(state, x, y);
+      return handleClickAccount(clickState, x, y);
     case 'Additional Views':
-      return handleClickAdditionalViews(state, x, y, viewletId);
+      return handleClickAdditionalViews(clickState, x, y, viewletId);
     case 'Settings':
-      return handleClickSettings(state, x, y);
+      return handleClickSettings(clickState, x, y);
     default:
-      return handleClickOther(state, viewletId);
+      return handleClickOther(clickState, viewletId);
   }
 };
 
@@ -3132,17 +3137,14 @@ const diffTrees = (oldTree, newTree, patches, path) => {
 };
 
 const removeTrailingNavigationPatches = patches => {
-  // Find the last non-navigation patch
-  let lastNonNavigationIndex = -1;
-  for (let i = patches.length - 1; i >= 0; i--) {
-    const patch = patches[i];
+  while (patches.length > 0) {
+    const patch = patches.at(-1);
     if (patch.type !== NavigateChild && patch.type !== NavigateParent && patch.type !== NavigateSibling) {
-      lastNonNavigationIndex = i;
       break;
     }
+    patches.pop();
   }
-  // Return patches up to and including the last non-navigation patch
-  return lastNonNavigationIndex === -1 ? [] : patches.slice(0, lastNonNavigationIndex + 1);
+  return patches;
 };
 
 const diffTree = (oldNodes, newNodes) => {
@@ -3189,20 +3191,21 @@ const getAriaSelected = (isTab, isSelected) => {
   return Boolean(isSelected);
 };
 
+const badgeVirtualDom = [{
+  childCount: 1,
+  className: ActivityBarItemBadge,
+  type: Div
+}, {
+  childCount: 1,
+  className: BadgeContent,
+  type: Div
+}, {
+  childCount: 0,
+  className: mergeClassNames(Icon, ActivityBarBadgeIcon, MaskIconProgress),
+  type: Div
+}];
 const getBadgeVirtualDom = () => {
-  return [{
-    childCount: 1,
-    className: ActivityBarItemBadge,
-    type: Div
-  }, {
-    childCount: 1,
-    className: BadgeContent,
-    type: Div
-  }, {
-    childCount: 0,
-    className: mergeClassNames(Icon, ActivityBarBadgeIcon, MaskIconProgress),
-    type: Div
-  }];
+  return badgeVirtualDom;
 };
 
 const getClassName = (isFocused, marginTop, isSelected) => {
@@ -3238,8 +3241,7 @@ const getActivityBarItemInProgressDom = item => {
   const ariaSelected = getAriaSelected(isTab, isSelected);
   const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
   const marginTop = flags & MarginTop;
-  let className = getClassName(isFocused, marginTop, isSelected);
-  className += ' ' + ActivityBarItemNested;
+  const className = mergeClassNames(getClassName(isFocused, marginTop, isSelected), ActivityBarItemNested);
   return [{
     ariaHasPopup,
     ariaSelected,
@@ -3274,8 +3276,7 @@ const getActivityBarItemWithBadgeDom = item => {
   const ariaSelected = getAriaSelected(isTab, isSelected);
   const ariaHasPopup = getActivityBarItemHasPopup(item) || undefined;
   const marginTop = flags & MarginTop;
-  let className = getClassName(isFocused, marginTop, isSelected);
-  className += ' ' + ActivityBarItemNested;
+  const className = mergeClassNames(getClassName(isFocused, marginTop, isSelected), ActivityBarItemNested);
   return [{
     ariaHasPopup,
     ariaSelected,
@@ -3392,6 +3393,7 @@ const getVisibleActivityBarItems = (items, focusedIndex) => {
 const renderItems = (oldState, newState) => {
   const {
     filteredItems,
+    focused,
     focusedIndex,
     initial,
     uid
@@ -3399,7 +3401,7 @@ const renderItems = (oldState, newState) => {
   if (initial) {
     return [SetDom2, uid, []];
   }
-  const visibleItems = getVisibleActivityBarItems(filteredItems, focusedIndex);
+  const visibleItems = getVisibleActivityBarItems(filteredItems, focused ? focusedIndex : -1);
   const dom = getActivityBarVirtualDom(visibleItems);
   return [SetDom2, uid, dom];
 };
@@ -3472,6 +3474,69 @@ const renderEventListeners = () => {
   }];
 };
 
+const createDefaultState = () => ({
+  accountEnabled: true,
+  activityBarItems: [],
+  currentViewletId: '',
+  filteredItems: [],
+  focus: 0,
+  focused: false,
+  focusedIndex: 0,
+  height: 400,
+  initial: true,
+  itemHeight: 48,
+  numberOfVisibleItems: 0,
+  platform: 0,
+  scrollBarHeight: 0,
+  selectedIndex: -1,
+  sideBarLocation: 0,
+  sideBarVisible: false,
+  uid: 0,
+  updateProgress: 0,
+  updateState: '',
+  userLoginProvider: 'Lvce Editor',
+  userLoginState: 'logged out',
+  userName: '',
+  width: 48,
+  x: 0,
+  y: 0
+});
+
+const createResetState = state => {
+  const {
+    accountEnabled,
+    height,
+    itemHeight,
+    platform,
+    uid,
+    userLoginProvider,
+    userLoginState,
+    userName,
+    width,
+    x,
+    y
+  } = state;
+  return {
+    ...createDefaultState(),
+    accountEnabled,
+    focusedIndex: -1,
+    height,
+    itemHeight,
+    platform,
+    uid,
+    userLoginProvider,
+    userLoginState,
+    userName,
+    width,
+    x,
+    y
+  };
+};
+const reset = async state => {
+  const resetState = createResetState(state);
+  return loadContent(resetState);
+};
+
 const saveState = state => {
   return {};
 };
@@ -3620,6 +3685,7 @@ const commandMap = {
   'ActivityBar.loadContent': wrapCommand(loadContent),
   'ActivityBar.render2': render2,
   'ActivityBar.renderEventListeners': renderEventListeners,
+  'ActivityBar.reset': wrapCommand(reset),
   'ActivityBar.resize': wrapCommand(handleResize),
   'ActivityBar.saveState': wrapGetter(saveState),
   'ActivityBar.selectCurrent': wrapCommand(selectCurrent),

package/package.json

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