@lvce-editor/static-server 0.49.18 → 0.49.20

package/static/{b935d42 → 3b2e1bb}/packages/explorer-worker/dist/explorerViewWorkerMain.js

@@ -861,46 +861,6 @@ const WebWorkerRpcClient = {
   create: create$1
 };
 
-const RE_CHARACTERS = /^[a-zA-Z.-]+$/;
-const compareStringNumeric = (a, b) => {
-  if (RE_CHARACTERS.test(a) && RE_CHARACTERS.test(b)) {
-    return a < b ? -1 : 1;
-  }
-  return a.localeCompare(b, 'en', {
-    numeric: true
-  });
-};
-
-const BlockDevice = 1;
-const CharacterDevice = 2;
-const Directory = 3;
-const DirectoryExpanded = 4;
-const DirectoryExpanding = 5;
-const File = 7;
-const Socket = 8;
-const Symlink = 9;
-const SymLinkFile = 10;
-const SymLinkFolder = 11;
-const Unknown = 12;
-
-const priorityMapFoldersFirst = {
-  [Directory]: 1,
-  [SymLinkFolder]: 1,
-  [File]: 0,
-  [SymLinkFile]: 0,
-  [Unknown]: 0,
-  [Socket]: 0
-};
-const compareDirentType = (direntA, direntB) => {
-  return priorityMapFoldersFirst[direntB.type] - priorityMapFoldersFirst[direntA.type];
-};
-const compareDirentName = (direntA, direntB) => {
-  return compareStringNumeric(direntA.name, direntB.name);
-};
-const compareDirent = (direntA, direntB) => {
-  return compareDirentType(direntA, direntB) || compareDirentName(direntA, direntB);
-};
-
 const None$5 = 0;
 const CreateFile = 1;
 const CreateFolder = 2;
@@ -991,28 +951,144 @@ const fileOrFolderNameMustBeProvided = () => {
 const List = 1;
 const Input$1 = 2;
 
+// TODO optimize this function to return the minimum number
+// of visible items needed, e.g. when not scrolled 5 items with
+// 20px fill 100px but when scrolled 6 items are needed
+const getNumberOfVisibleItems = (listHeight, itemHeight) => {
+  return Math.ceil(listHeight / itemHeight) + 1;
+};
+
+const getExplorerMaxLineY = (minLineY, height, itemHeight, direntsLength) => {
+  const maxLineY = minLineY + Math.min(getNumberOfVisibleItems(height, itemHeight), direntsLength);
+  return maxLineY;
+};
+
+const getIconsCached = (dirents, fileIconCache) => {
+  return dirents.map(dirent => fileIconCache[dirent]);
+};
+
+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 getPath = dirent => {
+  return dirent.path;
+};
+
+const BlockDevice = 1;
+const CharacterDevice = 2;
+const Directory = 3;
+const DirectoryExpanded = 4;
+const DirectoryExpanding = 5;
+const File = 7;
+const Socket = 8;
+const Symlink = 9;
+const SymLinkFile = 10;
+const SymLinkFolder = 11;
+const Unknown = 12;
+
+const RendererWorker = 1;
+
+const rpcs = Object.create(null);
+const set$1 = (id, rpc) => {
+  rpcs[id] = rpc;
+};
+const get$1 = id => {
+  return rpcs[id];
+};
+
+const invoke = (method, ...params) => {
+  const rpc = get$1(RendererWorker);
+  // @ts-ignore
+  return rpc.invoke(method, ...params);
+};
+
+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 paths = dirents.map(getPath);
+  const icons = getIconsCached(paths, newFileIconCache);
+  return {
+    icons,
+    newFileIconCache
+  };
+};
+
+const RE_CHARACTERS = /^[a-zA-Z.-]+$/;
+const compareStringNumeric = (a, b) => {
+  if (RE_CHARACTERS.test(a) && RE_CHARACTERS.test(b)) {
+    return a < b ? -1 : 1;
+  }
+  return a.localeCompare(b, 'en', {
+    numeric: true
+  });
+};
+
+const priorityMapFoldersFirst = {
+  [Directory]: 1,
+  [SymLinkFolder]: 1,
+  [File]: 0,
+  [SymLinkFile]: 0,
+  [Unknown]: 0,
+  [Socket]: 0
+};
+const compareDirentType = (direntA, direntB) => {
+  return priorityMapFoldersFirst[direntB.type] - priorityMapFoldersFirst[direntA.type];
+};
+const compareDirentName = (direntA, direntB) => {
+  return compareStringNumeric(direntA.name, direntB.name);
+};
+const compareDirent = (direntA, direntB) => {
+  return compareDirentType(direntA, direntB) || compareDirentName(direntA, direntB);
+};
+
 const getParentFolder = (dirents, index, root) => {
   if (index < 0) {
     return root;
   }
   return dirents[index].path;
 };
-const acceptCreate = async (state, newDirentType, createFn) => {
+const getNewDirentsAccept = async (state, newDirentType, createFn) => {
   const {
     focusedIndex,
     editingValue
   } = state;
   const newFileName = editingValue;
-  if (!newFileName) {
-    // TODO show error message that file name must not be empty
-    // below input box
-    // await ErrorHandling.showErrorDialog(new Error('file name must not be empty'))
-    const editingErrorMessage = fileOrFolderNameMustBeProvided();
-    return {
-      ...state,
-      editingErrorMessage
-    };
-  }
   const parentFolder = getParentFolder(state.items, focusedIndex, state.root);
   const absolutePath = [parentFolder, newFileName].join(state.pathSeparator);
   // TODO better handle error
@@ -1021,7 +1097,10 @@ const acceptCreate = async (state, newDirentType, createFn) => {
   } catch (error) {
     console.error(new VError(error, `Failed to create file`));
     // TODO display error
-    return state;
+    return {
+      dirents: state.items,
+      newFocusedIndex: state.focusedIndex
+    };
   }
   const parentDirent = focusedIndex >= 0 ? state.items[focusedIndex] : {
     depth: 0};
@@ -1073,34 +1152,54 @@ const acceptCreate = async (state, newDirentType, createFn) => {
   // @ts-ignore
   items.splice(insertIndex + 1, 0, newDirent);
   const newDirents = [...items];
-  const newMaxlineY = Math.max(state.maxLineY, newDirents.length);
+  return {
+    dirents: newDirents,
+    newFocusedIndex: insertIndex + 1
+  };
+};
+
+const acceptCreate = async (state, newDirentType, createFn) => {
+  const {
+    editingValue,
+    minLineY,
+    height,
+    itemHeight,
+    fileIconCache
+  } = state;
+  const newFileName = editingValue;
+  if (!newFileName) {
+    // TODO show error message that file name must not be empty
+    // below input box
+    // await ErrorHandling.showErrorDialog(new Error('file name must not be empty'))
+    const editingErrorMessage = fileOrFolderNameMustBeProvided();
+    return {
+      ...state,
+      editingErrorMessage
+    };
+  }
+  const {
+    dirents,
+    newFocusedIndex
+  } = await getNewDirentsAccept(state, newDirentType, createFn);
+  const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, dirents.length);
+  const visible = dirents.slice(minLineY, maxLineY);
+  const {
+    icons,
+    newFileIconCache
+  } = await getFileIcons(visible, fileIconCache);
   return {
     ...state,
-    items: newDirents,
+    items: dirents,
     editingIndex: -1,
-    focusedIndex: insertIndex + 1,
+    focusedIndex: newFocusedIndex,
     editingType: None$5,
-    maxLineY: newMaxlineY,
-    focus: List
+    maxLineY,
+    focus: List,
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 
-const RendererWorker = 1;
-
-const rpcs = Object.create(null);
-const set$1 = (id, rpc) => {
-  rpcs[id] = rpc;
-};
-const get$1 = id => {
-  return rpcs[id];
-};
-
-const invoke = (method, ...params) => {
-  const rpc = get$1(RendererWorker);
-  // @ts-ignore
-  return rpc.invoke(method, ...params);
-};
-
 const remove = async dirent => {
   return invoke('FileSystem.remove', dirent);
 };
@@ -1263,9 +1362,8 @@ const acceptRename = async state => {
     const oldParentPath = dirname(pathSeparator, oldAbsolutePath);
     const newAbsolutePath = [oldParentPath, editingValue].join(pathSeparator);
     await rename(oldAbsolutePath, newAbsolutePath);
-  } catch {
-    // TODO
-    // await ErrorHandling.showErrorDialog(error)
+  } catch (error) {
+    console.error(new VError(error, `Failed to rename file`));
     return state;
   }
   const {
@@ -1354,6 +1452,10 @@ const getFocusedDirent$1 = state => {
 };
 
 const copyPath = async state => {
+  const dirent = getFocusedDirent$1(state);
+  if (!dirent) {
+    return state;
+  }
   // await Command.execute(RendererWorkerCommandType.ClipBoardWriteText, /* text */ path)
   return state;
 };
@@ -1370,6 +1472,9 @@ const writeNativeFiles = async (type, files) => {
 
 const copyRelativePath = async state => {
   const dirent = getFocusedDirent$1(state);
+  if (!dirent) {
+    return state;
+  }
   const relativePath = dirent.path.slice(1);
   // TODO handle error
   await writeText(relativePath);
@@ -1422,7 +1527,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     icons: [],
     platform,
     focus: 0,
-    editingErrorMessage: ''
+    editingErrorMessage: '',
+    inputSource: 0
   };
   set(uid, state, state);
 };
@@ -1458,56 +1564,35 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     icons: [],
     platform,
     focus: 0,
-    editingErrorMessage: ''
+    editingErrorMessage: '',
+    inputSource: 0
   };
   set(state.uid, state, state);
   return state;
 };
 
 const RenderItems = 4;
-const RenderEditingIndex = 5;
 const RenderFocus = 6;
 
-const diffType$2 = RenderEditingIndex;
-const isEqual$3 = (oldState, newState) => {
-  return oldState.editingIndex === newState.editingIndex && oldState.editingType === newState.editingType;
-};
-
-const DiffEditingIndex = {
-  __proto__: null,
-  diffType: diffType$2,
-  isEqual: isEqual$3
-};
-
 const diffType$1 = RenderFocus;
 const isEqual$2 = (oldState, newState) => {
   return oldState.focused === newState.focused && oldState.focus === newState.focus;
 };
 
-const DiffFocus = {
-  __proto__: null,
-  diffType: diffType$1,
-  isEqual: isEqual$2
-};
-
 const diffType = RenderItems;
 const isEqual$1 = (oldState, newState) => {
   return oldState.items === 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.editingErrorMessage === newState.editingErrorMessage && oldState.width === newState.width && oldState.focused === newState.focused && oldState.dropTargets === newState.dropTargets;
 };
 
-const DiffItems = {
-  __proto__: null,
-  diffType,
-  isEqual: isEqual$1
-};
-
-const modules = [DiffItems, DiffEditingIndex, DiffFocus];
+const modules = [isEqual$1, isEqual$2];
+const numbers = [diffType, diffType$1];
 
 const diff = (oldState, newState) => {
   const diffResult = [];
-  for (const module of modules) {
-    if (!module.isEqual(oldState, newState)) {
-      diffResult.push(module.diffType);
+  for (let i = 0; i < modules.length; i++) {
+    const fn = modules[i];
+    if (!fn(oldState, newState)) {
+      diffResult.push(numbers[i]);
     }
   }
   return diffResult;
@@ -1635,72 +1720,6 @@ const getChildDirents = async (pathSeparator, parentDirent, excluded = []) => {
   return displayDirents;
 };
 
-// TODO optimize this function to return the minimum number
-// of visible items needed, e.g. when not scrolled 5 items with
-// 20px fill 100px but when scrolled 6 items are needed
-const getNumberOfVisibleItems = (listHeight, itemHeight) => {
-  return Math.ceil(listHeight / itemHeight) + 1;
-};
-
-const getExplorerMaxLineY = (minLineY, height, itemHeight, direntsLength) => {
-  const maxLineY = minLineY + Math.min(getNumberOfVisibleItems(height, itemHeight), direntsLength);
-  return maxLineY;
-};
-
-const getIconsCached = (dirents, fileIconCache) => {
-  return dirents.map(dirent => fileIconCache[dirent]);
-};
-
-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 paths = dirents.map(dirent => dirent.path);
-  const icons = getIconsCached(paths, newFileIconCache);
-  return {
-    icons,
-    newFileIconCache
-  };
-};
-
 const expandAll = async state => {
   const {
     items,
@@ -1952,7 +1971,7 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['getMenuEntries2', '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', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'setDeltaY', 'updateEditingValue', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'setDeltaY', 'updateEditingValue', 'updateIcons'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -2568,12 +2587,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 => {
@@ -3042,15 +3063,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,
@@ -3063,7 +3076,6 @@ const updateIcons = async state => {
   } = await getFileIcons(visible, Object.create(null));
   return {
     ...state,
-    items: newDirents,
     icons,
     fileIconCache: newFileIconCache
   };
@@ -3176,7 +3188,8 @@ const handlePointerDown = (state, button, x, y) => {
     return {
       ...state,
       focused: true,
-      focusedIndex: -1
+      focusedIndex: -1,
+      focus: List
     };
   }
   return state;
@@ -3459,7 +3472,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;
   }
@@ -3469,13 +3482,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;
 };
 
@@ -3485,6 +3503,9 @@ const removeDirent = async state => {
     return state;
   }
   const dirent = getFocusedDirent$1(state);
+  if (!dirent) {
+    return state;
+  }
   const absolutePath = dirent.path;
   try {
     // TODO handle error
@@ -3548,25 +3569,29 @@ const renameDirent = state => {
     items
   } = state;
   const item = items[focusedIndex];
-  // Focus.setFocus(FocusKey.ExplorerEditBox)
   return {
     ...state,
     editingIndex: focusedIndex,
     editingType: Rename$1,
-    editingValue: item.name
+    editingValue: item.name,
+    focus: Input$1
   };
 };
 
-const renderEditingIndex = (oldState, newState) => {
-  return ['focusInput', 'ExplorerInput'];
-};
-
 const ExplorerInput = 'ExplorerInput';
 
+const User = 1;
+
 const renderFocus = (oldState, newState) => {
+  if (newState.inputSource === User) {
+    return [];
+  }
   if (newState.focus === Input$1) {
     return ['Viewlet.focusElementByName', ExplorerInput];
   }
+  if (newState.focus === List) {
+    return ['Viewlet.focusSelector', '.ListItems'];
+  }
   // TODO
   // 1. when focused, focus the outer list element
   // 2. when focused, set focus context in renderer worker
@@ -3589,6 +3614,7 @@ const Explorer = 'Explorer';
 const ExplorerDropTarget = 'DropTarget';
 const FileIcon = 'FileIcon';
 const FocusOutline = 'FocusOutline';
+const ListItems = 'ListItems';
 const IconButton = 'IconButton';
 const InputBox = 'InputBox';
 const InputValidationError = 'InputValidationError';
@@ -3670,27 +3696,31 @@ const getFileIconVirtualDom = icon => {
   };
 };
 
-const label = {
-  type: Div,
-  className: Label,
-  childCount: 1
-};
 const getClassName$1 = hasEditingError => {
   if (hasEditingError) {
     return mergeClassNames(InputBox, InputValidationError);
   }
   return InputBox;
 };
+const getInputDom = hasEditingError => {
+  return [{
+    type: Input,
+    className: getClassName$1(hasEditingError),
+    id: 'ExplorerInput',
+    onInput: HandleEditingInput,
+    childCount: 0,
+    name: ExplorerInput
+  }];
+};
+
+const label = {
+  type: Div,
+  className: Label,
+  childCount: 1
+};
 const getInputOrLabelDom = (isEditing, hasEditingError, name) => {
   if (isEditing) {
-    return [{
-      type: Input,
-      className: getClassName$1(hasEditingError),
-      id: 'ExplorerInput',
-      onInput: HandleEditingInput,
-      childCount: 0,
-      name: ExplorerInput
-    }];
+    return getInputDom(hasEditingError);
   }
   return [label, text(name)];
 };
@@ -3762,14 +3792,20 @@ const getActiveDescendant = focusedIndex => {
 const getClassName = (focused, focusedIndex, dropTarget) => {
   const extraClass1 = focused && focusedIndex === -1 ? FocusOutline : Empty;
   const extraClass2 = dropTarget === dropTargetFull ? ExplorerDropTarget : Empty;
-  const className = mergeClassNames(Viewlet, Explorer, extraClass1, extraClass2);
+  const className = mergeClassNames(ListItems, extraClass1, extraClass2);
   return className;
 };
+const parentNode = {
+  type: Div,
+  childCount: 1,
+  className: mergeClassNames(Viewlet, Explorer),
+  role: 'none'
+};
 const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused, dropTargets) => {
   if (!root) {
     return getExplorerWelcomeVirtualDom(isWide);
   }
-  const dom = [{
+  const dom = [parentNode, {
     type: Div,
     className: getClassName(focused, focusedIndex, dropTargets),
     tabIndex: 0,
@@ -3857,6 +3893,8 @@ const getVisibleExplorerItems = (items, minLineY, maxLineY, focusedIndex, editin
     const className = isFocused ? mergeClassNames(TreeItem, TreeItemActive) : TreeItem;
     const expanded = getExpandedType(item.type);
     const ariaExpanded = ariaExpandedValues[expanded];
+
+    // @ts-ignore
     visible.push({
       ...item,
       isEditing: i === editingIndex,
@@ -3898,8 +3936,6 @@ const renderItems = (oldState, newState) => {
 
 const getRenderer = diffType => {
   switch (diffType) {
-    case RenderEditingIndex:
-      return renderEditingIndex;
     case RenderItems:
       return renderItems;
     case RenderFocus:
@@ -4125,6 +4161,18 @@ const getPathParts = (root, uri, pathSeparator) => {
   return parts;
 };
 
+const getPathPartsToReveal = (root, pathParts, dirents) => {
+  for (let i = 0; i < pathParts.length; i++) {
+    const pathPart = pathParts[i];
+    const index = getIndex(dirents, pathPart.path);
+    if (index === -1) {
+      continue;
+    }
+    return pathParts.slice(i);
+  }
+  return pathParts;
+};
+
 const isTopLevel = dirent => {
   return dirent.depth === 1;
 };
@@ -4132,23 +4180,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;
 };
 
@@ -4174,23 +4221,12 @@ const scrollInto = (index, minLineY, maxLineY) => {
   };
 };
 
-const getPathPartsToReveal = (root, pathParts, dirents) => {
-  for (let i = 0; i < pathParts.length; i++) {
-    const pathPart = pathParts[i];
-    const index = getIndex(dirents, pathPart.uri);
-    if (index === -1) {
-      continue;
-    }
-    return pathParts.slice(i);
-  }
-  return pathParts;
-};
 const getPathPartChildren = async pathPart => {
   const children = await getChildDirents(pathPart.pathSeparator, pathPart);
   return children;
 };
 const mergeVisibleWithHiddenItems = (visibleItems, hiddenItems) => {
-  const merged = [...hiddenItems];
+  const merged = [...visibleItems, ...hiddenItems];
   const seen = Object.create(null);
   const unique = [];
   for (const item of merged) {
@@ -4200,57 +4236,6 @@ const mergeVisibleWithHiddenItems = (visibleItems, hiddenItems) => {
     seen[item.path] = true;
     unique.push(item);
   }
-
-  // depth one
-  //   let depth=1
-  //   while(true){
-  //     for(const item of unique){
-  //       if(item.depth===depth){
-  //         ordered.push(item)
-  //       }
-  //     }
-  // break
-  //   }
-  // const getChildren = (path) => {
-  //   const children = []
-  //   for (const item of unique) {
-  //     if (item.path.startsWith(path) && item.path !== path) {
-  //       ordered.push(item)
-  //     }
-  //   }
-  //   return children
-  // }
-  // for (const item of unique) {
-  //   for (const potentialChild of unique) {
-  //     if (
-  //       potentialChild.path.startsWith(item.path) &&
-  //       potentialChild.path !== item.path
-  //     ) {
-  //       ordered.push(potentialChild)
-  //     }
-  //   }
-  // }
-  // const refreshedRoots = Object.create(null)
-  // for (const hiddenItem of hiddenItems) {
-  //   const parent = hiddenItem.path.slice(0, hiddenItem.path.lastIndexOf('/'))
-  //   refreshedRoots[parent] = true
-  // }
-  // const mergedDirents = []
-  // for(const v)
-  // for (const visibleItem of visibleItems) {
-  //   if (visibleItem.path === hiddenItemRoot) {
-  //     // TODO update aria posinset and aria setsize
-  //     mergedDirents.push(...hiddenItems)
-  //   } else {
-  //     for (const hiddenItem of hiddenItems) {
-  //       if (hiddenItem.path === visibleItem.path) {
-  //         continue
-  //       }
-  //     }
-  //     mergedDirents.push(visibleItem)
-  //   }
-  // }
-
   return unique;
 };
 
@@ -4321,10 +4306,6 @@ const revealItem = async (state, uri) => {
   return revealItemVisible(state, index);
 };
 
-const getPath = dirent => {
-  return dirent.path;
-};
-
 const isExpandedDirectory = dirent => {
   return dirent.type === DirectoryExpanded;
 };
@@ -4356,8 +4337,21 @@ const terminate = () => {
   globalThis.close();
 };
 
-const updateEditingValue = (state, value) => {
-  const editingIcon = '';
+const getEditingIcon = async (editingType, value) => {
+  if (editingType === File) {
+    return invoke('IconTheme.getFileIcon', {
+      name: value
+    });
+  }
+  if (editingType === Directory) {
+    return invoke('IconTheme.getFolderIcon', {
+      name: value
+    });
+  }
+  return '';
+};
+const updateEditingValue = async (state, value, inputSource = User) => {
+  const editingIcon = await getEditingIcon(state.editingType, value);
   return {
     ...state,
     editingValue: value,