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

package/dist/activityBarWorkerMain.js

@@ -1242,14 +1242,6 @@ const handleSideBarHidden = state => {
   };
 };
 
-const Tab = 1;
-const Button = 1 << 1;
-const Progress = 1 << 2;
-const Enabled = 1 << 3;
-const Selected = 1 << 4;
-const Focused = 1 << 5;
-const MarginTop = 1 << 6;
-
 const findIndex = (activityBarItems, id) => {
   for (let i = 0; i < activityBarItems.length; i++) {
     if (activityBarItems[i].id === id) {
@@ -1259,6 +1251,14 @@ const findIndex = (activityBarItems, id) => {
   return -1;
 };
 
+const Tab = 1;
+const Button = 1 << 1;
+const Progress = 1 << 2;
+const Enabled = 1 << 3;
+const Selected = 1 << 4;
+const Focused = 1 << 5;
+const MarginTop = 1 << 6;
+
 const setFlag = (item, flag, enabled) => {
   return {
     ...item,
@@ -1266,18 +1266,19 @@ const setFlag = (item, flag, enabled) => {
   };
 };
 
-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,
@@ -1387,11 +1388,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 +1632,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.16.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",