From 90ca52585ae93c0e0aadbc1ee272eb1af72b019d Mon Sep 17 00:00:00 2001 From: Rodrigo Antinarelli Date: Tue, 30 Jun 2020 15:57:24 -0300 Subject: [PATCH] update thumbnail props --- .../components/StudyBrowser/StudyBrowser.jsx | 21 ++++++------------- .../ThumbnailList/ThumbnailList.jsx | 7 ++++--- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/platform/ui/src/components/StudyBrowser/StudyBrowser.jsx b/platform/ui/src/components/StudyBrowser/StudyBrowser.jsx index 048489e70..24b2f52f3 100644 --- a/platform/ui/src/components/StudyBrowser/StudyBrowser.jsx +++ b/platform/ui/src/components/StudyBrowser/StudyBrowser.jsx @@ -1,4 +1,4 @@ -import React, { useState } from 'react'; +import React from 'react'; import PropTypes from 'prop-types'; import classnames from 'classnames'; @@ -26,9 +26,8 @@ const StudyBrowser = ({ onClickStudy, onClickThumbnail, onClickUntrack, + currentDisplaySetInstanceUID, }) => { - const [thumbnailActive, setThumbnailActive] = useState(null); - const getTabContent = () => { const tabData = tabs.find(tab => tab.name === activeTabName); @@ -58,18 +57,9 @@ const StudyBrowser = ({ {isExpanded && displaySets && ( { - setThumbnailActive( - displaySetInstanceUID === thumbnailActive - ? null - : displaySetInstanceUID - ); - onClickThumbnail(displaySetInstanceUID); - }} - onClickUntrack={displaySetInstanceUID => { - onClickUntrack(displaySetInstanceUID); - }} + currentDisplaySetInstanceUID={currentDisplaySetInstanceUID} + onThumbnailClick={onClickThumbnail} + onClickUntrack={onClickUntrack} /> )} @@ -121,6 +111,7 @@ StudyBrowser.propTypes = { onClickUntrack: PropTypes.func, activeTabName: PropTypes.string.isRequired, expandedStudyInstanceUIDs: PropTypes.arrayOf(PropTypes.string).isRequired, + currentDisplaySetInstanceUID: PropTypes.string.isRequired, tabs: PropTypes.arrayOf( PropTypes.shape({ name: PropTypes.string.isRequired, diff --git a/platform/ui/src/components/ThumbnailList/ThumbnailList.jsx b/platform/ui/src/components/ThumbnailList/ThumbnailList.jsx index fa17fc13e..a29a73e96 100644 --- a/platform/ui/src/components/ThumbnailList/ThumbnailList.jsx +++ b/platform/ui/src/components/ThumbnailList/ThumbnailList.jsx @@ -5,7 +5,7 @@ import { Thumbnail, ThumbnailNoImage, ThumbnailTracked } from '@ohif/ui'; const ThumbnailList = ({ thumbnails, - thumbnailActive, + currentDisplaySetInstanceUID, onThumbnailClick, onClickUntrack, }) => { @@ -26,7 +26,8 @@ const ThumbnailList = ({ imageSrc, imageAltText, }) => { - const isActive = thumbnailActive === displaySetInstanceUID; + const isActive = + currentDisplaySetInstanceUID === displaySetInstanceUID; switch (componentType) { case 'thumbnail': @@ -112,7 +113,7 @@ ThumbnailList.propTypes = { }), }) ), - thumbnailActive: PropTypes.string, + currentDisplaySetInstanceUID: PropTypes.string, onThumbnailClick: PropTypes.func, onClickUntrack: PropTypes.func.isRequired, };