@lvce-editor/explorer-view 1.15.0 → 1.17.0

package/dist/explorerViewWorkerMain.js

@@ -898,7 +898,7 @@ const compareDirent = (direntA, direntB) => {
   return compareDirentType(direntA, direntB) || compareDirentName(direntA, direntB);
 };
 
-const getFileIcon$1 = ({
+const getFileIcon = ({
   name
 }) => {
   return '';
@@ -921,7 +921,7 @@ const computeExplorerRenamedDirent = (dirents, index, newName) => {
     ...oldDirent,
     name: newName,
     path: oldDirent.path.slice(0, -oldDirent.name.length) + newName,
-    icon: getFileIcon$1({
+    icon: getFileIcon({
       name: newName
     })
   };
@@ -1005,7 +1005,7 @@ const computeExplorerRenamedDirent = (dirents, index, newName) => {
   };
 };
 
-const None$3 = 0;
+const None$5 = 0;
 const CreateFile = 1;
 const CreateFolder = 2;
 const Rename$1 = 3;
@@ -1155,7 +1155,7 @@ const acceptCreate = async (state, newDirentType, createFn) => {
     items: newDirents,
     editingIndex: -1,
     focusedIndex: insertIndex + 1,
-    editingType: None$3,
+    editingType: None$5,
     maxLineY: newMaxlineY
   };
 };
@@ -1189,7 +1189,7 @@ const acceptRename = async state => {
     ...state,
     editingIndex: -1,
     editingValue: '',
-    editingType: None$3,
+    editingType: None$5,
     editingIcon: '',
     focusedIndex,
     focused: true
@@ -1221,7 +1221,7 @@ const cancelEdit = state => {
     focused: true,
     editingIndex: -1,
     editingValue: '',
-    editingType: None$3
+    editingType: None$5
   };
 };
 
@@ -1408,6 +1408,59 @@ const getExplorerMaxLineY = (minLineY, height, itemHeight, direntsLength) => {
   return maxLineY;
 };
 
+const getIconsCached = (dirents, fileIconCache) => {
+  return dirents.map(dirent => fileIconCache[dirent.path]);
+};
+
+const getMissingIconRequests = (dirents, fileIconCache) => {
+  const missingRequests = [];
+  for (const dirent of dirents) {
+    if (!(dirent.path in fileIconCache)) {
+      missingRequests.push({
+        type: dirent.type,
+        name: dirent.name,
+        path: dirent.path
+      });
+    }
+  }
+  return missingRequests;
+};
+
+const requestFileIcons = async requests => {
+  const promises = requests.map(request => request.type === File ? invoke('IconTheme.getFileIcon', {
+    name: request.name
+  }) : invoke('IconTheme.getFolderIcon', {
+    name: request.name
+  }));
+  return Promise.all(promises);
+};
+
+const updateIconCache = (iconCache, missingRequests, newIcons) => {
+  if (missingRequests.length === 0) {
+    return iconCache;
+  }
+  const newFileIconCache = {
+    ...iconCache
+  };
+  for (let i = 0; i < missingRequests.length; i++) {
+    const request = missingRequests[i];
+    const icon = newIcons[i];
+    newFileIconCache[request.path] = icon;
+  }
+  return newFileIconCache;
+};
+
+const getFileIcons = async (dirents, fileIconCache) => {
+  const missingRequests = getMissingIconRequests(dirents, fileIconCache);
+  const newIcons = await requestFileIcons(missingRequests);
+  const newFileIconCache = updateIconCache(fileIconCache, missingRequests, newIcons);
+  const icons = getIconsCached(dirents, newFileIconCache);
+  return {
+    icons,
+    newFileIconCache
+  };
+};
+
 const expandAll = async state => {
   const {
     items,
@@ -1445,9 +1498,16 @@ const expandAll = async state => {
     }
   }
   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,
+    icons,
+    fileIconCache: newFileIconCache,
     maxLineY
   };
 };
@@ -1740,20 +1800,24 @@ const getActions = root => {
   }];
 };
 
-const None$2 = 'none';
+const None$4 = 'none';
 const ToolBar = 'toolbar';
 const Tree = 'tree';
 const TreeItem$1 = 'treeitem';
 
 const Actions = 'Actions';
 const Button$1 = 'Button';
+const ButtonNarrow = 'ButtonNarrow';
 const ButtonPrimary = 'ButtonPrimary';
+const ButtonWide = 'ButtonWide';
 const Chevron = 'Chevron';
 const Explorer$1 = 'Explorer';
 const FileIcon = 'FileIcon';
 const IconButton = 'IconButton';
 const InputBox = 'InputBox';
 const Label = 'Label';
+const MaskIconChevronDown = 'MaskIconChevronDown';
+const MaskIconChevronRight = 'MaskIconChevronRight';
 const TreeItem = 'TreeItem';
 const TreeItemActive = 'TreeItemActive';
 const Viewlet = 'Viewlet';
@@ -1764,6 +1828,7 @@ const HandleBlur = 'handleBlur';
 const HandleClick = 'handleClick';
 const handleClickOpenFolder$1 = 'handleClickOpenFolder';
 const HandleContextMenu = 'handleContextMenu';
+const HandleEditingInput = 'handleEditingInput';
 const HandleFocus = 'handleFocus';
 const HandlePointerDown = 'handlePointerDown';
 const HandleWheel = 'handleWheel';
@@ -1775,12 +1840,29 @@ const Text = 12;
 const Img = 17;
 const P = 50;
 
+const chevronDownVirtualDom = {
+  type: Div,
+  className: `${Chevron} ${MaskIconChevronDown}`,
+  childCount: 0
+};
+
+const chevronRightVirtualDom = {
+  type: Div,
+  className: `${Chevron} ${MaskIconChevronRight}`,
+  childCount: 0
+};
+
+const chevronDomNodes = [[], [chevronRightVirtualDom], [chevronDownVirtualDom]];
+const getChevronVirtualDom = chevronType => {
+  return chevronDomNodes[chevronType];
+};
+
 const getFileIconVirtualDom = icon => {
   return {
     type: Img,
     className: FileIcon,
     src: icon,
-    role: None$2,
+    role: None$4,
     childCount: 0
   };
 };
@@ -1795,76 +1877,26 @@ const text = data => {
   };
 };
 
-const getItemVirtualDomFile = item => {
-  const {
-    posInSet,
-    setSize,
-    icon,
-    name,
-    path,
-    depth,
-    isFocused,
-    isEditing,
-    indent
-  } = item;
-
-  // TODO avoid mutation
-  const dom = [];
-  dom.push({
-    type: Div,
-    role: TreeItem$1,
-    className: TreeItem,
-    draggable: true,
-    title: path,
-    ariaPosInSet: posInSet,
-    ariaSetSize: setSize,
-    ariaLevel: depth,
-    childCount: 2,
-    paddingLeft: indent,
-    ariaLabel: name,
-    ariaDescription: ''
-  }, getFileIconVirtualDom(icon));
+const label = {
+  type: Div,
+  className: Label,
+  childCount: 1
+};
+const getInputOrLabelDom = (isEditing, name) => {
   if (isEditing) {
-    dom.push({
+    return [{
       type: Input,
       className: InputBox,
       id: 'ExplorerInput',
-      onInput: 'handleEditingInput',
+      onInput: HandleEditingInput,
       childCount: 0,
       name: ExplorerInput
-    });
-  } else {
-    dom.push({
-      type: Div,
-      className: Label,
-      childCount: 1
-    }, text(name));
+    }];
   }
-  if (isFocused) {
-    // @ts-ignore
-    dom[0].id = 'TreeItemActive';
-    // @ts-ignore
-    dom[0].className += ' ' + TreeItemActive;
-  }
-  return dom;
-};
-
-const getChevronDownVirtualDom = () => {
-  return {
-    type: Div,
-    className: `${Chevron} MaskIconChevronDown`,
-    childCount: 0
-  };
-};
-const getChevronRightVirtualDom = () => {
-  return {
-    type: Div,
-    className: `${Chevron} MaskIconChevronRight`,
-    childCount: 0
-  };
+  return [label, text(name)];
 };
 
-const getItemVirtualDomFolder = item => {
+const getExplorerItemVirtualDom = item => {
   const {
     posInSet,
     setSize,
@@ -1872,76 +1904,33 @@ const getItemVirtualDomFolder = item => {
     name,
     path,
     depth,
-    type,
-    isFocused,
-    useChevrons,
-    indent
+    indent,
+    chevron,
+    id,
+    className,
+    isEditing,
+    ariaExpanded
   } = item;
-  let ariaExpanded = '';
-  let chevron;
-  switch (type) {
-    // TODO decide on directory vs folder
-    case Directory:
-      ariaExpanded = 'false';
-      chevron = getChevronRightVirtualDom();
-      break;
-    case DirectoryExpanding:
-      ariaExpanded = 'true'; // TODO tree should be aria-busy then
-      chevron = getChevronRightVirtualDom();
-      break;
-    case DirectoryExpanded:
-      ariaExpanded = 'true';
-      chevron = getChevronDownVirtualDom();
-      break;
-  }
-  const dom = [];
-  dom.push({
+  const chevronDom = getChevronVirtualDom(chevron);
+  const dom = [{
     type: Div,
     role: TreeItem$1,
-    className: TreeItem,
+    className,
     draggable: true,
     title: path,
     ariaPosInSet: posInSet,
     ariaSetSize: setSize,
     ariaLevel: depth,
-    childCount: 2,
+    childCount: 2 + chevronDom.length,
     paddingLeft: indent,
     ariaLabel: name,
     ariaExpanded,
-    ariaDescription: ''
-  });
-  if (useChevrons) {
-    // @ts-ignore
-    dom[0].childCount++;
-    // @ts-ignore
-    dom.push(chevron);
-  }
-  dom.push(getFileIconVirtualDom(icon), {
-    type: Div,
-    className: Label,
-    childCount: 1
-  }, text(name));
-  if (isFocused) {
-    // @ts-ignore
-    dom[0].id = 'TreeItemActive';
-  }
+    ariaDescription: '',
+    id
+  }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputOrLabelDom(isEditing, name)];
   return dom;
 };
 
-const getExplorerItemVirtualDom = item => {
-  const {
-    type
-  } = item;
-  switch (type) {
-    case Directory:
-    case DirectoryExpanding:
-    case DirectoryExpanded:
-      return getItemVirtualDomFolder(item);
-    default:
-      return getItemVirtualDomFile(item);
-  }
-};
-
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
 };
@@ -1962,7 +1951,7 @@ const getExplorerWelcomeVirtualDom = isWide => {
     childCount: 1
   }, text(youHaveNotYetOpenedAFolder()), {
     type: Button,
-    className: mergeClassNames(Button$1, ButtonPrimary, isWide ? 'ButtonWide' : 'ButtonNarrow'),
+    className: mergeClassNames(Button$1, ButtonPrimary, isWide ? ButtonWide : ButtonNarrow),
     childCount: 1,
     onClick: handleClickOpenFolder$1
   }, text(openFolder$1())];
@@ -1972,9 +1961,7 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide) => {
   if (!root) {
     return getExplorerWelcomeVirtualDom(isWide);
   }
-  // TODO
-  const dom = [];
-  dom.push({
+  const dom = [{
     type: Div,
     className: mergeClassNames(Viewlet, Explorer$1),
     tabIndex: 0,
@@ -1988,8 +1975,7 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide) => {
     onPointerDown: HandlePointerDown,
     onWheel: HandleWheel,
     onClick: HandleClick
-  });
-  dom.push(...visibleItems.flatMap(getExplorerItemVirtualDom));
+  }, ...visibleItems.flatMap(getExplorerItemVirtualDom)];
   return dom;
 };
 
@@ -2091,7 +2077,7 @@ const getKeyBindings = () => {
 };
 
 const Separator = 1;
-const None$1 = 0;
+const None$3 = 0;
 const RestoreFocus = 6;
 
 const menuEntrySeparator = {
@@ -2104,13 +2090,13 @@ const menuEntrySeparator = {
 const menuEntryNewFile = {
   id: 'newFile',
   label: newFile$1(),
-  flags: None$1,
+  flags: None$3,
   command: 'Explorer.newFile'
 };
 const menuEntryNewFolder = {
   id: 'newFolder',
   label: newFolder$1(),
-  flags: None$1,
+  flags: None$3,
   command: 'Explorer.newFolder'
 };
 const menuEntryOpenContainingFolder = {
@@ -2122,7 +2108,7 @@ const menuEntryOpenContainingFolder = {
 const menuEntryOpenInIntegratedTerminal = {
   id: 'openInIntegratedTerminal',
   label: openInIntegratedTerminal(),
-  flags: None$1,
+  flags: None$3,
   command: /* TODO */-1
 };
 const menuEntryCut = {
@@ -2140,7 +2126,7 @@ const menuEntryCopy = {
 const menuEntryPaste = {
   id: 'paste',
   label: paste(),
-  flags: None$1,
+  flags: None$3,
   command: 'Explorer.handlePaste'
 };
 const menuEntryCopyPath = {
@@ -2158,13 +2144,13 @@ const menuEntryCopyRelativePath = {
 const menuEntryRename = {
   id: 'rename',
   label: rename(),
-  flags: None$1,
+  flags: None$3,
   command: 'Explorer.renameDirent'
 };
 const menuEntryDelete = {
   id: 'delete',
   label: deleteItem(),
-  flags: None$1,
+  flags: None$3,
   command: 'Explorer.removeDirent'
 };
 const ALL_ENTRIES = [menuEntryNewFile, menuEntryNewFolder, menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntryRename, menuEntryDelete];
@@ -2205,51 +2191,98 @@ const getMenuEntries = state => {
   }
 };
 
-const defaultIndent = 1;
+const None$2 = 0;
+const Right = 1;
+const Down = 2;
+
+const getChevronType = (type, useChevrons) => {
+  if (!useChevrons) {
+    return None$2;
+  }
+  switch (type) {
+    case Directory:
+      return Right;
+    case DirectoryExpanded:
+    case DirectoryExpanding:
+      return Down;
+    default:
+      return None$2;
+  }
+};
+
+const None$1 = 0;
+const Expanded = 1;
+const Collapsed = 2;
+
+const getExpandedType = type => {
+  switch (type) {
+    case Directory:
+      return Collapsed;
+    case DirectoryExpanding:
+    case DirectoryExpanded:
+      return Expanded;
+    default:
+      return None$1;
+  }
+};
+
+const defaultIndent$1 = 1;
 const getTreeItemIndent = depth => {
-  // TODO logic should be in getVisibleItems
-  return `${depth * defaultIndent}rem`;
+  return `${depth * defaultIndent$1}rem`;
 };
 
+// TODO make all of these variable configurable
+const defaultPaddingLeft = 4;
+const defaultIndent = 8;
+
+// TODO make chevron size configurable
+const chevronSize = 22;
+const getTreeItemIndentWithChevron = (depth, chevron) => {
+  // TODO use numeric value here, convert to string value in renderer process
+  const extraSpace = chevron ? 0 : chevronSize;
+  return `${depth * defaultIndent + extraSpace + defaultPaddingLeft}px`;
+};
+
+const ariaExpandedValues = [undefined, 'true', 'false'];
 const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editingIndex, editingType, editingValue, icons, useChevrons) => {
   const visible = [];
+  const indentFn = useChevrons ? getTreeItemIndentWithChevron : getTreeItemIndent;
   let iconIndex = 0;
   for (let i = minLineY; i < Math.min(maxLineY, items.length); i++) {
     const item = items[i];
     const icon = icons[iconIndex++];
-    const indent = getTreeItemIndent(item.depth);
-    if (i === editingIndex) {
-      visible.push({
-        ...item,
-        isFocused: i === focusedIndex,
-        isEditing: true,
-        icon,
-        useChevrons,
-        indent
-      });
-    } else {
-      visible.push({
-        ...item,
-        isFocused: i === focusedIndex,
-        icon,
-        useChevrons,
-        indent
-      });
-    }
+    const chevron = getChevronType(item.type, useChevrons);
+    const indent = indentFn(item.depth, chevron);
+    const isFocused = i === focusedIndex;
+    const id = isFocused ? 'TreeItemActive' : undefined;
+    const className = isFocused ? TreeItem + ' ' + TreeItemActive : TreeItem;
+    const expanded = getExpandedType(item.type);
+    const ariaExpanded = ariaExpandedValues[expanded];
+    visible.push({
+      ...item,
+      isEditing: i === editingIndex,
+      icon,
+      indent,
+      ariaExpanded,
+      chevron,
+      id,
+      className
+    });
   }
-  if (editingType !== None$3 && editingIndex === -1) {
+  if (editingType !== None$5 && editingIndex === -1) {
     visible.push({
       depth: 3,
       posInSet: 1,
       setSize: 1,
       icon: '',
-      isFocused: false,
       name: 'new',
       path: '/test/new',
-      type: 2,
       isEditing: true,
-      useChevrons,
-      indent: ''
+      indent: '',
+      ariaExpanded: undefined,
+      chevron: 0,
+      id: undefined,
+      className: TreeItem
     });
   }
   return visible;
@@ -2261,7 +2294,7 @@ const handleBlur = state => {
   const {
     editingType
   } = state;
-  if (editingType !== None$3) {
+  if (editingType !== None$5) {
     return state;
   }
   return {
@@ -2270,22 +2303,6 @@ const handleBlur = state => {
   };
 };
 
-const getFileIcon = dirent => {
-  if (dirent.type === File) {
-    return invoke('IconTheme.getFileIcon', {
-      name: dirent.name
-    });
-  }
-  return invoke('IconTheme.getFolderIcon', {
-    name: dirent.name
-  });
-};
-const getFileIcons = async dirents => {
-  const promises = dirents.map(getFileIcon);
-  const icons = await Promise.all(promises);
-  return icons;
-};
-
 const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   dirent.type = DirectoryExpanding;
   // TODO handle error
@@ -2312,11 +2329,15 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   // TODO when focused index has changed while expanding, don't update it
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, newDirents.length);
   const parts = newDirents.slice(minLineY, maxLineY);
-  const icons = await getFileIcons(parts);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(parts, state.fileIconCache);
   return {
     ...state,
     items: newDirents,
     icons,
+    fileIconCache: newFileIconCache,
     focusedIndex: newIndex,
     focused: keepFocus,
     maxLineY
@@ -2343,11 +2364,15 @@ const handleClickDirectoryExpanded$1 = async (state, dirent, index, keepFocus) =
     const newMinLineY = newMaxLineY - visibleItems;
     const deltaY = newMinLineY * itemHeight;
     const parts = newDirents.slice(minLineY, maxLineY);
-    const icons = await getFileIcons(parts);
+    const {
+      icons,
+      newFileIconCache
+    } = await getFileIcons(parts, state.fileIconCache);
     return {
       ...state,
       items: newDirents,
       icons,
+      fileIconCache: newFileIconCache,
       focusedIndex: index,
       focused: keepFocus,
       minLineY: newMinLineY,
@@ -2356,11 +2381,15 @@ const handleClickDirectoryExpanded$1 = async (state, dirent, index, keepFocus) =
     };
   }
   const parts = newDirents.slice(state.minLineY, state.maxLineY);
-  const icons = await getFileIcons(parts);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(parts, state.fileIconCache);
   return {
     ...state,
     items: newDirents,
     icons,
+    fileIconCache: newFileIconCache,
     focusedIndex: index,
     focused: keepFocus
   };
@@ -3243,7 +3272,8 @@ const getSavedRoot$1 = (savedState, workspacePath) => {
   return workspacePath;
 };
 const loadContent = async (state, savedState) => {
-  const useChevrons = false;
+  const useChevronsRaw = await invoke('Preferences.get', 'explorer.useChevrons');
+  const useChevrons = Boolean(useChevronsRaw);
   const workspacePath = await getWorkspacePath();
   const root = getSavedRoot$1(savedState, workspacePath);
   // TODO path separator could be restored from saved state
@@ -3263,12 +3293,16 @@ const loadContent = async (state, savedState) => {
     deltaY = savedState.deltaY;
   }
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, restoredDirents.length);
-  const icons = await getFileIcons(restoredDirents);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(restoredDirents, Object.create(null));
   return {
     ...state,
     root,
     items: restoredDirents,
     icons,
+    fileIconCache: newFileIconCache,
     minLineY,
     deltaY,
     maxLineY,
@@ -3399,15 +3433,15 @@ const removeDirent = async state => {
     indexToFocus = Math.max(state.focusedIndex - 1, 0);
   }
   const visible = newDirents.slice(state.minLineY, state.maxLineY);
-  const icons = await getFileIcons(visible);
-  console.log({
-    icons
-  });
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visible, state.fileIconCache);
   return {
     ...state,
     items: newDirents,
-    // @ts-ignore
     icons,
+    fileIconCache: newFileIconCache,
     focusedIndex: indexToFocus
   };
 };
@@ -3432,11 +3466,7 @@ const renderItems = {
     return JSON.stringify(oldState.items) === JSON.stringify(newState.items) && oldState.minLineY === newState.minLineY && oldState.maxLineY === newState.maxLineY && oldState.focusedIndex === newState.focusedIndex && oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType && oldState.editingValue === newState.editingValue && oldState.width === newState.width;
   },
   apply(oldState, newState) {
-    const visibleDirents = getVisibleExplorerItems(newState.items, newState.minLineY, newState.maxLineY, newState.focusedIndex, newState.editingIndex, newState.editingType, newState.editingValue,
-    // @ts-ignore
-    newState.icons,
-    // @ts-ignore
-    newState.useChevrons);
+    const visibleDirents = getVisibleExplorerItems(newState.items, newState.minLineY, newState.maxLineY, newState.focusedIndex, newState.editingIndex, newState.editingType, newState.editingValue, newState.icons, newState.useChevrons);
     const isWide = newState.width > 450;
     const dom = getExplorerVirtualDom(visibleDirents, newState.focusedIndex, newState.root, isWide);
     return ['Viewlet.setDom2', dom];
@@ -3486,7 +3516,7 @@ const getIconVirtualDom = (icon, type = Div) => {
   return {
     type,
     className: `MaskIcon MaskIcon${icon}`,
-    role: None$2,
+    role: None$4,
     childCount: 0
   };
 };
@@ -3831,7 +3861,7 @@ const setDeltaY = (state, deltaY) => {
 };
 
 const updateEditingValue = (state, value) => {
-  const editingIcon = getFileIcon$1({
+  const editingIcon = getFileIcon({
     name: value
   });
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "1.15.0",
+  "version": "1.17.0",
   "description": "Explorer Worker",
   "main": "dist/explorerViewWorkerMain.js",
   "type": "module",