@lvce-editor/main-area-worker 9.37.6 → 9.38.0

package/dist/mainAreaWorkerMain.js

@@ -2854,6 +2854,8 @@ const create$1 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight =
     minGroupHeightPx: 80,
     minGroupWidthPx: 250,
     platform,
+    pointerDownGroupIndex: -1,
+    pointerDownTabIndex: -1,
     splitButtonEnabled: false,
     tabHeight,
     uid,
@@ -2865,10 +2867,14 @@ const create$1 = (uid, uri, x, y, width, height, platform, assetDir, tabHeight =
   set(uid, state, state);
 };
 
-const isEqual$2 = (oldState, newState) => {
+const isEqual$3 = (oldState, newState) => {
   return false;
 };
 
+const isEqual$2 = (oldState, newState) => {
+  return oldState.pointerDownGroupIndex === newState.pointerDownGroupIndex && oldState.pointerDownTabIndex === newState.pointerDownTabIndex;
+};
+
 const isEqual$1 = (oldState, newState) => {
   return oldState.dragOverlay === newState.dragOverlay && oldState.layout === newState.layout;
 };
@@ -2877,12 +2883,13 @@ const RenderItems = 4;
 const RenderCss = 10;
 const RenderIncremental = 11;
 const RenderPendingViewletUpdate = 12;
+const RenderDragData = 13;
 
 const isPendingViewletUpdateEqual = (oldState, newState) => {
   return newState.pendingViewletUpdate === undefined;
 };
-const modules = [isEqual$1, isEqual$2, isPendingViewletUpdateEqual];
-const numbers = [RenderIncremental, RenderCss, RenderPendingViewletUpdate];
+const modules = [isEqual$1, isEqual$3, isPendingViewletUpdateEqual, isEqual$2];
+const numbers = [RenderIncremental, RenderCss, RenderPendingViewletUpdate, RenderDragData];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
@@ -3953,6 +3960,7 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
   if (activeGroup) {
     const activeTab = activeGroup.tabs.find(tab => tab.id === activeGroup.activeTabId);
     if (activeTab?.isPreview) {
+      const tabId = create$2();
       const updatedGroups = groups.map(group => {
         if (group.id !== activeGroup.id) {
           return group;
@@ -3968,6 +3976,7 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
             editorUid: create$2(),
             errorMessage: '',
             icon: '',
+            id: tabId,
             isDirty: false,
             isPreview: preview,
             language: '',
@@ -3979,6 +3988,7 @@ const ensureActiveGroup = (state, uri, preview = false, title = getLabel(uri), e
         });
         return {
           ...group,
+          activeTabId: tabId,
           tabs: updatedTabs
         };
       });
@@ -4697,7 +4707,16 @@ const handleClickTab = async (state, groupIndexRaw, indexRaw, button = 0) => {
   }
   const groupIndex = Number.parseInt(groupIndexRaw);
   const index = Number.parseInt(indexRaw);
-  return selectTab(state, groupIndex, index);
+  const group = state.layout.groups[groupIndex];
+  if (!group || index < 0 || index >= group.tabs.length) {
+    return state;
+  }
+  const newState = await selectTab(state, groupIndex, index);
+  return {
+    ...newState,
+    pointerDownGroupIndex: groupIndex,
+    pointerDownTabIndex: index
+  };
 };
 
 const show2 = async (uid, menuId, x, y, args) => {
@@ -4871,6 +4890,10 @@ const handleDragOver = (state, eventX, eventY) => {
   };
 };
 
+const handleDragStart = state => {
+  return state;
+};
+
 const openUrisWithContext = async (context, uris, reuseExisting = true) => {
   for (const uri of uris) {
     await openUriWithContext(context, {
@@ -5041,6 +5064,26 @@ const splitForDrop = (state, splitDirection) => {
       return state;
   }
 };
+
+const applyDropAction = async (context, action, splitDirection) => {
+  switch (action.command) {
+    case 'openFiles':
+      {
+        if (action.uris.length > 0 && splitDirection !== None) {
+          await context.updateState(state => splitForDrop(state, splitDirection));
+        }
+        await openUrisWithContext(context, action.uris, splitDirection === None);
+        break;
+      }
+    case 'setPath':
+      void invoke('Workspace.setPath', action.value).catch(() => {});
+      break;
+    case 'setUri':
+      void invoke('Workspace.setUri', action.value).catch(() => {});
+      break;
+  }
+};
+
 const getDropAction = async uris => {
   for (const uri of uris) {
     if (uri.endsWith('/') || (await isDirectoryEditorInput({
@@ -5064,24 +5107,7 @@ const getDropAction = async uris => {
     uris
   };
 };
-const applyDropAction = async (context, action, splitDirection) => {
-  switch (action.command) {
-    case 'openFiles':
-      {
-        if (action.uris.length > 0 && splitDirection !== None) {
-          await context.updateState(state => splitForDrop(state, splitDirection));
-        }
-        await openUrisWithContext(context, action.uris, splitDirection === None);
-        break;
-      }
-    case 'setPath':
-      void invoke('Workspace.setPath', action.value).catch(() => {});
-      break;
-    case 'setUri':
-      void invoke('Workspace.setUri', action.value).catch(() => {});
-      break;
-  }
-};
+
 const handleDrop = async (context, itemIds) => {
   const splitDirection = context.getState().dragOverlay?.splitDirection ?? None;
   await context.updateState(handleDragLeave);
@@ -6603,6 +6629,39 @@ const renderCss = (oldState, newState) => {
   return [SetCss, newState.uid, css];
 };
 
+const ensureUri = uri => {
+  return uri.startsWith('/') ? `file://${uri}` : uri;
+};
+const renderDragData = (oldState, newState) => {
+  const {
+    layout,
+    pointerDownGroupIndex,
+    pointerDownTabIndex,
+    uid
+  } = newState;
+  const {
+    groups
+  } = layout;
+  if (pointerDownGroupIndex === -1 || pointerDownTabIndex === -1) {
+    return [];
+  }
+  const tab = groups[pointerDownGroupIndex]?.tabs[pointerDownTabIndex];
+  if (!tab?.uri) {
+    return [];
+  }
+  const data = ensureUri(tab.uri);
+  return ['Viewlet.setDragData', uid, {
+    items: [{
+      data,
+      type: 'text/uri-list'
+    }, {
+      data,
+      type: 'text/plain'
+    }],
+    label: tab.title
+  }];
+};
+
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -6894,6 +6953,9 @@ const HandleSashCornerPointerUp = 22;
 const HandleDragOver = 23;
 const HandleDragLeave = 24;
 const HandleDrop = 25;
+const HandleDragStart = 26;
+const HandleDragEnd = 27;
+const HandleTabMouseUp = 28;
 
 const dragOverlayVirtualDom = {
   childCount: 0,
@@ -7088,9 +7150,13 @@ const renderTab = (tab, isActive, tabIndex, groupIndex) => {
     className,
     'data-groupIndex': groupIndex,
     'data-index': tabIndex,
+    draggable: true,
     onContextMenu: HandleTabContextMenu,
     onDblClick: HandleDoubleClick,
+    onDragEnd: HandleDragEnd,
+    onDragStart: HandleDragStart,
     onMouseDown: HandleClickTab,
+    onMouseUp: HandleTabMouseUp,
     role: Tab$1,
     title: tab.uriTitle || tab.uri || tab.title,
     type: Div
@@ -7463,6 +7529,8 @@ const getRenderer = diffType => {
   switch (diffType) {
     case RenderCss:
       return renderCss;
+    case RenderDragData:
+      return renderDragData;
     case RenderIncremental:
       return renderIncremental;
     case RenderItems:
@@ -7556,6 +7624,16 @@ const renderEventListeners = () => {
     name: HandleDrop,
     params: ['handleDrop', DataTransferFiles2],
     preventDefault: true
+  }, {
+    dragEffect: 'copyMove',
+    name: HandleDragStart,
+    params: ['handleDragStart']
+  }, {
+    name: HandleDragEnd,
+    params: ['handleDragEnd']
+  }, {
+    name: HandleTabMouseUp,
+    params: ['handleTabMouseUp']
   }];
 };
 
@@ -7566,7 +7644,7 @@ const getViewProviderEntries = async uri => {
     type: 'editor'
   };
   try {
-    const providers = await invoke('WebView.getWebViews');
+    const providers = await invoke('WebView.getEditorProviders');
     const matchingProviders = providers.filter(provider => provider?.id && provider.selector?.some(selector => uri.endsWith(selector)));
     return [textEditorEntry, ...matchingProviders.map(provider => {
       const titleElement = provider.elements?.find(element => element.type === 'title');
@@ -7654,6 +7732,17 @@ const reopenEditorWith = async context => {
   }
 };
 
+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,
@@ -8064,8 +8153,10 @@ const commandMap = {
   'MainArea.handleClickTogglePreview': wrapSerialCommand(handleClickTogglePreview),
   'MainArea.handleContextMenu': wrapSerialCommand(handleContextMenu),
   'MainArea.handleDoubleClick': wrapSerialCommand(handleDoubleClick),
+  'MainArea.handleDragEnd': wrapSerialCommand(resetPointerDown),
   'MainArea.handleDragLeave': wrapSerialCommand(handleDragLeave),
   'MainArea.handleDragOver': wrapSerialCommand(handleDragOver),
+  'MainArea.handleDragStart': wrapSerialCommand(handleDragStart),
   'MainArea.handleDrop': wrapSerialAsyncCommand(handleDrop),
   'MainArea.handleHeaderDoubleClick': wrapSerialCommand(handleHeaderDoubleClick),
   'MainArea.handleIconThemeChange': wrapSerialCommand(handleIconThemeChange),
@@ -8078,6 +8169,7 @@ const commandMap = {
   'MainArea.handleSashPointerMove': wrapSerialCommand(handleSashPointerMove),
   'MainArea.handleSashPointerUp': wrapSerialCommand(handleSashPointerUp),
   'MainArea.handleTabContextMenu': wrapSerialCommand(handleTabContextMenu),
+  'MainArea.handleTabMouseUp': wrapSerialCommand(resetPointerDown),
   'MainArea.handleUriChange': wrapSerialCommand(handleUriChange),
   'MainArea.handleWorkspaceChange': wrapSerialCommand(handleWorkspaceChange),
   'MainArea.handleWorkspaceRefresh': wrapAsyncCommand(handleWorkspaceRefreshWithContext),

package/package.json

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