@lvce-editor/activity-bar-worker 1.7.0 → 1.9.0

package/dist/activityBarWorkerMain.js

@@ -1073,6 +1073,10 @@ const Home = 12;
 const UpArrow = 14;
 const DownArrow = 16;
 
+const ActivityBar$3 = 1;
+const Settings$1 = 12;
+const ActivityBarAdditionalViews = 17;
+
 const LeftClick = 0;
 
 const DebugWorker = 55;
@@ -1127,23 +1131,15 @@ const handleBlur = state => {
   };
 };
 
-const getIndexFromPosition = (eventX, eventY, itemHeight, itemCount) => {
-  const index = Math.floor(eventY / itemHeight);
+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;
@@ -1531,6 +1527,15 @@ const RendererWorker = {
   writeClipBoardText
 };
 
+const show = async (x, y, id, ...args) => {
+  await showContextMenu(x, y, id, args);
+};
+
+const handleClickAdditionalViews = async (state, x, y, viewletId) => {
+  await show(x, y, ActivityBarAdditionalViews);
+  return state;
+};
+
 const {
   set,
   invoke
@@ -1558,7 +1563,7 @@ const handleClickOther = async (state, x, y, viewletId) => {
 };
 
 const handleClickSettings = async (state, x, y, viewletId) => {
-  await show();
+  await show(x, y, Settings$1);
   return state;
 };
 
@@ -1566,35 +1571,36 @@ const handleClickIndex = async (state, button, index, x, y) => {
   if (button !== LeftClick) {
     return state;
   }
-  const {
-    activityBarItems
-  } = state;
   if (index === -1) {
     return state;
   }
+  const {
+    activityBarItems
+  } = state;
   const item = activityBarItems[index];
   const viewletId = item.id;
   switch (viewletId) {
     case 'Settings':
-      return handleClickSettings(state);
+      return handleClickSettings(state, x, y);
     case 'Additional Views':
-      return handleClickAdditionalViews(state);
+      return handleClickAdditionalViews(state, x, y);
     default:
       return handleClickOther(state, x, y, viewletId);
   }
 };
 
-const handleClick = async (state, button, x, y) => {
+const handleClick = async (state, button, eventX, eventY) => {
   const {
     activityBarItems,
-    itemHeight
+    itemHeight,
+    y
   } = state;
-  const index = getIndexFromPosition(x, y, itemHeight, activityBarItems.length);
-  return handleClickIndex(state, button, index, x, y);
+  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();
+  await show(x, y, ActivityBar$3);
   return state;
 };
 
@@ -1612,7 +1618,10 @@ const findIndex = (activityBarItems, id) => {
 };
 
 const handleSideBarViewletChange = (state, id, ...args) => {
-  const index = findIndex(state.activityBarItems, id);
+  const {
+    activityBarItems
+  } = state;
+  const index = findIndex(activityBarItems, id);
   return {
     ...state,
     selectedIndex: index
@@ -1730,7 +1739,8 @@ const loadContent = async (state, savedState) => {
   const items = getActivityBarItems();
   return {
     ...state,
-    activityBarItems: items
+    activityBarItems: items,
+    sideBarVisible: true
   };
 };
 
@@ -1938,7 +1948,8 @@ const renderEventListeners = () => {
     params: ['handleFocus']
   }, {
     name: HandleContextMenu,
-    params: ['handleContextMenu', Button$1, ClientX, ClientY]
+    params: ['handleContextMenu', Button$1, ClientX, ClientY],
+    preventDefault: true
   }, {
     name: HandleMouseDown,
     params: ['handleClick', Button$1, ClientX, ClientY],

package/package.json

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