@lvce-editor/explorer-view 2.53.0 → 2.55.0

package/dist/explorerViewWorkerMain.js

@@ -889,7 +889,7 @@ const Copy$2 = 3;
 const Rename$2 = 4;
 
 const rpcs = Object.create(null);
-const set$f = (id, rpc) => {
+const set$g = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -913,7 +913,7 @@ const create$2 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$f(rpcId, rpc);
+      set$g(rpcId, rpc);
     },
     async dispose() {
       const rpc = get$1(rpcId);
@@ -1005,9 +1005,6 @@ const dirname = (pathSeparator, path) => {
 const dirname2 = path => {
   return dirname('/', path);
 };
-const join = (pathSeparator, ...parts) => {
-  return parts.join(pathSeparator);
-};
 const getBaseName = (pathSeparator, path) => {
   return path.slice(path.lastIndexOf(pathSeparator) + 1);
 };
@@ -1844,6 +1841,7 @@ const writeText = async text => {
   await invoke$1('ClipBoard.writeText', /* text */text);
 };
 const readNativeFiles = async () => {
+  // @ts-ignore
   return invoke$1('ClipBoard.readNativeFiles');
 };
 const writeNativeFiles = async (type, files) => {
@@ -3361,12 +3359,12 @@ const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) =
   return true;
 };
 
-const mergeDirents$2 = (oldDirents, newDirents) => {
+const mergeDirents$1 = (oldDirents, newDirents) => {
   return newDirents;
 };
 const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
   const childDirents = await getChildDirents(pathSeparator, root, 0);
-  const mergedDirents = mergeDirents$2(dirents, childDirents);
+  const mergedDirents = mergeDirents$1(dirents, childDirents);
   return mergedDirents;
 };
 const handleDrop$2 = async (state, fileHandles, files) => {
@@ -3414,12 +3412,12 @@ const copyFilesElectron = async (root, pathSeparator, fileHandles, files, paths)
   await applyFileOperations(operations);
 };
 
-const mergeDirents$1 = (oldDirents, newDirents) => {
+const mergeDirents = (oldDirents, newDirents) => {
   return newDirents;
 };
 const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
   const childDirents = await getChildDirents(pathSeparator, root, 0);
-  const mergedDirents = mergeDirents$1(dirents, childDirents);
+  const mergedDirents = mergeDirents(dirents, childDirents);
   return mergedDirents;
 };
 const handleDrop$1 = async (state, fileHandles, files, paths) => {
@@ -3682,41 +3680,102 @@ const handleKeyDown = (state, key) => {
   };
 };
 
-const getTopLevelDirents = (root, pathSeparator, excluded) => {
-  if (!root) {
-    return [];
+const scrollInto = (index, minLineY, maxLineY) => {
+  const diff = maxLineY - minLineY;
+  const smallerHalf = Math.floor(diff / 2);
+  const largerHalf = diff - smallerHalf;
+  if (index < minLineY) {
+    return {
+      newMinLineY: index - smallerHalf,
+      newMaxLineY: index + largerHalf
+    };
+  }
+  if (index >= maxLineY) {
+    return {
+      newMinLineY: index - smallerHalf,
+      newMaxLineY: index + largerHalf
+    };
   }
-  return getChildDirents(pathSeparator, root, 0, excluded);
+  return {
+    newMinLineY: minLineY,
+    newMaxLineY: maxLineY
+  };
 };
 
-const mergeDirents = (oldDirents, newDirents) => {
-  const merged = [];
-  for (const newDirent of newDirents) {
-    merged.push(newDirent);
+const adjustScrollAfterPaste = (state, focusedIndex) => {
+  const {
+    minLineY,
+    maxLineY,
+    itemHeight
+  } = state;
+  const {
+    newMinLineY,
+    newMaxLineY
+  } = scrollInto(focusedIndex, minLineY, maxLineY);
+  const newDeltaY = newMinLineY * itemHeight;
+  return {
+    ...state,
+    focusedIndex,
+    focused: true,
+    minLineY: newMinLineY,
+    maxLineY: newMaxLineY,
+    deltaY: newDeltaY
+  };
+};
+
+const generateUniqueName = (baseName, existingPaths, root) => {
+  // Handle files with extensions
+  const lastDotIndex = baseName.lastIndexOf('.');
+  const hasExtension = lastDotIndex !== -1 && lastDotIndex !== 0 && lastDotIndex !== baseName.length - 1;
+  let nameWithoutExtension;
+  let extension;
+  if (hasExtension) {
+    nameWithoutExtension = baseName.slice(0, lastDotIndex);
+    extension = baseName.slice(lastDotIndex);
+  } else {
+    nameWithoutExtension = baseName;
+    extension = '';
+  }
+
+  // Check if original name exists
+  const originalPath = join2(root, baseName);
+  if (!existingPaths.includes(originalPath)) {
+    return baseName;
+  }
+
+  // Try "original copy"
+  const copyName = `${nameWithoutExtension} copy${extension}`;
+  const copyPath = join2(root, copyName);
+  if (!existingPaths.includes(copyPath)) {
+    return copyName;
+  }
+
+  // Try "original copy 1", "original copy 2", etc.
+  let counter = 1;
+  while (true) {
+    const numberedCopyName = `${nameWithoutExtension} copy ${counter}${extension}`;
+    const numberedCopyPath = join2(root, numberedCopyName);
+    if (!existingPaths.includes(numberedCopyPath)) {
+      return numberedCopyName;
+    }
+    counter++;
   }
-  return merged;
 };
 
-// TODO add lots of tests for this
-const updateRoot = async state1 => {
-  // @ts-ignore
-  if (state1.disposed) {
-    return state1;
+const getFileOperationsCopy = (root, existingUris, files) => {
+  const operations = [];
+  for (const file of files) {
+    const baseName = getBaseName('/', file);
+    const uniqueName = generateUniqueName(baseName, existingUris, root);
+    const newUri = join2(root, uniqueName);
+    operations.push({
+      type: Copy$2,
+      from: file,
+      // TODO ensure file is uri
+      path: newUri
+    });
   }
-  // const file = nativeFiles.files[0]
-  // @ts-ignore
-  const topLevelDirents = await getTopLevelDirents(state1.root, state1.pathSeparator, []);
-  // const state2 = Viewlet.getState('Explorer')
-  // // TODO what if root changes while reading directories?
-  // if (state2.disposed || state2.root !== state1.root) {
-  //   return state2
-  // }
-  const newDirents = mergeDirents(state1.items, topLevelDirents);
-  const state3 = {
-    ...state1,
-    items: newDirents
-  };
-  return state3;
+  return operations;
 };
 
 const handlePasteCopy = async (state, nativeFiles) => {
@@ -3725,13 +3784,38 @@ const handlePasteCopy = async (state, nativeFiles) => {
   // TODO handle pasting files into broken symlink
   // TODO handle pasting files into hardlink
   // TODO what if folder is big and it takes a long time
-  for (const source of nativeFiles.files) {
-    // @ts-ignore
-    const target = join(state.pathSeperator, state.root, getBaseName(state.pathSeparator, source));
-    await copy$1(source, target);
-  }
+
+  // TODO use file operations and bulk edit
+  const {
+    items,
+    root
+  } = state;
+  const existingUris = items.map(item => item.path);
+  const operations = getFileOperationsCopy(root, existingUris, nativeFiles.files);
+  // TODO handle error?
+  await applyFileOperations(operations);
+
+  // TODO use refreshExplorer with the paths that have been affected by file operations
   // TODO only update folder at which level it changed
-  return updateRoot(state);
+  const latestState = await refresh(state);
+
+  // Focus on the first newly created file and adjust scroll position
+  const newFilePaths = operations.map(operation => operation.path);
+  if (newFilePaths.length > 0) {
+    const firstNewFilePath = newFilePaths[0];
+    const newFileIndex = getIndex(latestState.items, firstNewFilePath);
+    if (newFileIndex !== -1) {
+      return adjustScrollAfterPaste(latestState, newFileIndex);
+    }
+  }
+  // If there are no items, ensure focusedIndex is 0
+  if (latestState.items.length === 0) {
+    return {
+      ...latestState,
+      focusedIndex: 0
+    };
+  }
+  return latestState;
 };
 
 const handlePasteCut = async (state, nativeFiles) => {
@@ -3739,7 +3823,20 @@ const handlePasteCut = async (state, nativeFiles) => {
     const target = `${state.root}${state.pathSeparator}${getBaseName(state.pathSeparator, source)}`;
     await rename$1(source, target);
   }
-  return state;
+
+  // Refresh the state after cut operations
+  const latestState = await refresh(state);
+
+  // Focus on the first pasted file and adjust scroll position
+  if (nativeFiles.files.length > 0) {
+    const firstPastedFile = nativeFiles.files[0];
+    const targetPath = `${state.root}${state.pathSeparator}${getBaseName(state.pathSeparator, firstPastedFile)}`;
+    const pastedFileIndex = getIndex(latestState.items, targetPath);
+    if (pastedFileIndex !== -1) {
+      return adjustScrollAfterPaste(latestState, pastedFileIndex);
+    }
+  }
+  return latestState;
 };
 
 const handlePasteNone = async (state, nativeFiles) => {
@@ -3752,18 +3849,6 @@ const Copy = 'copy';
 const Cut = 'cut';
 
 const getPasteHandler = type => {
-  // TODO detect cut/paste event, not sure if that is possible
-  // TODO check that pasted folder is not a parent folder of opened folder
-  // TODO support pasting multiple paths
-  // TODO what happens when pasting multiple paths, but some of them error?
-  // how many error messages should be shown? Should the operation be undone?
-  // TODO what if it is a large folder and takes a long time to copy? Should show progress
-  // TODO what if there is a permission error? Probably should show a modal to ask for permission
-  // TODO if error is EEXISTS, just rename the copy (e.g. file-copy-1.txt, file-copy-2.txt)
-  // TODO actual target should be selected folder
-  // TODO but what if a file is currently selected? Then maybe the parent folder
-  // TODO but will it work if the folder is a symlink?
-  // TODO handle error gracefully when copy fails
   switch (type) {
     case None$3:
       return handlePasteNone;
@@ -3778,6 +3863,9 @@ const getPasteHandler = type => {
 
 const handlePaste = async state => {
   const nativeFiles = await readNativeFiles();
+  if (!nativeFiles) {
+    return state;
+  }
   // TODO detect cut/paste event, not sure if that is possible
   // TODO check that pasted folder is not a parent folder of opened folder
   // TODO support pasting multiple paths
@@ -4267,7 +4355,11 @@ const removeDirent = async state => {
   // TODO use file operations, bulk edit and explorer refresh
   await removePaths(toRemove);
   const newState = await refresh(state);
-  return newState;
+  return {
+    ...newState,
+    focused: true,
+    focus: List
+  };
 };
 
 const getEditingType = direntType => {
@@ -5087,28 +5179,6 @@ const mergeVisibleWithHiddenItems = (visibleItems, hiddenItems) => {
   return unique;
 };
 
-const scrollInto = (index, minLineY, maxLineY) => {
-  const diff = maxLineY - minLineY;
-  const smallerHalf = Math.floor(diff / 2);
-  const largerHalf = diff - smallerHalf;
-  if (index < minLineY) {
-    return {
-      newMinLineY: index - smallerHalf,
-      newMaxLineY: index + largerHalf
-    };
-  }
-  if (index >= maxLineY) {
-    return {
-      newMinLineY: index - smallerHalf,
-      newMaxLineY: index + largerHalf
-    };
-  }
-  return {
-    newMinLineY: minLineY,
-    newMaxLineY: maxLineY
-  };
-};
-
 // TODO maybe just insert items into explorer and refresh whole explorer
 const revealItemHidden = async (state, uri) => {
   const {

package/package.json

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