@lvce-editor/main-area-worker 1.6.0 → 1.8.0

package/dist/mainAreaWorkerMain.js

@@ -1255,9 +1255,54 @@ const handleClickCloseTab = (state, groupId, tabId) => {
   return state;
 };
 
-const handleClickTab = async (state, groupIndex, index) => {
-  // TODO mark that tab as active (if it is a valid group index and index)
-  return state;
+const selectTab = async (state, groupIndex, index) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+
+  // Validate indexes
+  if (groupIndex < 0 || groupIndex >= groups.length) {
+    return state;
+  }
+  const group = groups[groupIndex];
+  if (index < 0 || index >= group.tabs.length) {
+    return state;
+  }
+  const tab = group.tabs[index];
+  const groupId = group.id;
+  const tabId = tab.id;
+
+  // Return same state if this group and tab are already active
+  if (layout.activeGroupId === groupId && group.activeTabId === tabId) {
+    return state;
+  }
+
+  // Update the groups array with the new active tab and active group
+  const updatedGroups = groups.map((g, i) => ({
+    ...g,
+    activeTabId: i === groupIndex ? tabId : g.activeTabId,
+    focused: i === groupIndex
+  }));
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      activeGroupId: groupId,
+      groups: updatedGroups
+    }
+  };
+};
+
+const handleClickTab = async (state, groupIndexRaw, indexRaw) => {
+  if (!groupIndexRaw || !indexRaw) {
+    return state;
+  }
+  const groupIndex = Number.parseInt(groupIndexRaw);
+  const index = Number.parseInt(indexRaw);
+  return selectTab(state, groupIndex, index);
 };
 
 const id = 7201;
@@ -1360,11 +1405,14 @@ const HandleClick = 11;
 const HandleClickClose = 12;
 const HandleClickTab = 13;
 
-const renderTab = (tab, isActive) => {
+const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   return [{
     childCount: 2,
-    className: isActive ? 'MainTab MainTabActive' : 'MainTab',
+    className: isActive ? 'MainTab MainTabSelected' : 'MainTab',
+    'data-groupIndex': groupIndex,
+    'data-index': tabIndex,
     onClick: HandleClickTab,
+    role: 'tab',
     type: Div
   }, {
     childCount: 1,
@@ -1378,21 +1426,21 @@ const renderTab = (tab, isActive) => {
   }, text('×')];
 };
 
-const renderTabBar = group => {
+const renderTabBar = (group, groupIndex) => {
   return [{
     childCount: group.tabs.length,
     className: 'MainTabs',
     type: Div
-  }, ...group.tabs.flatMap(tab => renderTab(tab, tab.id === group.activeTabId))];
+  }, ...group.tabs.flatMap((tab, tabIndex) => renderTab(tab, tab.id === group.activeTabId, tabIndex, groupIndex))];
 };
 
-const renderEditorGroup = group => {
+const renderEditorGroup = (group, groupIndex) => {
   const activeTab = group.tabs.find(tab => tab.id === group.activeTabId);
   return [{
     childCount: 2,
     className: 'EditorGroup',
     type: Div
-  }, ...renderTabBar(group), {
+  }, ...renderTabBar(group, groupIndex), {
     childCount: activeTab ? 1 : 1,
     className: 'EditorContainer',
     type: Div
@@ -1408,7 +1456,7 @@ const getMainAreaVirtualDom = layout => {
     childCount: layout.groups.length,
     className: CSS_CLASSES.EDITOR_GROUPS_CONTAINER,
     type: Div
-  }, ...layout.groups.flatMap(renderEditorGroup)];
+  }, ...layout.groups.flatMap((group, groupIndex) => renderEditorGroup(group, groupIndex))];
 };
 
 const renderItems = (oldState, newState) => {
@@ -1459,7 +1507,7 @@ const renderEventListeners = () => {
     name: HandleClickClose,
     params: ['handleClickCloseTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
   }, {
-    name: HandleClickClose,
+    name: HandleClickTab,
     params: ['handleClickTab', 'event.target.dataset.groupIndex', 'event.target.dataset.index']
   }];
 };
@@ -1501,6 +1549,7 @@ const commandMap = {
   'MainArea.renderEventListeners': renderEventListeners,
   'MainArea.resize': wrapCommand(resize),
   'MainArea.saveState': saveState,
+  'MainArea.selectTab': wrapCommand(selectTab),
   'MainArea.terminate': terminate
 };
 

package/package.json

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