@lvce-editor/explorer-view 7.18.0 → 7.19.1

package/dist/explorerViewWorkerMain.js

@@ -2251,7 +2251,7 @@ const openUri = async (uri, focus, options) => {
         type: 'editor',
         uri
       },
-      focu: focus,
+      focus,
       preview: options.preview ?? false
     });
     return;
@@ -4251,7 +4251,7 @@ const getKeyBindings = () => {
     key: Delete$1,
     when: FocusExplorer
   }, {
-    command: 'Explorer.focusNone',
+    command: 'Explorer.handleEscape',
     key: Escape,
     when: FocusExplorer
   }, {
@@ -4262,10 +4262,6 @@ const getKeyBindings = () => {
     command: 'Explorer.handleClickCurrent',
     key: Enter,
     when: FocusExplorer
-  }, {
-    command: 'Explorer.handleEscape',
-    key: Escape,
-    when: FocusExplorer
   }, {
     command: 'Explorer.selectAll',
     key: CtrlCmd | KeyA,
@@ -5215,11 +5211,12 @@ const handleContextMenuAtIndex = async (state, index, x, y) => {
   number(x);
   number(y);
   const {
+    focusedIndex,
     items,
     uid
   } = state;
   const contextMenuItem = items[index];
-  const newItems = contextMenuItem && !contextMenuItem.selected ? items.map(item => ({
+  const newItems = contextMenuItem && index !== focusedIndex && !contextMenuItem.selected ? items.map(item => ({
     ...item,
     selected: false
   })) : items;
@@ -5315,9 +5312,12 @@ const handleCut = async state => {
   }
   const files = dirents.map(dirent => dirent.path);
   await writeNativeFiles('cut', files);
+  await invoke$2('Focus.setFocus', FocusExplorer);
   return {
     ...state,
     cutItems: files,
+    focus: List,
+    focused: true,
     pasteShouldMove: true
   };
 };
@@ -5343,7 +5343,16 @@ const handleDragEnd = state => {
 };
 
 const handleDragLeave = state => {
-  return state;
+  const {
+    dropTargets
+  } = state;
+  if (dropTargets.length === 0) {
+    return state;
+  }
+  return {
+    ...state,
+    dropTargets: []
+  };
 };
 
 const canBeDroppedInto = dirent => {
@@ -6114,7 +6123,7 @@ const handleDrop = async (state, x, y, fileIds, fileList) => {
 
 const handleEscape = async state => {
   return {
-    ...state,
+    ...focusNone(state),
     cutItems: []
   };
 };
@@ -6750,9 +6759,10 @@ const openInIntegratedTerminal = async state => {
   return state;
 };
 
-const confirmDelete = async paths => {
+const confirmDelete = async items => {
   // TODO use i18n string
-  const message = paths.length === 1 ? `Are you sure you want to delete "${paths[0]}"?` : `Are you sure you want to delete ${paths.length} items?`;
+  const names = items.map(item => `"${item.name}"`).join(', ');
+  const message = items.length === 1 ? `Are you sure you want to delete "${items[0].path}"?` : `Are you sure you want to delete ${names}?`;
   const result = await confirm(message);
   return result;
 };
@@ -6776,7 +6786,7 @@ const removeDirent = async state => {
   }
   const toRemove = getPaths(selectedItems);
   if (confirmDelete$1) {
-    const confirmed = await confirmDelete(toRemove);
+    const confirmed = await confirmDelete(selectedItems);
     if (!confirmed) {
       return state;
     }

package/package.json

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