@lvce-editor/main-area-worker 9.71.2 → 9.72.0

package/dist/mainAreaWorkerMain.js

@@ -3992,6 +3992,7 @@ const HandleTabsWheel = 30;
 const HandleTabDragOver = 31;
 const HandleTabsDragOver = 32;
 const HandleFocus = 33;
+const HandleGroupMouseDown = 34;
 
 const dragOverlayVirtualDom = {
   childCount: 0,
@@ -4668,6 +4669,7 @@ const renderEditorGroup = (group, groupIndex, splitButtonEnabled = false, closeB
     childCount: 2,
     className: mergeClassNames(EditorGroup, getEditorGroupClassName(group.id)),
     'data-groupId': String(group.id),
+    onMouseDown: HandleGroupMouseDown,
     type: Div
   }, ...renderEditorGroupHeader(group, groupIndex, splitButtonEnabled, tabDropIndicator), editorContainerNode, ...renderEditor(activeTab)];
 };
@@ -4905,14 +4907,22 @@ const parseRawGroupId = rawGroupId => {
   return Number.isNaN(groupId) ? undefined : groupId;
 };
 
-const handleClick = async (state, name) => {
+const handleClick = (state, name) => {
   const groupId = parseRawGroupId(name);
   if (groupId === undefined) {
     return state;
   }
   const hasGroup = state.layout.groups.some(group => group.id === groupId);
+  // Empty-group focus must publish a fresh layout even when this group is already active.
   return hasGroup ? focusEditorGroup(state, groupId) : state;
 };
+const handleGroupMouseDown = async (context, name) => {
+  const groupId = parseRawGroupId(name);
+  await context.updateState(state => state.layout.activeGroupId === groupId ? state : handleClick(state, name));
+};
+const handleClickWithContext = async (context, name) => {
+  await context.updateState(state => handleClick(state, name));
+};
 
 const getActiveGroup = (groups, activeGroupId) => {
   return groups.find(g => g.id === activeGroupId);
@@ -8497,11 +8507,15 @@ const moveIntoNewWindow = async state => {
     return state;
   }
   const tab = group.tabs.find(tab => tab.id === activeTabId);
-  if (!tab?.uri) {
+  if (!tab || tab.terminal) {
     return state;
   }
-  await invoke$3('ElectronWindow.openNewWithUri', tab.uri);
-  return closeTabAndSave(state, group.id, activeTabId);
+  const editorInput = tab.editorInput ?? normalizeTabEditorInput(tab).editorInput;
+  if (!editorInput) {
+    return state;
+  }
+  await invoke$3('ElectronWindow.openNewWithEditorInput', editorInput, tab.editorUid, tab.isDirty);
+  return closeTabWithViewlet(state, group.id, activeTabId);
 };
 
 const newWindow = async state => {
@@ -8827,6 +8841,9 @@ const renderEventListeners = () => {
   }, {
     name: HandleFocus,
     params: ['handleClick', 'event.target.dataset.groupId']
+  }, {
+    name: HandleGroupMouseDown,
+    params: ['handleGroupMouseDown', 'event.currentTarget.dataset.groupId']
   }, {
     name: HandleClickClose,
     params: ['handleClickCloseTab', 'event.currentTarget.dataset.groupIndex', 'event.currentTarget.dataset.index'],
@@ -9488,7 +9505,7 @@ const commandMap = {
   'MainArea.getComponentState': getComponentState,
   'MainArea.getMenuEntries': wrapGetter(getMenuEntries),
   'MainArea.getMenuIds': getMenuIds,
-  'MainArea.handleClick': wrapSerialCommand(handleClick),
+  'MainArea.handleClick': wrapSerialAsyncCommand(handleClickWithContext),
   'MainArea.handleClickAction': wrapSerialCommand(handleClickAction),
   'MainArea.handleClickCloseTab': wrapSerialCommand(handleClickCloseTab),
   'MainArea.handleClickTab': wrapSerialCommand(handleClickTab),
@@ -9500,6 +9517,7 @@ const commandMap = {
   'MainArea.handleDragOver': wrapSerialCommand(handleDragOver),
   'MainArea.handleDragStart': wrapSerialCommand(handleDragStart),
   'MainArea.handleDrop': wrapSerialAsyncCommand(handleDrop),
+  'MainArea.handleGroupMouseDown': wrapSerialAsyncCommand(handleGroupMouseDown),
   'MainArea.handleHeaderDoubleClick': wrapSerialCommand(handleHeaderDoubleClick),
   'MainArea.handleIconThemeChange': wrapSerialCommand(handleIconThemeChange),
   'MainArea.handleMessagePort': handleDirectMessagePort,

package/package.json

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