@lvce-editor/status-bar-worker 3.13.0 → 3.15.0

package/dist/statusBarWorkerMain.js

@@ -1340,7 +1340,7 @@ const handleClickExtensionStatusBarItem = async name => {
 };
 
 const handleClickNotification = async () => {
-  // TODO toggle notifications
+  await invoke('Viewlet.openWidget', 'NotificationCenter');
 };
 
 const handleClickProblems = async () => {
@@ -1390,20 +1390,31 @@ const handleContextMenu = async (state, button, x, y) => {
   return state;
 };
 
-const getNotificationsStatusBarItem = enabled => {
+const getAriaLabel = count => {
+  if (count === 0) {
+    return 'No Notifications';
+  }
+  if (count === 1) {
+    return '1 Notification';
+  }
+  return `${count} Notifications`;
+};
+const getNotificationsStatusBarItem = (enabled, count = 0) => {
   if (!enabled) {
     return [];
   }
   return [{
-    ariaLabel: 'Notifications',
+    ariaLabel: getAriaLabel(count),
     command: '',
-    // TODO should show notifications center
     elements: [{
+      type: 'icon',
+      value: 'NotificationBellIcon'
+    }, ...(count > 0 ? [{
       type: 'text',
-      value: 'Notifications'
-    }],
+      value: String(count)
+    }] : [])],
     name: Notifications,
-    tooltip: 'Notifications'
+    tooltip: getAriaLabel(count)
   }];
 };
 
@@ -1454,10 +1465,11 @@ const getProblemsStatusBarItem = (errorCount, warningCount, enabled) => {
 };
 
 const getBuiltinStatusBarItems = async (errorCount, warningCount, {
+  notificationCount = 0,
   notificationsEnabled = true,
   problemsEnabled = true
 } = {}) => {
-  return [...getNotificationsStatusBarItem(notificationsEnabled), ...getProblemsStatusBarItem(errorCount, warningCount, problemsEnabled)];
+  return [...getNotificationsStatusBarItem(notificationsEnabled, notificationCount), ...getProblemsStatusBarItem(errorCount, warningCount, problemsEnabled)];
 };
 
 const getExtensionStatusBarItems = async (assetDir, platform) => {
@@ -1526,6 +1538,13 @@ const toUiStatusBarItems = statusBarItems => {
   return statusBarItems.map(toUiStatusBarItem);
 };
 
+const getNotificationCount = async () => {
+  try {
+    return await invoke$1('Extensions.getNotificationCount');
+  } catch {
+    return 0;
+  }
+};
 const getStatusBarItems = async ({
   assetDir,
   builtinNotificationsEnabled = true,
@@ -1539,8 +1558,10 @@ const getStatusBarItems = async ({
     return [];
   }
   const extensionStatusBarItems = await getExtensionStatusBarItems(assetDir, platform);
+  const notificationCount = await getNotificationCount();
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
   const extraItems = await getBuiltinStatusBarItems(errorCount, warningCount, {
+    notificationCount,
     notificationsEnabled: builtinNotificationsEnabled,
     problemsEnabled: builtinProblemsEnabled
   });
@@ -1592,8 +1613,37 @@ const handleExtensionManagementChange = async () => {
   }
 };
 
+const handleNotificationCountChanged = (state, count) => {
+  const {
+    statusBarItemsRight
+  } = state;
+  const notificationsEnabled = statusBarItemsRight.some(item => item.name === Notifications);
+  if (!notificationsEnabled) {
+    return state;
+  }
+  return {
+    ...state,
+    statusBarItemsRight: getNotificationsStatusBarItem(true, count)
+  };
+};
+
+const handleNotificationCountChangedAll = async count => {
+  for (const uid of getKeys()) {
+    const {
+      newState,
+      oldState
+    } = get$3(uid);
+    const newerState = handleNotificationCountChanged(newState, count);
+    if (newState === newerState || oldState === newerState) {
+      continue;
+    }
+    set$3(uid, oldState, newerState);
+  }
+};
+
 const commandMap$1 = {
-  'StatusBar.handleChange': handleExtensionManagementChange
+  'StatusBar.handleChange': handleExtensionManagementChange,
+  'StatusBar.handleNotificationCountChanged': handleNotificationCountChangedAll
 };
 
 const handleExtensionManagementMessagePort = async port => {
@@ -1604,6 +1654,27 @@ const handleExtensionManagementMessagePort = async port => {
   set$1(rpc);
 };
 
+const handleProblemsSummaryChange = (state, summary) => {
+  const {
+    errorCount: oldErrorCount,
+    statusBarItemsLeft: oldStatusBarItemsLeft,
+    warningCount: oldWarningCount
+  } = state;
+  const errorCount = summary.hasEditor ? summary.errorCount : 0;
+  const warningCount = summary.hasEditor ? summary.warningCount : 0;
+  if (oldErrorCount === errorCount && oldWarningCount === warningCount) {
+    return state;
+  }
+  const problemsItem = getProblemsStatusBarItem(errorCount, warningCount, true)[0];
+  const statusBarItemsLeft = oldStatusBarItemsLeft.map(item => item.name === Problems ? problemsItem : item);
+  return {
+    ...state,
+    errorCount,
+    statusBarItemsLeft,
+    warningCount
+  };
+};
+
 const initialize = async () => {};
 
 const getIndex = (items, item) => {
@@ -1693,8 +1764,8 @@ const loadContent = async state => {
     ...state,
     errorCount: 0,
     initial: false,
-    statusBarItemsLeft: [...statusBarItems],
-    statusBarItemsRight: [],
+    statusBarItemsLeft: statusBarItems.filter(item => item.name !== Notifications),
+    statusBarItemsRight: statusBarItems.filter(item => item.name === Notifications),
     warningCount: 0
   };
 };
@@ -1892,6 +1963,8 @@ const commandMap = {
   'StatusBar.handleExtensionManagementMessagePort': handleExtensionManagementMessagePort,
   'StatusBar.handleExtensionsChanged': wrapCommand(handleExtensionsChanged),
   'StatusBar.handleItemsChanged': wrapCommand(handleItemsChanged),
+  'StatusBar.handleNotificationCountChanged': wrapCommand(handleNotificationCountChanged),
+  'StatusBar.handleProblemsSummaryChange': wrapCommand(handleProblemsSummaryChange),
   'StatusBar.initialize': initialize,
   'StatusBar.itemLeftUpdate': wrapCommand(itemLeftUpdate),
   'StatusBar.itemRightCreate': wrapCommand(itemRightCreate),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/status-bar-worker",
-  "version": "3.13.0",
+  "version": "3.15.0",
   "description": "Status Bar Worker",
   "repository": {
     "type": "git",