@lvce-editor/explorer-view 2.5.0 → 2.7.0

package/dist/explorerViewWorkerMain.js

@@ -1317,7 +1317,8 @@ const create2 = (uid, uri, x, y, width, height, args, parentUid, platform = 0) =
     fileIconCache: Object.create(null),
     useChevrons: false,
     icons: [],
-    platform
+    platform,
+    focus: 0
   };
   set(uid, state, state);
 };
@@ -1351,7 +1352,8 @@ const create = (id, uri, x, y, width, height, args, parentUid, platform = 0) =>
     fileIconCache: Object.create(null),
     useChevrons: false,
     icons: [],
-    platform
+    platform,
+    focus: 0
   };
   set(state.uid, state, state);
   return state;
@@ -1845,7 +1847,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 = ['getMenuEntries2', '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', 'handleContextMenuKeyboard', '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;
@@ -2141,6 +2143,13 @@ const getMenuEntries = state => {
   }
 };
 
+const getMenuEntries2 = uid => {
+  const {
+    newState
+  } = get(uid);
+  return getMenuEntries(newState);
+};
+
 const getParentStartIndex = (dirents, index) => {
   const dirent = dirents[index];
   let startIndex = index - 1;
@@ -2249,6 +2258,10 @@ const handleArrowRightDirectoryExpanded = (state, dirent) => {
   return state;
 };
 
+const setFocus = key => {
+  return invoke('Focus.setFocus', key);
+};
+
 const handleClickDirectory = async (state, dirent, index, keepFocus) => {
   // @ts-ignore
   dirent.type = DirectoryExpanding;
@@ -2282,6 +2295,7 @@ const handleClickDirectory = async (state, dirent, index, keepFocus) => {
     icons,
     newFileIconCache
   } = await getFileIcons(parts, state.fileIconCache);
+  await setFocus(FocusExplorer);
   return {
     ...state,
     items: newDirents,
@@ -2486,6 +2500,10 @@ const handleClickAt = (state, button, x, y) => {
   return handleClick(state, index);
 };
 
+const handleClickCurrent = state => {
+  return handleClick(state, state.focusedIndex - state.minLineY, /* keepFocus */false);
+};
+
 const handleClickCurrentButKeepFocus = state => {
   return handleClick(state, state.focusedIndex - state.minLineY, /* keepFocus */true);
 };
@@ -2561,6 +2579,18 @@ const handleCopy = async state => {
   return state;
 };
 
+const handleDragLeave = state => {
+  return state;
+  // const { dropTargets } = state
+  // if (dropTargets.length === 0) {
+  //   return state
+  // }
+  // return {
+  //   ...state,
+  //   dropTargets: [],
+  // }
+};
+
 const canBeDroppedInto = dirent => {
   if (!dirent) {
     return false;
@@ -2658,6 +2688,9 @@ 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 => {
@@ -2753,16 +2786,19 @@ const getMergedDirents$2 = async (root, pathSeparator, dirents) => {
   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) {
     const updated = await refresh(state);
-    return updated;
+    return {
+      ...updated,
+      dropTargets: []
+    };
   }
   const mergedDirents = await getMergedDirents$2(root, pathSeparator, items);
   return {
@@ -2772,22 +2808,30 @@ const handleDrop$2 = async (state, files) => {
   };
 };
 
-const getFilePathElectron = async file => {
-  return invoke('GetFilePathElectron.getFilePathElectron', file);
+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 mergeDirents = (oldDirents, newDirents) => {
-  return newDirents;
+// TODO copy files in parallel
+const copyFilesElectron = async (root, pathSeparator, fileHandles, files, paths) => {
+  const operations = await getFileOperationsElectron(root, paths, fileHandles);
+  await applyFileOperations(operations);
 };
 
-// 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 mergeDirents = (oldDirents, newDirents) => {
+  return newDirents;
 };
 const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
   const childDirents = await getChildDirents(pathSeparator, {
@@ -2797,13 +2841,13 @@ const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
   const mergedDirents = mergeDirents(dirents, childDirents);
   return mergedDirents;
 };
-const handleDrop$1 = async (state, files) => {
+const handleDrop$1 = async (state, fileHandles, files, paths) => {
   const {
     root,
     pathSeparator,
     items
   } = state;
-  await copyFilesElectron(root, pathSeparator, files);
+  await copyFilesElectron(root, pathSeparator, fileHandles, files, paths);
   const mergedDirents = await getMergedDirents$1(root, pathSeparator, items);
   return {
     ...state,
@@ -2812,16 +2856,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, paths) => {
+  const isElectron = state.platform === Electron;
+  const fn = getModule(isElectron);
+  return fn(state, fileHandles, files, paths);
 };
 
 const getEndIndex = (items, index, dirent) => {
@@ -2841,13 +2887,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, paths) => {
   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;
@@ -2863,18 +2909,18 @@ const handleDropIntoFolder = async (state, dirent, index, files) => {
     dropTargets: []
   };
 };
-const handleDropIntoFile = (state, dirent, index, files) => {
+const handleDropIntoFile = (state, dirent, index, fileHandles, files, paths) => {
   const {
     items
   } = state;
   const parentIndex = getParentStartIndex(items, index);
   if (parentIndex === -1) {
-    return handleDropRoot(state, files);
+    return handleDropRoot(state, fileHandles, files, paths);
   }
   // @ts-ignore
   return handleDropIndex(parentIndex);
 };
-const handleDropIndex = async (state, files, index) => {
+const handleDropIndex = async (state, fileHandles, files, paths, index) => {
   const {
     items
   } = state;
@@ -2885,9 +2931,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, paths);
     default:
       return state;
   }
@@ -2907,22 +2953,37 @@ const getFileHandles = async fileIds => {
   return files;
 };
 
-const handleDrop = async (state, x, y, fileIds) => {
+const getFilePathElectron = async file => {
+  return invoke('FileSystemHandle.getFilePathElectron', file);
+};
+
+const getFilepath = async file => {
+  return getFilePathElectron(file);
+};
+const getFilePaths = async (files, platform) => {
+  if (platform !== Electron) {
+    return files.map(file => '');
+  }
+  const promises = files.map(getFilepath);
+  const paths = await Promise.all(promises);
+  return paths;
+};
+
+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 paths = await getFilePaths(files, state.platform);
     const index = getIndexFromPosition(state, x, y);
     const fn = getDropHandler(index);
-    const result = await fn(state, files, index);
+    const result = await fn(state, fileHandles, files, paths, index);
     return result;
   } catch (error) {
     throw new VError(error, 'Failed to drop files');
   }
 };
 
-const setFocus = key => {
-  return invoke('Focus.setFocus', key);
-};
-
 const handleFocus = async state => {
   await setFocus(FocusExplorer);
   return state;
@@ -3502,6 +3563,7 @@ const HandlePointerDown = 'handlePointerDown';
 const HandleWheel = 'handleWheel';
 const HandleDragOver = 'handleDragOver';
 const HandleDrop = 'handleDrop';
+const HandleDragLeave = 'handleDragLeave';
 
 const mergeClassNames = (...classNames) => {
   return classNames.filter(Boolean).join(' ');
@@ -3653,6 +3715,7 @@ const getExplorerVirtualDom = (visibleItems, focusedIndex, root, isWide, focused
     onBlur: HandleListBlur,
     onClick: HandleClick,
     onContextMenu: HandleContextMenu,
+    onDragLeave: HandleDragLeave,
     onDragOver: HandleDragOver,
     onDrop: HandleDrop,
     onFocus: HandleListFocus,
@@ -3925,8 +3988,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']
   }];
 };
 
@@ -4246,6 +4312,7 @@ const wrapCommand = fn => {
 };
 
 const commandMap = {
+  'Explorer.getMenuEntries2': getMenuEntries2,
   'Explorer.acceptEdit': wrapCommand(acceptEdit),
   'Explorer.cancelEdit': wrapCommand(cancelEdit),
   'Explorer.collapseAll': wrapCommand(collapseAll$1),
@@ -4264,10 +4331,13 @@ const commandMap = {
   'Explorer.handleBlur': wrapCommand(handleBlur),
   'Explorer.handleClick': wrapCommand(handleClick),
   'Explorer.handleClickAt': wrapCommand(handleClickAt),
+  'Explorer.handleClickCurrent': wrapCommand(handleClickCurrent),
   'Explorer.handleClickCurrentButKeepFocus': wrapCommand(handleClickCurrentButKeepFocus),
   'Explorer.handleClickOpenFolder': wrapCommand(handleClickOpenFolder),
   'Explorer.handleContextMenu': wrapCommand(handleContextMenu),
+  'Explorer.handleContextMenuKeyboard': wrapCommand(handleContextMenuKeyboard),
   'Explorer.handleCopy': wrapCommand(handleCopy),
+  'Explorer.handleDragLeave': wrapCommand(handleDragLeave),
   'Explorer.handleDragOver': wrapCommand(handleDragOver),
   'Explorer.handleDrop': wrapCommand(handleDrop),
   'Explorer.handleFocus': wrapCommand(handleFocus),

package/package.json

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