@lvce-editor/status-bar-worker 1.10.0 → 1.12.0

package/dist/statusBarWorkerMain.js

@@ -524,9 +524,9 @@ const get$3 = id => {
 const remove = id => {
   delete callbacks[id];
 };
-let id = 0;
+let id$1 = 0;
 const create$3$1 = () => {
-  return ++id;
+  return ++id$1;
 };
 const registerPromise = () => {
   const id = create$3$1();
@@ -1018,7 +1018,6 @@ const TargetName = 'event.target.name';
 
 const ExtensionHostWorker = 44;
 const RendererWorker = 1;
-const SourceControlWorker = 66;
 
 const SetDom2 = 'Viewlet.setDom2';
 
@@ -1260,8 +1259,9 @@ const handleClick = async (state, name) => {
   return state;
 };
 
+const id = 7201;
 const sendMessagePortToExtensionHostWorker = async port => {
-  await sendMessagePortToExtensionHostWorker$1(port, SourceControlWorker);
+  await sendMessagePortToExtensionHostWorker$1(port, id);
 };
 
 const createExtensionHostRpc = async () => {
@@ -1326,6 +1326,12 @@ const itemRightUpdate = (state, newItem) => {
   };
 };
 
+const ProblemsErrorIcon = 'ProblemsErrorIcon';
+const ProblemsWarningIcon = 'ProblemsWarningIcon';
+const StatusBarItem = 'StatusBarItem';
+const StatusBarItemsLeft = 'StatusBarItemsLeft';
+const StatusBarItemsRight = 'StatusBarItemsRight';
+
 const OnStatusBarItem = 'onStatusBarItem';
 
 const GetStatusBarItems = 'ExtensionHost.getStatusBarItems2';
@@ -1362,6 +1368,34 @@ const getStatusBarItems$1 = () => {
   });
 };
 
+const toStatusBarItem = uiStatusBarItem => {
+  const elements = [];
+  if (uiStatusBarItem.icon) {
+    elements.push({
+      type: 'icon',
+      value: uiStatusBarItem.icon
+    });
+  }
+  if (uiStatusBarItem.text) {
+    elements.push({
+      type: 'text',
+      value: uiStatusBarItem.text
+    });
+  }
+  if (elements.length === 0) {
+    elements.push({
+      type: 'text',
+      value: ''
+    });
+  }
+  return {
+    command: uiStatusBarItem.command || undefined,
+    elements,
+    name: uiStatusBarItem.name,
+    tooltip: uiStatusBarItem.tooltip
+  };
+};
+
 const toUiStatusBarItem = extensionHostStatusBarItem => {
   return {
     command: extensionHostStatusBarItem.command || '',
@@ -1371,12 +1405,14 @@ const toUiStatusBarItem = extensionHostStatusBarItem => {
     tooltip: extensionHostStatusBarItem.tooltip || ''
   };
 };
+
 const toUiStatusBarItems = statusBarItems => {
   if (!statusBarItems) {
     return [];
   }
   return statusBarItems.map(toUiStatusBarItem);
 };
+
 const getStatusBarItems = async showItems => {
   if (!showItems) {
     return [];
@@ -1385,19 +1421,32 @@ const getStatusBarItems = async showItems => {
   const extensionStatusBarItems = await getStatusBarItems$1();
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
   const extraItems = [{
-    command: '',
-    icon: '',
+    command: undefined,
+    elements: [{
+      type: 'text',
+      value: 'Notifications'
+    }],
     name: Notifications,
-    text: 'Notifications',
     tooltip: ''
   }, {
-    command: '',
-    icon: '',
+    command: undefined,
+    elements: [{
+      type: 'icon',
+      value: ProblemsErrorIcon
+    }, {
+      type: 'text',
+      value: '0'
+    }, {
+      type: 'icon',
+      value: ProblemsWarningIcon
+    }, {
+      type: 'text',
+      value: '0'
+    }],
     name: Problems,
-    text: 'Problems',
     tooltip: ''
   }];
-  return [...uiStatusBarItems, ...extraItems];
+  return [...uiStatusBarItems.map(toStatusBarItem), ...extraItems];
 };
 
 const get = async key => {
@@ -1427,26 +1476,37 @@ const text = data => {
   };
 };
 
-const StatusBarItem = 'StatusBarItem';
-const StatusBarItemsLeft = 'StatusBarItemsLeft';
-const StatusBarItemsRight = 'StatusBarItemsRight';
-
 const HandleClick = 11;
 
+const getElementVirtualDom = element => {
+  if (element.type === 'text') {
+    return [text(element.value)];
+  }
+  if (element.type === 'icon') {
+    return [{
+      childCount: 0,
+      className: element.value,
+      type: Div
+    }];
+  }
+  return [];
+};
 const getStatusBarItemVirtualDom = statusBarItem => {
   const {
+    elements,
     name,
     tooltip
   } = statusBarItem;
+  const elementNodes = elements.flatMap(getElementVirtualDom);
   return [{
-    childCount: 1,
+    childCount: elementNodes.length,
     className: StatusBarItem,
     name,
     role: Button$1,
     tabIndex: -1,
     title: tooltip,
     type: Button
-  }, text(statusBarItem.text)];
+  }, ...elementNodes];
 };
 
 const getStatusBarItemsVirtualDom = (items, className) => {

package/package.json

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