@lvce-editor/explorer-view 1.23.0 → 1.25.0

package/dist/explorerViewWorkerMain.js

@@ -898,18 +898,6 @@ const compareDirent = (direntA, direntB) => {
   return compareDirentType(direntA, direntB) || compareDirentName(direntA, direntB);
 };
 
-const getFileIcon = ({
-  name
-}) => {
-  return '';
-};
-const getIcon = dirent => {
-  return '';
-};
-const getFolderIcon = dirent => {
-  return '';
-};
-
 // TODO use posInSet and setSize properties to compute more effectively
 const computeExplorerRenamedDirent = (dirents, index, newName) => {
   let startIndex = index;
@@ -921,9 +909,7 @@ const computeExplorerRenamedDirent = (dirents, index, newName) => {
     ...oldDirent,
     name: newName,
     path: oldDirent.path.slice(0, -oldDirent.name.length) + newName,
-    icon: getFileIcon({
-      name: newName
-    })
+    icon: ''
   };
   const {
     depth
@@ -1111,7 +1097,7 @@ const acceptCreate = async (state, newDirentType, createFn) => {
     type: newDirentType,
     icon: ''
   };
-  newDirent.icon = getIcon();
+  newDirent.icon = '';
   let insertIndex = state.focusedIndex;
   let deltaPosInSet = 0;
   let posInSet = 1;
@@ -1441,7 +1427,7 @@ const toDisplayDirents = (pathSeparator, rawDirents, parentDirent, excluded) =>
       type: rawDirent.type,
       path,
       // TODO storing absolute path might be too costly, could also store relative path here
-      icon: getIcon()
+      icon: ''
     };
   };
   const result = [];
@@ -1600,15 +1586,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 +1596,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 +1643,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
   };
 };
 
@@ -2422,7 +2423,7 @@ const handleClickDirectoryExpanded = async (state, dirent, index, keepFocus) =>
   // @ts-ignore
   dirent.type = Directory;
   // @ts-ignore
-  dirent.icon = getIcon();
+  dirent.icon = '';
   const endIndex = getParentEndIndex(state.items, index);
   const removeCount = endIndex - index - 1;
   // TODO race conditions and side effects are everywhere
@@ -2523,7 +2524,7 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   // @ts-ignore
   dirent.type = DirectoryExpanded;
   // @ts-ignore
-  dirent.icon = getIcon();
+  dirent.icon = '';
   const {
     height,
     itemHeight,
@@ -2616,7 +2617,7 @@ const handleClickDirectoryExpanding = async (state, dirent, index, keepFocus) =>
   // @ts-ignore
   dirent.type = Directory;
   // @ts-ignore
-  dirent.icon = getIcon();
+  dirent.icon = '';
   return {
     ...state,
     focusedIndex: index,
@@ -3041,15 +3042,27 @@ const handleFocus = async state => {
 const updateIcon = dirent => {
   return {
     ...dirent,
-    icon: getIcon()
+    icon: ''
   };
 };
 
-const updateIcons = state => {
+const updateIcons = async state => {
   const newDirents = state.items.map(updateIcon);
+  const {
+    items,
+    minLineY,
+    maxLineY
+  } = state;
+  const visible = items.slice(minLineY, maxLineY);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visible, Object.create(null));
   return {
     ...state,
-    items: newDirents
+    items: newDirents,
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 
@@ -3283,7 +3296,7 @@ const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
         depth,
         posInSet: i + 1,
         setSize: visibleLength,
-        icon: getFolderIcon(),
+        icon: '',
         name,
         path: childPath,
         type: DirectoryExpanded
@@ -3294,7 +3307,7 @@ const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
         depth,
         posInSet: i + 1,
         setSize: visibleLength,
-        icon: getIcon(),
+        icon: '',
         name,
         path: childPath,
         type
@@ -3977,9 +3990,7 @@ const terminate = () => {
 };
 
 const updateEditingValue = (state, value) => {
-  const editingIcon = getFileIcon({
-    name: value
-  });
+  const editingIcon = '';
   return {
     ...state,
     editingValue: value,

package/package.json

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