@lvce-editor/main-area-worker 9.43.0 → 9.44.2

package/dist/mainAreaWorkerMain.js

@@ -2723,14 +2723,19 @@ const getGroupById = (state, groupId) => {
   return groups.find(group => group.id === groupId);
 };
 
-const closeTabsRight = (state, groupId) => {
+const closeTabsRight = (state, groupId, tabId) => {
   const {
     layout
   } = state;
   const {
+    activeGroupId,
     groups
   } = layout;
-  const group = getGroupById(state, groupId);
+  const targetGroupId = groupId ?? activeGroupId;
+  if (targetGroupId === -1) {
+    return state;
+  }
+  const group = getGroupById(state, targetGroupId);
   if (!group) {
     return state;
   }
@@ -2738,28 +2743,30 @@ const closeTabsRight = (state, groupId) => {
     activeTabId,
     tabs
   } = group;
-  if (activeTabId === -1) {
+  const targetTabId = tabId ?? activeTabId;
+  if (targetTabId === -1) {
     return state;
   }
-  const activeTabIndex = tabs.findIndex(tab => tab.id === activeTabId);
-  if (activeTabIndex === -1) {
+  const targetTabIndex = tabs.findIndex(tab => tab.id === targetTabId);
+  if (targetTabIndex === -1) {
     return state;
   }
-  const newTabs = tabs.slice(0, activeTabIndex + 1);
+  const newTabs = tabs.slice(0, targetTabIndex + 1);
   if (newTabs.length === tabs.length) {
     return state;
   }
-  const groupIndex = groups.findIndex(g => g.id === groupId);
-  const closedTabs = tabs.slice(activeTabIndex + 1).map((tab, index) => ({
+  const groupIndex = groups.findIndex(g => g.id === targetGroupId);
+  const closedTabs = tabs.slice(targetTabIndex + 1).map((tab, index) => ({
     group,
     groupIndex,
     tab,
-    tabIndex: activeTabIndex + index + 1
+    tabIndex: targetTabIndex + index + 1
   }));
   const newGroups = groups.map(g => {
-    if (g.id === groupId) {
+    if (g.id === targetGroupId) {
       return {
         ...g,
+        activeTabId: newTabs.some(tab => tab.id === activeTabId) ? activeTabId : targetTabId,
         isEmpty: newTabs.length === 0,
         tabs: newTabs
       };
@@ -4507,7 +4514,7 @@ const getGroupSegments = (groups, parentDirection) => {
         index++;
       }
       segments.push({
-        direction: group.direction,
+        direction: nestedGroups.length === 1 ? undefined : group.direction,
         groups: nestedGroups,
         startIndex
       });
@@ -5775,14 +5782,23 @@ const handleSashPointerUp = async state => {
   };
 };
 
-const handleTabContextMenu = async (state, button, x, y) => {
+const handleTabContextMenu = async (state, button, x, y, groupIndexRaw = '', tabIndexRaw = '') => {
   number(x);
   number(y);
   const {
     uid
   } = state;
+  const groupIndex = Number.parseInt(groupIndexRaw);
+  const tabIndex = Number.parseInt(tabIndexRaw);
+  const group = state.layout.groups[groupIndex];
+  const tab = group?.tabs[tabIndex];
+  const target = group && tab ? {
+    groupId: group.id,
+    tabId: tab.id
+  } : {};
   await show2(uid, Tab, x, y, {
-    menuId: Tab
+    menuId: Tab,
+    ...target
   });
   return state;
 };
@@ -6425,15 +6441,14 @@ const getMenuEntries$2 = (state, groupId) => {
   }];
 };
 
-// TODO should pass tab uri as argument or tab index
-const getMenuEntries$1 = state => {
+const getMenuEntries$1 = (state, groupId, tabId) => {
   const {
     layout
   } = state;
   const {
     activeGroupId
   } = layout;
-  const group = findGroupById(state, activeGroupId || 0);
+  const group = findGroupById(state, groupId ?? activeGroupId);
   if (!group) {
     return [];
   }
@@ -6441,7 +6456,7 @@ const getMenuEntries$1 = state => {
     activeTabId,
     tabs
   } = group;
-  const tab = tabs.find(t => t.id === activeTabId);
+  const tab = tabs.find(t => t.id === (tabId ?? activeTabId));
   if (!tab) {
     return [];
   }
@@ -6459,6 +6474,7 @@ const getMenuEntries$1 = state => {
     id: 'tabCloseOthers',
     label: closeOthers()
   }, {
+    args: [group.id, tab.id],
     command: 'Main.closeTabsRight',
     flags: None$1,
     id: 'tabCloseToTheRight',
@@ -6555,7 +6571,7 @@ const getMenuEntries = async (state, props) => {
     case Main$1:
       return getMenuEntries$2(state, props.groupId);
     case Tab:
-      return getMenuEntries$1(state);
+      return getMenuEntries$1(state, props.groupId, props.tabId);
     default:
       return [];
   }
@@ -7726,7 +7742,7 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleTabContextMenu,
-    params: ['handleTabContextMenu', Button$1, ClientX, ClientY],
+    params: ['handleTabContextMenu', Button$1, ClientX, ClientY, 'event.target.dataset.groupIndex', 'event.target.dataset.index'],
     preventDefault: true
   }, {
     name: HandleClickAction,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-area-worker",
-  "version": "9.43.0",
+  "version": "9.44.2",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",