@lvce-editor/explorer-view 2.42.0 → 2.44.0

package/dist/explorerViewWorkerMain.js

@@ -431,7 +431,7 @@ const create$4 = (method, params) => {
   };
 };
 const callbacks = Object.create(null);
-const set$3 = (id, fn) => {
+const set$2 = (id, fn) => {
   callbacks[id] = fn;
 };
 const get$2 = id => {
@@ -450,7 +450,7 @@ const registerPromise = () => {
     resolve,
     promise
   } = Promise.withResolvers();
-  set$3(id, resolve);
+  set$2(id, resolve);
   return {
     id,
     promise
@@ -761,7 +761,7 @@ const send = (transport, method, ...params) => {
   const message = create$4(method, params);
   transport.send(message);
 };
-const invoke$1 = (ipc, method, ...params) => {
+const invoke$2 = (ipc, method, ...params) => {
   return invokeHelper(ipc, method, params, false);
 };
 const invokeAndTransfer = (ipc, method, ...params) => {
@@ -794,7 +794,7 @@ const createRpc = ipc => {
       send(ipc, method, ...params);
     },
     invoke(method, ...params) {
-      return invoke$1(ipc, method, ...params);
+      return invoke$2(ipc, method, ...params);
     },
     invokeAndTransfer(method, ...params) {
       return invokeAndTransfer(ipc, method, ...params);
@@ -851,7 +851,7 @@ const WebWorkerRpcClient = {
 };
 
 const rpcs = Object.create(null);
-const set$7 = (id, rpc) => {
+const set$9 = (id, rpc) => {
   rpcs[id] = rpc;
 };
 const get$1 = id => {
@@ -875,26 +875,30 @@ const create$2 = rpcId => {
       return rpc.invokeAndTransfer(method, ...params);
     },
     set(rpc) {
-      set$7(rpcId, rpc);
+      set$9(rpcId, rpc);
     }
   };
 };
 const RendererWorker$1 = 1;
 const {
-  invoke: invoke$2,
-  set: set$2
+  invoke: invoke$4,
+  set: set$4
 } = create$2(RendererWorker$1);
 const RendererWorker = {
   __proto__: null,
-  invoke: invoke$2,
-  set: set$2
+  invoke: invoke$4,
+  set: set$4
 };
 
 const {
-  invoke,
+  invoke: invoke$1,
   set: set$1
 } = RendererWorker;
 
+const invoke = async (method, ...params) => {
+  return invoke$1(method, ...params);
+};
+
 const remove = async dirent => {
   return invoke('FileSystem.remove', dirent);
 };
@@ -1077,7 +1081,7 @@ const requestFileIcons = async requests => {
     return [];
   }
   const simpleRequests = requests.map(toSimpleIconRequest);
-  const icons = await invoke('IconTheme.getIcons', simpleRequests);
+  const icons = await invoke$1('IconTheme.getIcons', simpleRequests);
   return icons;
 };
 
@@ -1516,12 +1520,22 @@ const acceptCreateFolder = async state => {
   return acceptCreate(state, Directory, mkdir);
 };
 
-const computeExplorerRenamedDirentUpdate = async (root, parentPath, parentDepth) => {
-  const children = await getChildDirents('/', parentPath, parentDepth, []);
-  const relativeDirname = parentPath.slice(root.length);
-  return {
-    [relativeDirname]: children
-  };
+const computeExplorerRenamedDirentUpdate = (root, parentPath, oldUri, children, tree, newUri) => {
+  const rootLength = root.length;
+  const relativeDirname = parentPath.slice(rootLength);
+  const relativeOldPath = oldUri.slice(rootLength);
+  const relativeNewUri = newUri.slice(rootLength);
+  const update = Object.create(null);
+  update[relativeDirname] = children;
+  const oldItems = tree[relativeOldPath] || [];
+  update[relativeNewUri] = oldItems;
+  for (const [key, value] of Object.entries(tree)) {
+    if (key.startsWith(`${relativeOldPath}/`)) {
+      const newKey = `${relativeNewUri}` + key.slice(relativeOldPath.length);
+      update[newKey] = value;
+    }
+  }
+  return update;
 };
 
 const createNewDirentsRename = async (renamedDirent, editingValue, pathSeparator) => {
@@ -1569,10 +1583,12 @@ const acceptRename = async state => {
   if (!successful) {
     return state;
   }
-  const dirname = dirname2(renamedDirent.path);
+  const oldUri = renamedDirent.path;
+  const dirname = dirname2(oldUri);
   const newUri = join2(dirname, editingValue);
-  const update = await computeExplorerRenamedDirentUpdate(root, dirname, renamedDirent.depth - 1);
+  const children = await getChildDirents('/', dirname, renamedDirent.depth - 1, []);
   const tree = createTree(items, root);
+  const update = computeExplorerRenamedDirentUpdate(root, dirname, oldUri, children, tree, newUri);
   const newTree = updateTree2(tree, update);
   const newDirents = treeToArray(newTree, root);
   const newFocusedIndex = getIndex(newDirents, newUri);
@@ -1707,14 +1723,27 @@ const toCollapsedDirent = dirent => {
   return dirent;
 };
 
-const collapseAll = state => {
+const collapseAll = async state => {
   const {
+    minLineY,
+    height,
+    itemHeight,
+    fileIconCache,
     items
   } = state;
   const newDirents = items.filter(isTopLevel).map(toCollapsedDirent);
+  const dirents = newDirents;
+  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: newDirents,
+    icons,
+    fileIconCache: newFileIconCache
   };
 };
 
@@ -1738,13 +1767,13 @@ const copyPath = async state => {
 };
 
 const writeText = async text => {
-  await invoke('ClipBoard.writeText', /* text */text);
+  await invoke$1('ClipBoard.writeText', /* text */text);
 };
 const readNativeFiles = async () => {
-  return invoke('ClipBoard.readNativeFiles');
+  return invoke$1('ClipBoard.readNativeFiles');
 };
 const writeNativeFiles = async (type, files) => {
-  return invoke('ClipBoard.writeNativeFiles', type, files);
+  return invoke$1('ClipBoard.writeNativeFiles', type, files);
 };
 
 const copyRelativePath = async state => {
@@ -2250,7 +2279,7 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'handleInputKeyDown', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'cancelTypeAhead', 'updateEditingValue', 'handleKeyDown', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'cancelTypeAhead', 'collapseAll', 'copyPath', 'copyRelativePath', 'dispose', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'getMenuEntries2', 'getMouseActions', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleContextMenuKeyboard', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleInputBlur', 'handleInputClick', 'handleInputKeyDown', 'handleKeyDown', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'selectAll', 'selectDown', 'selectUp', 'setDeltaY', 'setSelectedIndices', 'updateEditingValue', 'updateIcons'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -2627,7 +2656,7 @@ const handleArrowRightDirectoryExpanded = (state, dirent) => {
 };
 
 const setFocus = key => {
-  return invoke('Focus.setFocus', key);
+  return invoke$1('Focus.setFocus', key);
 };
 
 const handleClickDirectory = async (state, dirent, index, keepFocus) => {
@@ -2676,7 +2705,7 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
 };
 
 const openUri = async (uri, focus) => {
-  await invoke(/* Main.openAbsolutePath */'Main.openUri', /* absolutePath */uri, /* focus */focus);
+  await invoke$1(/* Main.openAbsolutePath */'Main.openUri', /* absolutePath */uri, /* focus */focus);
 };
 
 const handleClickFile = async (state, dirent, index, keepFocus = false) => {
@@ -2937,7 +2966,7 @@ const handleClickOpenFolder = async state => {
 };
 
 const show = async (x, y, id, ...args) => {
-  return invoke('ContextMenu.show', x, y, id, ...args);
+  return invoke$1('ContextMenu.show', x, y, id, ...args);
 };
 
 const Explorer$1 = 4;
@@ -3086,8 +3115,12 @@ const getExpandedDirents = items => {
 const getPathDirentsMap = async allPaths => {
   const pathToDirents = Object.create(null);
   await Promise.all(allPaths.map(async path => {
-    const dirents = await readDirWithFileTypes(path);
-    pathToDirents[path] = dirents;
+    try {
+      const dirents = await readDirWithFileTypes(path);
+      pathToDirents[path] = dirents;
+    } catch {
+      // ignore
+    }
   }));
   return pathToDirents;
 };
@@ -3443,12 +3476,12 @@ const getFileArray = fileList => {
 };
 
 const getFileHandles = async fileIds => {
-  const files = await invoke('FileSystemHandle.getFileHandles', fileIds);
+  const files = await invoke$1('FileSystemHandle.getFileHandles', fileIds);
   return files;
 };
 
 const getFilePathElectron = async file => {
-  return invoke('FileSystemHandle.getFilePathElectron', file);
+  return invoke$1('FileSystemHandle.getFilePathElectron', file);
 };
 
 const getFilepath = async file => {
@@ -3575,7 +3608,7 @@ const handleKeyDown = (state, key) => {
   // @ts-ignore
   // eslint-disable-next-line  @typescript-eslint/no-misused-promises
   timeout = setTimeout(async () => {
-    await invoke('Explorer.cancelTypeAhead');
+    await invoke$1('Explorer.cancelTypeAhead');
   }, focusWordTimeout);
   if (matchingIndex === -1) {
     return {
@@ -3770,11 +3803,11 @@ const handleWheel = (state, deltaMode, deltaY) => {
 };
 
 const getWorkspacePath = () => {
-  return invoke('Workspace.getPath');
+  return invoke$1('Workspace.getPath');
 };
 
 const getSettings = async () => {
-  const useChevronsRaw = await invoke('Preferences.get', 'explorer.useChevrons');
+  const useChevronsRaw = await invoke$1('Preferences.get', 'explorer.useChevrons');
   const useChevrons = useChevronsRaw === false ? false : true;
   return {
     useChevrons
@@ -4038,6 +4071,18 @@ const getNewDirentType = editingType => {
   }
 };
 
+const isFolder = direntType => {
+  return direntType === Directory || direntType === DirectoryExpanded || direntType === SymLinkFolder;
+};
+const getFittingIndex = (dirents, startIndex) => {
+  for (let i = startIndex; i >= 0; i--) {
+    const dirent = dirents[i];
+    if (isFolder(dirent.type)) {
+      return i;
+    }
+  }
+  return -1;
+};
 const newDirent = async (state, editingType) => {
   // TODO make focus functional instead of side effect
   await setFocus(ExplorerEditBox);
@@ -4051,8 +4096,9 @@ const newDirent = async (state, editingType) => {
     fileIconCache,
     root
   } = state;
+  const index = getFittingIndex(items, focusedIndex);
   const direntType = getNewDirentType(editingType);
-  const newDirents = await getNewDirentsForNewDirent(items, focusedIndex, direntType, root);
+  const newDirents = await getNewDirentsForNewDirent(items, index, direntType, root);
   const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, newDirents.length);
   const visible = newDirents.slice(minLineY, maxLineY);
   const {
@@ -4095,7 +4141,7 @@ const getContainingFolder = (root, dirents, focusedIndex, pathSeparator) => {
 };
 
 const openNativeFolder = async path => {
-  await invoke('OpenNativeFolder.openNativeFolder', /* path */path);
+  await invoke$1('OpenNativeFolder.openNativeFolder', /* path */path);
 };
 
 const openContainingFolder = async state => {
@@ -4139,10 +4185,17 @@ const removeDirent = async state => {
   return newState;
 };
 
+const getEditingType = direntType => {
+  if (direntType < DELTA_EDITING) {
+    return direntType + DELTA_EDITING;
+  }
+  return direntType;
+};
+
 const getNewDirentsForRename = (items, focusedIndex) => {
   const item = items[focusedIndex];
   const newItems = [...items];
-  const editingType = item.type === File ? EditingFile : EditingFolder;
+  const editingType = getEditingType(item.type);
   // TODO avoid mutation
   newItems[focusedIndex] = {
     ...item,
@@ -5144,24 +5197,24 @@ const terminate = () => {
 
 const getEditingIcon = async (editingType, value, direntType) => {
   if (editingType === CreateFile) {
-    return invoke('IconTheme.getFileIcon', {
+    return invoke$1('IconTheme.getFileIcon', {
       name: value
     });
   }
   if (editingType === Rename$1) {
     if (direntType === File || direntType === EditingFile) {
-      return invoke('IconTheme.getFileIcon', {
+      return invoke$1('IconTheme.getFileIcon', {
         name: value
       });
     }
-    if (direntType === Directory || direntType === EditingFolder) {
-      return invoke('IconTheme.getFolderIcon', {
+    if (direntType === Directory || direntType === EditingFolder || direntType === EditingDirectoryExpanded) {
+      return invoke$1('IconTheme.getFolderIcon', {
         name: value
       });
     }
   }
   if (editingType === CreateFolder) {
-    return invoke('IconTheme.getFolderIcon', {
+    return invoke$1('IconTheme.getFolderIcon', {
       name: value
     });
   }

package/package.json

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