add react-highlight-word and change autocomplete list

[arvados-workbench2.git] / src / views-components / search-bar / search-bar-autocomplete-view.tsx

diff --git a/src/views-components/search-bar/search-bar-autocomplete-view.tsx b/src/views-components/search-bar/search-bar-autocomplete-view.tsx
index fb3e895da8927c8e1b02b3cc36effc137e3e2143..30da9a45606e5df396f3737c7b7ba36b52ff8cd2 100644 (file)
--- a/src/views-components/search-bar/search-bar-autocomplete-view.tsx
+++ b/src/views-components/search-bar/search-bar-autocomplete-view.tsx
@@ -3,13 +3,15 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 import * as React from 'react';
-import { Paper, StyleRulesCallback, withStyles, WithStyles, List } from '@material-ui/core';
+import { Paper, StyleRulesCallback, withStyles, WithStyles, List, ListItem, ListItemText } from '@material-ui/core';
+import { ArvadosTheme } from '~/common/custom-theme';
 import { RecentQueriesItem } from '~/views-components/search-bar/search-bar-view';
 import { GroupContentsResource } from '~/services/groups-service/groups-service';
+import Highlighter from "react-highlight-words";
 
 type CssRules = 'list';
 
-const styles: StyleRulesCallback<CssRules> = theme => {
+const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => {
     return {
         list: {
             padding: '0px'
@@ -19,17 +21,25 @@ const styles: StyleRulesCallback<CssRules> = theme => {
 
 export interface SearchBarAutocompleteViewDataProps {
     searchResults?: GroupContentsResource[];
+    searchValue?: string;
 }
 
 type SearchBarAutocompleteViewProps = SearchBarAutocompleteViewDataProps & WithStyles<CssRules>;
 
 export const SearchBarAutocompleteView = withStyles(styles)(
-    ({ classes, searchResults }: SearchBarAutocompleteViewProps ) =>
+    ({ classes, searchResults, searchValue }: SearchBarAutocompleteViewProps ) =>
         <Paper>
             {searchResults &&  <List component="nav" className={classes.list}>
-                {searchResults.map((item) => {
-                    return <RecentQueriesItem key={item.uuid} text={item.name} />;
+                {searchResults.map((item: GroupContentsResource) => {
+                    return <RecentQueriesItem key={item.uuid} text={getFormattedText(item.name, searchValue)} />;
                 })}
             </List>}
         </Paper>
-);
\ No newline at end of file
+);
+
+const getFormattedText = (textToHighlight: string, searchString = '') => {
+    return <Highlighter
+                searchWords={[searchString]}
+                autoEscape={true}
+                textToHighlight={textToHighlight} />;
+};
\ No newline at end of file