@lvce-editor/explorer-view 6.3.0 → 6.5.0

package/dist/explorerViewWorkerMain.js

@@ -936,6 +936,7 @@ const FileCannotStartWithBackSlash = 'A file or folder name cannot start with a
 const FilesExplorer = 'Files Explorer';
 const NewFile$2 = 'New File...';
 const NewFolder$2 = 'New Folder...';
+const OpenAnotherFolder = 'Open another folder';
 const OpenContainingFolder = 'Open Containing Folder';
 const OpenFolder$1 = 'Open folder';
 const OpenInIntegratedTerminal = 'Open in integrated Terminal';
@@ -998,6 +999,9 @@ const youHaveNotYetOpenedAFolder = () => {
 const openFolder$1 = () => {
   return i18nString(OpenFolder$1);
 };
+const openAnotherFolder = () => {
+  return i18nString(OpenAnotherFolder);
+};
 const fileOrFolderNameMustBeProvided = () => {
   return i18nString(FileOrFolderNameMustBeProvider);
 };
@@ -1207,7 +1211,7 @@ const acceptEdit = async state => {
 };
 
 const getFocusedIndexCancel = (items, editingIndex) => {
-  const newFocusedIndex = editingIndex > items.length ? items.length - 1 : editingIndex;
+  const newFocusedIndex = editingIndex >= items.length ? items.length - 1 : editingIndex;
   return newFocusedIndex;
 };
 
@@ -1346,12 +1350,25 @@ const writeNativeFiles = async (type, files) => {
   return invoke$2('ClipBoard.writeNativeFiles', type, files);
 };
 
+const getRelativePath = (root, pathSeparator, path) => {
+  if (root && path.startsWith(root)) {
+    const relativePath = path.slice(root.length);
+    if (relativePath.startsWith(pathSeparator)) {
+      return relativePath.slice(pathSeparator.length);
+    }
+    return relativePath;
+  }
+  if (path.startsWith(pathSeparator)) {
+    return path.slice(pathSeparator.length);
+  }
+  return path;
+};
 const copyRelativePath = async state => {
   const dirent = getFocusedDirent$1(state);
   if (!dirent) {
     return state;
   }
-  const relativePath = dirent.path.slice(1);
+  const relativePath = getRelativePath(state.root, state.pathSeparator, dirent.path);
   // TODO handle error
   await writeText(relativePath);
   return state;
@@ -2834,6 +2851,19 @@ const NewFolder$1 = 'NewFolder';
 const OpenFolder = 'OpenFolder';
 const Refresh$1 = 'Refresh';
 
+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 (dirent && isFolder(dirent.type)) {
+      return i;
+    }
+  }
+  return -1;
+};
+
 const getNewChildDirentsForNewDirent = async (items, depth, parentPath, direntType) => {
   // Get existing children or query them if they don't exist
   let existingChildren = items.filter(item => item.depth === depth && item.path.startsWith(parentPath));
@@ -2921,18 +2951,6 @@ 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 do it like vscode, select position between folders and files
   const {
@@ -4186,8 +4204,12 @@ const handleIconThemeChange = state => {
 const handleInputBlur = async state => {
   const {
     editingErrorMessage,
+    editingIndex,
     editingValue
   } = state;
+  if (editingIndex === -1) {
+    return state;
+  }
   if (editingErrorMessage || !editingValue) {
     return cancelEditInternal(state, false);
   }
@@ -5084,6 +5106,12 @@ const getLabelDom = (isEditing, name, isDimmed) => {
   return [label, text(name)];
 };
 
+const getTitle = path => {
+  if (path.startsWith('file://')) {
+    return path.slice('file://'.length);
+  }
+  return path;
+};
 const getExplorerItemVirtualDom = item => {
   const {
     ariaExpanded,
@@ -5116,7 +5144,7 @@ const getExplorerItemVirtualDom = item => {
     draggable: true,
     id,
     role: TreeItem,
-    title: path,
+    title: getTitle(path),
     type: Div
   }, ...chevronDom, getFileIconVirtualDom(icon), ...getInputDom(isEditing, hasEditingError), ...getLabelDom(isEditing, name, isCut || isIgnored)];
 };
@@ -5167,13 +5195,26 @@ const getParentNode$1 = childCount => {
     type: Div
   };
 };
-const getLoadErrorVirtualDom = loadErrorMessage => {
+const getLoadErrorVirtualDom = (loadErrorMessage, isWide, showOpenAnotherFolderButton) => {
+  const childCount = showOpenAnotherFolderButton ? 2 : 1;
   const errorDom = [{
-    childCount: 1,
+    childCount,
+    className: Welcome,
     type: Div
+  }, {
+    childCount: 1,
+    className: WelcomeMessage,
+    type: P
   }, text(loadErrorMessage)];
+  const buttonDom = showOpenAnotherFolderButton ? [{
+    childCount: 1,
+    className: mergeClassNames(Button$2, ButtonPrimary, isWide ? ButtonWide : ButtonNarrow),
+    name: OpenFolder,
+    onClick: HandleClickOpenFolder,
+    type: Button$1
+  }, text(openAnotherFolder())] : [];
   const parentNode = getParentNode$1(1);
-  return [parentNode, ...errorDom];
+  return [parentNode, ...errorDom, ...buttonDom];
 };
 
 const getScrollBarVirtualDom = scrollBarHeight => {
@@ -5210,12 +5251,12 @@ const getChildCount = (scrollBarDomLength, errorDomLength) => {
   }
   return childCount;
 };
-const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage, loadErrorMessage) => {
+const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage, loadErrorMessage, showOpenAnotherFolderButton) => {
   if (!root) {
     return getExplorerWelcomeVirtualDom(isWide, dropTargets);
   }
   if (loadErrorMessage) {
-    return getLoadErrorVirtualDom(loadErrorMessage);
+    return getLoadErrorVirtualDom(loadErrorMessage, isWide, showOpenAnotherFolderButton);
   }
   const scrollBarHeight = getScrollBarSize(height, contentHeight, 20);
   const scrollBarDom = getScrollBarVirtualDom(scrollBarHeight);
@@ -5226,14 +5267,26 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
   return dom;
 };
 
+const getMissingFolderMessage = root => {
+  if (root) {
+    return `Could not open "${root}" because the folder does not exist. It may have been moved or deleted.`;
+  }
+  return 'Could not open folder because the folder does not exist. It may have been moved or deleted.';
+};
 const getLoadErrorMessage = state => {
   if (state.hasError) {
+    if (state.errorCode === 'ENOENT') {
+      return getMissingFolderMessage(state.root);
+    }
     const code = state.errorCode ? ` (error code: ${state.errorCode})` : '';
     const reason = state.errorMessage || 'an unexpected error occurred';
     return `Could not open folder due to ${reason}${code}.`;
   }
   return '';
 };
+const shouldShowOpenAnotherFolderButton = state => {
+  return state.hasError && state.errorCode === 'ENOENT';
+};
 
 const renderItems = (oldState, newState) => {
   const {
@@ -5252,10 +5305,11 @@ const renderItems = (oldState, newState) => {
   const isWide = width > 450;
   const contentHeight = items.length * itemHeight;
   const loadErrorMessage = getLoadErrorMessage(newState);
+  const showOpenAnotherFolderButton = shouldShowOpenAnotherFolderButton(newState);
   if (initial) {
     return [SetDom2, newState.uid, []];
   }
-  const dom = getExplorerVirtualDom(visibleDirents, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage, loadErrorMessage);
+  const dom = getExplorerVirtualDom(visibleDirents, focusedIndex, root, isWide, focused, dropTargets, height, contentHeight, editingErrorMessage, loadErrorMessage, showOpenAnotherFolderButton);
   return [SetDom2, newState.uid, dom];
 };
 

package/package.json

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