@lvce-editor/activity-bar-worker 7.19.0 → 7.20.0

package/dist/activityBarWorkerMain.js

@@ -249,7 +249,7 @@ const {
   get: get$2,
   getCommandIds,
   registerCommands,
-  set: set$3,
+  set: set$5,
   wrapAsyncCommand,
   wrapCommand,
   wrapGetter
@@ -284,7 +284,7 @@ const create$9 = (id, uri, x, y, width, height, args, parentUid, platform = 0) =
     x,
     y
   };
-  set$3(id, state, state);
+  set$5(id, state, state);
   return state;
 };
 
@@ -594,6 +594,7 @@ const LeftClick = 0;
 const Electron = 2;
 
 const ExtensionManagementWorker = 9006;
+const RendererProcess = 1670;
 const RendererWorker = 1;
 
 const Left = 1;
@@ -1966,7 +1967,7 @@ const createMockRpc = ({
 };
 
 const rpcs = Object.create(null);
-const set$2 = (id, rpc) => {
+const set$4 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get = id => {
@@ -1999,7 +2000,7 @@ const create = rpcId => {
       const mockRpc = createMockRpc({
         commandMap
       });
-      set$2(rpcId, mockRpc);
+      set$4(rpcId, mockRpc);
       // @ts-ignore
       mockRpc[Symbol.dispose] = () => {
         remove(rpcId);
@@ -2008,27 +2009,32 @@ const create = rpcId => {
       return mockRpc;
     },
     set(rpc) {
-      set$2(rpcId, rpc);
+      set$4(rpcId, rpc);
     }
   };
 };
 
 const {
-  invoke: invoke$1,
-  set: set$1
+  invoke: invoke$3,
+  set: set$3
 } = create(ExtensionManagementWorker);
 
 const {
-  invoke,
+  invoke: invoke$2,
+  set: set$2
+} = create(RendererProcess);
+
+const {
+  invoke: invoke$1,
   invokeAndTransfer,
-  set
+  set: set$1
 } = create(RendererWorker);
 const showContextMenu2 = async (uid, menuId, x, y, args) => {
   number(uid);
   number(menuId);
   number(x);
   number(y);
-  await invoke('ContextMenu.show2', uid, menuId, x, y, args);
+  await invoke$1('ContextMenu.show2', uid, menuId, x, y, args);
 };
 const sendMessagePortToExtensionManagementWorker = async (port, rpcId) => {
   const command = 'Extensions.handleMessagePort';
@@ -2046,7 +2052,7 @@ const handleClickAccount = async (state, eventX, eventY, viewletId) => {
     uid
   } = state;
   try {
-    await invoke('Layout.refreshAuthState');
+    await invoke$1('Layout.refreshAuthState');
   } catch {
     // Keep the account menu available when auth is unavailable.
   }
@@ -2164,6 +2170,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) : '';
@@ -2175,7 +2244,7 @@ const getBadgeText = badgeCount => {
 
 const updateItemsWithBadgeCount = async items => {
   try {
-    const badgeCounts = await invoke('Layout.getBadgeCounts');
+    const badgeCounts = await invoke$1('Layout.getBadgeCounts');
     const newItems = items.map(item => {
       const badgeCount = badgeCounts[item.id] || 0;
       const badgeText = getBadgeText(badgeCount);
@@ -2306,35 +2375,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,22 +2394,8 @@ 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);
+  await invoke$1('Layout.toggleSideBarView', id);
 };
 
 const handleClickOther = async (state, viewletId) => {
@@ -2380,10 +2406,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 +2434,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,
@@ -2467,18 +2508,18 @@ const handleClick = async (state, button, eventX, eventY, targetName = '') => {
 };
 
 const handleClickSignIn = async state => {
-  await invoke('Layout.signIn');
+  await invoke$1('Layout.signIn');
   return state;
 };
 
 const handleClickSignOut = async state => {
-  await invoke('Layout.signOut');
+  await invoke$1('Layout.signOut');
   return state;
 };
 
 const getSideBarPosition = async () => {
   try {
-    return await invoke('Layout.getSideBarPosition');
+    return await invoke$1('Layout.getSideBarPosition');
   } catch {
     return Left;
   }
@@ -2507,7 +2548,7 @@ const handleExtensionManagementMessagePort = async port => {
     commandMap: commandMap$1,
     messagePort: port
   });
-  set$1(rpc);
+  set$3(rpc);
 };
 
 const hashString = value => {
@@ -2543,6 +2584,9 @@ const toActivityBarItem = view => {
     icon,
     id: view.id,
     keyShortcuts: '',
+    ...(view.preferredLocation === 'preview' && {
+      preferredLocation: 'preview'
+    }),
     title: view.title || view.id
   };
   if (customIconClass && customIconUrl) {
@@ -2623,7 +2667,7 @@ const getActivityBarItems = (state, contributedViews = []) => {
 
 const getContributedViews = async platform => {
   try {
-    const views = await invoke$1('Extensions.getViews', '', platform);
+    const views = await invoke$3('Extensions.getViews', '', platform);
     if (!Array.isArray(views)) {
       return [];
     }
@@ -2633,16 +2677,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 {
@@ -2674,6 +2731,31 @@ const handleFocus = state => {
   };
 };
 
+const state = {
+  connected: false
+};
+const isConnected = () => {
+  const {
+    connected
+  } = state;
+  return connected;
+};
+const invoke = (method, ...params) => {
+  return invoke$2(method, ...params);
+};
+const set = rpc => {
+  set$2(rpc);
+  state.connected = true;
+};
+
+const handleMessagePort = async port => {
+  const rpc = await create$4({
+    commandMap: {},
+    messagePort: port
+  });
+  set(rpc);
+};
+
 const handleResize = (state, dimensions) => {
   const {
     activityBarItems,
@@ -2698,7 +2780,7 @@ const handleResize = (state, dimensions) => {
 
 const getAccountEnabled = async defaultValue => {
   try {
-    const value = await invoke('Preferences.get', 'activityBar.accountEnabled');
+    const value = await invoke$1('Preferences.get', 'activityBar.accountEnabled');
     return typeof value === 'boolean' ? value : defaultValue;
   } catch {
     return defaultValue;
@@ -2710,8 +2792,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 +2800,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 {
@@ -2732,16 +2814,15 @@ const handleSettingsChanged = async state => {
 
 const getSideBarVisible = async () => {
   try {
-    const visible = await invoke('Layout.getSideBarVisible');
+    const visible = await invoke$1('Layout.getSideBarVisible');
     return visible;
   } catch {
     return true;
   }
 };
 
-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 +2838,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 +2856,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,
@@ -2826,7 +2910,7 @@ const handleUpdateStateChange = async (state, config) => {
 
 const getActiveView = async () => {
   try {
-    const activeView = await invoke('Layout.getActiveSideBarView');
+    const activeView = await invoke$1('Layout.getActiveSideBarView');
     return activeView;
   } catch {
     return Explorer;
@@ -2865,13 +2949,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,
@@ -3494,14 +3579,23 @@ const applyRender = (oldState, newState, diffResult) => {
   return commands;
 };
 
+const renderDirect = async (uid, commands) => {
+  const rendererWorkerCommands = commands.filter(command => command[0] === SetFocusContext);
+  const rendererProcessCommands = commands.filter(command => command[0] !== SetFocusContext);
+  const transactionId = await invoke('Viewlet.queueCommands', uid, rendererProcessCommands);
+  return [...rendererWorkerCommands, ['Viewlet.commitPending', uid, transactionId]];
+};
 const render2 = (uid, diffResult) => {
   const {
     newState,
     oldState
   } = get$2(uid);
-  set$3(uid, newState, newState);
+  set$5(uid, newState, newState);
   const commands = applyRender(oldState, newState, diffResult);
-  return commands;
+  if (!isConnected()) {
+    return commands;
+  }
+  return renderDirect(uid, commands);
 };
 
 const renderEventListeners = () => {
@@ -3627,15 +3721,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,
@@ -3709,7 +3803,7 @@ const toggleActivityBarItem = async (state, itemId) => {
 };
 
 const wakeUp = sleepState => {
-  set$3(sleepState.uid, sleepState, sleepState);
+  set$5(sleepState.uid, sleepState, sleepState);
 };
 
 const commandMap = {
@@ -3726,6 +3820,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),
@@ -3740,6 +3835,7 @@ const commandMap = {
   'ActivityBar.handleExtensionManagementMessagePort': handleExtensionManagementMessagePort,
   'ActivityBar.handleExtensionsChanged': wrapCommand(handleExtensionsChanged),
   'ActivityBar.handleFocus': wrapCommand(handleFocus),
+  'ActivityBar.handleMessagePort': handleMessagePort,
   'ActivityBar.handleSettingsChanged': wrapCommand(handleSettingsChanged),
   'ActivityBar.handleSideBarStateChange': wrapCommand(handleSideBarStateChange),
   'ActivityBar.handleUpdateStateChange': wrapCommand(handleUpdateStateChange),
@@ -3766,14 +3862,14 @@ const initializeExtensionManagementWorker = async () => {
     commandMap: {},
     send
   });
-  set$1(rpc);
+  set$3(rpc);
 };
 
 const initializeRendererWorker = async () => {
   const rpc = await create$1({
     commandMap: commandMap
   });
-  set(rpc);
+  set$1(rpc);
 };
 
 const listen = async () => {

package/package.json

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