@lvce-editor/activity-bar-worker 1.18.0 → 1.22.0

package/dist/activityBarWorkerMain.js

@@ -1040,7 +1040,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.focusedIndex === newState.focusedIndex && oldState.activityBarItems === newState.activityBarItems;
+  return oldState.focusedIndex === newState.focusedIndex && oldState.activityBarItems === newState.activityBarItems && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
 };
 
 const RenderItems = 4;
@@ -1296,6 +1296,31 @@ const handleSideBarViewletChange = (state, id, ...args) => {
   };
 };
 
+const getNewItems = (items, state) => {
+  return items.map(item => {
+    if (item.id === 'Settings' && state === 1) {
+      return {
+        ...item,
+        badgeIcon: 'clock',
+        flags: item.flags | Progress
+      };
+    }
+    return item;
+  });
+};
+const handleUpdateStateChange = async (state, config) => {
+  const {
+    activityBarItems
+  } = state;
+  const newItems = getNewItems(activityBarItems, config.state);
+  return {
+    ...state,
+    updateState: config.state,
+    updateProgress: config.progress,
+    activityBarItems: newItems
+  };
+};
+
 const emptyObject = {};
 const RE_PLACEHOLDER = /\{(PH\d+)\}/g;
 const i18nString = (key, placeholders = emptyObject) => {
@@ -1441,12 +1466,14 @@ const ActivityBar$1 = 'ActivityBar';
 const ActivityBarItem = 'ActivityBarItem';
 const ActivityBarItemNested = 'ActivityBarItemNested';
 const ActivityBarItemSelected = 'ActivityBarItemSelected';
-const Badge = 'Badge';
+const ActivityBarItemBadge = 'ActivityBarItemBadge';
 const BadgeContent = 'BadgeContent';
 const FocusOutline = 'FocusOutline';
 const Icon = 'Icon';
 const MarginTopAuto = 'MarginTopAuto';
 const Viewlet = 'Viewlet';
+const MaskIconProgress = 'MaskIconProgress';
+const ActivityBarBadgeIcon = 'ActivityBarBadgeIcon';
 
 const HandleBlur = 1;
 const HandleContextMenu = 2;
@@ -1455,6 +1482,29 @@ const HandleMouseDown = 4;
 
 const ActivityBar = 'ActivityBar';
 
+const getAriaSelected = (isTab, isSelected) => {
+  if (!isTab) {
+    return undefined;
+  }
+  return Boolean(isSelected);
+};
+
+const getBadgeVirtualDom = () => {
+  return [{
+    type: Div,
+    className: ActivityBarItemBadge,
+    childCount: 1
+  }, {
+    type: Div,
+    className: BadgeContent,
+    childCount: 1
+  }, {
+    type: Div,
+    className: mergeClassNames(Icon, ActivityBarBadgeIcon, MaskIconProgress),
+    childCount: 0
+  }];
+};
+
 const getClassName = (isFocused, marginTop, isSelected) => {
   const classNames = [ActivityBarItem];
   if (isFocused) {
@@ -1469,6 +1519,36 @@ const getClassName = (isFocused, marginTop, isSelected) => {
   return mergeClassNames(...classNames);
 };
 
+const getActivityBarItemInProgressDom = item => {
+  const {
+    flags,
+    title,
+    icon
+  } = item;
+  const isTab = flags & Tab;
+  const isSelected = flags & Selected;
+  const isFocused = flags & Focused;
+  const role = isTab ? Tab$1 : Button$2;
+  const ariaSelected = getAriaSelected(isTab, isSelected);
+  const marginTop = flags & MarginTop;
+  let className = getClassName(isFocused, marginTop, isSelected);
+  className += ' ' + ActivityBarItemNested;
+  return [{
+    type: Div,
+    className,
+    ariaLabel: '',
+    title,
+    role,
+    ariaSelected,
+    childCount: 2
+  }, {
+    type: Div,
+    className: mergeClassNames(Icon, `MaskIcon${icon}`),
+    role: None,
+    childCount: 0
+  }, ...getBadgeVirtualDom()];
+};
+
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
@@ -1478,13 +1558,7 @@ const getIconVirtualDom = (icon, type = Div) => {
   };
 };
 
-const getAriaSelected = (isTab, isSelected) => {
-  if (!isTab) {
-    return undefined;
-  }
-  return Boolean(isSelected);
-};
-const createActivityBarItem = item => {
+const getActivityBarItemVirtualDom = item => {
   const {
     flags,
     title,
@@ -1497,7 +1571,7 @@ const createActivityBarItem = item => {
   const role = isTab ? Tab$1 : Button$2;
   const ariaSelected = getAriaSelected(isTab, isSelected);
   const marginTop = flags & MarginTop;
-  let className = getClassName(isFocused, marginTop, isSelected);
+  const className = getClassName(isFocused, marginTop, isSelected);
   if (isSelected) {
     return [{
       type: Div,
@@ -1512,34 +1586,7 @@ const createActivityBarItem = item => {
 
   // TODO support progress on selected activity bar item
   if (isProgress) {
-    className += ' ' + ActivityBarItemNested;
-    return [{
-      type: Div,
-      className,
-      ariaLabel: '',
-      title,
-      role,
-      ariaSelected,
-      childCount: 2
-    }, {
-      type: Div,
-      className: Icon,
-      role: None,
-      childCount: 0,
-      maskImage: icon
-    }, {
-      type: Div,
-      className: Badge,
-      childCount: 1
-    }, {
-      type: Div,
-      className: BadgeContent,
-      childCount: 1
-    }, {
-      type: Div,
-      className: Icon,
-      maskImage: 'Progress'
-    }];
+    return getActivityBarItemInProgressDom(item);
   }
   return [{
     type: Div,
@@ -1551,8 +1598,9 @@ const createActivityBarItem = item => {
     childCount: 0
   }];
 };
+
 const getVirtualDom = visibleItems => {
-  const dom = visibleItems.flatMap(createActivityBarItem);
+  const dom = visibleItems.flatMap(getActivityBarItemVirtualDom);
   return dom;
 };
 
@@ -1670,6 +1718,7 @@ const commandMap = {
   'ActivityBar.focusFirst': wrapCommand(focusFirst),
   'ActivityBar.focusIndex': wrapCommand(focusIndex),
   'ActivityBar.focusLast': wrapCommand(focusLast),
+  'ActivityBar.handleUpdateStateChange': wrapCommand(handleUpdateStateChange),
   'ActivityBar.focusNext': wrapCommand(focusNext),
   'ActivityBar.focusNone': wrapCommand(focusNone),
   'ActivityBar.getCommandIds': getCommandIds,

package/package.json

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