fix(Panels): dicom seg panel sizing issue (#3125)

* Fix dicom seg panel sizing issue

* Set unecessary changes back

Co-authored-by: Rodolfo <rodolfo@radicalimaging.com>
This commit is contained in:
ladeirarodolfo 2023-01-25 12:14:12 -03:00 committed by GitHub
parent 514ea3ccea
commit b4881ab02e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 20 deletions

View File

@ -196,7 +196,7 @@ export default function PanelSegmentation({
); );
return ( return (
<div className="flex flex-col justify-between mt-1"> <div className="flex flex-col flex-auto min-h-0 justify-between mt-1">
{/* show segmentation table */} {/* show segmentation table */}
{segmentations?.length ? ( {segmentations?.length ? (
<SegmentationGroupTable <SegmentationGroupTable

View File

@ -58,7 +58,7 @@ const SegmentGroupHeader = ({
return ( return (
<div <div
className={classnames( className={classnames(
'flex items-center pr-2 pl-[3px] h-[27px] gap-2 rounded-t-md border-b border-secondary-light cursor-pointer text-[12px]', 'flex flex-static items-center pr-2 pl-[3px] h-[27px] gap-2 rounded-t-md border-b border-secondary-light cursor-pointer text-[12px]',
{ {
'bg-secondary-main': isActive, 'bg-secondary-main': isActive,
'bg-secondary-dark': !isActive, 'bg-secondary-dark': !isActive,
@ -149,7 +149,7 @@ const SegmentationGroup = ({
onSegmentEdit, onSegmentEdit,
}) => { }) => {
return ( return (
<div className="flex flex-col"> <div className="flex flex-col flex-auto min-h-0">
<SegmentGroupHeader <SegmentGroupHeader
id={id} id={id}
label={label} label={label}
@ -162,7 +162,7 @@ const SegmentationGroup = ({
onSegmentationDelete={onSegmentationDelete} onSegmentationDelete={onSegmentationDelete}
/> />
{!isMinimized && ( {!isMinimized && (
<div className=""> <div className="flex flex-col flex-auto min-h-0">
<AddNewSegmentRow <AddNewSegmentRow
onConfigChange={onSegmentationConfigChange} onConfigChange={onSegmentationConfigChange}
onSegmentAdd={onSegmentAdd} onSegmentAdd={onSegmentAdd}
@ -172,8 +172,7 @@ const SegmentationGroup = ({
showAddSegment={showAddSegment} showAddSegment={showAddSegment}
/> />
<div <div
className="ohif-scrollbar overflow-y-hidden" className="flex flex-col min-h-0 ohif-scrollbar overflow-y-hidden"
style={{ maxHeight: '40rem' }}
> >
{!!segments.length && {!!segments.length &&
segments.map(segment => { segments.map(segment => {

View File

@ -55,7 +55,7 @@ const SegmentationGroupTable = ({
setRenderOutline, setRenderOutline,
}) => { }) => {
return ( return (
<div className="font-inter font-[300]"> <div className="flex flex-col min-h-0 font-inter font-[300]">
<GetSegmentationConfig <GetSegmentationConfig
// showAddSegmentation={showAddSegmentation} // showAddSegmentation={showAddSegmentation}
// onSegmentationAdd={onSegmentationAdd} // onSegmentationAdd={onSegmentationAdd}
@ -68,7 +68,7 @@ const SegmentationGroupTable = ({
setRenderInactiveSegmentations={setRenderInactiveSegmentations} setRenderInactiveSegmentations={setRenderInactiveSegmentations}
setRenderOutline={setRenderOutline} setRenderOutline={setRenderOutline}
/> />
<div className="flex flex-col pr-[1px] mt-1"> <div className="flex flex-col min-h-0 pr-[1px] mt-1">
{!!segmentations.length && {!!segmentations.length &&
segmentations.map((segmentation, index) => { segmentations.map((segmentation, index) => {
const { const {
@ -82,7 +82,6 @@ const SegmentationGroupTable = ({
activeSegmentIndex, activeSegmentIndex,
} = segmentation; } = segmentation;
return ( return (
<>
<SegmentationGroup <SegmentationGroup
id={id} id={id}
label={label} label={label}
@ -107,8 +106,6 @@ const SegmentationGroupTable = ({
onSegmentAdd={onSegmentAdd} onSegmentAdd={onSegmentAdd}
showSegmentDelete={false} showSegmentDelete={false}
/> />
<div className="h-2 bg-black"></div>
</>
); );
})} })}
</div> </div>

View File

@ -176,7 +176,7 @@ const SidePanel = ({
{/** Panel Header with Arrow and Close Actions */} {/** Panel Header with Arrow and Close Actions */}
<div <div
className={classnames( className={classnames(
'px-[10px] bg-primary-dark h-9 cursor-pointer flex shrink-0', 'flex flex-static px-[10px] bg-primary-dark h-9 cursor-pointer',
tabs.length === 1 && 'mb-1' tabs.length === 1 && 'mb-1'
)} )}
onClick={() => { onClick={() => {
@ -190,7 +190,7 @@ const SidePanel = ({
color="inherit" color="inherit"
border="none" border="none"
rounded="none" rounded="none"
className="flex flex-row items-center px-3 relative w-full" className="flex flex-row flex-static items-center px-3 relative w-full"
name={tabs.length === 1 ? `${tabs[activeTabIndex].name}` : ''} name={tabs.length === 1 ? `${tabs[activeTabIndex].name}` : ''}
> >
<Icon <Icon
@ -278,7 +278,7 @@ function _getMoreThanOneTabLayout(
) { ) {
return ( return (
<div <div
className="collapse-sidebar relative" className="flex-static collapse-sidebar relative"
style={{ style={{
backgroundColor: '#06081f', backgroundColor: '#06081f',
}} }}

View File

@ -230,6 +230,7 @@ module.exports = {
auto: '1 1 auto', auto: '1 1 auto',
initial: '0 1 auto', initial: '0 1 auto',
none: 'none', none: 'none',
static: '0 0 auto',
}, },
flexGrow: { flexGrow: {
'0': '0', '0': '0',

View File

@ -238,6 +238,7 @@ module.exports = {
auto: '1 1 auto', auto: '1 1 auto',
initial: '0 1 auto', initial: '0 1 auto',
none: 'none', none: 'none',
static: '0 0 auto',
}, },
flexGrow: { flexGrow: {
'0': '0', '0': '0',
@ -302,6 +303,7 @@ module.exports = {
...theme('spacing'), ...theme('spacing'),
full: '100%', full: '100%',
screen: '100vh', screen: '100vh',
inherit: 'inherit',
}), }),
inset: { inset: {
'0': '0', '0': '0',
@ -311,6 +313,12 @@ module.exports = {
'1/2': '50%', '1/2': '50%',
'viewport-scrollbar': '1.3rem', 'viewport-scrollbar': '1.3rem',
}, },
minHeight: theme => ({
...theme('spacing'),
'0': '0',
full: '100%',
screen: '100vh',
}),
letterSpacing: { letterSpacing: {
tighter: '-0.05em', tighter: '-0.05em',
tight: '-0.025em', tight: '-0.025em',
@ -366,12 +374,6 @@ module.exports = {
...breakpoints(theme('screens')), ...breakpoints(theme('screens')),
...theme('spacing'), ...theme('spacing'),
}), }),
minHeight: theme => ({
...theme('spacing'),
'0': '0',
full: '100%',
screen: '100vh',
}),
minWidth: theme => ({ minWidth: theme => ({
...theme('spacing'), ...theme('spacing'),
'0': '0', '0': '0',