@lvce-editor/explorer-view 2.54.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);
@@ -3680,6 +3680,49 @@ const handleKeyDown = (state, key) => {
   };
 };
 
+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
+  };
+};
+
+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('.');
@@ -3756,17 +3799,13 @@ const handlePasteCopy = async (state, nativeFiles) => {
   // TODO only update folder at which level it changed
   const latestState = await refresh(state);
 
-  // Focus on the first newly created file
+  // 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 {
-        ...latestState,
-        focusedIndex: newFileIndex,
-        focused: true
-      };
+      return adjustScrollAfterPaste(latestState, newFileIndex);
     }
   }
   // If there are no items, ensure focusedIndex is 0
@@ -3784,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) => {
@@ -3797,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;
@@ -3823,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
@@ -4312,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 => {
@@ -5132,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.54.0",
+  "version": "2.55.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",