@lvce-editor/explorer-view 1.22.0 → 1.24.0

package/dist/explorerViewWorkerMain.js

@@ -1600,15 +1600,6 @@ const expandAll = async state => {
   };
 };
 
-const getParentEndIndex = (dirents, index) => {
-  const dirent = dirents[index];
-  let endIndex = index + 1;
-  while (endIndex < dirents.length && dirents[endIndex].depth > dirent.depth) {
-    endIndex++;
-  }
-  return endIndex;
-};
-
 const makeExpanded = dirent => {
   if (dirent.type === Directory) {
     return {
@@ -1619,6 +1610,35 @@ const makeExpanded = dirent => {
   return dirent;
 };
 
+// TODO this is very inefficient
+const getChildDirentsRecursively = async (dirent, pathSeparator) => {
+  switch (dirent.type) {
+    case File:
+      return [dirent];
+    case Directory:
+    case DirectoryExpanding:
+    case DirectoryExpanded:
+      const childDirents = await getChildDirents(pathSeparator, dirent);
+      const all = [makeExpanded(dirent)];
+      for (const childDirent of childDirents) {
+        const childAll = await getChildDirentsRecursively(childDirent, pathSeparator);
+        all.push(...childAll);
+      }
+      return all;
+    default:
+      return [];
+  }
+};
+
+const getParentEndIndex = (dirents, index) => {
+  const dirent = dirents[index];
+  let endIndex = index + 1;
+  while (endIndex < dirents.length && dirents[endIndex].depth > dirent.depth) {
+    endIndex++;
+  }
+  return endIndex;
+};
+
 const expandRecursively = async state => {
   const {
     items,
@@ -1637,47 +1657,42 @@ const expandRecursively = async state => {
   if (dirent.type !== Directory && dirent.type !== DirectoryExpanding && dirent.type !== DirectoryExpanded) {
     return state;
   }
-  // TODO this is very inefficient
-  const getChildDirentsRecursively = async dirent => {
-    switch (dirent.type) {
-      case File:
-        return [dirent];
-      case Directory:
-      case DirectoryExpanding:
-      case DirectoryExpanded:
-        const childDirents = await getChildDirents(pathSeparator, dirent);
-        const all = [makeExpanded(dirent)];
-        for (const childDirent of childDirents) {
-          const childAll = await getChildDirentsRecursively(childDirent);
-          all.push(...childAll);
-        }
-        return all;
-      default:
-        return [];
-    }
-  };
   // TODO race condition: what if folder is being collapse while it is recursively expanding?
   // TODO race condition: what if folder is being deleted while it is recursively expanding?
   // TODO race condition: what if a new file/folder is created while the folder is recursively expanding?
   // @ts-ignore
-  const childDirents = await getChildDirentsRecursively(dirent);
+  const childDirents = await getChildDirentsRecursively(dirent, pathSeparator);
   const startIndex = focusedIndex;
   if (focusedIndex >= 0) {
     const endIndex = getParentEndIndex(items, focusedIndex);
     const newDirents = [...items.slice(0, startIndex), ...childDirents, ...items.slice(endIndex)];
     const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, newDirents.length);
+    const visible = newDirents.slice(minLineY, maxLineY);
+    const {
+      icons,
+      newFileIconCache
+    } = await getFileIcons(visible, state.fileIconCache);
     return {
       ...state,
       items: newDirents,
-      maxLineY
+      maxLineY,
+      icons,
+      fileIconCache: newFileIconCache
     };
   }
   const newDirents = childDirents.slice(1);
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, newDirents.length);
+  const visible = newDirents.slice(minLineY, maxLineY);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visible, state.fileIconCache);
   return {
     ...state,
     items: newDirents,
-    maxLineY
+    maxLineY,
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 
@@ -3203,7 +3218,7 @@ const handleUpload = async (state, dirents) => {
   }
 };
 
-const setDeltaY = (state, deltaY) => {
+const setDeltaY = async (state, deltaY) => {
   const {
     itemHeight,
     height,
@@ -3219,11 +3234,18 @@ const setDeltaY = (state, deltaY) => {
   }
   const minLineY = Math.round(deltaY / itemHeight);
   const maxLineY = minLineY + Math.round(height / itemHeight);
+  const visible = items.slice(minLineY, maxLineY);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visible, state.fileIconCache);
   return {
     ...state,
     deltaY,
     minLineY,
-    maxLineY
+    maxLineY,
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 

package/package.json

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