@lvce-editor/explorer-view 2.13.0 → 2.14.0

package/dist/explorerViewWorkerMain.js

@@ -981,6 +981,10 @@ const getMissingIconRequests = (dirents, fileIconCache) => {
   return missingRequests;
 };
 
+const getPath = dirent => {
+  return dirent.path;
+};
+
 const BlockDevice = 1;
 const CharacterDevice = 2;
 const Directory = 3;
@@ -1037,7 +1041,7 @@ const getFileIcons = async (dirents, fileIconCache) => {
   const missingRequests = getMissingIconRequests(dirents, fileIconCache);
   const newIcons = await requestFileIcons(missingRequests);
   const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
-  const paths = dirents.map(dirent => dirent.path);
+  const paths = dirents.map(getPath);
   const icons = getIconsCached(paths, newFileIconCache);
   return {
     icons,
@@ -2598,12 +2602,14 @@ const handleContextMenuMouseAt = async (state, x, y) => {
   number(x);
   number(y);
   const focusedIndex = getIndexFromPosition(state, x, y);
-  await show(x, y, Explorer$1);
-  return {
+  const newState = {
     ...state,
     focusedIndex,
     focused: false
   };
+  set(state.uid, state, newState);
+  await show(x, y, Explorer$1);
+  return state;
 };
 
 const getContextMenuHandler = button => {
@@ -3072,15 +3078,7 @@ const handleFocus = async state => {
   return state;
 };
 
-const updateIcon = dirent => {
-  return {
-    ...dirent,
-    icon: ''
-  };
-};
-
 const updateIcons = async state => {
-  const newDirents = state.items.map(updateIcon);
   const {
     items,
     minLineY,
@@ -3093,7 +3091,6 @@ const updateIcons = async state => {
   } = await getFileIcons(visible, Object.create(null));
   return {
     ...state,
-    items: newDirents,
     icons,
     fileIconCache: newFileIconCache
   };
@@ -3489,7 +3486,7 @@ const newFolder = state => {
   return newDirent(state, CreateFolder);
 };
 
-const getContaingingFolder = (root, dirents, focusedIndex, pathSeparator) => {
+const getContainingFolder = (root, dirents, focusedIndex, pathSeparator) => {
   if (focusedIndex < 0) {
     return root;
   }
@@ -3499,13 +3496,18 @@ const getContaingingFolder = (root, dirents, focusedIndex, pathSeparator) => {
   const path = `${direntParentPath}`;
   return path;
 };
+
+const openNativeFolder = async path => {
+  await invoke('OpenNativeFolder.openNativeFolder', /* path */path);
+};
+
 const openContainingFolder = async state => {
   const {
     focusedIndex,
     root,
     items} = state;
-  const path = getContaingingFolder(root, items, focusedIndex);
-  await invoke('OpenNativeFolder.openNativeFolder', /* path */path);
+  const path = getContainingFolder(root, items, focusedIndex);
+  await openNativeFolder(path);
   return state;
 };
 
@@ -4166,23 +4168,22 @@ const orderDirents = dirents => {
   if (dirents.length === 0) {
     return dirents;
   }
-  // const parentMap = Object.create(null)
-  // for(const dirent of dirents){
-  //   const parentPath = dirent.slice(0, dirent.lastIndexOf('/'))
-  //   parentMap[parentPath]||=[]
-  //   parentMap[parentPath].push(dirent)
-  // }
-  const withDeepChildren = parent => {
+  const withDeepChildren = (parent, processed) => {
+    if (processed.has(parent.path)) {
+      return [];
+    }
+    processed.add(parent.path);
     const children = [];
     for (const dirent of dirents) {
       if (dirent.depth === parent.depth + 1 && dirent.path.startsWith(parent.path)) {
-        children.push(dirent, ...withDeepChildren(dirent));
+        children.push(...withDeepChildren(dirent, processed));
       }
     }
     return [parent, ...children];
   };
   const topLevelDirents = dirents.filter(isTopLevel);
-  const ordered = topLevelDirents.flatMap(withDeepChildren);
+  const processed = new Set();
+  const ordered = topLevelDirents.flatMap(dirent => withDeepChildren(dirent, processed));
   return ordered;
 };
 
@@ -4355,10 +4356,6 @@ const revealItem = async (state, uri) => {
   return revealItemVisible(state, index);
 };
 
-const getPath = dirent => {
-  return dirent.path;
-};
-
 const isExpandedDirectory = dirent => {
   return dirent.type === DirectoryExpanded;
 };

package/package.json

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