fix(segmentation): Add segment jump for new segments and make panels scrollable (#4928)
This commit is contained in:
1 parent
a8ac297e16
commit
3653de7487
23 files changed
+491
-368
No files matched your search
@@ -2,6 +2,8 @@ import React from 'react';
|
||||
import PropTypes from 'prop-types';
|
||||
|
||||
import { Thumbnail } from '../Thumbnail';
|
||||
import { useDynamicMaxHeight } from '../../hooks/useDynamicMaxHeight';
|
||||
import { ScrollArea } from '../ScrollArea';
|
||||
|
||||
const ThumbnailList = ({
|
||||
thumbnails,
|
||||
@@ -12,6 +14,9 @@ const ThumbnailList = ({
|
||||
viewPreset,
|
||||
ThumbnailMenuItems,
|
||||
}) => {
|
||||
// Use the dynamic height hook on the parent container
|
||||
const { ref, maxHeight } = useDynamicMaxHeight(thumbnails);
|
||||
|
||||
// Filter thumbnails into list items and thumbnail items
|
||||
const listItems = thumbnails?.filter(
|
||||
({ componentType }) => componentType === 'thumbnailNoImage' || viewPreset === 'list'
|
||||
@@ -22,63 +27,68 @@ const ThumbnailList = ({
|
||||
);
|
||||
|
||||
return (
|
||||
<div className="flex flex-col gap-[4px] pt-[4px] pr-[2.5px] pl-[5px] pb-[4px]">
|
||||
{/* Thumbnail Items */}
|
||||
{thumbnailItems.length > 0 && (
|
||||
<div
|
||||
id="ohif-thumbnail-list"
|
||||
className="ohif-scrollbar bg-bkg-low grid grid-cols-[repeat(auto-fit,_minmax(0,135px))] place-items-start gap-[4px] overflow-y-hidden"
|
||||
>
|
||||
{thumbnailItems.map(item => {
|
||||
const { displaySetInstanceUID, componentType, numInstances, ...rest } = item;
|
||||
<ScrollArea className="flex flex-col gap-[4px] pt-[4px] pr-[2.5px] pl-[5px] pb-[4px]">
|
||||
<div
|
||||
ref={ref}
|
||||
style={{ maxHeight: maxHeight, minHeight: '300px' }}
|
||||
className="flex flex-col gap-[4px] pt-[4px] pr-[2.5px] pl-[5px] pb-[4px]"
|
||||
>
|
||||
{thumbnailItems.length > 0 && (
|
||||
<div
|
||||
id="ohif-thumbnail-list"
|
||||
className="bg-bkg-low grid grid-cols-[repeat(auto-fit,_minmax(0,135px))] place-items-start gap-[4px]"
|
||||
>
|
||||
{thumbnailItems.map(item => {
|
||||
const { displaySetInstanceUID, componentType, numInstances, ...rest } = item;
|
||||
|
||||
const isActive = activeDisplaySetInstanceUIDs.includes(displaySetInstanceUID);
|
||||
return (
|
||||
<Thumbnail
|
||||
key={displaySetInstanceUID}
|
||||
{...rest}
|
||||
displaySetInstanceUID={displaySetInstanceUID}
|
||||
numInstances={numInstances || 1}
|
||||
isActive={isActive}
|
||||
thumbnailType={componentType}
|
||||
viewPreset="thumbnails"
|
||||
onClick={onThumbnailClick.bind(null, displaySetInstanceUID)}
|
||||
onDoubleClick={onThumbnailDoubleClick.bind(null, displaySetInstanceUID)}
|
||||
onClickUntrack={onClickUntrack.bind(null, displaySetInstanceUID)}
|
||||
ThumbnailMenuItems={ThumbnailMenuItems}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
{/* List Items */}
|
||||
{listItems.length > 0 && (
|
||||
<div
|
||||
id="ohif-thumbnail-list"
|
||||
className="ohif-scrollbar bg-bkg-low grid grid-cols-[repeat(auto-fit,_minmax(0,275px))] place-items-start gap-[2px] overflow-y-hidden"
|
||||
>
|
||||
{listItems.map(item => {
|
||||
const { displaySetInstanceUID, componentType, numInstances, ...rest } = item;
|
||||
const isActive = activeDisplaySetInstanceUIDs.includes(displaySetInstanceUID);
|
||||
return (
|
||||
<Thumbnail
|
||||
key={displaySetInstanceUID}
|
||||
{...rest}
|
||||
displaySetInstanceUID={displaySetInstanceUID}
|
||||
numInstances={numInstances || 1}
|
||||
isActive={isActive}
|
||||
thumbnailType={componentType}
|
||||
viewPreset="list"
|
||||
onClick={onThumbnailClick.bind(null, displaySetInstanceUID)}
|
||||
onDoubleClick={onThumbnailDoubleClick.bind(null, displaySetInstanceUID)}
|
||||
onClickUntrack={onClickUntrack.bind(null, displaySetInstanceUID)}
|
||||
ThumbnailMenuItems={ThumbnailMenuItems}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
const isActive = activeDisplaySetInstanceUIDs.includes(displaySetInstanceUID);
|
||||
return (
|
||||
<Thumbnail
|
||||
key={displaySetInstanceUID}
|
||||
{...rest}
|
||||
displaySetInstanceUID={displaySetInstanceUID}
|
||||
numInstances={numInstances || 1}
|
||||
isActive={isActive}
|
||||
thumbnailType={componentType}
|
||||
viewPreset="thumbnails"
|
||||
onClick={onThumbnailClick.bind(null, displaySetInstanceUID)}
|
||||
onDoubleClick={onThumbnailDoubleClick.bind(null, displaySetInstanceUID)}
|
||||
onClickUntrack={onClickUntrack.bind(null, displaySetInstanceUID)}
|
||||
ThumbnailMenuItems={ThumbnailMenuItems}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
{/* List Items */}
|
||||
{listItems.length > 0 && (
|
||||
<div
|
||||
id="ohif-thumbnail-list"
|
||||
className="bg-bkg-low grid grid-cols-[repeat(auto-fit,_minmax(0,275px))] place-items-start gap-[2px]"
|
||||
>
|
||||
{listItems.map(item => {
|
||||
const { displaySetInstanceUID, componentType, numInstances, ...rest } = item;
|
||||
const isActive = activeDisplaySetInstanceUIDs.includes(displaySetInstanceUID);
|
||||
return (
|
||||
<Thumbnail
|
||||
key={displaySetInstanceUID}
|
||||
{...rest}
|
||||
displaySetInstanceUID={displaySetInstanceUID}
|
||||
numInstances={numInstances || 1}
|
||||
isActive={isActive}
|
||||
thumbnailType={componentType}
|
||||
viewPreset="list"
|
||||
onClick={onThumbnailClick.bind(null, displaySetInstanceUID)}
|
||||
onDoubleClick={onThumbnailDoubleClick.bind(null, displaySetInstanceUID)}
|
||||
onClickUntrack={onClickUntrack.bind(null, displaySetInstanceUID)}
|
||||
ThumbnailMenuItems={ThumbnailMenuItems}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</ScrollArea>
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user