@lvce-editor/activity-bar-worker 1.26.0 → 1.28.0

package/dist/activityBarWorkerMain.js

@@ -1025,17 +1025,15 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     itemHeight: 48,
     updateState: '',
     updateProgress: 0,
-    filteredItems: []
+    filteredItems: [],
+    numberOfVisibleItems: 0
   };
   set(id, state, state);
   return state;
 };
 
 const isEqual$2 = (oldState, newState) => {
-  // TODO compute css more optimized
-  // maybe only when items change, and even then not
-  // always, but only when it affects the css
-  return false;
+  return oldState.itemHeight === newState.itemHeight;
 };
 
 const isEqual$1 = (oldState, newState) => {
@@ -1043,7 +1041,7 @@ const isEqual$1 = (oldState, newState) => {
 };
 
 const isEqual = (oldState, newState) => {
-  return oldState.focusedIndex === newState.focusedIndex && oldState.activityBarItems === newState.activityBarItems && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
+  return oldState.activityBarItems === newState.activityBarItems && oldState.filteredItems === newState.filteredItems && oldState.focusedIndex === newState.focusedIndex && oldState.updateProgress === newState.updateProgress && oldState.updateState === newState.updateState;
 };
 
 const RenderItems = 4;
@@ -1146,10 +1144,30 @@ const handleBlur = state => {
   };
 };
 
-const getIndexFromPosition = (y, eventX, eventY, itemHeight, itemCount) => {
+const getIndexFromPosition = (y, eventX, eventY, itemHeight, itemCount, height) => {
+  if (itemCount === 0) {
+    return -1;
+  }
+  // If there's only one item, treat it as a top item (not Settings at bottom)
+  if (itemCount === 1) {
+    const relativeY = eventY - y;
+    const index = Math.floor(relativeY / itemHeight);
+    if (index < 0 || index >= itemCount) {
+      return -1;
+    }
+    return index;
+  }
+  // Settings is always at the bottom (last item) when there are multiple items
+  const settingsBottomY = y + height;
+  const settingsTopY = settingsBottomY - itemHeight;
+  // Check if click is in the Settings area (bottom)
+  if (eventY >= settingsTopY && eventY < settingsBottomY) {
+    return itemCount - 1;
+  }
+  // Otherwise, calculate index from top items
   const relativeY = eventY - y;
   const index = Math.floor(relativeY / itemHeight);
-  if (index < 0 || index >= itemCount) {
+  if (index < 0 || index >= itemCount - 1) {
     return -1;
   }
   return index;
@@ -1206,9 +1224,9 @@ const handleClickIndex = async (state, button, index, x, y) => {
     return state;
   }
   const {
-    activityBarItems
+    filteredItems
   } = state;
-  const item = activityBarItems[index];
+  const item = filteredItems[index];
   const viewletId = item.id;
   switch (viewletId) {
     case 'Settings':
@@ -1222,11 +1240,12 @@ const handleClickIndex = async (state, button, index, x, y) => {
 
 const handleClick = async (state, button, eventX, eventY) => {
   const {
-    activityBarItems,
+    filteredItems,
     itemHeight,
-    y
+    y,
+    height
   } = state;
-  const index = getIndexFromPosition(y, eventX, eventY, itemHeight, activityBarItems.length);
+  const index = getIndexFromPosition(y, eventX, eventY, itemHeight, filteredItems.length, height);
   return handleClickIndex(state, button, index, eventX, eventY);
 };
 
@@ -1385,15 +1404,19 @@ const markSelected = (items, selectedIndex) => {
 
 const handleSideBarViewletChange = (state, id, ...args) => {
   const {
-    activityBarItems
+    activityBarItems,
+    height,
+    itemHeight
   } = state;
   const index = findIndex(activityBarItems, id);
   const newActivityBarItems = markSelected(activityBarItems, index);
+  const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
   return {
     ...state,
     selectedIndex: index,
     currentViewletId: id,
     activityBarItems: newActivityBarItems,
+    filteredItems,
     sideBarVisible: true
   };
 };
@@ -1425,14 +1448,14 @@ const getNewItems = (items, state) => {
 };
 const handleUpdateStateChange = async (state, config) => {
   const {
-    activityBarItems
+    filteredItems
   } = state;
-  const newItems = getNewItems(activityBarItems, config.state);
+  const newItems = getNewItems(filteredItems, config.state);
   return {
     ...state,
     updateState: config.state,
     updateProgress: config.progress,
-    activityBarItems: newItems
+    filteredItems: newItems
   };
 };
 
@@ -1487,15 +1510,21 @@ const getActivityBarItems = () => {
 };
 
 const loadContent = async (state, savedState) => {
+  const {
+    itemHeight,
+    height
+  } = state;
   const items = getActivityBarItems();
   const explorerIndex = 0;
   const itemsWithSelected = markSelected(items, explorerIndex);
+  const filteredItems = getFilteredActivityBarItems(itemsWithSelected, height, itemHeight);
   return {
     ...state,
     activityBarItems: itemsWithSelected,
-    sideBarVisible: true,
     currentViewletId: Explorer,
-    selectedIndex: explorerIndex
+    filteredItems,
+    selectedIndex: explorerIndex,
+    sideBarVisible: true
   };
 };
 
@@ -1742,9 +1771,9 @@ const getActivityBarVirtualDom = visibleItems => {
 const renderItems = (oldState, newState) => {
   const {
     uid,
-    activityBarItems
+    filteredItems
   } = newState;
-  const dom = getActivityBarVirtualDom(activityBarItems);
+  const dom = getActivityBarVirtualDom(filteredItems);
   return [SetDom2, uid, dom];
 };
 

package/package.json

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