@lvce-editor/activity-bar-worker 7.18.1 → 7.19.1

package/dist/activityBarWorkerMain.js

@@ -2164,6 +2164,69 @@ const getMenuEntryIds = () => {
   return [ActivityBar$3, ActivityBarAdditionalViews, Settings$1, ACCOUNT_MENU_ID, ACCOUNT_SUBMENU_ID];
 };
 
+const getActiveViewIds = items => {
+  return items.filter(item => item.flags & Selected).map(item => item.id);
+};
+
+const Account = 'Account';
+const DebugAlt2 = 'DebugAlt2';
+const Extensions$1 = 'Extensions';
+const Files = 'Files';
+const References$1 = 'References';
+const Search$1 = 'Search';
+const SettingsGear = 'SettingsGear';
+const SourceControl$1 = 'SourceControl';
+const Ellipsis = 'Ellipsis';
+
+const getFilteredActivityBarItems = (items, height, itemHeight) => {
+  const enabledItems = items.filter(item => item.flags & Enabled);
+  const numberOfVisibleItems = getNumberOfVisibleItems({
+    height,
+    itemHeight
+  });
+  if (numberOfVisibleItems >= enabledItems.length) {
+    return enabledItems;
+  }
+  const showMoreItem = {
+    flags: Button,
+    icon: Ellipsis,
+    id: 'Additional Views',
+    keyShortcuts: '',
+    title: additionalViews()
+  };
+  return [...enabledItems.slice(0, numberOfVisibleItems - 2), showMoreItem, enabledItems.at(-1)];
+};
+
+const setFlag = (item, flag, enabled) => {
+  return {
+    ...item,
+    flags: enabled ? item.flags | flag : item.flags & ~flag
+  };
+};
+
+const markActiveViews = (items, activeViewIds) => {
+  const activeViews = new Set(activeViewIds);
+  return items.map(item => setFlag(item, Selected, activeViews.has(item.id)));
+};
+
+const handleActiveViewStateChange = (state, id, visible) => {
+  const {
+    activityBarItems,
+    height,
+    itemHeight
+  } = state;
+  const activeViewIds = getActiveViewIds(activityBarItems);
+  const withoutView = activeViewIds.filter(activeViewId => activeViewId !== id);
+  const newActiveViewIds = visible ? [...withoutView, id] : withoutView;
+  const newActivityBarItems = markActiveViews(activityBarItems, newActiveViewIds);
+  const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
+  return {
+    ...state,
+    activityBarItems: newActivityBarItems,
+    filteredItems
+  };
+};
+
 const getBadgeText = badgeCount => {
   if (badgeCount <= 999) {
     return badgeCount ? String(badgeCount) : '';
@@ -2306,35 +2369,6 @@ const findIndex = (activityBarItems, id) => {
   return -1;
 };
 
-const Account = 'Account';
-const DebugAlt2 = 'DebugAlt2';
-const Extensions$1 = 'Extensions';
-const Files = 'Files';
-const References$1 = 'References';
-const Search$1 = 'Search';
-const SettingsGear = 'SettingsGear';
-const SourceControl$1 = 'SourceControl';
-const Ellipsis = 'Ellipsis';
-
-const getFilteredActivityBarItems = (items, height, itemHeight) => {
-  const enabledItems = items.filter(item => item.flags & Enabled);
-  const numberOfVisibleItems = getNumberOfVisibleItems({
-    height,
-    itemHeight
-  });
-  if (numberOfVisibleItems >= enabledItems.length) {
-    return enabledItems;
-  }
-  const showMoreItem = {
-    flags: Button,
-    icon: Ellipsis,
-    id: 'Additional Views',
-    keyShortcuts: '',
-    title: additionalViews()
-  };
-  return [...enabledItems.slice(0, numberOfVisibleItems - 2), showMoreItem, enabledItems.at(-1)];
-};
-
 const getSideBarChange = (sideBarVisible, currentViewletId, viewletId) => {
   if (sideBarVisible) {
     if (currentViewletId === viewletId) {
@@ -2354,20 +2388,6 @@ const getSideBarChange = (sideBarVisible, currentViewletId, viewletId) => {
   };
 };
 
-const setFlag = (item, flag, enabled) => {
-  return {
-    ...item,
-    flags: enabled ? item.flags | flag : item.flags & ~flag
-  };
-};
-
-const markSelected = (items, selectedIndex) => {
-  return items.map((item, index) => {
-    const isSelected = index === selectedIndex;
-    return setFlag(item, Selected, isSelected);
-  });
-};
-
 const toggle = async id => {
   await invoke('Layout.toggleSideBarView', id);
 };
@@ -2380,10 +2400,24 @@ const handleClickOther = async (state, viewletId) => {
     itemHeight,
     sideBarVisible
   } = state;
+  const activeViewIds = getActiveViewIds(activityBarItems);
+  const selectedItem = activityBarItems.find(item => item.id === viewletId);
   const sideBarChange = getSideBarChange(sideBarVisible, currentViewletId, viewletId);
   await toggle(viewletId);
+  if (selectedItem?.preferredLocation === 'preview') {
+    const isActive = activeViewIds.includes(viewletId);
+    const newActiveViewIds = isActive ? activeViewIds.filter(id => id !== viewletId) : [...activeViewIds, viewletId];
+    const newActivityBarItems = markActiveViews(activityBarItems, newActiveViewIds);
+    const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
+    return {
+      ...state,
+      activityBarItems: newActivityBarItems,
+      filteredItems
+    };
+  }
+  const withoutCurrentSideBarView = activeViewIds.filter(id => id !== currentViewletId);
   if (sideBarChange.type === 'hide') {
-    const newActivityBarItems = markSelected(activityBarItems, -1);
+    const newActivityBarItems = markActiveViews(activityBarItems, withoutCurrentSideBarView);
     const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
     return {
       ...state,
@@ -2394,7 +2428,8 @@ const handleClickOther = async (state, viewletId) => {
     };
   }
   const selectedIndex = findIndex(activityBarItems, viewletId);
-  const newActivityBarItems = markSelected(activityBarItems, selectedIndex);
+  const newActiveViewIds = [...withoutCurrentSideBarView, viewletId];
+  const newActivityBarItems = markActiveViews(activityBarItems, newActiveViewIds);
   const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
   return {
     ...state,
@@ -2543,6 +2578,9 @@ const toActivityBarItem = view => {
     icon,
     id: view.id,
     keyShortcuts: '',
+    ...(view.preferredLocation === 'preview' && {
+      preferredLocation: 'preview'
+    }),
     title: view.title || view.id
   };
   if (customIconClass && customIconUrl) {
@@ -2633,16 +2671,29 @@ const getContributedViews = async platform => {
   }
 };
 
+const resolveActiveViewIds = (state, newItems) => {
+  const {
+    activityBarItems,
+    selectedIndex
+  } = state;
+  const activeViewIds = getActiveViewIds(activityBarItems);
+  if (activeViewIds.length > 0 || selectedIndex === -1) {
+    return activeViewIds;
+  }
+  const selectedItem = activityBarItems[selectedIndex] || newItems[selectedIndex];
+  return selectedItem ? [selectedItem.id] : [];
+};
+
 const handleExtensionsChanged = async state => {
   const {
     height,
     itemHeight,
-    platform,
-    selectedIndex
+    platform
   } = state;
   const contributedViews = await getContributedViews(platform);
   const items = getActivityBarItems(state, contributedViews);
-  const itemsWithSelected = markSelected(items, selectedIndex);
+  const activeViewIds = resolveActiveViewIds(state, items);
+  const itemsWithSelected = markActiveViews(items, activeViewIds);
   const activityBarItems = await updateItemsWithBadgeCount(itemsWithSelected);
   const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
   return {
@@ -2710,8 +2761,7 @@ const handleSettingsChanged = async state => {
     accountEnabled: currentAccountEnabled,
     height,
     itemHeight,
-    platform,
-    selectedIndex
+    platform
   } = state;
   const [accountEnabled, contributedViews, sidebarLocation] = await Promise.all([getAccountEnabled(currentAccountEnabled), getContributedViews(platform), getSideBarPosition()]);
   const newState = {
@@ -2719,7 +2769,8 @@ const handleSettingsChanged = async state => {
     accountEnabled
   };
   const items = getActivityBarItems(newState, contributedViews);
-  const itemsWithSelected = markSelected(items, selectedIndex);
+  const activeViewIds = resolveActiveViewIds(state, items);
+  const itemsWithSelected = markActiveViews(items, activeViewIds);
   const activityBarItems = await updateItemsWithBadgeCount(itemsWithSelected);
   const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
   return {
@@ -2739,9 +2790,8 @@ const getSideBarVisible = async () => {
   }
 };
 
-const clearItem = item => {
-  const withoutSelected = setFlag(item, Selected, false);
-  return setFlag(withoutSelected, Focused, false);
+const clearFocus = item => {
+  return setFlag(item, Focused, false);
 };
 const enableReferencesItem = (items, id) => {
   if (id !== References) {
@@ -2757,10 +2807,12 @@ const handleSideBarStateChange = async (state, id, sideBarVisibleOverride) => {
     height,
     itemHeight
   } = state;
+  const activeViewIds = getActiveViewIds(activityBarItems);
   const resolvedId = id === undefined ? currentViewletId : id;
   const sideBarVisible = typeof sideBarVisibleOverride === 'boolean' ? sideBarVisibleOverride : await getSideBarVisible();
+  const withoutCurrentSideBarView = activeViewIds.filter(activeViewId => activeViewId !== currentViewletId && activeViewId !== resolvedId);
   if (!sideBarVisible) {
-    const itemsCleared = activityBarItems.map(clearItem);
+    const itemsCleared = markActiveViews(activityBarItems.map(clearFocus), withoutCurrentSideBarView);
     const filteredItems = getFilteredActivityBarItems(itemsCleared, height, itemHeight);
     return {
       ...state,
@@ -2773,7 +2825,8 @@ const handleSideBarStateChange = async (state, id, sideBarVisibleOverride) => {
   }
   const enabledItems = enableReferencesItem(activityBarItems, resolvedId);
   const selectedIndex = findIndex(enabledItems, resolvedId);
-  const newActivityBarItems = markSelected(enabledItems, selectedIndex);
+  const newActiveViewIds = selectedIndex === -1 ? withoutCurrentSideBarView : [...withoutCurrentSideBarView, resolvedId];
+  const newActivityBarItems = markActiveViews(enabledItems, newActiveViewIds);
   const filteredItems = getFilteredActivityBarItems(newActivityBarItems, height, itemHeight);
   return {
     ...state,
@@ -2865,13 +2918,14 @@ const loadContent = async state => {
   const items = getActivityBarItems(newState, contributedViews);
   const index = items.findIndex(item => item.id === activeView);
   const selectedIndex = sideBarVisible ? index : -1;
-  const itemsWithSelected = markSelected(items, selectedIndex);
+  const activeViewIds = sideBarVisible && index !== -1 ? [activeView] : [];
+  const itemsWithSelected = markActiveViews(items, activeViewIds);
   const activityBarItems = await updateItemsWithBadgeCount(itemsWithSelected);
   const filteredItems = getFilteredActivityBarItems(activityBarItems, height, itemHeight);
   return {
     ...newState,
     activityBarItems,
-    currentViewletId: Explorer,
+    currentViewletId: activeView || Explorer,
     filteredItems,
     initial: false,
     selectedIndex,
@@ -3627,15 +3681,15 @@ const selectCurrent = async state => {
 const setAccountEnabled = (state, enabled) => {
   const {
     height,
-    itemHeight,
-    selectedIndex
+    itemHeight
   } = state;
   const newState = {
     ...state,
     accountEnabled: enabled
   };
   const newActivityBarItems = getActivityBarItems(newState);
-  const markedItems = markSelected(newActivityBarItems, selectedIndex);
+  const activeViewIds = resolveActiveViewIds(state, newActivityBarItems);
+  const markedItems = markActiveViews(newActivityBarItems, activeViewIds);
   const filteredItems = getFilteredActivityBarItems(markedItems, height, itemHeight);
   return {
     ...newState,
@@ -3726,6 +3780,7 @@ const commandMap = {
   'ActivityBar.getKeyBindings': getKeyBindings,
   'ActivityBar.getMenuEntries': wrapGetter(getMenuEntries),
   'ActivityBar.getMenuEntryIds': getMenuEntryIds,
+  'ActivityBar.handleActiveViewStateChange': wrapCommand(handleActiveViewStateChange),
   'ActivityBar.handleBadgeCountChange': wrapCommand(handleBadgeCountChange),
   'ActivityBar.handleBlur': wrapCommand(handleBlur),
   'ActivityBar.handleClick': wrapCommand(handleClick),

package/package.json

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