Create new ToolbarButton type for Layout Selector; wire up custom UI; prep for viewportGridService usage

This commit is contained in:
dannyrb committed 2020-06-15 00:51:36 -04:00
1 parent 83eb24337c
commit 9146a9ee32
18 files changed
+166 -162

No files matched your search

@@ -2,18 +2,18 @@ import React, { useEffect, useState } from 'react';
import PropTypes from 'prop-types';
import { ToolbarButton } from '@ohif/ui';
function NestedToolbar({ children }) {
function NestedMenu({ children }) {
const [isOpen, setIsOpen] = useState(false);
useEffect(() => {
function closeNestedToolbar() {
function closeNestedMenu() {
if (isOpen) {
setIsOpen(false);
}
}
window.addEventListener('click', closeNestedToolbar);
window.addEventListener('click', closeNestedMenu);
return () => {
window.removeEventListener('click', closeNestedToolbar);
window.removeEventListener('click', closeNestedMenu);
};
}, [isOpen]);
@@ -34,8 +34,8 @@ function NestedToolbar({ children }) {
);
}
NestedToolbar.propTypes = {
NestedMenu.propTypes = {
children: PropTypes.any.isRequired,
};
export default NestedToolbar;
export default NestedMenu;
@@ -3,7 +3,7 @@ import classnames from 'classnames';
import PropTypes from 'prop-types';
import { SidePanel } from '@ohif/ui';
import Header from './Header.jsx';
import NestedToolbar from './NestedToolbar.jsx';
import NestedMenu from './ToolbarButtonNestedMenu.jsx';
function ViewerLayout({
// From Extension Module Params
@@ -90,14 +90,14 @@ function ViewerLayout({
return <Component key={id} id={id} {...componentProps} />;
} else {
return (
<NestedToolbar>
<NestedMenu>
<div className="flex">
{toolDef.map(x => {
const { id, Component, componentProps } = x;
return <Component key={id} id={id} {...componentProps} />;
})}
</div>
</NestedToolbar>
</NestedMenu>
);
}
})}