@lvce-editor/activity-bar-worker 1.15.0 → 1.17.0

package/dist/activityBarWorkerMain.js

@@ -1179,12 +1179,12 @@ const handleClickOther = async (state, x, y, viewletId) => {
   if (sideBarVisible) {
     if (currentViewletId === viewletId) {
       await hide();
-    } else {
-      await show(sideBarVisible, viewletId);
+      return state;
     }
-  } else {
-    await show(sideBarVisible, currentViewletId);
+    await show(sideBarVisible, viewletId);
+    return state;
   }
+  await show(sideBarVisible, currentViewletId);
   return state;
 };
 
@@ -1234,14 +1234,6 @@ const handleResize = state => {
   return state;
 };
 
-const handleSideBarHidden = state => {
-  return {
-    ...state,
-    focusedIndex: -1,
-    selectedIndex: -1
-  };
-};
-
 const Tab = 1;
 const Button = 1 << 1;
 const Progress = 1 << 2;
@@ -1250,6 +1242,27 @@ const Selected = 1 << 4;
 const Focused = 1 << 5;
 const MarginTop = 1 << 6;
 
+const setFlag = (item, flag, enabled) => {
+  return {
+    ...item,
+    flags: enabled ? item.flags | flag : item.flags & ~flag
+  };
+};
+
+const handleSideBarHidden = state => {
+  const itemsCleared = state.activityBarItems.map(item => {
+    const withoutSelected = setFlag(item, Selected, false);
+    return setFlag(withoutSelected, Focused, false);
+  });
+  return {
+    ...state,
+    activityBarItems: itemsCleared,
+    focusedIndex: -1,
+    selectedIndex: -1,
+    sideBarVisible: false
+  };
+};
+
 const findIndex = (activityBarItems, id) => {
   for (let i = 0; i < activityBarItems.length; i++) {
     if (activityBarItems[i].id === id) {
@@ -1259,30 +1272,25 @@ const findIndex = (activityBarItems, id) => {
   return -1;
 };
 
-const setFlag = (item, flag, enabled) => {
-  return {
-    ...item,
-    flags: enabled ? item.flags | flag : item.flags & ~flag
-  };
-};
-
-const getNewItems = (items, selectedIndex) => {
+const markSelected = (items, selectedIndex) => {
   return items.map((item, index) => {
     const isSelected = index === selectedIndex;
     return setFlag(item, Selected, isSelected);
   });
 };
+
 const handleSideBarViewletChange = (state, id, ...args) => {
   const {
     activityBarItems
   } = state;
   const index = findIndex(activityBarItems, id);
-  const newActivityBarItems = getNewItems(activityBarItems, index);
+  const newActivityBarItems = markSelected(activityBarItems, index);
   return {
     ...state,
     selectedIndex: index,
     currentViewletId: id,
-    activityBarItems: newActivityBarItems
+    activityBarItems: newActivityBarItems,
+    sideBarVisible: true
   };
 };
 
@@ -1387,11 +1395,14 @@ const getActivityBarItems = () => {
 
 const loadContent = async (state, savedState) => {
   const items = getActivityBarItems();
+  const explorerIndex = 0;
+  const itemsWithSelected = markSelected(items, explorerIndex);
   return {
     ...state,
-    activityBarItems: items,
+    activityBarItems: itemsWithSelected,
     sideBarVisible: true,
-    currentViewletId: Explorer
+    currentViewletId: Explorer,
+    selectedIndex: explorerIndex
   };
 };
 
@@ -1628,10 +1639,12 @@ const renderEventListeners = () => {
 
 const saveState = state => {
   const {
-    uid
+    uid,
+    currentViewletId
   } = state;
   return {
-    uid
+    uid,
+    currentViewletId
   };
 };
 

package/package.json

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