@lvce-editor/explorer-view 2.6.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', '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 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);
 };
@@ -2562,16 +2580,15 @@ const handleCopy = async state => {
 };
 
 const handleDragLeave = state => {
-  const {
-    dropTargets
-  } = state;
-  if (dropTargets.length === 0) {
-    return state;
-  }
-  return {
-    ...state,
-    dropTargets: []
-  };
+  return state;
+  // const { dropTargets } = state
+  // if (dropTargets.length === 0) {
+  //   return state
+  // }
+  // return {
+  //   ...state,
+  //   dropTargets: [],
+  // }
 };
 
 const canBeDroppedInto = dirent => {
@@ -2807,22 +2824,8 @@ const getFileOperationsElectron = async (root, paths, fileHandles) => {
   return operations;
 };
 
-const getFilePathElectron = async file => {
-  return invoke('FileSystemHandle.getFilePathElectron', file);
-};
-
-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, fileHandles, files) => {
-  const paths = await getFilePaths(files);
+const copyFilesElectron = async (root, pathSeparator, fileHandles, files, paths) => {
   const operations = await getFileOperationsElectron(root, paths, fileHandles);
   await applyFileOperations(operations);
 };
@@ -2838,13 +2841,13 @@ const getMergedDirents$1 = async (root, pathSeparator, dirents) => {
   const mergedDirents = mergeDirents(dirents, childDirents);
   return mergedDirents;
 };
-const handleDrop$1 = async (state, fileHandles, files) => {
+const handleDrop$1 = async (state, fileHandles, files, paths) => {
   const {
     root,
     pathSeparator,
     items
   } = state;
-  await copyFilesElectron(root, pathSeparator, fileHandles, files);
+  await copyFilesElectron(root, pathSeparator, fileHandles, files, paths);
   const mergedDirents = await getMergedDirents$1(root, pathSeparator, items);
   return {
     ...state,
@@ -2861,10 +2864,10 @@ const getModule = isElectron => {
   }
   return handleDrop$2;
 };
-const handleDropRoot = async (state, fileHandles, files) => {
+const handleDropRoot = async (state, fileHandles, files, paths) => {
   const isElectron = state.platform === Electron;
   const fn = getModule(isElectron);
-  return fn(state, fileHandles, files);
+  return fn(state, fileHandles, files, paths);
 };
 
 const getEndIndex = (items, index, dirent) => {
@@ -2884,7 +2887,7 @@ const getMergedDirents = (items, index, dirent, childDirents) => {
   }, ...childDirents, ...items.slice(endIndex)];
   return mergedDirents;
 };
-const handleDropIntoFolder = async (state, dirent, index, fileHandles, files) => {
+const handleDropIntoFolder = async (state, dirent, index, fileHandles, files, paths) => {
   const {
     pathSeparator,
     items
@@ -2906,18 +2909,18 @@ const handleDropIntoFolder = async (state, dirent, index, fileHandles, files) =>
     dropTargets: []
   };
 };
-const handleDropIntoFile = (state, dirent, index, fileHandles, files) => {
+const handleDropIntoFile = (state, dirent, index, fileHandles, files, paths) => {
   const {
     items
   } = state;
   const parentIndex = getParentStartIndex(items, index);
   if (parentIndex === -1) {
-    return handleDropRoot(state, fileHandles, files);
+    return handleDropRoot(state, fileHandles, files, paths);
   }
   // @ts-ignore
   return handleDropIndex(parentIndex);
 };
-const handleDropIndex = async (state, fileHandles, files, index) => {
+const handleDropIndex = async (state, fileHandles, files, paths, index) => {
   const {
     items
   } = state;
@@ -2930,7 +2933,7 @@ const handleDropIndex = async (state, fileHandles, files, index) => {
     case DirectoryExpanded:
       return handleDropIntoFolder(state, dirent, index, fileHandles);
     case File:
-      return handleDropIntoFile(state, dirent, index, fileHandles, files);
+      return handleDropIntoFile(state, dirent, index, fileHandles, files, paths);
     default:
       return state;
   }
@@ -2950,24 +2953,37 @@ const getFileHandles = async fileIds => {
   return files;
 };
 
+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 {
     // @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, fileHandles, 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;
@@ -4296,6 +4312,7 @@ const wrapCommand = fn => {
 };
 
 const commandMap = {
+  'Explorer.getMenuEntries2': getMenuEntries2,
   'Explorer.acceptEdit': wrapCommand(acceptEdit),
   'Explorer.cancelEdit': wrapCommand(cancelEdit),
   'Explorer.collapseAll': wrapCommand(collapseAll$1),
@@ -4314,9 +4331,11 @@ 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),

package/package.json

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