@lvce-editor/explorer-view 2.16.0 → 2.18.0

package/dist/explorerViewWorkerMain.js

@@ -1971,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;
@@ -3569,12 +3569,12 @@ 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
   };
 };
 
@@ -4226,7 +4226,7 @@ const getPathPartChildren = async 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) {
@@ -4236,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;
 };
 
@@ -4388,8 +4337,21 @@ const terminate = () => {
   globalThis.close();
 };
 
-const updateEditingValue = (state, value, inputSource = User) => {
-  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,

package/package.json

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