@lvce-editor/main-area-worker 7.4.0 → 8.1.0

package/dist/mainAreaWorkerMain.js

@@ -2216,11 +2216,9 @@ const focusNextTab = async state => {
     return state;
   }
 
-  // If not at the last tab, select the next tab
-  if (activeTabIndex < activeGroup.tabs.length - 1) {
-    return selectTab(state, activeGroupIndex, activeTabIndex + 1);
-  }
-  return state;
+  // If not at the last tab, select the next tab, otherwise cycle to first
+  const nextTabIndex = activeTabIndex < activeGroup.tabs.length - 1 ? activeTabIndex + 1 : 0;
+  return selectTab(state, activeGroupIndex, nextTabIndex);
 };
 
 const focusPreviousTab = async state => {
@@ -2250,11 +2248,9 @@ const focusPreviousTab = async state => {
     return state;
   }
 
-  // If not at the first tab, select the previous tab
-  if (activeTabIndex > 0) {
-    return selectTab(state, activeGroupIndex, activeTabIndex - 1);
-  }
-  return state;
+  // If not at the first tab, select the previous tab, otherwise cycle to last
+  const previousTabIndex = activeTabIndex > 0 ? activeTabIndex - 1 : activeGroup.tabs.length - 1;
+  return selectTab(state, activeGroupIndex, previousTabIndex);
 };
 
 const getMenuIds = () => {
@@ -2668,18 +2664,13 @@ const handleModifiedStatusChange = (state, uri, newStatus) => {
   };
 };
 
-const handleResize = async (state, x, y, width, height) => {
-  number(x);
-  number(y);
-  number(width);
-  number(height);
-  const newState = {
-    ...state,
+const handleResize = async (state, dimensions) => {
+  const {
     height,
     width,
     x,
     y
-  };
+  } = dimensions;
 
   // Resize all editor children to their new bounds
   const {
@@ -2690,26 +2681,28 @@ const handleResize = async (state, x, y, width, height) => {
     groups
   } = layout;
   const contentHeight = height - tabHeight;
+  const allResizeCommands = [];
   for (const group of groups) {
     for (const tab of group.tabs) {
       if (tab.editorUid !== -1) {
-        await invoke('Viewlet.setBounds', tab.editorUid, {
+        const resizeCommands = await invoke('Viewlet.resize', tab.editorUid, {
           height: contentHeight,
           width,
           x,
           y: y + tabHeight
         });
+        allResizeCommands.push(...resizeCommands);
       }
     }
   }
-  return newState;
+  return allResizeCommands;
 };
 
 const show2 = async (uid, menuId, x, y, args) => {
   await showContextMenu2(uid, menuId, x, y, args);
 };
 
-const handleTabContextMenu = async (state, x, y) => {
+const handleTabContextMenu = async (state, button, x, y) => {
   number(x);
   number(y);
   const {
@@ -4107,13 +4100,6 @@ const renderEventListeners = () => {
   }];
 };
 
-const resize = (state, dimensions) => {
-  return {
-    ...state,
-    ...dimensions
-  };
-};
-
 const getActiveTab = state => {
   const {
     layout
@@ -4281,7 +4267,8 @@ const commandMap = {
   'MainArea.handleDoubleClick': wrapCommand(handleDoubleClick),
   'MainArea.handleHeaderDoubleClick': wrapCommand(handleHeaderDoubleClick),
   'MainArea.handleModifiedStatusChange': wrapCommand(handleModifiedStatusChange),
-  'MainArea.handleResize': wrapCommand(handleResize),
+  'MainArea.handleResize': wrapGetter(handleResize),
+  // TODO would need to have a function that returns newstate as well as commands
   'MainArea.handleTabContextMenu': wrapCommand(handleTabContextMenu),
   'MainArea.handleUriChange': wrapCommand(handleUriChange),
   'MainArea.handleWorkspaceChange': wrapCommand(handleWorkspaceChange),
@@ -4292,7 +4279,7 @@ const commandMap = {
   'MainArea.refresh': wrapCommand(refresh),
   'MainArea.render2': render2,
   'MainArea.renderEventListeners': renderEventListeners,
-  'MainArea.resize': wrapCommand(resize),
+  'MainArea.resize': wrapGetter(handleResize),
   'MainArea.save': wrapCommand(save),
   'MainArea.saveState': wrapGetter(saveState),
   'MainArea.selectTab': wrapCommand(selectTab),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/main-area-worker",
-  "version": "7.4.0",
+  "version": "8.1.0",
   "description": "Main Area Worker",
   "repository": {
     "type": "git",
@@ -11,6 +11,6 @@
   "type": "module",
   "main": "dist/mainAreaWorkerMain.js",
   "dependencies": {
-    "@lvce-editor/virtual-dom-worker": "^6.11.0"
+    "@lvce-editor/virtual-dom-worker": "^7.1.0"
   }
 }