Create a Backdrop layer for SearchBarView

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

diff --git a/src/views-components/search-bar/search-bar-view.tsx b/src/views-components/search-bar/search-bar-view.tsx
index ec1c8b83041e432f37380fd06ba0947f993b7972..6251308d984f74dd31e3531d330c2fe94673a8ee 100644 (file)
--- a/src/views-components/search-bar/search-bar-view.tsx
+++ b/src/views-components/search-bar/search-bar-view.tsx
@@ -11,7 +11,6 @@ import {
     WithStyles,
     Tooltip,
     InputAdornment, Input,
-    ClickAwayListener
 } from '@material-ui/core';
 import SearchIcon from '@material-ui/icons/Search';
 import ArrowDropDownIcon from '@material-ui/icons/ArrowDropDown';
@@ -41,12 +40,14 @@ const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => {
         container: {
             position: 'relative',
             width: '100%',
-            borderRadius: theme.spacing.unit / 2
+            borderRadius: theme.spacing.unit / 2,
+            zIndex: theme.zIndex.modal,
         },
         containerSearchViewOpened: {
             position: 'relative',
             width: '100%',
-            borderRadius: `${theme.spacing.unit / 2}px ${theme.spacing.unit / 2}px 0 0`
+            borderRadius: `${theme.spacing.unit / 2}px ${theme.spacing.unit / 2}px 0 0`,
+            zIndex: theme.zIndex.modal,
         },
         input: {
             border: 'none',
@@ -86,6 +87,7 @@ interface SearchBarViewActionProps {
     loadRecentQueries: () => string[];
     moveUp: () => void;
     moveDown: () => void;
+    setAdvancedDataFromSearchValue: (search: string) => void;
 }
 
 type SearchBarViewProps = SearchBarDataProps & SearchBarActionProps & WithStyles<CssRules>;
@@ -94,6 +96,7 @@ const handleKeyDown = (e: React.KeyboardEvent, props: SearchBarViewProps) => {
     if (e.keyCode === KEY_CODE_DOWN) {
         e.preventDefault();
         if (!props.isPopoverOpen) {
+            props.onSetView(SearchView.AUTOCOMPLETE);
             props.openSearchView();
         } else {
             props.moveDown();
@@ -117,11 +120,39 @@ const handleKeyDown = (e: React.KeyboardEvent, props: SearchBarViewProps) => {
     }
 };
 
+const handleInputClick = (e: React.MouseEvent, props: SearchBarViewProps) => {
+    if (props.searchValue) {
+        props.onSetView(SearchView.AUTOCOMPLETE);
+        props.openSearchView();
+    } else {
+        props.closeView();
+    }
+};
+
+const handleDropdownClick = (e: React.MouseEvent, props: SearchBarViewProps) => {
+    e.stopPropagation();
+    if (props.isPopoverOpen) {
+        if (props.currentView === SearchView.ADVANCED) {
+            props.closeView();
+        } else {
+            props.setAdvancedDataFromSearchValue(props.searchValue);
+            props.onSetView(SearchView.ADVANCED);
+        }
+    } else {
+        props.setAdvancedDataFromSearchValue(props.searchValue);
+        props.onSetView(SearchView.ADVANCED);
+    }
+};
+
 export const SearchBarView = withStyles(styles)(
-    (props : SearchBarViewProps) => {
+    (props: SearchBarViewProps) => {
         const { classes, isPopoverOpen } = props;
         return (
-            <ClickAwayListener onClickAway={props.closeView}>
+            <>
+
+                {isPopoverOpen &&
+                    <Backdrop onClick={props.closeView} />}
+
                 <Paper className={isPopoverOpen ? classes.containerSearchViewOpened : classes.container} >
                     <form onSubmit={props.onSubmit}>
                         <Input
@@ -131,7 +162,7 @@ export const SearchBarView = withStyles(styles)(
                             value={props.searchValue}
                             fullWidth={true}
                             disableUnderline={true}
-                            onClick={props.openSearchView}
+                            onClick={e => handleInputClick(e, props)}
                             onKeyDown={e => handleKeyDown(e, props)}
                             startAdornment={
                                 <InputAdornment position="start">
@@ -145,7 +176,7 @@ export const SearchBarView = withStyles(styles)(
                             endAdornment={
                                 <InputAdornment position="end">
                                     <Tooltip title='Advanced search'>
-                                        <IconButton onClick={() => props.onSetView(SearchView.ADVANCED)}>
+                                        <IconButton onClick={e => handleDropdownClick(e, props)}>
                                             <ArrowDropDownIcon />
                                         </IconButton>
                                     </Tooltip>
@@ -153,10 +184,10 @@ export const SearchBarView = withStyles(styles)(
                             } />
                     </form>
                     <div className={classes.view}>
-                        {isPopoverOpen && getView({...props})}
+                        {isPopoverOpen && getView({ ...props })}
                     </div>
                 </Paper >
-            </ClickAwayListener>
+            </>
         );
     }
 );
@@ -172,7 +203,8 @@ const getView = (props: SearchBarViewProps) => {
         case SearchView.ADVANCED:
             return <SearchBarAdvancedView
                 closeAdvanceView={props.closeAdvanceView}
-                tags={props.tags} />;
+                tags={props.tags}
+                saveQuery={props.saveQuery} />;
         default:
             return <SearchBarBasicView
                 onSetView={props.onSetView}
@@ -184,3 +216,16 @@ const getView = (props: SearchBarViewProps) => {
                 selectedItem={props.selectedItem} />;
     }
 };
+
+const Backdrop = withStyles<'backdrop'>(theme => ({
+    backdrop: {
+        position: 'fixed',
+        top: 0,
+        right: 0,
+        bottom: 0,
+        left: 0,
+        zIndex: theme.zIndex.modal
+    }
+}))(
+    ({ classes, ...props }: WithStyles<'backdrop'> & React.HTMLProps<HTMLDivElement>) =>
+        <div className={classes.backdrop} {...props} />);