@lvce-editor/activity-bar-worker 1.19.0 → 1.23.0

package/dist/activityBarWorkerMain.js

@@ -843,6 +843,7 @@ const Tab$1 = 'tab';
 const ToolBar = 'toolbar';
 
 const Div = 4;
+const Text = 12;
 
 const Button$1 = 'event.button';
 const ClientX = 'event.clientX';
@@ -1296,14 +1297,27 @@ const handleSideBarViewletChange = (state, id, ...args) => {
   };
 };
 
+const CheckingForUpdate = 1;
+const WaitingForRestart = 4;
+
 const getNewItems = (items, state) => {
   return items.map(item => {
-    if (item.id === 'Settings' && state === 1) {
-      return {
-        ...item,
-        badgeIcon: 'clock',
-        flags: item.flags | Progress
-      };
+    if (item.id === 'Settings') {
+      if (state === CheckingForUpdate) {
+        return {
+          ...item,
+          badgeIcon: 'clock',
+          flags: item.flags | Progress
+        };
+      }
+      if (state === WaitingForRestart) {
+        return {
+          ...item,
+          badgeIcon: '',
+          badgeText: '1'
+        };
+      }
+      return item;
     }
     return item;
   });
@@ -1460,18 +1474,28 @@ const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
 
+const text = data => {
+  return {
+    type: Text,
+    text: data,
+    childCount: 0
+  };
+};
+
 const Vertical = 'vertical';
 
 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;
@@ -1480,6 +1504,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) {
@@ -1494,6 +1541,75 @@ 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 getActivityBarItemWithBadgeDom = item => {
+  const {
+    flags,
+    title,
+    icon,
+    badgeText
+  } = item;
+  if (!badgeText) {
+    // TODO should not happen
+    return [];
+  }
+  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
+  }, {
+    type: Div,
+    className: ActivityBarItemBadge,
+    childCount: 1
+  }, text(badgeText)];
+};
+
 const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
@@ -1503,17 +1619,12 @@ const getIconVirtualDom = (icon, type = Div) => {
   };
 };
 
-const getAriaSelected = (isTab, isSelected) => {
-  if (!isTab) {
-    return undefined;
-  }
-  return Boolean(isSelected);
-};
 const getActivityBarItemVirtualDom = item => {
   const {
     flags,
     title,
-    icon
+    icon,
+    badgeText
   } = item;
   const isTab = flags & Tab;
   const isSelected = flags & Selected;
@@ -1522,7 +1633,7 @@ const getActivityBarItemVirtualDom = 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,
@@ -1537,34 +1648,10 @@ const getActivityBarItemVirtualDom = 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);
+  }
+  if (badgeText) {
+    return getActivityBarItemWithBadgeDom(item);
   }
   return [{
     type: Div,

package/package.json

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