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

package/dist/activityBarWorkerMain.js

@@ -1251,20 +1251,34 @@ const findIndex = (activityBarItems, id) => {
   return -1;
 };
 
-const getNewItems = (items, selectedIndex) => {
-  return items.map(item => {
-    return {
-      ...item
-      // TODO set selected property if it matches the selected index
-    };
+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,
+    flags: enabled ? item.flags | flag : item.flags & ~flag
+  };
+};
+
+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);
+  const newActivityBarItems = markSelected(activityBarItems, index);
   return {
     ...state,
     selectedIndex: index,
@@ -1273,14 +1287,6 @@ const handleSideBarViewletChange = (state, id, ...args) => {
   };
 };
 
-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 emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -1382,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
   };
 };
 
@@ -1623,10 +1632,25 @@ const renderEventListeners = () => {
 
 const saveState = state => {
   const {
-    uid
+    uid,
+    currentViewletId
   } = state;
   return {
-    uid
+    uid,
+    currentViewletId
+  };
+};
+
+const isEnabled = activityBarItem => {
+  return activityBarItem.enabled;
+};
+const toggleActivityBarItem = async (state, item) => {
+  const activityBarItem = state.activityBarItems.find(activityBarItem => activityBarItem.id === item.label);
+  // @ts-ignore
+  activityBarItem.enabled = !activityBarItem.enabled;
+  return {
+    ...state,
+    activityBarItems: state.activityBarItems.filter(isEnabled)
   };
 };
 
@@ -1642,17 +1666,18 @@ const commandMap = {
   'ActivityBar.getCommandIds': getCommandIds,
   'ActivityBar.getKeyBindings': getKeyBindings,
   'ActivityBar.handleBlur': wrapCommand(handleBlur),
-  'ActivityBar.handleResize': wrapCommand(handleResize),
   'ActivityBar.handleClick': wrapCommand(handleClick),
+  'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),
   'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
+  'ActivityBar.handleResize': wrapCommand(handleResize),
   'ActivityBar.handleSideBarHidden': wrapCommand(handleSideBarHidden),
-  'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),
   'ActivityBar.handleSideBarViewletChange': wrapCommand(handleSideBarViewletChange),
   'ActivityBar.loadContent': wrapCommand(loadContent),
   'ActivityBar.render2': render2,
   'ActivityBar.renderEventListeners': renderEventListeners,
   'ActivityBar.saveState': wrapGetter(saveState),
-  'ActivityBar.terminate': terminate
+  'ActivityBar.terminate': terminate,
+  'ActivityBar.toggleActivityBarItem': wrapCommand(toggleActivityBarItem)
 };
 
 const listen = async () => {

package/package.json

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