fix(ui): clean up remaining legacy ui usage (#6140)
* Update button on DataSourceSelector * Removed dead code ToolbarButtonNestedMenu, button spacing
This commit is contained in:
parent
3d70db2d3b
commit
03e17d764a
@ -3,7 +3,7 @@ import classnames from 'classnames';
|
|||||||
import { useNavigate } from 'react-router-dom';
|
import { useNavigate } from 'react-router-dom';
|
||||||
import { useAppConfig } from '@state';
|
import { useAppConfig } from '@state';
|
||||||
|
|
||||||
import { Button, ButtonEnums } from '@ohif/ui';
|
import { Button } from '@ohif/ui-next';
|
||||||
|
|
||||||
function DataSourceSelector() {
|
function DataSourceSelector() {
|
||||||
const [appConfig] = useAppConfig();
|
const [appConfig] = useAppConfig();
|
||||||
@ -31,8 +31,8 @@ function DataSourceSelector() {
|
|||||||
{ds.configuration?.friendlyName || ds.friendlyName}
|
{ds.configuration?.friendlyName || ds.friendlyName}
|
||||||
</h1>
|
</h1>
|
||||||
<Button
|
<Button
|
||||||
type={ButtonEnums.type.primary}
|
variant="secondary"
|
||||||
className={classnames('ml-2')}
|
className={classnames('ml-2', 'mt-1')}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
navigate({
|
navigate({
|
||||||
pathname: '/',
|
pathname: '/',
|
||||||
|
|||||||
@ -1,42 +0,0 @@
|
|||||||
import React, { useEffect, useState } from 'react';
|
|
||||||
import PropTypes from 'prop-types';
|
|
||||||
import { ToolbarButton } from '@ohif/ui';
|
|
||||||
|
|
||||||
function NestedMenu({ children, label = 'More', icon = 'tool-more-menu', isActive }) {
|
|
||||||
const [isOpen, setIsOpen] = useState(false);
|
|
||||||
|
|
||||||
const toggleNestedMenu = () => setIsOpen(!isOpen);
|
|
||||||
|
|
||||||
const closeNestedMenu = () => {
|
|
||||||
if (isOpen) {
|
|
||||||
setIsOpen(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
window.addEventListener('click', closeNestedMenu);
|
|
||||||
return () => {
|
|
||||||
window.removeEventListener('click', closeNestedMenu);
|
|
||||||
};
|
|
||||||
}, [isOpen]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<ToolbarButton
|
|
||||||
id="NestedMenu"
|
|
||||||
label={label}
|
|
||||||
icon={icon}
|
|
||||||
onClick={toggleNestedMenu}
|
|
||||||
dropdownContent={isOpen && children}
|
|
||||||
isActive={isActive || isOpen}
|
|
||||||
type="primary"
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
NestedMenu.propTypes = {
|
|
||||||
children: PropTypes.any.isRequired,
|
|
||||||
icon: PropTypes.string,
|
|
||||||
label: PropTypes.string,
|
|
||||||
};
|
|
||||||
|
|
||||||
export default NestedMenu;
|
|
||||||
Loading…
Reference in New Issue
Block a user