@lvce-editor/explorer-view 2.43.0 → 2.45.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$3 = (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$3(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,19 +875,19 @@ 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 {
@@ -978,10 +978,10 @@ const createNewDirentsAccept = async (newFileName, pathSeparator, absolutePath,
       await createNestedPath(root, parentPath, pathSeparator);
     }
     await createFn(absolutePath);
-    return true;
+    return '';
   } catch (error) {
     console.error(new VError(error, `Failed to create file`));
-    return false;
+    return `${error}`;
   }
 };
 
@@ -1481,9 +1481,12 @@ const acceptCreate = async (state, newDirentType, createFn) => {
   }
   const parentFolder = getParentFolder(items, focusedIndex, root);
   const absolutePath = join2(parentFolder, newFileName);
-  const successful = await createNewDirentsAccept(newFileName, pathSeparator, absolutePath, root, createFn);
-  if (!successful) {
-    return state;
+  const createErrorMessage = await createNewDirentsAccept(newFileName, pathSeparator, absolutePath, root, createFn);
+  if (createErrorMessage) {
+    return {
+      ...state,
+      editingErrorMessage: createErrorMessage
+    };
   }
   const pathPaths = getPathParts(root, absolutePath, pathSeparator);
   const children = await getPathPartsChildren(pathPaths);
@@ -2279,7 +2282,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;
@@ -4071,6 +4074,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);
@@ -4084,8 +4099,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 {

package/package.json

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