@lvce-editor/main-area-worker 9.52.0 → 9.53.1

package/dist/mainAreaWorkerMain.js

@@ -1748,12 +1748,13 @@ const getIcons = async iconRequests => {
 
 const {
   invoke: invoke$2,
+  invokeAndTransfer: invokeAndTransfer$2,
   set: set$3
 } = create$3(RendererProcess);
 
 const {
   invoke: invoke$1,
-  invokeAndTransfer,
+  invokeAndTransfer: invokeAndTransfer$1,
   set: set$2
 } = create$3(RendererWorker);
 const handleModifiedStatusChange$1 = async (uri, modified) => {
@@ -1768,19 +1769,15 @@ const showContextMenu2 = async (uid, menuId, x, y, args) => {
 };
 const sendMessagePortToClipBoardWorker$1 = async (port, rpcId) => {
   const command = 'ClipBoard.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToClipBoardWorker', port, command, rpcId);
-};
-const sendMessagePortToDragAndDropWorker = async port => {
-  const command = 'DragAndDrop.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDragAndDropWorker', port, command);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToClipBoardWorker', port, command, rpcId);
 };
 const sendMessagePortToDialogWorker = async port => {
   const command = 'HandleMessagePort.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToDialogWorker', port, command);
 };
 const sendMessagePortToIconThemeWorker = async (port, rpcId) => {
   const command = 'IconTheme.handleMessagePort';
-  await invokeAndTransfer('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
+  await invokeAndTransfer$1('SendMessagePortToExtensionHostWorker.sendMessagePortToIconThemeWorker', port, command, rpcId);
 };
 const readFile = async uri => {
   return invoke$1('FileSystem.readFile', uri);
@@ -2925,6 +2922,9 @@ const isConnected = () => {
 const invoke = (method, ...params) => {
   return invoke$2(method, ...params);
 };
+const invokeAndTransfer = (method, ...params) => {
+  return invokeAndTransfer$2(method, ...params);
+};
 const set = rpc => {
   set$3(rpc);
   state.connected = true;
@@ -5065,6 +5065,17 @@ const handleDragStart = state => {
   return state;
 };
 
+const resetPointerDown = state => {
+  if (state.pointerDownGroupIndex === -1 && state.pointerDownTabIndex === -1) {
+    return state;
+  }
+  return {
+    ...state,
+    pointerDownGroupIndex: -1,
+    pointerDownTabIndex: -1
+  };
+};
+
 const openUrisWithContext = async (context, uris, reuseExisting = true) => {
   for (const uri of uris) {
     await openUriWithContext(context, {
@@ -5257,6 +5268,81 @@ const applyDropAction = async (context, action, splitDirection, targetGroupId) =
   }
 };
 
+const moveTabToGroup = (state, sourceGroupId, targetGroupId, tabId, targetIndex) => {
+  const {
+    layout
+  } = state;
+  const {
+    groups
+  } = layout;
+  const sourceGroup = groups.find(group => group.id === sourceGroupId);
+  const hasTargetGroup = groups.some(group => group.id === targetGroupId);
+  if (!sourceGroup || !hasTargetGroup || sourceGroupId === targetGroupId) {
+    return state;
+  }
+  const tabToMove = sourceGroup.tabs.find(tab => tab.id === tabId);
+  if (!tabToMove) {
+    return state;
+  }
+  const updatedGroups = groups.map(group => {
+    if (group.id === sourceGroupId) {
+      const newTabs = group.tabs.filter(tab => tab.id !== tabId);
+      let newActiveTabId = group.activeTabId;
+      if (group.activeTabId === tabId) {
+        if (newTabs.length > 0) {
+          const removedIndex = group.tabs.findIndex(tab => tab.id === tabId);
+          newActiveTabId = newTabs[Math.min(removedIndex, newTabs.length - 1)].id;
+        } else {
+          newActiveTabId = -1;
+        }
+      }
+      return {
+        ...group,
+        activeTabId: newActiveTabId,
+        isEmpty: newTabs.length === 0,
+        tabs: newTabs
+      };
+    }
+    if (group.id === targetGroupId) {
+      const insertIndex = group.tabs.length ;
+      const newTabs = [...group.tabs];
+      newTabs.splice(insertIndex, 0, tabToMove);
+      return {
+        ...group,
+        activeTabId: tabId,
+        isEmpty: newTabs.length === 0,
+        tabs: newTabs
+      };
+    }
+    return group;
+  });
+  return {
+    ...state,
+    layout: {
+      ...layout,
+      activeGroupId: targetGroupId,
+      groups: updatedGroups
+    }
+  };
+};
+
+const getOpenTabCount = state => {
+  return state.layout.groups.reduce((count, group) => count + group.tabs.length, 0);
+};
+const applyTabDrop = (state, sourceGroupId, tabId, splitDirection, targetGroupId) => {
+  if (targetGroupId === undefined) {
+    return state;
+  }
+  if (splitDirection === None) {
+    return moveTabToGroup(state, sourceGroupId, targetGroupId, tabId);
+  }
+  if (getOpenTabCount(state) === 1) {
+    return state;
+  }
+  const splitState = splitForDrop(state, splitDirection, targetGroupId);
+  return moveTabToGroup(splitState, sourceGroupId, splitState.layout.activeGroupId, tabId);
+};
+
 const getDropAction = async uris => {
   for (const uri of uris) {
     if (uri.endsWith('/') || (await isDirectoryEditorInput({
@@ -5281,11 +5367,21 @@ const getDropAction = async uris => {
   };
 };
 
+const normalizeUri = uri => {
+  return uri.startsWith('/') ? `file://${uri}` : uri;
+};
 const handleDrop = async (context, dropIdOrItemIds) => {
+  const initialState = context.getState();
+  const {
+    pointerDownGroupIndex,
+    pointerDownTabIndex
+  } = initialState;
+  const sourceGroup = initialState.layout.groups[pointerDownGroupIndex];
+  const draggedTab = sourceGroup?.tabs[pointerDownTabIndex];
   const {
     splitDirection = None,
     targetGroupId
-  } = context.getState().dragOverlay ?? {};
+  } = initialState.dragOverlay ?? {};
   await context.updateState(handleDragLeave);
   const {
     platform
@@ -5300,6 +5396,10 @@ const handleDrop = async (context, dropIdOrItemIds) => {
     } = await getDroppedItems(dropIdOrItemIds, isElectron);
     uris = droppedUris;
   }
+  if (draggedTab?.uri && uris.length === 1 && normalizeUri(uris[0]) === normalizeUri(draggedTab.uri)) {
+    await context.updateState(state => resetPointerDown(applyTabDrop(state, sourceGroup.id, draggedTab.id, splitDirection, targetGroupId)));
+    return;
+  }
   const actions = await getDropAction(uris);
   await applyDropAction(context, actions, splitDirection, targetGroupId);
 };
@@ -7556,6 +7656,9 @@ const renderTabIcon = tab => {
   if (tab.uri?.startsWith(SearchEditorScheme)) {
     return renderMaskIcon(MaskIconSearch);
   }
+  if (!tab.icon) {
+    return [];
+  }
   return [{
     childCount: 0,
     className: TabIcon,
@@ -7566,6 +7669,7 @@ const renderTabIcon = tab => {
 };
 const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   const closeButtonNodes = renderTabActions(tab.isDirty, tabIndex, groupIndex);
+  const tabIconNodes = renderTabIcon(tab);
   let className = MainTab;
   if (isActive) {
     className = mergeClassNames(className, MainTabSelected);
@@ -7578,7 +7682,7 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
   }
   return [{
     'aria-selected': isActive,
-    childCount: 3,
+    childCount: 2 + (tabIconNodes.length > 0 ? 1 : 0),
     className,
     'data-groupIndex': groupIndex,
     'data-index': tabIndex,
@@ -7594,7 +7698,7 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     tabIndex: isActive ? 0 : -1,
     title: tab.uriTitle || tab.uri || tab.title,
     type: Div
-  }, ...renderTabIcon(tab), tabTitleNode, text(tab.title), ...closeButtonNodes];
+  }, ...tabIconNodes, tabTitleNode, text(tab.title), ...closeButtonNodes];
 };
 
 const getTabsVirtualDom = (group, groupIndex, tabsChildCount) => {
@@ -8186,17 +8290,6 @@ const reopenEditorWith = async (context, preferredEditorId) => {
   }
 };
 
-const resetPointerDown = state => {
-  if (state.pointerDownGroupIndex === -1 && state.pointerDownTabIndex === -1) {
-    return state;
-  }
-  return {
-    ...state,
-    pointerDownGroupIndex: -1,
-    pointerDownTabIndex: -1
-  };
-};
-
 const resize$1 = (state, dimensions) => {
   return {
     ...state,
@@ -8685,7 +8778,7 @@ const initializeClipBoardWorker = async () => {
 };
 
 const send$1 = async port => {
-  await sendMessagePortToDragAndDropWorker(port);
+  await invokeAndTransfer('DragAndDrop.handleMessagePort', port);
 };
 const createDragAndDropWorkerRpc = async () => {
   return create$6({

package/package.json

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