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

package/dist/activityBarWorkerMain.js

@@ -963,9 +963,10 @@ const create$1 = (id, uri, x, y, width, height, args, parentUid, platform = 0) =
     y: 0,
     sideBarVisible: false,
     activityBarItems: [],
-    selectedIndex: -1
+    selectedIndex: -1,
+    itemHeight: 48
   };
-  set$3(state.uid, state, state);
+  set$3(id, state, state);
   return state;
 };
 
@@ -1054,11 +1055,15 @@ const focusNone = state => {
   return focusIndex(state, -1);
 };
 
-const Button$1 = 'button';
+const Button$2 = 'button';
 const None = 'none';
 const Tab$1 = 'tab';
 const ToolBar = 'toolbar';
 
+const Button$1 = 'event.button';
+const ClientX = 'event.clientX';
+const ClientY = 'event.clientY';
+
 const Enter = 3;
 const Space = 9;
 const PageUp = 10;
@@ -1122,10 +1127,24 @@ const handleBlur = state => {
   };
 };
 
+const getIndexFromPosition = (y, eventX, eventY, itemHeight, itemCount) => {
+  const relativeY = eventY - y;
+  const index = Math.floor(relativeY / itemHeight);
+  if (index < 0 || index >= itemCount) {
+    return -1;
+  }
+  return index;
+};
+
 const show = async (x, y, id, ...args) => {
   // TODO
 };
 
+const handleClickAdditionalViews = async (state, x, y, viewletId) => {
+  await show();
+  return state;
+};
+
 const rpcs = Object.create(null);
 const set$2 = (id, rpc) => {
   rpcs[id] = rpc;
@@ -1518,14 +1537,6 @@ const {
   invoke
 } = RendererWorker;
 
-const handleClickSettings = async (state, x, y, viewletId) => {
-  await show();
-  return state;
-};
-const handleClickAdditionalViews = async (state, x, y, viewletId) => {
-  await show();
-  return state;
-};
 const handleClickOther = async (state, x, y, viewletId) => {
   // TODO ask renderer worker asynchronously if sidebar is visible
 
@@ -1546,10 +1557,19 @@ const handleClickOther = async (state, x, y, viewletId) => {
   }
   return state;
 };
-const handleClick = async (state, button, index, x, y) => {
+
+const handleClickSettings = async (state, x, y, viewletId) => {
+  await show();
+  return state;
+};
+
+const handleClickIndex = async (state, button, index, x, y) => {
   if (button !== LeftClick) {
     return state;
   }
+  if (index === -1) {
+    return state;
+  }
   const {
     activityBarItems
   } = state;
@@ -1565,6 +1585,21 @@ const handleClick = async (state, button, index, x, y) => {
   }
 };
 
+const handleClick = async (state, button, eventX, eventY) => {
+  const {
+    activityBarItems,
+    itemHeight,
+    y
+  } = state;
+  const index = getIndexFromPosition(y, eventX, eventY, itemHeight, activityBarItems.length);
+  return handleClickIndex(state, button, index, eventX, eventY);
+};
+
+const handleContextMenu = async (state, button, x, y) => {
+  await show();
+  return state;
+};
+
 const handleResize = state => {
   return state;
 };
@@ -1697,7 +1732,8 @@ const loadContent = async (state, savedState) => {
   const items = getActivityBarItems();
   return {
     ...state,
-    activityBarItems: items
+    activityBarItems: items,
+    sideBarVisible: true
   };
 };
 
@@ -1763,7 +1799,7 @@ const createActivityBarItem = item => {
   const isSelected = flags & Selected;
   const isFocused = flags & Focused;
   const isProgress = flags & Progress;
-  const role = isTab ? Tab$1 : Button$1;
+  const role = isTab ? Tab$1 : Button$2;
   const ariaSelected = getAriaSelected(isTab, isSelected);
   const marginTop = flags & MarginTop;
   let className = ActivityBarItem;
@@ -1832,11 +1868,12 @@ const getVirtualDom = visibleItems => {
   return dom;
 };
 
+const className = mergeClassNames(Viewlet, ActivityBar$1);
 const getActivityBarVirtualDom = visibleItems => {
   return [{
     type: Div,
     id: ActivityBar,
-    className: mergeClassNames(Viewlet, ActivityBar$1),
+    className,
     role: ToolBar,
     ariaRoleDescription: activityBar(),
     ariaOrientation: Vertical,
@@ -1896,7 +1933,21 @@ const render2 = (uid, diffResult) => {
 };
 
 const renderEventListeners = () => {
-  return [];
+  return [{
+    name: HandleBlur,
+    params: ['handleBlur']
+  }, {
+    name: HandleFocus,
+    params: ['handleFocus']
+  }, {
+    name: HandleContextMenu,
+    params: ['handleContextMenu', Button$1, ClientX, ClientY]
+  }, {
+    name: HandleMouseDown,
+    params: ['handleClick', Button$1, ClientX, ClientY],
+    preventDefault: true,
+    stopPropagation: true
+  }];
 };
 
 const saveState = state => {
@@ -1922,6 +1973,8 @@ const commandMap = {
   'ActivityBar.handleBlur': wrapCommand(handleBlur),
   'ActivityBar.handleResize': wrapCommand(handleResize),
   'ActivityBar.handleClick': wrapCommand(handleClick),
+  'ActivityBar.handleContextMenu': wrapCommand(handleContextMenu),
+  'ActivityBar.handleClickIndex': wrapCommand(handleClickIndex),
   'ActivityBar.handleSideBarViewletChange': wrapCommand(handleSideBarViewletChange),
   'ActivityBar.loadContent': wrapCommand(loadContent),
   'ActivityBar.render2': render2,

package/package.json

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