@lvce-editor/explorer-view 7.16.1 → 7.18.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);
@@ -3383,14 +3382,11 @@ const compareNodes = (oldNode, newNode) => {
   }
   const patches = [];
   // Handle reference nodes - special handling for uid changes
-  if (oldNode.type === Reference) {
-    if (oldNode.uid !== newNode.uid) {
-      patches.push({
-        type: SetReferenceNodeUid,
-        uid: newNode.uid
-      });
-    }
-    return patches;
+  if (oldNode.type === Reference && oldNode.uid !== newNode.uid) {
+    patches.push({
+      type: SetReferenceNodeUid,
+      uid: newNode.uid
+    });
   }
   // Handle text nodes
   if (oldNode.type === Text && newNode.type === Text) {
@@ -3403,8 +3399,8 @@ const compareNodes = (oldNode, newNode) => {
     return patches;
   }
   // Compare attributes
-  const oldKeys = getKeys(oldNode);
-  const newKeys = getKeys(newNode);
+  const oldKeys = getKeys(oldNode).filter(key => oldNode.type !== Reference || key !== 'uid');
+  const newKeys = getKeys(newNode).filter(key => newNode.type !== Reference || key !== 'uid');
   // Check for attribute changes
   for (const key of newKeys) {
     if (oldNode[key] !== newNode[key]) {
@@ -3428,9 +3424,14 @@ const compareNodes = (oldNode, newNode) => {
 };
 
 const treeToArray = node => {
-  const result = [node.node];
-  for (const child of node.children) {
-    result.push(...treeToArray(child));
+  const result = [];
+  const stack = [node];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    result.push(current.node);
+    for (let i = current.children.length - 1; i >= 0; i--) {
+      stack.push(current.children[i]);
+    }
   }
   return result;
 };
@@ -4303,10 +4304,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',
@@ -6725,6 +6726,30 @@ const openContainingFolder = async state => {
   return state;
 };
 
+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 paths => {
   // 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?`;
@@ -7995,6 +8020,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.16.1",
+  "version": "7.18.0",
   "description": "Explorer Worker",
   "repository": {
     "type": "git",