@lvce-editor/main-area-worker 9.34.2 → 9.35.0

package/dist/mainAreaWorkerMain.js

@@ -4817,32 +4817,40 @@ const handleDragOver = (state, eventX, eventY) => {
   };
 };
 
-const lineSeparatorRegex = /\r?\n/;
 const chromiumDragIdRegex = /^[A-F\d]{32}$/i;
-const isUriList = item => {
+const isChromiumDragId = item => {
   if (!item || typeof item !== 'object') {
     return false;
   }
   const candidate = item;
-  return candidate.kind === 'string' && candidate.type === 'text/uri-list' && typeof candidate.value === 'string';
-};
-const parseUriList = value => {
-  return value.split(lineSeparatorRegex).map(uri => uri.trim()).filter(uri => uri && !uri.startsWith('#'));
+  return candidate.kind === 'string' && (candidate.type === '' || candidate.type === 'chromium/x-drag-id') && typeof candidate.value === 'string' && chromiumDragIdRegex.test(candidate.value);
 };
-const isChromiumDragId = item => {
+
+const isDroppedFileSystemHandle = item => {
   if (!item || typeof item !== 'object') {
     return false;
   }
   const candidate = item;
-  return candidate.kind === 'string' && (candidate.type === '' || candidate.type === 'chromium/x-drag-id') && typeof candidate.value === 'string' && chromiumDragIdRegex.test(candidate.value);
+  const handle = candidate.value;
+  return candidate.kind === 'file' && Boolean(handle) && typeof handle === 'object' && (handle.kind === 'directory' || handle.kind === 'file') && typeof handle.name === 'string';
 };
-const isDroppedFile = item => {
+
+const isUriList = item => {
   if (!item || typeof item !== 'object') {
     return false;
   }
   const candidate = item;
-  const handle = candidate.value;
-  return candidate.kind === 'file' && Boolean(handle) && typeof handle === 'object' && handle.kind === 'file' && typeof handle.name === 'string';
+  return candidate.kind === 'string' && candidate.type === 'text/uri-list' && typeof candidate.value === 'string';
+};
+
+const lineSeparatorRegex = /\r?\n/;
+const parseUriList = value => {
+  return value.split(lineSeparatorRegex).map(uri => uri.trim()).filter(uri => uri && !uri.startsWith('#'));
+};
+
+const suffixByHandleKind = {
+  directory: '/',
+  file: ''
 };
 const getDroppedUris = async itemIds => {
   if (itemIds.length === 0) {
@@ -4851,7 +4859,7 @@ const getDroppedUris = async itemIds => {
   const items = await getFileHandles(itemIds);
   let hasChromiumDragId = false;
   const uris = [];
-  for (const item of items) {
+  for (const [index, item] of items.entries()) {
     if (isUriList(item)) {
       uris.push(...parseUriList(item.value));
       continue;
@@ -4860,11 +4868,12 @@ const getDroppedUris = async itemIds => {
       hasChromiumDragId = true;
       continue;
     }
-    if (!isDroppedFile(item)) {
+    if (!isDroppedFileSystemHandle(item)) {
       continue;
     }
     const handle = item.value;
-    const uri = `html:///dropped-files/${handle.name}`;
+    const suffix = suffixByHandleKind[handle.kind];
+    const uri = `html:///dropped-files/${Date.now()}/${itemIds[index]}/${handle.name}${suffix}`;
     await invoke('PersistentFileHandle.addHandle', uri, handle);
     uris.push(uri);
   }
@@ -4873,7 +4882,7 @@ const getDroppedUris = async itemIds => {
   }
   const dragInfo = await invoke('Viewlet.getDragData');
   if (!dragInfo || typeof dragInfo !== 'object' || !Array.isArray(dragInfo.items)) {
-    return [];
+    return uris;
   }
   for (const item of dragInfo.items) {
     const candidate = item;
@@ -4893,6 +4902,16 @@ const openUrisWithContext = async (context, uris) => {
 const handleDrop = async (context, itemIds) => {
   await context.updateState(handleDragLeave);
   const uris = await getDroppedUris(itemIds);
+  for (const uri of uris) {
+    if (uri.endsWith('/') || (await isDirectoryEditorInput({
+      type: 'editor',
+      uri
+    }))) {
+      const command = uri.startsWith('file://') ? 'Workspace.setUri' : 'Workspace.setPath';
+      void invoke(command, uri).catch(() => {});
+      return;
+    }
+  }
   await openUrisWithContext(context, uris);
 };
 

package/package.json

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