bring back title to nac bar

This commit is contained in:
nklhrstv 2020-02-19 12:50:05 +02:00
parent 267457589d
commit 968b001db5
2 changed files with 29 additions and 11 deletions

View file

@ -11,7 +11,7 @@ const NotificationsMenu = require('../NotificationsMenu');
const NavMenu = require('../NavMenu'); const NavMenu = require('../NavMenu');
const styles = require('./styles'); const styles = require('./styles');
const HorizontalNavBar = React.memo(({ className, route, query, backButton, searchBar, addonsButton, fullscreenButton, notificationsMenu, navMenu }) => { const HorizontalNavBar = React.memo(({ className, route, query, title, backButton, searchBar, addonsButton, fullscreenButton, notificationsMenu, navMenu }) => {
const backButtonOnClick = React.useCallback(() => { const backButtonOnClick = React.useCallback(() => {
window.history.back(); window.history.back();
}, []); }, []);
@ -32,15 +32,23 @@ const HorizontalNavBar = React.memo(({ className, route, query, backButton, sear
</div> </div>
} }
{ {
searchBar ? typeof title === 'string' && title.length > 0 ?
<React.Fragment> <h2 className={styles['title']}>{title}</h2>
<div className={styles['spacing']} />
<SearchBar className={styles['search-bar']} query={query} active={route === 'search'} />
<div className={styles['spacing']} />
</React.Fragment>
: :
null null
} }
<div className={styles['spacing']} />
{
searchBar ?
<SearchBar
className={styles['search-bar']}
query={query}
active={route === 'search'}
/>
:
null
}
<div className={styles['spacing']} />
{ {
addonsButton ? addonsButton ?
<AddonsButton className={styles['addons-button']} /> <AddonsButton className={styles['addons-button']} />
@ -75,6 +83,7 @@ HorizontalNavBar.propTypes = {
className: PropTypes.string, className: PropTypes.string,
route: PropTypes.string, route: PropTypes.string,
query: PropTypes.string, query: PropTypes.string,
title: PropTypes.string,
backButton: PropTypes.bool, backButton: PropTypes.bool,
searchBar: PropTypes.bool, searchBar: PropTypes.bool,
addonsButton: PropTypes.bool, addonsButton: PropTypes.bool,

View file

@ -37,10 +37,19 @@
} }
} }
.nav-tab-button { .title {
flex: none; flex: 1;
align-self: stretch; padding: 0 1rem;
max-width: 11rem; font-size: 1.1rem;
font-style: normal;
font-weight: 400;
white-space: nowrap;
text-overflow: ellipsis;
color: var(--color-surfacelighter);
&+.spacing {
display: none;
}
} }
.spacing { .spacing {