@lvce-editor/explorer-view 1.24.0 → 1.26.0

package/dist/explorerViewWorkerMain.js

@@ -779,12 +779,12 @@ const invokeAndTransfer = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, true);
 };
 
-const commands$1 = Object.create(null);
+const commands = Object.create(null);
 const register = commandMap => {
-  Object.assign(commands$1, commandMap);
+  Object.assign(commands, commandMap);
 };
 const getCommand = key => {
-  return commands$1[key];
+  return commands[key];
 };
 const execute = (command, ...args) => {
   const fn = getCommand(command);
@@ -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 = [];
@@ -1903,9 +1889,10 @@ const getActions = root => {
   }];
 };
 
-const commands = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleCopy', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'refresh', 'relealItem', 'removeDirent', 'rename', 'renameDirent', 'revealItem', 'scrollDown', 'scrollUp', 'setDeltaY', 'updateEditingValue', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleCopy', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'refresh', 'relealItem', 'removeDirent', 'rename', 'renameDirent', 'revealItem', 'scrollDown', 'scrollUp', 'setDeltaY', 'renderEventListeners', 'updateEditingValue', 'updateIcons'];
+
 const getCommandIds = () => {
-  return commands;
+  return commandIds;
 };
 
 const None$4 = 'none';
@@ -2078,6 +2065,12 @@ const getExplorerWelcomeVirtualDom = isWide => {
   }, text(openFolder$1())];
 };
 
+const getActiveDescendant = focusedIndex => {
+  if (focusedIndex >= 0) {
+    return 'TreeItemActive';
+  }
+  return undefined;
+};
 const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused) => {
   if (!root) {
     return getExplorerWelcomeVirtualDom(isWide);
@@ -2090,7 +2083,7 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
     role: Tree,
     ariaLabel: filesExplorer(),
     childCount: visibleItems.length,
-    ariaActiveDescendant: focusedIndex >= 0 ? 'TreeItemActive' : undefined,
+    ariaActiveDescendant: getActiveDescendant(focusedIndex),
     onFocus: HandleFocus,
     onBlur: HandleBlur,
     onContextMenu: HandleContextMenu,
@@ -2437,7 +2430,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
@@ -2538,7 +2531,7 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   // @ts-ignore
   dirent.type = DirectoryExpanded;
   // @ts-ignore
-  dirent.icon = getIcon();
+  dirent.icon = '';
   const {
     height,
     itemHeight,
@@ -2631,7 +2624,7 @@ const handleClickDirectoryExpanding = async (state, dirent, index, keepFocus) =>
   // @ts-ignore
   dirent.type = Directory;
   // @ts-ignore
-  dirent.icon = getIcon();
+  dirent.icon = '';
   return {
     ...state,
     focusedIndex: index,
@@ -3056,15 +3049,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
   };
 };
 
@@ -3298,7 +3303,7 @@ const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
         depth,
         posInSet: i + 1,
         setSize: visibleLength,
-        icon: getFolderIcon(),
+        icon: '',
         name,
         path: childPath,
         type: DirectoryExpanded
@@ -3309,7 +3314,7 @@ const getSavedChildDirents = (map, path, depth, excluded, pathSeparator) => {
         depth,
         posInSet: i + 1,
         setSize: visibleLength,
-        icon: getIcon(),
+        icon: '',
         name,
         path: childPath,
         type
@@ -3962,14 +3967,9 @@ const isExpandedDirectory = dirent => {
 };
 
 const saveState = uid => {
-  let newState;
-  if (typeof uid === 'number') {
-    const value = get(uid);
-    newState = value.newState;
-  } else {
-    // deprecated
-    newState = uid;
-  }
+  number(uid);
+  const value = get(uid);
+  const newState = value.newState;
   const {
     items,
     root,
@@ -3992,9 +3992,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.24.0",
+  "version": "1.26.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",