@lvce-editor/explorer-view 2.4.0 → 2.6.0

package/dist/explorerViewWorkerMain.js

@@ -1845,7 +1845,7 @@ const focusPrevious = state => {
   }
 };
 
-const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleCopy', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'refresh', 'revealItem', 'removeDirent', 'rename', 'renameDirent', 'revealItem', 'scrollDown', 'scrollUp', 'setDeltaY', 'renderEventListeners', 'updateEditingValue', 'updateIcons'];
+const commandIds = ['acceptEdit', 'cancelEdit', 'collapseAll', 'copyPath', 'copyRelativePath', 'expandAll', 'expandRecursively', 'focus', 'focusFirst', 'focusIndex', 'focusLast', 'focusNext', 'focusNone', 'focusPrevious', 'getFocusedDirent', 'handleArrowLeft', 'handleArrowLeft', 'handleArrowRight', 'handleArrowRight', 'handleBlur', 'handleClick', 'handleClickAt', 'handleClickCurrent', 'handleClickCurrentButKeepFocus', 'handleClickOpenFolder', 'handleContextMenu', 'handleCopy', 'handleDragLeave', 'handleDragOver', 'handleDrop', 'handleFocus', 'handleIconThemeChange', 'handleLanguagesChanged', 'handleMouseEnter', 'handleMouseLeave', 'handlePaste', 'handlePointerDown', 'handleUpload', 'handleWheel', 'handleWorkspaceChange', 'hotReload', 'newFile', 'newFolder', 'openContainingFolder', 'refresh', 'refresh', 'removeDirent', 'rename', 'renameDirent', 'renderEventListeners', 'revealItem', 'revealItem', 'scrollDown', 'scrollUp', 'setDeltaY', 'updateEditingValue', 'updateIcons'];
 
 const getCommandIds = () => {
   return commandIds;
@@ -2010,7 +2010,7 @@ const rename = () => {
 const deleteItem = () => {
   return i18nString(Delete);
 };
-const refresh = () => {
+const refresh$1 = () => {
   return i18nString(RefreshExplorer);
 };
 const collapseAll = () => {
@@ -2561,6 +2561,19 @@ const handleCopy = async state => {
   return state;
 };
 
+const handleDragLeave = state => {
+  const {
+    dropTargets
+  } = state;
+  if (dropTargets.length === 0) {
+    return state;
+  }
+  return {
+    ...state,
+    dropTargets: []
+  };
+};
+
 const canBeDroppedInto = dirent => {
   if (!dirent) {
     return false;
@@ -2624,6 +2637,52 @@ const handleDragOver = (state, x, y) => {
   };
 };
 
+const getTopLevelDirents = (root, pathSeparator, excluded) => {
+  if (!root) {
+    return [];
+  }
+  return getChildDirents(pathSeparator, {
+    depth: 0,
+    path: root,
+    type: Directory
+  }, excluded);
+};
+
+const mergeDirents$2 = (oldDirents, newDirents) => {
+  const merged = [];
+  for (const newDirent of newDirents) {
+    merged.push(newDirent);
+  }
+  return merged;
+};
+
+// TODO add lots of tests for this
+const refresh = async state1 => {
+  const topLevelDirents = await getTopLevelDirents(state1.root, state1.pathSeparator, []);
+  const newDirents = mergeDirents$2(state1.items, topLevelDirents);
+  const state3 = {
+    ...state1,
+    items: newDirents
+  };
+  return state3;
+};
+
+const applyOperation = operation => {
+  if (operation.type === 'createFolder') {
+    return mkdir(operation.path);
+  }
+  if (operation.type === 'copy') {
+    return copy$1(operation.from || '', operation.path);
+  }
+  return writeFile(operation.path, operation.text);
+};
+const applyFileOperations = async operations => {
+  // TODO run operations in parallel if possible
+  for (const operation of operations) {
+    await applyOperation(operation);
+  }
+};
+
 const getChildHandles = async fileHandle => {
   // @ts-ignore
   const values = fileHandle.values();
@@ -2661,11 +2720,35 @@ const createUploadTree = async (root, fileHandles) => {
   return uploadTree;
 };
 
+const getFileOperations = (root, uploadTree) => {
+  const operations = [];
+  const processTree = (tree, currentPath) => {
+    for (const [path, value] of Object.entries(tree)) {
+      const fullPath = currentPath ? `${currentPath}/${path}` : path;
+      if (typeof value === 'object') {
+        operations.push({
+          type: 'createFolder',
+          path: `${root}/${fullPath}`,
+          text: ''
+        });
+        processTree(value, fullPath);
+      } else if (typeof value === 'string') {
+        operations.push({
+          type: 'createFile',
+          path: `${root}/${fullPath}`,
+          text: value
+        });
+      }
+    }
+  };
+  processTree(uploadTree, '');
+  return operations;
+};
+
 const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) => {
   const uploadTree = await createUploadTree(root, fileSystemHandles);
-  console.log({
-    uploadTree
-  });
+  const fileOperations = getFileOperations(root, uploadTree);
+  await applyFileOperations(fileOperations);
 
   // TODO
   // 1. in electron, use webutils.getPathForFile to see if a path is available
@@ -2675,7 +2758,7 @@ const uploadFileSystemHandles = async (root, pathSeparator, fileSystemHandles) =
   return true;
 };
 
-const mergeDirents$2 = (oldDirents, newDirents) => {
+const mergeDirents$1 = (oldDirents, newDirents) => {
   return newDirents;
 };
 const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
@@ -2683,18 +2766,22 @@ const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
     path: root,
     depth: 0
   });
-  const mergedDirents = mergeDirents$2(dirents, childDirents);
+  const mergedDirents = mergeDirents$1(dirents, childDirents);
   return mergedDirents;
 };
-const handleDrop$2 = async (state, files) => {
+const handleDrop$2 = async (state, fileHandles, files) => {
   const {
     root,
     pathSeparator,
     items
   } = state;
-  const handled = await uploadFileSystemHandles(root, pathSeparator, files);
+  const handled = await uploadFileSystemHandles(root, pathSeparator, fileHandles);
   if (handled) {
-    return state;
+    const updated = await refresh(state);
+    return {
+      ...updated,
+      dropTargets: []
+    };
   }
   const mergedDirents = await getMergedDirents$2(root, pathSeparator, items);
   return {
@@ -2704,38 +2791,60 @@ const handleDrop$2 = async (state, files) => {
   };
 };
 
+const getFileOperationsElectron = async (root, paths, fileHandles) => {
+  const operations = [];
+  for (let i = 0; i < paths.length; i++) {
+    const fileHandle = fileHandles[i];
+    const name = fileHandle.name;
+    const path = paths[i];
+    operations.push({
+      type: 'copy',
+      path: `${root}/${name}`,
+      text: '',
+      from: path
+    });
+  }
+  return operations;
+};
+
 const getFilePathElectron = async file => {
-  return invoke('GetFilePathElectron.getFilePathElectron', file);
+  return invoke('FileSystemHandle.getFilePathElectron', file);
 };
 
-const mergeDirents$1 = (oldDirents, newDirents) => {
-  return newDirents;
+const getFilepath = async file => {
+  return getFilePathElectron(file);
+};
+const getFilePaths = async files => {
+  const promises = files.map(getFilepath);
+  const paths = await Promise.all(promises);
+  return paths;
 };
 
 // TODO copy files in parallel
-const copyFilesElectron = async (root, pathSeparator, files) => {
-  for (const file of files) {
-    const from = await getFilePathElectron(file);
-    // const from = file.path
-    const to = join(pathSeparator, root, file.name);
-    await copy$1(from, to);
-  }
+const copyFilesElectron = async (root, pathSeparator, fileHandles, files) => {
+  const paths = await getFilePaths(files);
+  const operations = await getFileOperationsElectron(root, paths, fileHandles);
+  await applyFileOperations(operations);
+};
+
+const mergeDirents = (oldDirents, newDirents) => {
+  return newDirents;
 };
 const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
   const childDirents = await getChildDirents(pathSeparator, {
     path: root,
     depth: 0
   });
-  const mergedDirents = mergeDirents$1(dirents, childDirents);
+  const mergedDirents = mergeDirents(dirents, childDirents);
   return mergedDirents;
 };
-const handleDrop$1 = async (state, files) => {
+const handleDrop$1 = async (state, fileHandles, files) => {
   const {
     root,
     pathSeparator,
     items
   } = state;
-  await copyFilesElectron(root, pathSeparator, files);
+  await copyFilesElectron(root, pathSeparator, fileHandles, files);
   const mergedDirents = await getMergedDirents$1(root, pathSeparator, items);
   return {
     ...state,
@@ -2744,16 +2853,18 @@ const handleDrop$1 = async (state, files) => {
   };
 };
 
+const Electron = 2;
+
 const getModule = isElectron => {
   if (isElectron) {
     return handleDrop$1;
   }
   return handleDrop$2;
 };
-const handleDropRoot = async (state, files) => {
-  // @ts-ignore
-  const fn = getModule(state.isElectron);
-  return fn(state, files);
+const handleDropRoot = async (state, fileHandles, files) => {
+  const isElectron = state.platform === Electron;
+  const fn = getModule(isElectron);
+  return fn(state, fileHandles, files);
 };
 
 const getEndIndex = (items, index, dirent) => {
@@ -2773,13 +2884,13 @@ const getMergedDirents = (items, index, dirent, childDirents) => {
   }, ...childDirents, ...items.slice(endIndex)];
   return mergedDirents;
 };
-const handleDropIntoFolder = async (state, dirent, index, files) => {
+const handleDropIntoFolder = async (state, dirent, index, fileHandles, files) => {
   const {
     pathSeparator,
     items
   } = state;
   // @ts-ignore
-  for (const file of files) {
+  for (const file of fileHandles) {
     // TODO path basename
     const baseName = file.name;
     const to = dirent.path + pathSeparator + baseName;
@@ -2795,18 +2906,18 @@ const handleDropIntoFolder = async (state, dirent, index, files) => {
     dropTargets: []
   };
 };
-const handleDropIntoFile = (state, dirent, index, files) => {
+const handleDropIntoFile = (state, dirent, index, fileHandles, files) => {
   const {
     items
   } = state;
   const parentIndex = getParentStartIndex(items, index);
   if (parentIndex === -1) {
-    return handleDropRoot(state, files);
+    return handleDropRoot(state, fileHandles, files);
   }
   // @ts-ignore
   return handleDropIndex(parentIndex);
 };
-const handleDropIndex = async (state, files, index) => {
+const handleDropIndex = async (state, fileHandles, files, index) => {
   const {
     items
   } = state;
@@ -2817,9 +2928,9 @@ const handleDropIndex = async (state, files, index) => {
   switch (dirent.type) {
     case Directory:
     case DirectoryExpanded:
-      return handleDropIntoFolder(state, dirent, index, files);
+      return handleDropIntoFolder(state, dirent, index, fileHandles);
     case File:
-      return handleDropIntoFile(state, dirent, index, files);
+      return handleDropIntoFile(state, dirent, index, fileHandles, files);
     default:
       return state;
   }
@@ -2839,12 +2950,14 @@ const getFileHandles = async fileIds => {
   return files;
 };
 
-const handleDrop = async (state, x, y, fileIds) => {
+const handleDrop = async (state, x, y, fileIds, fileList) => {
   try {
-    const files = await getFileHandles(fileIds);
+    // @ts-ignore
+    const files = [...fileList];
+    const fileHandles = await getFileHandles(fileIds);
     const index = getIndexFromPosition(state, x, y);
     const fn = getDropHandler(index);
-    const result = await fn(state, files, index);
+    const result = await fn(state, fileHandles, files, index);
     return result;
   } catch (error) {
     throw new VError(error, 'Failed to drop files');
@@ -2891,25 +3004,6 @@ const handleIconThemeChange = state => {
   return updateIcons(state);
 };
 
-const getTopLevelDirents = (root, pathSeparator, excluded) => {
-  if (!root) {
-    return [];
-  }
-  return getChildDirents(pathSeparator, {
-    depth: 0,
-    path: root,
-    type: Directory
-  }, excluded);
-};
-
-const mergeDirents = (oldDirents, newDirents) => {
-  const merged = [];
-  for (const newDirent of newDirents) {
-    merged.push(newDirent);
-  }
-  return merged;
-};
-
 // TODO add lots of tests for this
 const updateRoot = async state1 => {
   // @ts-ignore
@@ -2918,13 +3012,13 @@ const updateRoot = async state1 => {
   }
   // const file = nativeFiles.files[0]
   // @ts-ignore
-  const topLevelDirents = await getTopLevelDirents(state1.root, state1.pathSeparator);
+  const topLevelDirents = await getTopLevelDirents(state1.root, state1.pathSeparator, []);
   // const state2 = Viewlet.getState('Explorer')
   // // TODO what if root changes while reading directories?
   // if (state2.disposed || state2.root !== state1.root) {
   //   return state2
   // }
-  const newDirents = mergeDirents(state1.items, topLevelDirents);
+  const newDirents = mergeDirents$2(state1.items, topLevelDirents);
   const state3 = {
     ...state1,
     items: newDirents
@@ -3453,6 +3547,7 @@ const HandlePointerDown = 'handlePointerDown';
 const HandleWheel = 'handleWheel';
 const HandleDragOver = 'handleDragOver';
 const HandleDrop = 'handleDrop';
+const HandleDragLeave = 'handleDragLeave';
 
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
@@ -3604,6 +3699,7 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
     onBlur: HandleListBlur,
     onClick: HandleClick,
     onContextMenu: HandleContextMenu,
+    onDragLeave: HandleDragLeave,
     onDragOver: HandleDragOver,
     onDrop: HandleDrop,
     onFocus: HandleListFocus,
@@ -3775,7 +3871,7 @@ const getActions = root => {
     command: 'newFolder'
   }, {
     type: Button,
-    id: refresh(),
+    id: refresh$1(),
     icon: Refresh,
     command: 'refresh'
   }, {
@@ -3876,8 +3972,11 @@ const renderEventListeners = () => {
     preventDefault: true
   }, {
     name: HandleDrop,
-    params: ['handleDrop', 'event.clientX', 'event.clientY', 'event.dataTransfer.files2'],
+    params: ['handleDrop', 'event.clientX', 'event.clientY', 'event.dataTransfer.files2', 'event.dataTransfer.files'],
     preventDefault: true
+  }, {
+    name: HandleDragLeave,
+    params: ['handleDragLeave']
   }];
 };
 
@@ -4219,6 +4318,7 @@ const commandMap = {
   'Explorer.handleClickOpenFolder': wrapCommand(handleClickOpenFolder),
   'Explorer.handleContextMenu': wrapCommand(handleContextMenu),
   'Explorer.handleCopy': wrapCommand(handleCopy),
+  'Explorer.handleDragLeave': wrapCommand(handleDragLeave),
   'Explorer.handleDragOver': wrapCommand(handleDragOver),
   'Explorer.handleDrop': wrapCommand(handleDrop),
   'Explorer.handleFocus': wrapCommand(handleFocus),
@@ -4232,6 +4332,7 @@ const commandMap = {
   'Explorer.newFile': wrapCommand(newFile),
   'Explorer.newFolder': wrapCommand(newFolder),
   'Explorer.openContainingFolder': wrapCommand(openContainingFolder),
+  'Explorer.refresh': wrapCommand(refresh),
   'Explorer.removeDirent': wrapCommand(removeDirent),
   'Explorer.renameDirent': wrapCommand(renameDirent),
   'Explorer.restoreState': restoreState,

package/package.json

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