diff --git a/extensions/default/src/ViewerLayout/Header.jsx b/extensions/default/src/ViewerLayout/Header.jsx index b795f2fcb..132fd7916 100644 --- a/extensions/default/src/ViewerLayout/Header.jsx +++ b/extensions/default/src/ViewerLayout/Header.jsx @@ -67,26 +67,7 @@ function Header({ children }) { {t('Header:INVESTIGATIONAL USE ONLY')} - - - - - - - - } + showDropdownIcon={false} list={[ { title: t('Header:About'), @@ -99,7 +80,24 @@ function Header({ children }) { onClick: showPreferencesModal, }, ]} - /> + > + + + + + + + diff --git a/platform/ui/src/components/Dropdown/Dropdown.jsx b/platform/ui/src/components/Dropdown/Dropdown.jsx index f13852aad..149c55ece 100644 --- a/platform/ui/src/components/Dropdown/Dropdown.jsx +++ b/platform/ui/src/components/Dropdown/Dropdown.jsx @@ -4,19 +4,17 @@ import classnames from 'classnames'; import { Icon, Typography } from '@ohif/ui'; -const Dropdown = ({ titleElement, title, list }) => { +const Dropdown = ({ children, showDropdownIcon, list }) => { const [open, setOpen] = useState(false); const element = useRef(null); const renderTitleElement = () => { - if (titleElement) { - return titleElement; - } - return ( -
- {title} - +
+ {children} + {showDropdownIcon && ( + + )}
); }; @@ -96,9 +94,13 @@ const Dropdown = ({ titleElement, title, list }) => { ); }; +Dropdown.defaultProps = { + showDropdownIcon: true, +}; + Dropdown.propTypes = { - titleElement: PropTypes.node, - title: PropTypes.string, + children: PropTypes.node.isRequired, + showDropdownIcon: PropTypes.bool, /** Items to render in the select's drop down */ list: PropTypes.arrayOf( PropTypes.shape({ diff --git a/platform/viewer/src/components/PreferencesDropdown/PreferencesDropdown.jsx b/platform/viewer/src/components/PreferencesDropdown/PreferencesDropdown.jsx index 3df73650a..791905819 100644 --- a/platform/viewer/src/components/PreferencesDropdown/PreferencesDropdown.jsx +++ b/platform/viewer/src/components/PreferencesDropdown/PreferencesDropdown.jsx @@ -23,27 +23,7 @@ const PreferencesDropdown = () => { return ( - - - - {}} - > - - - - } + showDropdownIcon={false} list={[ { title: 'About', icon: 'info', onClick: showAboutModal }, { @@ -52,7 +32,25 @@ const PreferencesDropdown = () => { onClick: showPreferencesModal, }, ]} - /> + > + + + + {}} + > + + + ); };