@lvce-editor/explorer-view 7.21.2 → 7.22.0

package/dist/explorerViewWorkerMain.js

@@ -1317,7 +1317,6 @@ const DownArrow = 16;
 const Delete$1 = 18;
 const KeyA = 29;
 const KeyC = 31;
-const KeyV = 50;
 const KeyX = 52;
 const F2 = 58;
 const Star = 131;
@@ -1836,7 +1835,7 @@ const dirname = (pathSeparator, path) => {
 const dirname2 = path => {
   return dirname('/', path);
 };
-const join = (pathSeparator, ...parts) => {
+const join$1 = (pathSeparator, ...parts) => {
   return parts.join(pathSeparator);
 };
 const getBaseName = (pathSeparator, path) => {
@@ -2338,6 +2337,7 @@ const i18nString = (key, placeholders = emptyObject) => {
 };
 
 const CollapseAllFoldersInExplorer = 'Collapse All Folders in Explorer';
+const CannotMoveFolderIntoSubfolderOfItself = 'Cannot move folder {PH1} into a subfolder of itself';
 const Copy = 'Copy';
 const CopyPath = 'Copy Path';
 const CopyRelativePath = 'Copy Relative Path';
@@ -2441,6 +2441,11 @@ const fileOrFolderAlreadyExists = name => {
     PH1: name
   });
 };
+const cannotMoveFolderIntoSubfolderOfItself = folderName => {
+  return i18nString(CannotMoveFolderIntoSubfolderOfItself, {
+    PH1: folderName
+  });
+};
 const theNameIsNotValid = () => {
   return i18nString(TheNameIsNotValid);
 };
@@ -3019,7 +3024,7 @@ const getFileIcons = async (dirents, fileIconCache) => {
   };
 };
 
-const directoryTypes$1 = new Set([DirectoryExpanded, DirectoryExpanding, EditingDirectoryExpanded]);
+const directoryTypes$2 = new Set([DirectoryExpanded, DirectoryExpanding, EditingDirectoryExpanded]);
 const getParentPath = (path, pathSeparator) => {
   const index = path.lastIndexOf(pathSeparator);
   if (index === -1) {
@@ -3030,7 +3035,7 @@ const getParentPath = (path, pathSeparator) => {
 const getGitIgnoreCandidateDirs = (root, items, pathSeparator) => {
   const dirs = new Set([root]);
   for (const item of items) {
-    if (directoryTypes$1.has(item.type)) {
+    if (directoryTypes$2.has(item.type)) {
       dirs.add(item.path);
     }
     const parent = getParentPath(item.path, pathSeparator);
@@ -4270,10 +4275,6 @@ const getKeyBindings = () => {
     command: 'Explorer.collapseAll',
     key: CtrlCmd | LeftArrow,
     when: FocusExplorer
-  }, {
-    command: 'Explorer.handlePaste',
-    key: CtrlCmd | KeyV,
-    when: FocusExplorer
   }, {
     command: 'Explorer.handleCopy',
     key: CtrlCmd | KeyC,
@@ -5962,7 +5963,7 @@ const getFileOperationsElectron = async (root, paths, fileHandles, pathSeparator
     const path = paths[i];
     operations.push({
       from: path,
-      path: join(pathSeparator, root, name),
+      path: join$1(pathSeparator, root, name),
       type: Copy$1
     });
   }
@@ -6030,6 +6031,121 @@ const handleDrop$1 = async (state, fileHandles, files, paths) => {
   };
 };
 
+const directoryTypes$1 = [Directory, DirectoryExpanded, DirectoryExpanding];
+const isDirectory = item => {
+  return directoryTypes$1.includes(item.type);
+};
+const isDescendant = (path, parentPath, pathSeparator) => {
+  const prefix = parentPath.endsWith(pathSeparator) ? parentPath : `${parentPath}${pathSeparator}`;
+  return path.startsWith(prefix);
+};
+const join = (parentPath, name, pathSeparator) => {
+  if (parentPath.endsWith(pathSeparator)) {
+    return `${parentPath}${name}`;
+  }
+  return `${parentPath}${pathSeparator}${name}`;
+};
+const getTargetFolder = (state, index) => {
+  const {
+    items,
+    pathSeparator,
+    root
+  } = state;
+  if (index === -1) {
+    return root;
+  }
+  const item = items[index];
+  if (!item) {
+    throw new Error('Drop target does not exist');
+  }
+  if (isDirectory(item)) {
+    return item.path;
+  }
+  if (item.type === File) {
+    return dirname(pathSeparator, item.path);
+  }
+  throw new Error('Drop target is not a file or folder');
+};
+const getTopLevelSourcePaths = (sourcePaths, pathSeparator) => {
+  const uniquePaths = [...new Set(sourcePaths)];
+  return uniquePaths.filter(path => uniquePaths.every(otherPath => otherPath === path || !isDescendant(path, otherPath, pathSeparator)));
+};
+const getMoveOperations = (state, sourcePaths, targetFolder) => {
+  const {
+    items,
+    pathSeparator
+  } = state;
+  const itemByPath = new Map(items.map(item => [item.path, item]));
+  const existingPaths = new Set(itemByPath.keys());
+  const destinationPaths = new Set();
+  const operations = [];
+  for (const sourcePath of getTopLevelSourcePaths(sourcePaths, pathSeparator)) {
+    const sourceItem = itemByPath.get(sourcePath);
+    if (!sourceItem) {
+      throw new Error(`Dragged item no longer exists: ${sourcePath}`);
+    }
+    if (sourcePath === targetFolder) {
+      continue;
+    }
+    if (isDirectory(sourceItem) && isDescendant(targetFolder, sourcePath, pathSeparator)) {
+      throw new Error(cannotMoveFolderIntoSubfolderOfItself(sourceItem.name));
+    }
+    const destinationPath = join(targetFolder, sourceItem.name, pathSeparator);
+    if (destinationPath === sourcePath) {
+      continue;
+    }
+    if (destinationPaths.has(destinationPath) || existingPaths.has(destinationPath)) {
+      throw new Error(fileOrFolderAlreadyExists(sourceItem.name));
+    }
+    destinationPaths.add(destinationPath);
+    operations.push({
+      from: sourcePath,
+      path: destinationPath
+    });
+  }
+  return operations;
+};
+const expandTargetFolder = (items, targetFolder) => {
+  return items.map(item => {
+    if (item.path === targetFolder && item.type === Directory) {
+      return {
+        ...item,
+        type: DirectoryExpanded
+      };
+    }
+    return item;
+  });
+};
+const handleInternalDrop = async (state, sourcePaths, index) => {
+  const {
+    isReadonly,
+    items
+  } = state;
+  if (isReadonly) {
+    return state;
+  }
+  const targetFolder = getTargetFolder(state, index);
+  const operations = getMoveOperations(state, sourcePaths, targetFolder);
+  if (operations.length === 0) {
+    return {
+      ...state,
+      dropTargets: []
+    };
+  }
+  for (const operation of operations) {
+    await rename$1(operation.from, operation.path);
+  }
+  const expandedItems = expandTargetFolder(items, targetFolder);
+  const updated = await refresh({
+    ...state,
+    items: expandedItems
+  });
+  return {
+    ...updated,
+    dropTargets: []
+  };
+};
+
 const Electron = 2;
 
 const getModule = isElectron => {
@@ -6042,6 +6158,9 @@ const handleDropRoot = async (state, fileHandles, files, paths) => {
   if (state.isReadonly && state.root !== '') {
     return state;
   }
+  if (fileHandles.length === 0 && paths.length > 0) {
+    return handleInternalDrop(state, paths, -1);
+  }
   const isElectron = state.platform === Electron;
   const fn = getModule(isElectron);
   return fn(state, fileHandles, files, paths);
@@ -6095,6 +6214,9 @@ const handleDropIndex = async (state, fileHandles, files, paths, index) => {
   if (state.isReadonly) {
     return state;
   }
+  if (fileHandles.length === 0 && paths.length > 0) {
+    return handleInternalDrop(state, paths, index);
+  }
   const {
     items
   } = state;
@@ -6132,10 +6254,27 @@ const getDroppedItems = async (itemIds, isElectron) => {
   const paths = files.map(file => file.path);
   return {
     fileHandles,
-    paths
+    paths,
+    uris: result.uris
   };
 };
 
+const getInternalDragPaths = (items, uris) => {
+  if (uris.length === 0) {
+    return [];
+  }
+  const pathByUri = new Map(items.map(item => [ensureUri(item.path), item.path]));
+  const paths = [];
+  for (const uri of uris) {
+    const path = pathByUri.get(uri);
+    if (path === undefined) {
+      return [];
+    }
+    paths.push(path);
+  }
+  return paths;
+};
+
 const handleDrop = async (state, x, y, fileIds) => {
   if (state.isReadonly && state.root !== '') {
     return state;
@@ -6144,11 +6283,14 @@ const handleDrop = async (state, x, y, fileIds) => {
     const isElectron = state.platform === Electron;
     const {
       fileHandles,
-      paths
+      paths,
+      uris
     } = await getDroppedItems(fileIds, isElectron);
+    const internalPaths = getInternalDragPaths(state.items, uris);
+    const droppedPaths = internalPaths.length > 0 ? internalPaths : paths;
     const index = getIndexFromPosition(state, x, y);
     const fn = getDropHandler(index);
-    const result = await fn(state, fileHandles, [], paths, index);
+    const result = await fn(state, fileHandles, [], droppedPaths, index);
     return result;
   } catch (error) {
     throw new VError(error, 'Failed to drop files');
@@ -6529,6 +6671,42 @@ const handlePaste = async state => {
   return handlePasteCopy(state, nativeFiles);
 };
 
+const handleNativePaste = async (state, itemIds) => {
+  const {
+    focusedIndex,
+    isReadonly,
+    platform
+  } = state;
+  if (isReadonly) {
+    return state;
+  }
+  if (itemIds.length === 0) {
+    return handlePaste(state);
+  }
+  try {
+    const isElectron = platform === Electron;
+    const {
+      fileHandles,
+      paths
+    } = await getDroppedItems(itemIds, isElectron);
+    if (isElectron) {
+      const nativePaths = paths.filter(Boolean);
+      if (nativePaths.length === 0) {
+        return handlePaste(state);
+      }
+      return handlePasteCopy(state, {
+        files: nativePaths,
+        source: 'gnomeCopiedFiles',
+        type: 'copy'
+      });
+    }
+    const handleDrop = getDropHandler(focusedIndex);
+    return handleDrop(state, fileHandles, [], paths, focusedIndex);
+  } catch (error) {
+    throw new VError(error, 'Failed to paste native files');
+  }
+};
+
 const handlePointerDown = (state, button, x, y) => {
   const index = getIndexFromPosition(state, x, y);
   if (button === LeftClick && index === -1) {
@@ -7032,14 +7210,8 @@ const getDragLabel = urls => {
   return String(urls.length);
 };
 
-const toUri = path => {
-  if (path.startsWith('file://')) {
-    return path;
-  }
-  return 'file://' + path;
-};
 const getDragData = urls => {
-  const data = urls.map(toUri).join('\n');
+  const data = urls.map(ensureUri).join('\n');
   const dragData = [{
     data,
     type: 'text/uri-list'
@@ -7055,6 +7227,7 @@ const getDragData = urls => {
 
 const renderDragData = (oldState, newState) => {
   const {
+    focusedIndex,
     isPointerDown,
     items,
     pointerDownIndex,
@@ -7063,9 +7236,16 @@ const renderDragData = (oldState, newState) => {
   if (!isPointerDown) {
     return [];
   }
-  const selected = items.filter((item, index) => item.selected || index === pointerDownIndex);
-  const urls = selected.map(item => item.path);
-  const dragData = getDragData(urls);
+  const pointerDownItem = items[pointerDownIndex];
+  let draggedItems;
+  if (pointerDownIndex === focusedIndex || pointerDownItem?.selected) {
+    draggedItems = getSelectedItems(items, focusedIndex);
+  } else if (pointerDownItem) {
+    draggedItems = [pointerDownItem];
+  } else {
+    draggedItems = [];
+  }
+  const dragData = getDragData(draggedItems.map(item => item.path));
   return ['Viewlet.setDragData', uid, dragData];
 };
 
@@ -7146,6 +7326,7 @@ const HandleInputClick = 9;
 const HandleKeyDown = 21;
 const HandleListBlur = 11;
 const HandleListFocus = 12;
+const HandleNativePaste = 26;
 const HandlePointerDown = 14;
 const HandlePointerUp = 25;
 const HandleScrollBarMove = 22;
@@ -7341,6 +7522,7 @@ const getListItemsVirtualDom = (visibleItems, focusedIndex, focused, dropTargets
     onDragStart: HandleDragStart,
     onDrop: HandleDrop,
     onFocus: HandleListFocus,
+    onPaste: HandleNativePaste,
     onPointerDown: HandlePointerDown,
     onPointerUp: HandlePointerUp,
     onWheel: HandleWheel,
@@ -7709,6 +7891,10 @@ const renderEventListeners = () => {
     name: HandleDrop,
     params: ['handleDrop', ClientX, ClientY, DataTransferFiles2],
     preventDefault: true
+  }, {
+    name: HandleNativePaste,
+    params: ['handleNativePaste', 'event.clipboardData.files2'],
+    preventDefault: true
   }, {
     name: HandleDragLeave,
     params: ['handleDragLeave']
@@ -8083,6 +8269,7 @@ const commandMap = {
   'Explorer.handleInputClick': wrapListItemCommand(handleInputClick),
   'Explorer.handleInputKeyDown': wrapListItemCommand(handleInputKeyDown),
   'Explorer.handleKeyDown': wrapListItemCommand(handleKeyDown),
+  'Explorer.handleNativePaste': wrapListItemCommand(handleNativePaste),
   'Explorer.handlePaste': wrapListItemCommand(handlePaste),
   'Explorer.handlePointerDown': wrapListItemCommand(handlePointerDown),
   'Explorer.handlePointerUp': wrapListItemCommand(handlePointerUp),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "7.21.2",
+  "version": "7.22.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",