Merge branch 'master' into 14275-structured-search-basic-view

[arvados-workbench2.git] / src / views-components / main-app-bar / main-app-bar.tsx

diff --git a/src/views-components/main-app-bar/main-app-bar.tsx b/src/views-components/main-app-bar/main-app-bar.tsx
index ddd39e5e278274efa306d95681a8fe5bc80b6d65..ba01f5508b1ce342aca0e338e2c09c67ef5db07c 100644 (file)
--- a/src/views-components/main-app-bar/main-app-bar.tsx
+++ b/src/views-components/main-app-bar/main-app-bar.tsx
@@ -7,19 +7,22 @@ import { AppBar, Toolbar, Typography, Grid } from "@material-ui/core";
 import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core/styles';
 import { Link } from "react-router-dom";
 import { User } from "~/models/user";
-import { SearchBar } from "~/components/search-bar/search-bar";
+import { SearchBar } from "~/views-components/search-bar/search-bar";
 import { Routes } from '~/routes/routes';
 import { NotificationsMenu } from "~/views-components/main-app-bar/notifications-menu";
 import { AccountMenu } from "~/views-components/main-app-bar/account-menu";
-import { AnonymousMenu } from "~/views-components/main-app-bar/anonymous-menu";
 import { HelpMenu } from './help-menu';
+import { ReactNode } from "react";
 
-type CssRules = 'link';
+type CssRules = 'toolbar' | 'link';
 
 const styles: StyleRulesCallback<CssRules> = () => ({
     link: {
         textDecoration: 'none',
         color: 'inherit'
+    },
+    toolbar: {
+        height: '56px'
     }
 });
 
@@ -28,6 +31,7 @@ interface MainAppBarDataProps {
     searchDebounce?: number;
     user?: User;
     buildInfo?: string;
+    children?: ReactNode;
 }
 
 export interface MainAppBarActionProps {
@@ -38,8 +42,8 @@ export type MainAppBarProps = MainAppBarDataProps & MainAppBarActionProps & With
 
 export const MainAppBar = withStyles(styles)(
     (props: MainAppBarProps) => {
-        return <AppBar position="static">
-            <Toolbar>
+        return <AppBar position="absolute">
+            <Toolbar className={props.classes.toolbar}>
                 <Grid container justify="space-between">
                     <Grid container item xs={3} direction="column" justify="center">
                         <Typography variant="title" color="inherit" noWrap>
@@ -73,10 +77,11 @@ export const MainAppBar = withStyles(styles)(
                                 <AccountMenu />
                                 <HelpMenu />
                             </>
-                            : <AnonymousMenu />}
+                            : <HelpMenu />}
                     </Grid>
                 </Grid>
             </Toolbar>
+            {props.children}
         </AppBar>;
     }
 );