@lvce-editor/main-area-worker 1.7.0 → 1.9.0

package/dist/mainAreaWorkerMain.js

@@ -96,12 +96,6 @@ const object = value => {
     throw new AssertionError('expected value to be of type object');
   }
 };
-const number = value => {
-  const type = getType(value);
-  if (type !== Number$1) {
-    throw new AssertionError('expected value to be of type number');
-  }
-};
 
 const isMessagePort = value => {
   return value && value instanceof MessagePort;
@@ -1250,12 +1244,43 @@ const handleClick = async (state, name) => {
   return state;
 };
 
-const handleClickCloseTab = (state, groupId, tabId) => {
-  // TODO
-  return state;
+const closeTab = (state, groupId, tabId) => {
+  const groups = state.layout.groups.map(group => {
+    if (group.id === groupId) {
+      const newTabs = group.tabs.filter(tab => tab.id !== tabId);
+      let newActiveTabId = group.activeTabId;
+      if (group.activeTabId === tabId) {
+        const tabIndex = group.tabs.findIndex(tab => tab.id === tabId);
+        if (newTabs.length > 0) {
+          newActiveTabId = newTabs[Math.min(tabIndex, newTabs.length - 1)].id;
+        } else {
+          newActiveTabId = undefined;
+        }
+      }
+      return {
+        ...group,
+        activeTabId: newActiveTabId,
+        tabs: newTabs
+      };
+    }
+    return group;
+  });
+  return {
+    ...state,
+    layout: {
+      ...state.layout,
+      groups
+    }
+  };
 };
 
-const handleClickTab = async (state, groupIndex, index) => {
+const handleClickCloseTab = (state, rawGroupId, rawTabId) => {
+  const groupId = Number.parseInt(rawGroupId);
+  const tabId = Number.parseInt(rawTabId);
+  return closeTab(state, groupId, tabId);
+};
+
+const selectTab = async (state, groupIndex, index) => {
   const {
     layout
   } = state;
@@ -1296,6 +1321,15 @@ const handleClickTab = async (state, groupIndex, index) => {
   };
 };
 
+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;
 const sendMessagePortToExtensionHostWorker = async port => {
   await sendMessagePortToExtensionHostWorker$1(port, id);
@@ -1318,7 +1352,7 @@ const initialize = async () => {
   set$2(rpc);
 };
 
-const loadContent = async state => {
+const getTabs = async () => {
   const tabs = [{
     content: '',
     editorType: 'text',
@@ -1332,6 +1366,11 @@ const loadContent = async state => {
     isDirty: false,
     title: 'tab 2'
   }];
+  return tabs;
+};
+
+const loadContent = async state => {
+  const tabs = await getTabs();
   return {
     ...state,
     layout: {
@@ -1400,9 +1439,10 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   return [{
     childCount: 2,
     className: isActive ? 'MainTab MainTabSelected' : 'MainTab',
-    'data-group-index': groupIndex,
+    'data-groupIndex': groupIndex,
     'data-index': tabIndex,
     onClick: HandleClickTab,
+    role: 'tab',
     type: Div
   }, {
     childCount: 1,
@@ -1411,6 +1451,8 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   }, text(tab.isDirty ? `*${tab.title}` : tab.title), {
     childCount: 1,
     className: 'EditorTabCloseButton',
+    'data-groupIndex': groupIndex,
+    'data-index': tabIndex,
     onClick: HandleClickClose,
     type: Button
   }, text('×')];
@@ -1509,19 +1551,12 @@ const resize = (state, dimensions) => {
   };
 };
 
-const saveState = uid => {
-  number(uid);
-  const value = get(uid);
+const saveState = state => {
   const {
-    newState
-  } = value;
-  const {
-    statusBarItemsLeft,
-    statusBarItemsRight
-  } = newState;
+    layout
+  } = state;
   return {
-    itemsLeft: statusBarItemsLeft,
-    itemsRight: statusBarItemsRight
+    layout
   };
 };
 
@@ -1539,6 +1574,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.7.0",
+  "version": "1.9.0",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",
@@ -11,6 +11,6 @@
   "type": "module",
   "main": "dist/mainAreaWorkerMain.js",
   "dependencies": {
-    "@lvce-editor/virtual-dom-worker": "^5.0.0"
+    "@lvce-editor/virtual-dom-worker": "^5.1.0"
   }
 }