@lvce-editor/explorer-view 2.54.0 → 2.56.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);
@@ -995,6 +995,23 @@ const applyFileOperations = async operations => {
   }
 };
 
+const DELTA_EDITING = 100;
+
+const BlockDevice = 1;
+const CharacterDevice = 2;
+const Directory = 3;
+const DirectoryExpanded = 4;
+const DirectoryExpanding = 5;
+const File = 7;
+const Socket = 8;
+const Symlink = 9;
+const SymLinkFile = 10;
+const SymLinkFolder = 11;
+const Unknown = 12;
+const EditingFile = File + DELTA_EDITING;
+const EditingFolder = Directory + DELTA_EDITING;
+const EditingDirectoryExpanded = DirectoryExpanded + DELTA_EDITING;
+
 const dirname = (pathSeparator, path) => {
   const index = path.lastIndexOf(pathSeparator);
   if (index === -1) {
@@ -1015,16 +1032,32 @@ const join2 = (path, childPath) => {
   return `${path}/${childPath}`;
 };
 
+const getActualType = (type, expanded) => {
+  const actualType = type === Directory && expanded ? DirectoryExpanded : type;
+  return actualType;
+};
 const createTree = (items, root) => {
   const tree = Object.create(null);
   const rootLength = root.length;
-  for (const item of items) {
+  const paths = items.map(item => {
     const relativePath = item.path.slice(rootLength);
     const dirname = dirname2(relativePath);
+    return dirname;
+  });
+  for (const item of items) {
+    const {
+      type,
+      name,
+      path
+    } = item;
+    const relativePath = path.slice(rootLength);
+    const dirname = dirname2(relativePath);
+    const isExpanded = paths.includes(relativePath);
+    const actualType = getActualType(type, isExpanded);
     tree[dirname] ||= [];
     tree[dirname].push({
-      name: item.name,
-      type: item.type
+      name,
+      type: actualType
     });
   }
   return tree;
@@ -1076,23 +1109,6 @@ const getPaths = items => {
   return items.map(getPath);
 };
 
-const DELTA_EDITING = 100;
-
-const BlockDevice = 1;
-const CharacterDevice = 2;
-const Directory = 3;
-const DirectoryExpanded = 4;
-const DirectoryExpanding = 5;
-const File = 7;
-const Socket = 8;
-const Symlink = 9;
-const SymLinkFile = 10;
-const SymLinkFolder = 11;
-const Unknown = 12;
-const EditingFile = File + DELTA_EDITING;
-const EditingFolder = Directory + DELTA_EDITING;
-const EditingDirectoryExpanded = DirectoryExpanded + DELTA_EDITING;
-
 const getSimpleIconRequestType = direntType => {
   if (direntType === Directory || direntType === DirectoryExpanded || direntType === EditingDirectoryExpanded || direntType === EditingFolder) {
     return 2;
@@ -1197,13 +1213,14 @@ const getPathParts = (root, uri, pathSeparator) => {
   const parts = [];
   let index = root.length - 1;
   let depth = 0;
-  while ((index = uri.indexOf('/', index + 1)) !== -1) {
+  while ((index = uri.indexOf(pathSeparator, index + 1)) !== -1) {
     const partUri = uri.slice(0, index);
     parts.push({
       path: partUri,
       depth: depth++,
       root,
-      pathSeparator
+      pathSeparator,
+      expanded: true
     });
   }
   return parts;
@@ -1310,14 +1327,14 @@ const sortExplorerItems = rawDirents => {
 };
 
 // TODO figure out whether this uses too much memory (name,path -> redundant, depth could be computed on demand)
-const toDisplayDirent = (parentPath, parentDepth, rawDirent, index, length) => {
-  const path = join2(parentPath, rawDirent.name);
+const toDisplayDirent = (parentPath, parentDepth, rawDirentType, rawDirentName, index, length) => {
+  const path = join2(parentPath, rawDirentName);
   return {
-    name: rawDirent.name,
+    name: rawDirentName,
     posInSet: index + 1,
     setSize: length,
     depth: parentDepth + 1,
-    type: rawDirent.type,
+    type: rawDirentType,
     path,
     // TODO storing absolute path might be too costly, could also store relative path here
     icon: '',
@@ -1325,7 +1342,7 @@ const toDisplayDirent = (parentPath, parentDepth, rawDirent, index, length) => {
   };
 };
 
-const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded) => {
+const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDirentDepth, excluded, expanded = false) => {
   rawDirents = sortExplorerItems(rawDirents);
   const result = [];
   const visibleItems = rawDirents.filter(item => {
@@ -1337,7 +1354,7 @@ const toDisplayDirents = (pathSeparator, rawDirents, parentDirentPath, parentDir
   const count = visibleItems.length;
   for (let i = 0; i < visibleItems.length; i++) {
     const rawDirent = visibleItems[i];
-    result.push(toDisplayDirent(parentDirentPath, parentDirentDepth, rawDirent, i, count));
+    result.push(toDisplayDirent(parentDirentPath, parentDirentDepth, rawDirent.type, rawDirent.name, i, count));
   }
   return result;
 };
@@ -1448,6 +1465,7 @@ const CopyPath = 'Copy Path';
 const CopyRelativePath = 'Copy Relative Path';
 const Cut$1 = 'Cut';
 const Delete$1 = 'Delete';
+const FileNameCannotStartWithSlash = 'A file or folder name cannot start with a slash.';
 const FileOrFolderNameMustBeProvider = 'A file or folder name must be provided.';
 const FilesExplorer = 'Files Explorer';
 const NewFile$1 = 'New File...';
@@ -1512,6 +1530,9 @@ const openFolder$1 = () => {
 const fileOrFolderNameMustBeProvided = () => {
   return i18nString(FileOrFolderNameMustBeProvider);
 };
+const fileCannotStartWithSlash = () => {
+  return i18nString(FileNameCannotStartWithSlash);
+};
 const typeAFileName = () => {
   return i18nString(TypeAFileName);
 };
@@ -1521,6 +1542,9 @@ const validateFileName2 = name => {
     const editingErrorMessage = fileOrFolderNameMustBeProvided();
     return editingErrorMessage;
   }
+  if (name.startsWith('/')) {
+    return fileCannotStartWithSlash();
+  }
   return '';
 };
 
@@ -3680,6 +3704,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 +3823,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 +3847,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 +3873,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 +3887,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 +4379,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 +5203,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.56.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",