@lvce-editor/text-search-view 1.12.2 → 1.14.0

package/dist/textSearchViewMain.js

@@ -2813,6 +2813,7 @@ const PreserveCase$1 = 'Preserve Case';
 const Refresh$2 = 'Refresh';
 const Replace = 'Replace';
 const ReplaceAll$1 = 'Replace All';
+const RevealInExplorerView = 'Reveal in Explorer View';
 const ReplacingManyOccurrencesInManyFiles = 'Replacing {PH1} occurrences across {PH2} files…';
 const ReplacingManyOccurrencesInOneFile = 'Replacing {PH1} occurrences across 1 file…';
 const ReplacingOneOccurrenceInOneFile = 'Replacing 1 occurrence across 1 file…';
@@ -2967,6 +2968,9 @@ const copyPath = () => {
 const copyAll = () => {
   return i18nString(CopyAll);
 };
+const revealInExplorerView = () => {
+  return i18nString(RevealInExplorerView);
+};
 const refresh$1 = () => {
   return i18nString(Refresh$2);
 };
@@ -3410,7 +3414,52 @@ const getMenuEntriesInput = options => {
   }];
 };
 
+const getFileIndex$1 = (items, index) => {
+  for (let i = index; i >= 0; i--) {
+    const item = items[i];
+    if (item.type === File) {
+      return i;
+    }
+  }
+  return -1;
+};
+
+// TODO this should be in FileSystem module
+const pathBaseName = path => {
+  return path.slice(path.lastIndexOf('/') + 1);
+};
+const getRelativePath = relativePath => {
+  if (relativePath.startsWith('./')) {
+    return `/${relativePath.slice(2)}`; // TODO support windows paths
+  }
+  return `/${relativePath}`; // TODO support windows paths
+};
+const getRelativeFolderPath = relativePath => {
+  const normalized = relativePath.startsWith('./') ? relativePath.slice(2) : relativePath;
+  const slashIndex = normalized.lastIndexOf('/');
+  if (slashIndex === -1) {
+    return '';
+  }
+  return normalized.slice(0, slashIndex);
+};
+
+const getFileUri = (state, index) => {
+  const {
+    items,
+    workspacePath
+  } = state;
+  if (index < 0 || index >= items.length) {
+    return '';
+  }
+  const fileIndex = getFileIndex$1(items, index);
+  if (fileIndex === -1) {
+    return '';
+  }
+  return `${workspacePath}${getRelativePath(items[fileIndex].text)}`;
+};
+
 const getMenuEntriesFile = (state, props) => {
+  const uri = getFileUri(state, props.index);
   return [{
     command: 'Search.replaceAll',
     flags: None$1,
@@ -3421,7 +3470,7 @@ const getMenuEntriesFile = (state, props) => {
     flags: None$1,
     id: 'dismiss',
     label: dismiss()
-  }, {
+  }, menuEntrySeparator, {
     command: 'Search.copy',
     flags: None$1,
     id: 'copy',
@@ -3436,16 +3485,23 @@ const getMenuEntriesFile = (state, props) => {
     flags: None$1,
     id: 'copyAll',
     label: copyAll()
+  }, menuEntrySeparator, {
+    args: [uri],
+    command: 'Search.revealInExplorer',
+    flags: None$1,
+    id: 'revealInExplorerView',
+    label: revealInExplorerView()
   }];
 };
 
 const getMenuEntriesMatch = (state, props) => {
+  const uri = getFileUri(state, props.index);
   return [{
     command: 'Search.removeCurrent',
     flags: None$1,
     id: 'dismiss',
     label: dismiss()
-  }, {
+  }, menuEntrySeparator, {
     command: 'Search.copy',
     flags: None$1,
     id: 'copy',
@@ -3455,6 +3511,12 @@ const getMenuEntriesMatch = (state, props) => {
     flags: None$1,
     id: 'copyAll',
     label: copyAll()
+  }, menuEntrySeparator, {
+    args: [uri],
+    command: 'Search.revealInExplorer',
+    flags: None$1,
+    id: 'revealInExplorerView',
+    label: revealInExplorerView()
   }];
 };
 
@@ -3470,10 +3532,10 @@ const getMenuEntriesList = (state, props) => {
     return [];
   }
   if (item.type === Match$1) {
-    return getMenuEntriesMatch();
+    return getMenuEntriesMatch(state, props);
   }
   if (item.type === File$1) {
-    return getMenuEntriesFile();
+    return getMenuEntriesFile(state, props);
   }
   return [];
 };
@@ -4160,7 +4222,7 @@ const getActualIndex = state => {
   } = state;
   return focusedIndex === -1 ? listFocusedIndex : focusedIndex;
 };
-const getFileIndex$1 = (state, actualIndex) => {
+const getFileIndex = (state, actualIndex) => {
   const {
     items
   } = state;
@@ -4290,7 +4352,7 @@ const replaceAllConfirmed = async (state, fileIndex) => {
 };
 const replaceAll = async state => {
   const actualIndex = getActualIndex(state);
-  const fileIndex = getFileIndex$1(state, actualIndex);
+  const fileIndex = getFileIndex(state, actualIndex);
   const shouldReplace = await confirmReplaceAll(state, fileIndex);
   if (!shouldReplace) {
     return state;
@@ -4304,7 +4366,7 @@ const replaceAllWithProgress = async context => {
     matchCount: totalMatchCount
   } = state;
   const actualIndex = getActualIndex(state);
-  const fileIndex = getFileIndex$1(state, actualIndex);
+  const fileIndex = getFileIndex(state, actualIndex);
   const fileCount = fileIndex === -1 ? totalFileCount : 1;
   const matchCount = fileIndex === -1 ? totalMatchCount : Math.max(getFileItems(state, fileIndex).length - 1, 0);
   const shouldReplace = await confirmReplaceAll(state, fileIndex);
@@ -5347,41 +5409,12 @@ const selectIndexFile = async (state, searchResult, index) => {
   return applyCollapsedPaths(state, newCollapsedPaths, index);
 };
 
-const getFileIndex = (items, index) => {
-  for (let i = index; i >= 0; i--) {
-    const item = items[i];
-    if (item.type === File) {
-      return i;
-    }
-  }
-  return -1;
-};
-
-// TODO this should be in FileSystem module
-const pathBaseName = path => {
-  return path.slice(path.lastIndexOf('/') + 1);
-};
-const getRelativePath = relativePath => {
-  if (relativePath.startsWith('./')) {
-    return `/${relativePath.slice(2)}`; // TODO support windows paths
-  }
-  return `/${relativePath}`; // TODO support windows paths
-};
-const getRelativeFolderPath = relativePath => {
-  const normalized = relativePath.startsWith('./') ? relativePath.slice(2) : relativePath;
-  const slashIndex = normalized.lastIndexOf('/');
-  if (slashIndex === -1) {
-    return '';
-  }
-  return normalized.slice(0, slashIndex);
-};
-
 const selectIndexPreview = async (state, searchResult, index) => {
   const {
     listItems,
     workspacePath
   } = state;
-  const fileIndex = getFileIndex(listItems, index);
+  const fileIndex = getFileIndex$1(listItems, index);
   if (fileIndex === -1) {
     throw new Error('Search result is missing file');
   }
@@ -6791,9 +6824,11 @@ const getActionButtonVirtualDom = action => {
     label
   } = action;
   const className = getClassName(enabled);
+  const disabled = !enabled;
   return [{
     childCount: 1,
     className,
+    disabled,
     name: id,
     title: label,
     type: Button$2
@@ -6827,20 +6862,23 @@ const Refresh = 'Refresh';
 
 const getActions = state => {
   const {
+    items,
     replacement,
     value
   } = state;
-  const bothEmpty = value === '' && replacement === '';
+  const hasSearchPattern = value !== '';
+  const hasSearchResults = items.length > 0;
+  const canClear = hasSearchResults || hasSearchPattern || replacement !== '';
   return [{
     command: 'refresh',
-    enabled: true,
+    enabled: hasSearchPattern,
     icon: Refresh,
     id: Refresh$1,
     label: refresh$1(),
     type: Button
   }, {
     command: 'clearSearchResults',
-    enabled: !bothEmpty,
+    enabled: canClear,
     icon: ClearAll,
     id: ClearAll$1,
     label: clearSearchResults(),
@@ -6854,14 +6892,14 @@ const getActions = state => {
     type: Button
   }, {
     command: '',
-    enabled: true,
+    enabled: hasSearchResults,
     icon: ListFlat,
     id: ViewAsTree,
     label: viewAsTree$1(),
     type: Button
   }, {
     command: '',
-    enabled: true,
+    enabled: hasSearchResults,
     icon: CollapseAll,
     id: CollapseAll$1,
     label: collapseAll(),
@@ -6963,6 +7001,19 @@ const rerender = state => {
   };
 };
 
+const revealInExplorerActual = async uri => {
+  await invoke$2('SideBar.show', 'Explorer');
+  const states = await invoke$2('Viewlet.getAllStates');
+  const viewlets = Object.values(states);
+  const sideBar = viewlets.find(viewlet => viewlet.currentViewletId === 'Explorer');
+  const explorerUid = Math.max(...viewlets.filter(viewlet => viewlet.parentUid === sideBar.uid).map(viewlet => viewlet.uid));
+  await invoke$2('Viewlet.executeViewletCommand', explorerUid, 'reveal', uri);
+};
+const revealInExplorer = async (state, uri) => {
+  await revealInExplorerActual(uri);
+  return state;
+};
+
 const saveState = state => {
   const {
     collapsedPaths,
@@ -7083,13 +7134,15 @@ const Keyboard = -1;
 
 const handleContextMenuKeyboard = async state => {
   const {
+    focusedIndex,
+    listFocusedIndex,
     uid,
     x,
     y
-  } = state; // TODO
+  } = state;
+  const index = focusedIndex === -1 ? listFocusedIndex : focusedIndex;
   await show2(uid, Search$1, x, y, {
-    index: 0,
-    // TODO pass proper index
+    index,
     menuId: Search$1
   });
   return state;
@@ -7234,6 +7287,7 @@ const commandMap = {
   'TextSearch.replaceAllInFile': wrapCommand(replaceAllInFile),
   'TextSearch.rerender': rerender,
   'TextSearch.restoreState': restoreState,
+  'TextSearch.revealInExplorer': wrapCommand(revealInExplorer),
   'TextSearch.saveState': wrapGetter(saveState),
   'TextSearch.selectIndex': wrapCommand(selectIndex),
   'TextSearch.setLimit': wrapCommand(setLimit),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/text-search-view",
-  "version": "1.12.2",
+  "version": "1.14.0",
   "description": "Text Search View",
   "keywords": [
     "text-search"