@lvce-editor/explorer-view 1.6.0 → 1.7.0

package/dist/explorerViewWorkerMain.js

@@ -2213,36 +2213,11 @@ const handleBlur = state => {
   };
 };
 
-// TODO viewlet should only have create and refresh functions
-// every thing else can be in a separate module <viewlet>.lazy.js
-// and  <viewlet>.ipc.js
-
-// viewlet: creating | refreshing | done | disposed
-// TODO recycle viewlets (maybe)
-
-// TODO instead of root string, there should be a root dirent
-
-// TODO rename dirents to items, then can use virtual list component directly
-
-// TODO support multiselection and removing multiple dirents
-
-// TODO use posInSet and setSize properties to compute more effectively
-
-// TODO much shared logic with newFolder
-
-const handleClickFile$1 = async (state, dirent, index, keepFocus = false) => {
-  // await Command.execute(/* Main.openAbsolutePath */ 'Main.openUri', /* absolutePath */ dirent.path, /* focus */ !keepFocus)
-  return {
-    ...state,
-    focusedIndex: index,
-    focused: keepFocus
-  };
-};
-const handleClickDirectory$1 = async (state, dirent, index, keepFocus) => {
+const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   dirent.type = DirectoryExpanding;
   // TODO handle error
   const dirents = await getChildDirents(state.pathSeparator, dirent);
-  const state2 = {};
+  const state2 = state;
   if (!state2) {
     return state;
   }
@@ -2271,15 +2246,7 @@ const handleClickDirectory$1 = async (state, dirent, index, keepFocus) => {
     maxLineY
   };
 };
-const handleClickDirectoryExpanding = (state, dirent, index, keepFocus) => {
-  dirent.type = Directory;
-  dirent.icon = getIcon();
-  return {
-    ...state,
-    focusedIndex: index,
-    focused: keepFocus
-  };
-};
+
 const handleClickDirectoryExpanded$1 = (state, dirent, index, keepFocus) => {
   const {
     minLineY,
@@ -2316,6 +2283,26 @@ const handleClickDirectoryExpanded$1 = (state, dirent, index, keepFocus) => {
     focused: keepFocus
   };
 };
+
+const handleClickDirectoryExpanding = (state, dirent, index, keepFocus) => {
+  dirent.type = Directory;
+  dirent.icon = getIcon();
+  return {
+    ...state,
+    focusedIndex: index,
+    focused: keepFocus
+  };
+};
+
+const handleClickFile$1 = async (state, dirent, index, keepFocus = false) => {
+  // await Command.execute(/* Main.openAbsolutePath */ 'Main.openUri', /* absolutePath */ dirent.path, /* focus */ !keepFocus)
+  return {
+    ...state,
+    focusedIndex: index,
+    focused: keepFocus
+  };
+};
+
 const handleClickSymLink$1 = async (state, dirent, index) => {
   const realPath = await getRealPath(dirent.path);
   const type = await stat(realPath);
@@ -2326,6 +2313,24 @@ const handleClickSymLink$1 = async (state, dirent, index) => {
       throw new Error(`unsupported file type ${type}`);
   }
 };
+
+// TODO viewlet should only have create and refresh functions
+// every thing else can be in a separate module <viewlet>.lazy.js
+// and  <viewlet>.ipc.js
+
+// viewlet: creating | refreshing | done | disposed
+// TODO recycle viewlets (maybe)
+
+// TODO instead of root string, there should be a root dirent
+
+// TODO rename dirents to items, then can use virtual list component directly
+
+// TODO support multiselection and removing multiple dirents
+
+// TODO use posInSet and setSize properties to compute more effectively
+
+// TODO much shared logic with newFolder
+
 const getClickFn = direntType => {
   switch (direntType) {
     case File:
@@ -2333,7 +2338,7 @@ const getClickFn = direntType => {
       return handleClickFile$1;
     case Directory:
     case SymLinkFolder:
-      return handleClickDirectory$1;
+      return handleClickDirectory;
     case DirectoryExpanding:
       return handleClickDirectoryExpanding;
     case DirectoryExpanded:
@@ -2367,40 +2372,6 @@ const getIndexFromPosition = (state, eventX, eventY) => {
   return index;
 };
 
-const handleClickDirectory = async (state, dirent, index, keepFocus) => {
-  dirent.type = DirectoryExpanding;
-  // TODO handle error
-  const dirents = await getChildDirents(state.pathSeparator, dirent);
-  const state2 = state;
-  if (!state2) {
-    return state;
-  }
-  // TODO use Viewlet.getState here and check if it exists
-  const newIndex = state2.items.indexOf(dirent);
-  // TODO if viewlet is disposed or root has changed, return
-  if (newIndex === -1) {
-    return state;
-  }
-  const newDirents = [...state2.items];
-  newDirents.splice(newIndex + 1, 0, ...dirents);
-  dirent.type = DirectoryExpanded;
-  dirent.icon = getIcon();
-  const {
-    height,
-    itemHeight,
-    minLineY
-  } = state2;
-  // TODO when focused index has changed while expanding, don't update it
-  const maxLineY = getExplorerMaxLineY(minLineY, height, itemHeight, newDirents.length);
-  return {
-    ...state,
-    items: newDirents,
-    focusedIndex: newIndex,
-    focused: keepFocus,
-    maxLineY
-  };
-};
-
 const getParentStartIndex = (dirents, index) => {
   const dirent = dirents[index];
   let startIndex = index - 1;
@@ -2422,21 +2393,21 @@ const LeftClick = 0;
 
 // TODO instead of root string, there should be a root dirent
 
-const updateIcon = dirent => {
+const updateIcon$1 = dirent => {
   return {
     ...dirent,
     icon: getIcon()
   };
 };
-const updateIcons = state => {
-  const newDirents = state.items.map(updateIcon);
+const updateIcons$1 = state => {
+  const newDirents = state.items.map(updateIcon$1);
   return {
     ...state,
     items: newDirents
   };
 };
 const handleIconThemeChange = state => {
-  return updateIcons(state);
+  return updateIcons$1(state);
 };
 
 // TODO rename dirents to items, then can use virtual list component directly
@@ -2985,8 +2956,7 @@ const None = 'none';
 const Copy = 'copy';
 const Cut = 'cut';
 
-const handlePaste = async state => {
-  const nativeFiles = await readNativeFiles();
+const getPasteHandler = type => {
   // TODO detect cut/paste event, not sure if that is possible
   // TODO check that pasted folder is not a parent folder of opened folder
   // TODO support pasting multiple paths
@@ -2999,18 +2969,36 @@ const handlePaste = async state => {
   // TODO but what if a file is currently selected? Then maybe the parent folder
   // TODO but will it work if the folder is a symlink?
   // TODO handle error gracefully when copy fails
-  switch (nativeFiles.type) {
+  switch (type) {
     case None:
-      return handlePasteNone(state);
+      return handlePasteNone;
     case Copy:
-      return handlePasteCopy(state, nativeFiles);
+      return handlePasteCopy;
     case Cut:
-      return handlePasteCut(state, nativeFiles);
+      return handlePasteCut;
     default:
-      throw new Error(`unexpected native paste type: ${nativeFiles.type}`);
+      throw new Error(`unexpected native paste type: ${type}`);
   }
 };
 
+const handlePaste = async state => {
+  const nativeFiles = await readNativeFiles();
+  // TODO detect cut/paste event, not sure if that is possible
+  // TODO check that pasted folder is not a parent folder of opened folder
+  // TODO support pasting multiple paths
+  // TODO what happens when pasting multiple paths, but some of them error?
+  // how many error messages should be shown? Should the operation be undone?
+  // TODO what if it is a large folder and takes a long time to copy? Should show progress
+  // TODO what if there is a permission error? Probably should show a modal to ask for permission
+  // TODO if error is EEXISTS, just rename the copy (e.g. file-copy-1.txt, file-copy-2.txt)
+  // TODO actual target should be selected folder
+  // TODO but what if a file is currently selected? Then maybe the parent folder
+  // TODO but will it work if the folder is a symlink?
+  // TODO handle error gracefully when copy fails
+  const fn = getPasteHandler(nativeFiles.type);
+  return fn(state, nativeFiles);
+};
+
 const handlePointerDown = (state, button, x, y) => {
   const index = getIndexFromPosition(state, x, y);
   if (button === LeftClick && index === -1) {
@@ -3042,15 +3030,15 @@ const handleUpload = async (state, dirents) => {
   }
 };
 
+const getWorkspacePath = () => {
+  return invoke('Workspace.getPath');
+};
+
 const EmptyString = '';
 
 const Fulfilled = 'fulfilled';
 const Rejected = 'rejected';
 
-const getWorkspacePath = () => {
-  return invoke('Workspace.getPath');
-};
-
 // TODO viewlet should only have create and refresh functions
 // every thing else can be in a separate module <viewlet>.lazy.js
 // and  <viewlet>.ipc.js
@@ -3196,6 +3184,16 @@ const loadContent = async (state, savedState) => {
   };
 };
 
+const handleWorkspaceChange = async state => {
+  const newRoot = await getWorkspacePath();
+  const state1 = {
+    ...state,
+    root: newRoot
+  };
+  const newState = await loadContent(state1, undefined);
+  return newState;
+};
+
 const ExplorerEditBox = FocusExplorerEditBox;
 
 const setFocus = key => {
@@ -3215,7 +3213,7 @@ const newDirent = async (state, editingType) => {
     if (dirent.type === Directory) {
       // TODO handle error
       // @ts-ignore
-      await undefined(state, dirent, focusedIndex);
+      await handleClickDirectory(state, dirent);
     }
   }
   return {
@@ -3377,6 +3375,7 @@ const renderActions = state => {
 const getSavedRoot = (savedState, workspacePath) => {
   return workspacePath;
 };
+
 const restoreState = savedState => {
   if (!savedState) {
     return {
@@ -3401,6 +3400,21 @@ const restoreState = savedState => {
   };
 };
 
+const updateIcon = dirent => {
+  return {
+    ...dirent,
+    icon: getIcon()
+  };
+};
+
+const updateIcons = state => {
+  const newDirents = state.items.map(updateIcon);
+  return {
+    ...state,
+    items: newDirents
+  };
+};
+
 const getIndex = (dirents, uri) => {
   for (let i = 0; i < dirents.length; i++) {
     const dirent = dirents[i];
@@ -3717,6 +3731,7 @@ const commandMap = {
   'Explorer.handlePointerDown': handlePointerDown,
   'Explorer.handleUpload': handleUpload,
   'Explorer.handleWheel': handleWheel,
+  'Explorer.handleWorkspaceChange': handleWorkspaceChange,
   'Explorer.loadContent': loadContent,
   'Explorer.newFile': newFile,
   'Explorer.newFolder': newFolder,
@@ -3728,7 +3743,8 @@ const commandMap = {
   'Explorer.revealItem': revealItem,
   'Explorer.saveState': saveState,
   'Explorer.setDeltaY': setDeltaY,
-  'Explorer.updateEditingValue': updateEditingValue
+  'Explorer.updateEditingValue': updateEditingValue,
+  'Explorer.updateIcons': updateIcons
 };
 
 const listen = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/explorer-view",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Explorer Worker",
   "main": "dist/explorerViewWorkerMain.js",
   "type": "module",