@lvce-editor/status-bar-worker 1.6.0 → 1.8.0

package/dist/statusBarWorkerMain.js

@@ -1008,18 +1008,12 @@ const WebWorkerRpcClient = {
   create: create$4
 };
 
-const Button$1 = 'button';
+const Button = 'button';
 
 const Div = 4;
 const Text = 12;
 
-const Button = 'event.button';
-const ClientX = 'event.clientX';
-const ClientY = 'event.clientY';
-const DeltaMode = 'event.deltaMode';
-const DeltaY = 'event.deltaY';
 const TargetName = 'event.target.name';
-const TargetValue = 'event.target.value';
 
 const ExtensionHostWorker = 44;
 const RendererWorker = 1;
@@ -1208,7 +1202,52 @@ const diff2 = uid => {
   return result;
 };
 
-const handleClick = (state, name) => {
+const getMatchingItem = (itemsLeft, itemsRight, name) => {
+  for (const item of itemsLeft) {
+    if (item.name === name) {
+      return item;
+    }
+  }
+  for (const item of itemsRight) {
+    if (item.name === name) {
+      return item;
+    }
+  }
+  return undefined;
+};
+
+const handleClickNotification = async () => {
+  // TODO toggle notifications
+};
+
+const handleClickProblems = async () => {
+  // @ts-ignore
+  await invoke('Layout.showPanel');
+  // @ts-ignore
+  await invoke('Panel.selectView', 'Problems');
+};
+
+const Notifications = 'Notifications';
+const Problems = 'Problems';
+
+const handleClick = async (state, name) => {
+  if (!name) {
+    return state;
+  }
+  const {
+    statusBarItemsLeft,
+    statusBarItemsRight
+  } = state;
+  const item = getMatchingItem(statusBarItemsLeft, statusBarItemsRight, name);
+  if (!item) {
+    return state;
+  }
+  if (item.name === Notifications) {
+    await handleClickNotification();
+  }
+  if (item.name === Problems) {
+    await handleClickProblems();
+  }
   // TODO
   // sendExtensionWorker([/* statusBarItemHandleClick */ 7657, /* name */ name])
   return state;
@@ -1243,6 +1282,7 @@ const getIndex = (items, item) => {
   }
   return -1;
 };
+
 const updateArray = (items, newItem) => {
   const index = getIndex(items, newItem);
   const before = items.slice(0, index);
@@ -1337,7 +1377,20 @@ const getStatusBarItems = async showItems => {
   await activateByEvent('onSourceControl');
   const extensionStatusBarItems = await getStatusBarItems$1();
   const uiStatusBarItems = toUiStatusBarItems(extensionStatusBarItems);
-  return uiStatusBarItems;
+  const extraItems = [{
+    command: '',
+    icon: '',
+    name: Notifications,
+    text: 'Notifications',
+    tooltip: ''
+  }, {
+    command: '',
+    icon: '',
+    name: Problems,
+    text: 'Problems',
+    tooltip: ''
+  }];
+  return [...uiStatusBarItems, ...extraItems];
 };
 
 const get = async key => {
@@ -1345,7 +1398,7 @@ const get = async key => {
 };
 
 const itemsVisible = async () => {
-  const statusBarItemsPreference = (await get('statusBar.itemsVisible')) ?? false;
+  const statusBarItemsPreference = (await get('statusBar.itemsVisible')) ?? true;
   return statusBarItemsPreference;
 };
 
@@ -1354,14 +1407,11 @@ const loadContent = async state => {
   const statusBarItems = await getStatusBarItems(statusBarItemsPreference);
   return {
     ...state,
-    statusBarItemsLeft: [...statusBarItems]
+    statusBarItemsLeft: [...statusBarItems],
+    statusBarItemsRight: []
   };
 };
 
-const StatusBarItem = 'StatusBarItem';
-const StatusBarItemsLeft = 'StatusBarItemsLeft';
-const StatusBarItemsRight = 'StatusBarItemsRight';
-
 const text = data => {
   return {
     type: Text,
@@ -1370,14 +1420,22 @@ const text = data => {
   };
 };
 
+const StatusBarItem = 'StatusBarItem';
+const StatusBarItemsLeft = 'StatusBarItemsLeft';
+const StatusBarItemsRight = 'StatusBarItemsRight';
+
+const HandleClick = 11;
+
 const getStatusBarItemVirtualDom = statusBarItem => {
   const {
+    name,
     tooltip
   } = statusBarItem;
   return [{
     childCount: 1,
     className: StatusBarItem,
-    role: Button$1,
+    name,
+    role: Button,
     tabIndex: -1,
     title: tooltip,
     type: Div
@@ -1385,6 +1443,9 @@ const getStatusBarItemVirtualDom = statusBarItem => {
 };
 
 const getStatusBarItemsVirtualDom = (items, className) => {
+  if (items.length === 0) {
+    return [];
+  }
   return [{
     childCount: items.length,
     className,
@@ -1392,14 +1453,23 @@ const getStatusBarItemsVirtualDom = (items, className) => {
   }, ...items.flatMap(getStatusBarItemVirtualDom)];
 };
 
-const getStatusBarVirtualDom = (statusBarItemsLeft, statusBarItemsRight) => {
-  const dom = [];
-  if (statusBarItemsLeft.length > 0) {
-    dom.push(...getStatusBarItemsVirtualDom(statusBarItemsLeft, StatusBarItemsLeft));
+const getChildCount = (leftCount, rightCount) => {
+  let count = 0;
+  if (leftCount > 0) {
+    count++;
   }
-  if (statusBarItemsRight.length > 0) {
-    dom.push(...getStatusBarItemsVirtualDom(statusBarItemsRight, StatusBarItemsRight));
+  if (rightCount > 0) {
+    count++;
   }
+  return count;
+};
+const getStatusBarVirtualDom = (statusBarItemsLeft, statusBarItemsRight) => {
+  const dom = [{
+    childCount: getChildCount(statusBarItemsLeft.length, statusBarItemsRight.length),
+    className: 'StatusBar',
+    onClick: HandleClick,
+    type: Div
+  }, ...getStatusBarItemsVirtualDom(statusBarItemsLeft, StatusBarItemsLeft), ...getStatusBarItemsVirtualDom(statusBarItemsRight, StatusBarItemsRight)];
   return dom;
 };
 
@@ -1444,50 +1514,10 @@ const render2 = (uid, diffResult) => {
   return commands;
 };
 
-const HandleClickAt = 1;
-const HandleContextMenu = 2;
-const HandleFocus = 3;
-const HandleInput = 4;
-const HandleMouseOutAt = 6;
-const HandleMouseOver = 7;
-const HandleMouseOverAt = 8;
-const HandleWheel = 9;
-const HandleClickAction = 10;
-
 const renderEventListeners = () => {
   return [{
-    name: HandleWheel,
-    params: ['handleWheel', DeltaMode, DeltaY],
-    passive: true
-  }, {
-    name: HandleFocus,
-    params: ['handleFocus']
-  }, {
-    name: HandleClickAt,
-    params: ['handleClickAt', ClientX, ClientY, TargetName]
-  }, {
-    name: HandleMouseOverAt,
-    params: ['handleMouseOverAt', ClientX, ClientY]
-  }, {
-    name: HandleMouseOver,
-    params: ['handleMouseOver', ClientX, ClientY]
-  }, {
-    name: HandleMouseOutAt,
-    params: ['handleMouseOutAt', ClientX, ClientY]
-  }, {
-    name: HandleInput,
-    params: ['handleInput', TargetValue]
-  }, {
-    name: HandleContextMenu,
-    params: ['handleContextMenu', Button, ClientX, ClientY],
-    preventDefault: true
-  }, {
-    name: HandleWheel,
-    params: ['handleWheel', DeltaMode, DeltaY],
-    passive: true
-  }, {
-    name: HandleClickAction,
-    params: ['handleActionClick', TargetName]
+    name: HandleClick,
+    params: ['handleClick', TargetName]
   }];
 };
 

package/package.json

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