@lvce-editor/explorer-view 7.17.0 → 7.19.0

package/dist/explorerViewWorkerMain.js

@@ -2350,7 +2350,7 @@ const newFolder$1 = () => {
 const openContainingFolder$1 = () => {
   return i18nString(OpenContainingFolder);
 };
-const openInIntegratedTerminal = () => {
+const openInIntegratedTerminal$1 = () => {
   return i18nString(OpenInIntegratedTerminal);
 };
 const cut = () => {
@@ -2814,10 +2814,9 @@ const compareWithSelected = async state => {
 const getFocusedDirent$1 = state => {
   const {
     focusedIndex,
-    items,
-    minLineY
+    items
   } = state;
-  const dirent = items[focusedIndex + minLineY];
+  const dirent = items[focusedIndex];
   return dirent;
 };
 
@@ -2973,7 +2972,7 @@ const getFileIcons = async (dirents, fileIconCache) => {
   };
 };
 
-const directoryTypes = new Set([DirectoryExpanded, DirectoryExpanding, EditingDirectoryExpanded]);
+const directoryTypes$1 = new Set([DirectoryExpanded, DirectoryExpanding, EditingDirectoryExpanded]);
 const getParentPath = (path, pathSeparator) => {
   const index = path.lastIndexOf(pathSeparator);
   if (index === -1) {
@@ -2984,7 +2983,7 @@ const getParentPath = (path, pathSeparator) => {
 const getGitIgnoreCandidateDirs = (root, items, pathSeparator) => {
   const dirs = new Set([root]);
   for (const item of items) {
-    if (directoryTypes.has(item.type)) {
+    if (directoryTypes$1.has(item.type)) {
       dirs.add(item.path);
     }
     const parent = getParentPath(item.path, pathSeparator);
@@ -4252,7 +4251,7 @@ const getKeyBindings = () => {
     key: Delete$1,
     when: FocusExplorer
   }, {
-    command: 'Explorer.focusNone',
+    command: 'Explorer.handleEscape',
     key: Escape,
     when: FocusExplorer
   }, {
@@ -4263,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,
@@ -4305,10 +4300,10 @@ const menuEntryOpenContainingFolder = {
   label: openContainingFolder$1()
 };
 const menuEntryOpenInIntegratedTerminal = {
-  command: /* TODO */'-1',
+  command: 'Explorer.openInIntegratedTerminal',
   flags: None$2,
   id: 'openInIntegratedTerminal',
-  label: openInIntegratedTerminal()
+  label: openInIntegratedTerminal$1()
 };
 const menuEntryCut = {
   command: 'Explorer.handleCut',
@@ -5216,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;
@@ -5316,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
   };
 };
@@ -6115,7 +6114,7 @@ const handleDrop = async (state, x, y, fileIds, fileList) => {
 
 const handleEscape = async state => {
   return {
-    ...state,
+    ...focusNone(state),
     cutItems: []
   };
 };
@@ -6727,9 +6726,34 @@ const openContainingFolder = async state => {
   return state;
 };
 
-const confirmDelete = async paths => {
+const directoryTypes = new Set([Directory, DirectoryExpanded, DirectoryExpanding, SymLinkFolder]);
+const getIntegratedTerminalCwd = state => {
+  const {
+    focusedIndex,
+    items,
+    pathSeparator,
+    root
+  } = state;
+  if (focusedIndex < 0 || focusedIndex >= items.length) {
+    return root;
+  }
+  const item = items[focusedIndex];
+  if (directoryTypes.has(item.type)) {
+    return item.path;
+  }
+  return dirname(pathSeparator, item.path);
+};
+
+const openInIntegratedTerminal = async state => {
+  const cwd = getIntegratedTerminalCwd(state);
+  await invoke$2('Layout.openIntegratedTerminal', cwd);
+  return state;
+};
+
+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;
 };
@@ -6753,7 +6777,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;
     }
@@ -7997,6 +8021,7 @@ const commandMap = {
   'Explorer.newFile': wrapListItemCommand(newFile),
   'Explorer.newFolder': wrapListItemCommand(newFolder),
   'Explorer.openContainingFolder': wrapListItemCommand(openContainingFolder),
+  'Explorer.openInIntegratedTerminal': wrapListItemCommand(openInIntegratedTerminal),
   'Explorer.refresh': wrapListItemCommand(refresh),
   'Explorer.removeDirent': wrapListItemCommand(removeDirent),
   'Explorer.renameDirent': wrapListItemCommand(renameDirent),

package/package.json

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