fix dropdown title

This commit is contained in:
Rodrigo Antinarelli 2020-06-24 01:27:02 -03:00
parent db0ce2f6f7
commit a19c1acd7b
3 changed files with 51 additions and 53 deletions

View File

@ -67,26 +67,7 @@ function Header({ children }) {
{t('Header:INVESTIGATIONAL USE ONLY')} {t('Header:INVESTIGATIONAL USE ONLY')}
</span> </span>
<Dropdown <Dropdown
titleElement={ showDropdownIcon={false}
<>
<IconButton
variant="text"
color="inherit"
size="initial"
className="text-primary-active"
>
<Icon name="settings" />
</IconButton>
<IconButton
variant="text"
color="inherit"
size="initial"
className="text-primary-active"
>
<Icon name="chevron-down" />
</IconButton>
</>
}
list={[ list={[
{ {
title: t('Header:About'), title: t('Header:About'),
@ -99,7 +80,24 @@ function Header({ children }) {
onClick: showPreferencesModal, onClick: showPreferencesModal,
}, },
]} ]}
/> >
<IconButton
variant="text"
color="inherit"
size="initial"
className="text-primary-active"
>
<Icon name="settings" />
</IconButton>
<IconButton
variant="text"
color="inherit"
size="initial"
className="text-primary-active"
>
<Icon name="chevron-down" />
</IconButton>
</Dropdown>
</div> </div>
</div> </div>
</NavBar> </NavBar>

View File

@ -4,19 +4,17 @@ import classnames from 'classnames';
import { Icon, Typography } from '@ohif/ui'; import { Icon, Typography } from '@ohif/ui';
const Dropdown = ({ titleElement, title, list }) => { const Dropdown = ({ children, showDropdownIcon, list }) => {
const [open, setOpen] = useState(false); const [open, setOpen] = useState(false);
const element = useRef(null); const element = useRef(null);
const renderTitleElement = () => { const renderTitleElement = () => {
if (titleElement) {
return titleElement;
}
return ( return (
<div className="flex"> <div className="flex text-white items-center">
<Typography>{title}</Typography> {children}
<Icon name="chevron-down" className="text-white ml-1" /> {showDropdownIcon && (
<Icon name="chevron-down" className="text-white ml-1" />
)}
</div> </div>
); );
}; };
@ -96,9 +94,13 @@ const Dropdown = ({ titleElement, title, list }) => {
); );
}; };
Dropdown.defaultProps = {
showDropdownIcon: true,
};
Dropdown.propTypes = { Dropdown.propTypes = {
titleElement: PropTypes.node, children: PropTypes.node.isRequired,
title: PropTypes.string, showDropdownIcon: PropTypes.bool,
/** Items to render in the select's drop down */ /** Items to render in the select's drop down */
list: PropTypes.arrayOf( list: PropTypes.arrayOf(
PropTypes.shape({ PropTypes.shape({

View File

@ -23,27 +23,7 @@ const PreferencesDropdown = () => {
return ( return (
<Dropdown <Dropdown
titleElement={ showDropdownIcon={false}
<>
<IconButton
variant="text"
color="inherit"
size="initial"
className="text-primary-active"
>
<Icon name="settings" />
</IconButton>
<IconButton
variant="text"
color="inherit"
size="initial"
className="text-primary-active"
onClick={() => {}}
>
<Icon name="chevron-down" />
</IconButton>
</>
}
list={[ list={[
{ title: 'About', icon: 'info', onClick: showAboutModal }, { title: 'About', icon: 'info', onClick: showAboutModal },
{ {
@ -52,7 +32,25 @@ const PreferencesDropdown = () => {
onClick: showPreferencesModal, onClick: showPreferencesModal,
}, },
]} ]}
/> >
<IconButton
variant="text"
color="inherit"
size="initial"
className="text-primary-active"
>
<Icon name="settings" />
</IconButton>
<IconButton
variant="text"
color="inherit"
size="initial"
className="text-primary-active"
onClick={() => {}}
>
<Icon name="chevron-down" />
</IconButton>
</Dropdown>
); );
}; };