fix panel width

This commit is contained in:
Rodrigo Antinarelli 2020-04-13 19:35:32 -03:00 committed by James A. Petts
parent ebef71da3b
commit cb7f6cd709
8 changed files with 29 additions and 18 deletions

View File

@ -5,8 +5,8 @@ import classnames from 'classnames';
import { Button, Icon } from '@ohif/ui'; import { Button, Icon } from '@ohif/ui';
const borderSize = 4; const borderSize = 4;
const expandedWidth = 320; const expandedWidth = 248;
const collapsedWidth = 60; const collapsedWidth = 56;
const baseStyle = { const baseStyle = {
maxWidth: `${expandedWidth}px`, maxWidth: `${expandedWidth}px`,
@ -26,7 +26,7 @@ const styleMap = {
}; };
const baseClasses = const baseClasses =
'transition-all duration-300 ease-in-out h-100 bg-primary-dark border-black flex flex-col justify-start'; 'transition-all duration-300 ease-in-out h-100 bg-primary-dark border-black flex flex-col justify-start box-content';
const classesMap = { const classesMap = {
open: { open: {

View File

@ -11,7 +11,7 @@ const studyGroup = {
All: [studySimple, studyWithSR], All: [studySimple, studyWithSR],
}; };
const buttonClasses = 'text-white text-base border-none bg-black'; const buttonClasses = 'text-white text-base border-none bg-black p-2 min-w-18';
const activeButtonClasses = 'bg-primary-main'; const activeButtonClasses = 'bg-primary-main';
const StudyBrowser = () => { const StudyBrowser = () => {
@ -35,7 +35,7 @@ const StudyBrowser = () => {
buttonClasses, buttonClasses,
isActive && activeButtonClasses isActive && activeButtonClasses
)} )}
size="small" size="initial"
onClick={() => { onClick={() => {
setStudyGroupSelected(studyGroup); setStudyGroupSelected(studyGroup);
setStudyActive(null); setStudyActive(null);

View File

@ -5,7 +5,7 @@ import classnames from 'classnames';
import { Icon } from '@ohif/ui'; import { Icon } from '@ohif/ui';
const baseClasses = const baseClasses =
'first:border-0 border-t border-secondary-light cursor-pointer'; 'first:border-0 border-t border-secondary-light cursor-pointer outline-none';
const StudyItem = ({ const StudyItem = ({
studyDate, studyDate,

View File

@ -17,20 +17,20 @@ const Thumbnail = ({
return ( return (
<div <div
className="flex flex-row flex-1 px-4 py-2 showExcludeButtonOnHover cursor-pointer" className="flex flex-row flex-1 px-3 py-2 showExcludeButtonOnHover cursor-pointer outline-none"
onClick={onClick} onClick={onClick}
onKeyDown={onClick} onKeyDown={onClick}
role="button" role="button"
tabIndex="0" tabIndex="0"
> >
<div className="flex flex-col flex-2 px-2 items-center"> <div className="flex flex-col flex-2 items-center">
<div <div
className={classnames( className={classnames(
'flex flex-col items-center justify-start p-2 mb-2 relative cursor-pointer', 'flex flex-col items-center justify-start p-2 mb-2 relative cursor-pointer',
isTracked && 'rounded-sm hover:bg-gray-900 showTooltipOnHover' isTracked && 'rounded-sm hover:bg-gray-900 showTooltipOnHover'
)} )}
> >
<Icon name={trackedIcon} className="text-primary-light mb-2 w-5" /> <Icon name={trackedIcon} className="text-primary-light mb-2 w-4" />
<div className="text-white text-xl leading-tight h-5"> <div className="text-white text-xl leading-tight h-5">
{viewportIdentificator} {viewportIdentificator}
</div> </div>
@ -74,13 +74,16 @@ const Thumbnail = ({
</div> </div>
</div> </div>
{isTracked && ( {isTracked && (
<Icon name="cancel" className="text-primary-active excludeButton" /> <Icon
name="cancel"
className="text-primary-active excludeButton w-4"
/>
)} )}
</div> </div>
<div className="flex flex-col flex-1 px-4"> <div className="flex flex-col flex-1 px-3">
<div <div
className={classnames( className={classnames(
'flex flex-1 items-center justify-center rounded-md bg-black text-white mb-2', 'flex flex-1 items-center justify-center rounded-md bg-black text-base text-white mb-2',
isActive isActive
? 'border-2 border-primary-light' ? 'border-2 border-primary-light'
: 'border border-secondary-light hover:border-blue-300' : 'border border-secondary-light hover:border-blue-300'

View File

@ -29,6 +29,7 @@ const ThumbnailList = ({ thumbnails }) => {
modality={modality} modality={modality}
seriesDate={seriesDate} seriesDate={seriesDate}
seriesDescription={seriesDescription} seriesDescription={seriesDescription}
onClick={() => {}}
/> />
); );
} else { } else {

View File

@ -3,10 +3,13 @@ import PropTypes from 'prop-types';
import { Icon } from '@ohif/ui'; import { Icon } from '@ohif/ui';
const ThumbnailSR = ({ seriesDescription, seriesDate }) => { const ThumbnailSR = ({ seriesDescription, seriesDate, onClick }) => {
return ( return (
<div className="flex flex-row flex-1 px-4 py-3"> <div
<div className="flex flex-2 pl-4 pr-6"> className="flex flex-row flex-1 px-4 py-3 cursor-pointer"
onClick={onClick}
>
<div className="flex flex-2 pl-2 pr-3">
<Icon name="list-bullets" className="text-secondary-light" /> <Icon name="list-bullets" className="text-secondary-light" />
</div> </div>
<div className="flex flex-col flex-1"> <div className="flex flex-col flex-1">
@ -26,6 +29,7 @@ const ThumbnailSR = ({ seriesDescription, seriesDate }) => {
ThumbnailSR.propTypes = { ThumbnailSR.propTypes = {
seriesDescription: PropTypes.string, seriesDescription: PropTypes.string,
seriesDate: PropTypes.string, seriesDate: PropTypes.string,
onClick: PropTypes.func.isRequired,
}; };
export default ThumbnailSR; export default ThumbnailSR;

View File

@ -50,7 +50,7 @@ import ViewportToolbar from './components/ViewportToolBar';
iconName="group-layers" iconName="group-layers"
iconLabel="Studies" iconLabel="Studies"
componentLabel="Studies" componentLabel="Studies"
defaultIsOpen={false} defaultIsOpen={true}
> >
<StudyBrowser /> <StudyBrowser />
</SidePanel> </SidePanel>

View File

@ -161,7 +161,9 @@ module.exports = {
'8': '2rem', '8': '2rem',
'10': '2.5rem', '10': '2.5rem',
'12': '3rem', '12': '3rem',
'14': '3.5rem',
'16': '4rem', '16': '4rem',
'18': '4.5rem',
'20': '5rem', '20': '5rem',
'24': '6rem', '24': '6rem',
'32': '8rem', '32': '8rem',
@ -374,7 +376,8 @@ module.exports = {
full: '100%', full: '100%',
screen: '100vh', screen: '100vh',
}, },
minWidth: { minWidth: (theme) => ({
...theme('spacing'),
'0': '0', '0': '0',
xs: '2rem', xs: '2rem',
sm: '4rem', sm: '4rem',
@ -382,7 +385,7 @@ module.exports = {
lg: '8rem', lg: '8rem',
xl: '10rem', xl: '10rem',
full: '100%', full: '100%',
}, }),
objectPosition: { objectPosition: {
bottom: 'bottom', bottom: 'bottom',
center: 'center', center: 'center',