@lvce-editor/explorer-view 6.2.0 → 6.4.0

package/dist/explorerViewWorkerMain.js

@@ -936,11 +936,13 @@ 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';
 const Paste = 'Paste';
 const RefreshExplorer = 'Refresh Explorer';
+const RemoveFolderFromWorkspace = 'Remove folder from workspace';
 const Rename = 'Rename';
 const TheNameIsNotValid = 'The name **{0}** is not valid as a file or folder name. Please choose a different name.';
 const TypeAFileName = 'Type file name. Press Enter to confirm or Escape to cancel.'; // TODO use keybinding
@@ -982,6 +984,9 @@ const deleteItem = () => {
 const refresh$1 = () => {
   return i18nString(RefreshExplorer);
 };
+const removeFolderFromWorkspace = () => {
+  return i18nString(RemoveFolderFromWorkspace);
+};
 const collapseAll$1 = () => {
   return i18nString(CollapseAllFoldersInExplorer);
 };
@@ -994,6 +999,9 @@ const youHaveNotYetOpenedAFolder = () => {
 const openFolder$1 = () => {
   return i18nString(OpenFolder$1);
 };
+const openAnotherFolder = () => {
+  return i18nString(OpenAnotherFolder);
+};
 const fileOrFolderNameMustBeProvided = () => {
   return i18nString(FileOrFolderNameMustBeProvider);
 };
@@ -1203,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;
 };
 
@@ -1325,14 +1333,9 @@ const getFocusedDirent$1 = state => {
 
 const copyPath = async state => {
   const dirent = getFocusedDirent$1(state);
-  if (!dirent) {
-    return state;
-  }
   // TODO windows paths
   // TODO handle error
-  const {
-    path
-  } = dirent;
+  const path = dirent ? dirent.path : state.root;
   await writeClipBoardText(path);
   return state;
 };
@@ -1347,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;
@@ -2556,6 +2572,12 @@ const menuEntryDelete = {
   id: 'delete',
   label: deleteItem()
 };
+const menuEntryRemoveFolderFromWorkspace = {
+  command: 'Workspace.close',
+  flags: None$2,
+  id: 'removeFolderFromWorkspace',
+  label: removeFolderFromWorkspace()
+};
 const ALL_ENTRIES = [menuEntryNewFile, menuEntryNewFolder, menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryCut, menuEntryCopy, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath, menuEntrySeparator, menuEntryRename, menuEntryDelete];
 
 // TODO there are two possible ways of getting the focused dirent of explorer
@@ -2576,13 +2598,17 @@ const getMenuEntriesFile = () => {
 const getMenuEntriesDefault = () => {
   return ALL_ENTRIES;
 };
-const getMenuEntriesRoot = () => {
-  return [menuEntryNewFile, menuEntryNewFolder, menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath];
+const getMenuEntriesRoot = root => {
+  const entries = [menuEntryNewFile, menuEntryNewFolder, menuEntryOpenContainingFolder, menuEntryOpenInIntegratedTerminal, menuEntrySeparator, menuEntryPaste, menuEntrySeparator, menuEntryCopyPath, menuEntryCopyRelativePath];
+  if (root) {
+    entries.push(menuEntrySeparator, menuEntryRemoveFolderFromWorkspace);
+  }
+  return entries;
 };
 const getMenuEntries = state => {
   const focusedDirent = getFocusedDirent(state);
   if (!focusedDirent) {
-    return getMenuEntriesRoot();
+    return getMenuEntriesRoot(state.root);
   }
   switch (focusedDirent.type) {
     case Directory:
@@ -2825,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));
@@ -2912,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 {
@@ -3829,16 +3856,24 @@ const getFileOperations = (root, uploadTree) => {
 };
 
 const isDroppedFile = item => {
-  return item.kind === 'file' && 'value' in item && item.value instanceof FileSystemHandle;
+  return item.kind === 'file' && 'value' in item;
+};
+const getFileSystemHandle = item => {
+  if (isDroppedFile(item)) {
+    return item.value;
+  }
+  return item;
+};
+const getDroppedName = item => {
+  if (isDroppedFile(item)) {
+    return item.value.name;
+  }
+  return item.name;
 };
 const getFileSystemHandlesNormalized = fileSystemHandles => {
   const normalized = [];
   for (const item of fileSystemHandles) {
-    if (isDroppedFile(item)) {
-      normalized.push(item.value);
-    } else {
-      normalized.push(item);
-    }
+    normalized.push(getFileSystemHandle(item));
   }
   return normalized;
 };
@@ -3870,7 +3905,7 @@ const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
 const getDroppedDirectoryWorkspacePath = fileHandle => {
   return `html://${fileHandle.name}`;
 };
-const openDroppedDirectoryAsWorkspace = async (state, fileHandle) => {
+const openDroppedDirectoryAsWorkspace$1 = async (state, fileHandle) => {
   const path = getDroppedDirectoryWorkspacePath(fileHandle);
   await invoke$2('PersistentFileHandle.addHandle', fileHandle.name, fileHandle);
   await invoke$2('Workspace.setPath', path);
@@ -3884,17 +3919,15 @@ const getFirstDroppedDirectory = (state, fileHandles) => {
   if (state.root !== '') {
     return undefined;
   }
-  for (const fileHandle of fileHandles) {
+  for (const item of fileHandles) {
+    const fileHandle = getFileSystemHandle(item);
     if (isDirectoryHandle(fileHandle)) {
       return fileHandle;
     }
   }
   return undefined;
 };
-const shouldIgnoreDroppedHandles = (state, fileHandles) => {
-  return state.root === '' && fileHandles.length > 0 && !getFirstDroppedDirectory(state, fileHandles);
-};
-const handleDrop$2 = async (state, fileHandles, files) => {
+const handleDrop$2 = async (state, fileHandles, files, paths) => {
   const {
     items,
     pathSeparator,
@@ -3902,9 +3935,9 @@ const handleDrop$2 = async (state, fileHandles, files) => {
   } = state;
   const droppedDirectory = getFirstDroppedDirectory(state, fileHandles);
   if (droppedDirectory) {
-    return openDroppedDirectoryAsWorkspace(state, droppedDirectory);
+    return openDroppedDirectoryAsWorkspace$1(state, droppedDirectory);
   }
-  if (shouldIgnoreDroppedHandles(state, fileHandles)) {
+  if (root === '') {
     return {
       ...state,
       dropTargets: []
@@ -3930,9 +3963,7 @@ const getFileOperationsElectron = async (root, paths, fileHandles, pathSeparator
   const operations = [];
   for (let i = 0; i < paths.length; i++) {
     const fileHandle = fileHandles[i];
-    const {
-      name
-    } = fileHandle;
+    const name = getDroppedName(fileHandle);
     const path = paths[i];
     operations.push({
       from: path,
@@ -3958,12 +3989,42 @@ const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
   const mergedDirents = mergeDirents(dirents, childDirents);
   return mergedDirents;
 };
+const openDroppedDirectoryAsWorkspace = async (state, path) => {
+  await invoke$2('Workspace.setPath', path);
+  const updated = await loadContent(state, undefined);
+  return {
+    ...updated,
+    dropTargets: []
+  };
+};
+const getFirstDroppedDirectoryPath = (state, fileHandles, paths) => {
+  if (state.root !== '') {
+    return undefined;
+  }
+  for (let i = 0; i < fileHandles.length; i++) {
+    const fileHandle = getFileSystemHandle(fileHandles[i]);
+    if (isDirectoryHandle(fileHandle)) {
+      return paths[i];
+    }
+  }
+  return undefined;
+};
 const handleDrop$1 = async (state, fileHandles, files, paths) => {
   const {
     items,
     pathSeparator,
     root
   } = state;
+  const droppedDirectoryPath = getFirstDroppedDirectoryPath(state, fileHandles, paths);
+  if (droppedDirectoryPath) {
+    return openDroppedDirectoryAsWorkspace(state, droppedDirectoryPath);
+  }
+  if (root === '') {
+    return {
+      ...state,
+      dropTargets: []
+    };
+  }
   await copyFilesElectron(root, fileHandles, files, paths);
   const mergedDirents = await getMergedDirents$1(root, pathSeparator, items);
   return {
@@ -5041,6 +5102,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,
@@ -5073,7 +5140,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)];
 };
@@ -5124,13 +5191,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 => {
@@ -5167,12 +5247,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);
@@ -5183,14 +5263,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 {
@@ -5209,10 +5301,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.2.0",
+  "version": "6.4.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",