@lvce-editor/activity-bar-worker 2.0.0 → 2.2.0

package/dist/activityBarWorkerMain.js

@@ -1051,37 +1051,38 @@ const terminate = () => {
 };
 
 const {
+  diff,
   get,
-  set,
-  registerCommands,
   getCommandIds,
-  wrapGetter,
+  registerCommands,
+  set,
   wrapCommand,
-  diff
+  wrapGetter
 } = create$1();
 
 // TODO parentUid might ot be needed
 const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) => {
   const state = {
+    activityBarItems: [],
     currentViewletId: '',
-    uid: id,
+    filteredItems: [],
     focus: 0,
     focused: false,
     focusedIndex: -1,
-    scrollBarHeight: 0,
-    width,
     height,
-    x,
-    y,
-    sideBarVisible: false,
-    activityBarItems: [],
-    selectedIndex: -1,
     itemHeight: 48,
-    updateState: '',
-    updateProgress: 0,
-    filteredItems: [],
     numberOfVisibleItems: 0,
-    sideBarLocation: 0
+    platform: 0,
+    scrollBarHeight: 0,
+    selectedIndex: -1,
+    sideBarLocation: 0,
+    sideBarVisible: false,
+    uid: id,
+    updateProgress: 0,
+    updateState: '',
+    width,
+    x,
+    y
   };
   set(id, state, state);
   return state;
@@ -1129,8 +1130,8 @@ const focus = state => {
 const focusIndex = (state, index) => {
   return {
     ...state,
-    focusedIndex: index,
-    focused: true
+    focused: true,
+    focusedIndex: index
   };
 };
 
@@ -1158,36 +1159,36 @@ const focusNone = state => {
 
 const getKeyBindings = () => {
   return [{
-    key: DownArrow,
     command: 'ActivityBar.focusNext',
+    key: DownArrow,
     when: FocusActivityBar
   }, {
-    key: UpArrow,
     command: 'ActivityBar.focusPrevious',
+    key: UpArrow,
     when: FocusActivityBar
   }, {
-    key: Home,
     command: 'ActivityBar.focusFirst',
+    key: Home,
     when: FocusActivityBar
   }, {
-    key: PageUp,
     command: 'ActivityBar.focusFirst',
+    key: PageUp,
     when: FocusActivityBar
   }, {
-    key: PageDown,
     command: 'ActivityBar.focusLast',
+    key: PageDown,
     when: FocusActivityBar
   }, {
-    key: End,
     command: 'ActivityBar.focusLast',
+    key: End,
     when: FocusActivityBar
   }, {
-    key: Space,
     command: 'ActivityBar.selectCurrent',
+    key: Space,
     when: FocusActivityBar
   }, {
-    key: Enter,
     command: 'ActivityBar.selectCurrent',
+    key: Enter,
     when: FocusActivityBar
   }];
 };
@@ -1265,17 +1266,17 @@ const menuEntryMoveSideBar = sideBarLocation => {
   switch (sideBarLocation) {
     case Left:
       return {
-        id: 'moveSideBarRight',
-        label: moveSideBarRight(),
+        command: 'Layout.moveSideBarRight',
         flags: None,
-        command: 'Layout.moveSideBarRight'
+        id: 'moveSideBarRight',
+        label: moveSideBarRight()
       };
     case Right:
       return {
-        id: 'moveSideBarLeft',
-        label: moveSideBarLeft(),
+        command: 'Layout.moveSideBarLeft',
         flags: None,
-        command: 'Layout.moveSideBarLeft'
+        id: 'moveSideBarLeft',
+        label: moveSideBarLeft()
       };
     default:
       throw new Error('unexpected side bar location');
@@ -1283,20 +1284,20 @@ const menuEntryMoveSideBar = sideBarLocation => {
 };
 
 const menuEntrySeparator = {
-  id: 'separator',
-  label: '',
+  command: '',
   flags: Separator,
-  command: ''
+  id: 'separator',
+  label: ''
 };
 
 const toContextMenuItem$1 = activityBarItem => {
   const isEnabled = activityBarItem.flags & Enabled;
   return {
-    label: activityBarItem.id,
+    command: '',
+    flags: isEnabled ? Checked : Unchecked,
     id: '',
     // TODO
-    flags: isEnabled ? Checked : Unchecked,
-    command: ''
+    label: activityBarItem.id
   };
 };
 const getMenuEntriesActivityBar = state => {
@@ -1305,10 +1306,10 @@ const getMenuEntriesActivityBar = state => {
     sideBarLocation
   } = state;
   return [...activityBarItems.map(toContextMenuItem$1), menuEntrySeparator, menuEntryMoveSideBar(sideBarLocation), {
-    id: 'hideActivityBar',
-    label: hideActivityBar(),
+    command: 'Layout.hideActivityBar',
     flags: None,
-    command: 'Layout.hideActivityBar'
+    id: 'hideActivityBar',
+    label: hideActivityBar()
   }];
 };
 
@@ -1331,11 +1332,12 @@ const getHiddenItems = state => {
 
 const toContextMenuItem = activityBarItem => {
   return {
-    label: activityBarItem.id,
-    id: '8000',
+    command: '-1',
     // TODO
     flags: None,
-    command: '-1' // TODO
+    id: '8000',
+    // TODO
+    label: activityBarItem.id
   };
 };
 const getMenuEntriesAdditionalViews = state => {
@@ -1371,31 +1373,31 @@ const colorTheme = () => {
 const keyBindingsUri = 'app://keybindings';
 const getMenuEntriesSettings = () => {
   return [{
-    id: 'commandPalette',
-    label: commandPalette(),
+    command: 'QuickPick.showEverything',
     flags: None,
-    command: 'QuickPick.showEverything'
+    id: 'commandPalette',
+    label: commandPalette()
   }, menuEntrySeparator, {
-    id: 'settings',
-    label: settings(),
+    command: 'Preferences.openSettingsJson',
     flags: None,
-    command: 'Preferences.openSettingsJson'
+    id: 'settings',
+    label: settings()
   }, {
-    id: 'keyboardShortcuts',
-    label: keyboardShortcuts(),
-    flags: None,
+    args: [keyBindingsUri],
     command: 'Main.openUri',
-    args: [keyBindingsUri]
+    flags: None,
+    id: 'keyboardShortcuts',
+    label: keyboardShortcuts()
   }, {
-    id: 'colorTheme',
-    label: colorTheme(),
+    command: 'QuickPick.showColorTheme',
     flags: None,
-    command: 'QuickPick.showColorTheme'
+    id: 'colorTheme',
+    label: colorTheme()
   }, menuEntrySeparator, {
-    id: 'checkForUpdates',
-    label: checkForUpdates(),
+    command: 'AutoUpdater.checkForUpdates',
     flags: None,
-    command: /* TODO */'-1'
+    id: 'checkForUpdates',
+    label: checkForUpdates()
   }];
 };
 
@@ -1419,6 +1421,34 @@ const getMenuEntryIds = () => {
   return [ActivityBar$3, ActivityBarAdditionalViews, Settings$1];
 };
 
+const updateItemsWithBadgeCount = async items => {
+  try {
+    const badgeCounts = await invoke('Layout.getBadgeCounts');
+    const newItems = items.map(item => {
+      const badgeCount = badgeCounts[item.id] || 0;
+      const badgeText = badgeCount ? `${badgeCount}` : '';
+      return {
+        ...item,
+        badgeText
+      };
+    });
+    return newItems;
+  } catch {
+    return items;
+  }
+};
+
+const handleBadgeCountChange = async state => {
+  const {
+    filteredItems
+  } = state;
+  const newItems = await updateItemsWithBadgeCount(filteredItems);
+  return {
+    ...state,
+    filteredItems: newItems
+  };
+};
+
 const handleBlur = state => {
   return {
     ...state,
@@ -1484,8 +1514,8 @@ const hide = async () => {
 
 const handleClickOther = async (state, x, y, viewletId) => {
   const {
-    sideBarVisible,
-    currentViewletId
+    currentViewletId,
+    sideBarVisible
   } = state;
   if (sideBarVisible) {
     if (currentViewletId === viewletId) {
@@ -1522,10 +1552,10 @@ const handleClickIndex = async (state, button, index, x, y) => {
   const item = filteredItems[index];
   const viewletId = item.id;
   switch (viewletId) {
-    case 'Settings':
-      return handleClickSettings(state, x, y);
     case 'Additional Views':
       return handleClickAdditionalViews(state, x, y, viewletId);
+    case 'Settings':
+      return handleClickSettings(state, x, y);
     default:
       return handleClickOther(state, x, y, viewletId);
   }
@@ -1534,9 +1564,9 @@ const handleClickIndex = async (state, button, index, x, y) => {
 const handleClick = async (state, button, eventX, eventY) => {
   const {
     filteredItems,
+    height,
     itemHeight,
-    y,
-    height
+    y
   } = state;
   const index = getIndexFromPosition(y, eventX, eventY, itemHeight, filteredItems.length, height);
   return handleClickIndex(state, button, index, eventX, eventY);
@@ -1569,11 +1599,11 @@ const getFilteredActivityBarItems = (items, height, itemHeight) => {
     return items;
   }
   const showMoreItem = {
-    id: 'Additional Views',
-    title: additionalViews(),
-    icon: Ellipsis,
     flags: Button,
-    keyShortcuts: ''
+    icon: Ellipsis,
+    id: 'Additional Views',
+    keyShortcuts: '',
+    title: additionalViews()
   };
   return [...items.slice(0, numberOfVisibleItems - 2), showMoreItem, items.at(-1)];
 };
@@ -1584,19 +1614,19 @@ const handleResize = (state, dimensions) => {
     itemHeight
   } = state;
   const {
-    x,
-    y,
+    height,
     width,
-    height
+    x,
+    y
   } = dimensions;
   const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
   return {
     ...state,
-    x,
-    y,
-    width,
+    filteredItems,
     height,
-    filteredItems
+    width,
+    x,
+    y
   };
 };
 
@@ -1648,10 +1678,10 @@ const handleSideBarViewletChange = (state, id, ...args) => {
   const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
   return {
     ...state,
-    selectedIndex: index,
-    currentViewletId: id,
     activityBarItems: newActivityBarItems,
+    currentViewletId: id,
     filteredItems,
+    selectedIndex: index,
     sideBarVisible: true
   };
 };
@@ -1688,9 +1718,9 @@ const handleUpdateStateChange = async (state, config) => {
   const newItems = getNewItems(filteredItems, config.state);
   return {
     ...state,
-    updateState: config.state,
+    filteredItems: newItems,
     updateProgress: config.progress,
-    filteredItems: newItems
+    updateState: config.state
   };
 };
 
@@ -1704,60 +1734,61 @@ const getActivityBarItems = () => {
   return [
   // Top
   {
-    id: Explorer,
-    title: explorer(),
-    icon: Files,
     flags: Tab | Enabled,
-    keyShortcuts: 'Control+Shift+E'
+    icon: Files,
+    id: Explorer,
+    keyShortcuts: 'Control+Shift+E',
+    title: explorer()
   }, {
-    id: Search,
-    title: search(),
-    icon: Search$1,
     flags: Tab | Enabled,
-    keyShortcuts: 'Control+Shift+F'
+    icon: Search$1,
+    id: Search,
+    keyShortcuts: 'Control+Shift+F',
+    title: search()
   }, {
-    id: SourceControl,
-    title: sourceControl(),
-    icon: SourceControl$1,
     flags: Tab | Enabled,
-    keyShortcuts: 'Control+Shift+G'
+    icon: SourceControl$1,
+    id: SourceControl,
+    keyShortcuts: 'Control+Shift+G',
+    title: sourceControl()
   }, {
-    id: RunAndDebug,
-    title: runAndDebug(),
-    icon: DebugAlt2,
     flags: Tab | Enabled,
-    keyShortcuts: 'Control+Shift+D'
+    icon: DebugAlt2,
+    id: RunAndDebug,
+    keyShortcuts: 'Control+Shift+D',
+    title: runAndDebug()
   }, {
-    id: Extensions,
-    title: extensions(),
-    icon: Extensions$1,
     flags: Tab | Enabled,
-    keyShortcuts: 'Control+Shift+X'
+    icon: Extensions$1,
+    id: Extensions,
+    keyShortcuts: 'Control+Shift+X',
+    title: extensions()
   },
   // Bottom
   {
-    id: 'Settings',
-    title: settings$1(),
-    icon: SettingsGear,
     flags: Button | Enabled | MarginTop,
-    keyShortcuts: ''
+    icon: SettingsGear,
+    id: 'Settings',
+    keyShortcuts: '',
+    title: settings$1()
   }];
 };
 
 const loadContent = async (state, savedState) => {
   const {
-    itemHeight,
-    height
+    height,
+    itemHeight
   } = state;
   const items = getActivityBarItems();
   const explorerIndex = 0;
   const itemsWithSelected = markSelected(items, explorerIndex);
   const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
+  const newItems = await updateItemsWithBadgeCount(filteredItems);
   return {
     ...state,
     activityBarItems: itemsWithSelected,
     currentViewletId: Explorer,
-    filteredItems,
+    filteredItems: newItems,
     selectedIndex: explorerIndex,
     sideBarLocation: Left,
     sideBarVisible: true
@@ -1773,8 +1804,8 @@ const getCss = itemHeight => {
 
 const renderCss = (oldState, newState) => {
   const {
-    uid,
-    itemHeight
+    itemHeight,
+    uid
   } = newState;
   const css = getCss(itemHeight);
   return [SetCss, uid, css];
@@ -1830,17 +1861,17 @@ const getAriaSelected = (isTab, isSelected) => {
 
 const getBadgeVirtualDom = () => {
   return [{
-    type: Div,
+    childCount: 1,
     className: ActivityBarItemBadge,
-    childCount: 1
+    type: Div
   }, {
-    type: Div,
+    childCount: 1,
     className: BadgeContent,
-    childCount: 1
+    type: Div
   }, {
-    type: Div,
+    childCount: 0,
     className: mergeClassNames(Icon, ActivityBarBadgeIcon, MaskIconProgress),
-    childCount: 0
+    type: Div
   }];
 };
 
@@ -1861,8 +1892,8 @@ const getClassName = (isFocused, marginTop, isSelected) => {
 const getActivityBarItemInProgressDom = item => {
   const {
     flags,
-    title,
-    icon
+    icon,
+    title
   } = item;
   const isTab = flags & Tab;
   const isSelected = flags & Selected;
@@ -1873,27 +1904,27 @@ const getActivityBarItemInProgressDom = item => {
   let className = getClassName(isFocused, marginTop, isSelected);
   className += ' ' + ActivityBarItemNested;
   return [{
-    type: Div,
-    className,
     ariaLabel: '',
-    title,
-    role,
     ariaSelected,
-    childCount: 2
+    childCount: 2,
+    className,
+    role,
+    title,
+    type: Div
   }, {
-    type: Div,
+    childCount: 0,
     className: mergeClassNames(Icon, `MaskIcon${icon}`),
     role: None$1,
-    childCount: 0
+    type: Div
   }, ...getBadgeVirtualDom()];
 };
 
 const getActivityBarItemWithBadgeDom = item => {
   const {
+    badgeText,
     flags,
-    title,
     icon,
-    badgeText
+    title
   } = item;
   if (!badgeText) {
     // TODO should not happen
@@ -1908,40 +1939,40 @@ const getActivityBarItemWithBadgeDom = item => {
   let className = getClassName(isFocused, marginTop, isSelected);
   className += ' ' + ActivityBarItemNested;
   return [{
-    type: Div,
-    className,
     ariaLabel: '',
-    title,
-    role,
     ariaSelected,
-    childCount: 2
+    childCount: 2,
+    className,
+    role,
+    title,
+    type: Div
   }, {
-    type: Div,
+    childCount: 0,
     className: mergeClassNames(Icon, `MaskIcon${icon}`),
     role: None$1,
-    childCount: 0
+    type: Div
   }, {
-    type: Div,
+    childCount: 1,
     className: ActivityBarItemBadge,
-    childCount: 1
+    type: Div
   }, text(badgeText)];
 };
 
 const getIconVirtualDom = (icon, type = Div) => {
   return {
-    type,
+    childCount: 0,
     className: `MaskIcon MaskIcon${icon}`,
     role: None$1,
-    childCount: 0
+    type
   };
 };
 
 const getActivityBarItemVirtualDom = item => {
   const {
+    badgeText,
     flags,
-    title,
     icon,
-    badgeText
+    title
   } = item;
   const isTab = flags & Tab;
   const isSelected = flags & Selected;
@@ -1953,13 +1984,13 @@ const getActivityBarItemVirtualDom = item => {
   const className = getClassName(isFocused, marginTop, isSelected);
   if (isSelected) {
     return [{
-      type: Div,
-      className,
       ariaLabel: '',
-      title,
-      role,
       ariaSelected,
-      childCount: 1
+      childCount: 1,
+      className,
+      role,
+      title,
+      type: Div
     }, getIconVirtualDom(icon)];
   }
 
@@ -1971,13 +2002,13 @@ const getActivityBarItemVirtualDom = item => {
     return getActivityBarItemWithBadgeDom(item);
   }
   return [{
-    type: Div,
-    className: mergeClassNames(className, `Icon${icon}`),
     ariaLabel: '',
-    title,
-    role,
     ariaSelected,
-    childCount: 0
+    childCount: 0,
+    className: mergeClassNames(className, `Icon${icon}`),
+    role,
+    title,
+    type: Div
   }];
 };
 
@@ -1989,25 +2020,25 @@ const getVirtualDom = visibleItems => {
 const className = mergeClassNames(Viewlet, ActivityBar$1);
 const getActivityBarVirtualDom = visibleItems => {
   return [{
-    type: Div,
-    id: ActivityBar,
-    className,
-    role: ToolBar,
-    ariaRoleDescription: activityBar(),
     ariaOrientation: Vertical,
-    tabIndex: 0,
-    onMouseDown: HandleMouseDown,
+    ariaRoleDescription: activityBar(),
+    childCount: visibleItems.length,
+    className,
+    id: ActivityBar,
+    onBlur: HandleBlur,
     onContextMenu: HandleContextMenu,
     onFocus: HandleFocus,
-    onBlur: HandleBlur,
-    childCount: visibleItems.length
+    onMouseDown: HandleMouseDown,
+    role: ToolBar,
+    tabIndex: 0,
+    type: Div
   }, ...getVirtualDom(visibleItems)];
 };
 
 const renderItems = (oldState, newState) => {
   const {
-    uid,
-    filteredItems
+    filteredItems,
+    uid
   } = newState;
   const dom = getActivityBarVirtualDom(filteredItems);
   return [SetDom2, uid, dom];
@@ -2015,14 +2046,14 @@ const renderItems = (oldState, newState) => {
 
 const getRenderer = diffType => {
   switch (diffType) {
-    case RenderItems:
-      return renderItems;
-    case RenderFocusContext:
-      return renderFocusContext;
-    case RenderFocus:
-      return renderFocusContext;
     case RenderCss:
       return renderCss;
+    case RenderFocus:
+      return renderFocusContext;
+    case RenderFocusContext:
+      return renderFocusContext;
+    case RenderItems:
+      return renderItems;
     default:
       throw new Error('unknown renderer');
   }
@@ -2042,8 +2073,8 @@ const applyRender = (oldState, newState, diffResult) => {
 
 const render2 = (uid, diffResult) => {
   const {
-    oldState,
-    newState
+    newState,
+    oldState
   } = get(uid);
   set(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
@@ -2071,12 +2102,12 @@ const renderEventListeners = () => {
 
 const saveState = state => {
   const {
-    uid,
-    currentViewletId
+    currentViewletId,
+    uid
   } = state;
   return {
-    uid,
-    currentViewletId
+    currentViewletId,
+    uid
   };
 };
 
@@ -2106,6 +2137,7 @@ const commandMap = {
   'ActivityBar.getKeyBindings': getKeyBindings,
   'ActivityBar.getMenuEntries': wrapGetter(getMenuEntries),
   'ActivityBar.getMenuEntryIds': getMenuEntryIds,
+  'ActivityBar.handleBadgeCountChange': wrapCommand(handleBadgeCountChange),
   'ActivityBar.handleBlur': wrapCommand(handleBlur),
   'ActivityBar.handleClick': wrapCommand(handleClick),
   'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),

package/package.json

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