@lvce-editor/explorer-view 6.2.0 → 6.3.0

package/dist/explorerViewWorkerMain.js

@@ -941,6 +941,7 @@ 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 +983,9 @@ const deleteItem = () => {
 const refresh$1 = () => {
   return i18nString(RefreshExplorer);
 };
+const removeFolderFromWorkspace = () => {
+  return i18nString(RemoveFolderFromWorkspace);
+};
 const collapseAll$1 = () => {
   return i18nString(CollapseAllFoldersInExplorer);
 };
@@ -1325,14 +1329,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;
 };
@@ -2556,6 +2555,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 +2581,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:
@@ -3829,16 +3838,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 +3887,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 +3901,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 +3917,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 +3945,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 +3971,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 {

package/package.json

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