Avoid re-renders in study browser and entire page

This commit is contained in:
Erik Ziegler committed 2020-05-16 15:08:06 +02:00
1 parent 4fc3169fed
commit 10930cda68
9 files changed
+180 -67

No files matched your search

+46 -7
View File
@@ -3,6 +3,7 @@ import { StudyBrowser } from '@ohif/ui';
import {
dicomMetadataStore,
useViewModel,
useToolbarLayout,
displaySetManager,
} from '@ohif/core';
@@ -27,18 +28,49 @@ function getImageSrc(imageId, { cornerstone }) {
});
}
function StudyBrowserPanel({ getDataSources, commandsManager }) {
const viewModel = useViewModel();
const dataSource = getDataSources('dicomweb')[0];
function StudyBrowserUIData({ getDataSources, commandsManager }) {
const [activeTabName, setActiveTabName] = useState('primary');
const [studyData, setStudyData] = useState([]);
const [thumbnailImageSrcMap, setThumbnailImageSrcMap] = useState(new Map());
const updateThumbnailMap = (k, v) => {
setThumbnailImageSrcMap(thumbnailImageSrcMap.set(k, v));
};
console.log('StudyBrowserUIData rerender');
return (
<StudyBrowserPanel
activeTabName={activeTabName}
getDataSources={getDataSources}
commandsManager={commandsManager}
onSetTabActive={setActiveTabName}
studyData={studyData}
setStudyData={setStudyData}
thumbnailImageSrcMap={thumbnailImageSrcMap}
updateThumbnailMap={updateThumbnailMap}
/>
);
}
function StudyBrowserPanel({
activeTabName,
getDataSources,
commandsManager,
onSetTabActive,
studyData,
setStudyData,
thumbnailImageSrcMap,
updateThumbnailMap,
}) {
console.warn('StudyBrowserPanel rerender');
const viewModel = useViewModel();
const dataSource = getDataSources('dicomweb')[0];
const viewportData = []; //useViewportGrid();
const seriesTracking = {}; //useSeriesTracking();
// This effect
useEffect(() => {
if (!viewModel.displaySetInstanceUIDs.length) {
return;
@@ -192,7 +224,7 @@ function StudyBrowserPanel({ getDataSources, commandsManager }) {
});
return () => (isSubscribed = false);
}, [viewModel.displaySetInstanceUIDs]);
}, [viewModel.displaySetInstanceUIDs, thumbnailImageSrcMap, setStudyData]);
studyData.forEach(study => {
study.displaySets.forEach(ds => {
@@ -251,13 +283,20 @@ function StudyBrowserPanel({ getDataSources, commandsManager }) {
[studyData]
);
return <StudyBrowser tabs={tabs} onClickStudy={memoOnClickStudy} />;
return (
<StudyBrowser
activeTabName={activeTabName}
tabs={tabs}
onClickStudy={memoOnClickStudy}
onSetTabActive={onSetTabActive}
/>
);
}
function getPanelModule({ getDataSources, commandsManager, servicesManager }) {
const wrappedStudyBrowserPanel = () => {
return (
<StudyBrowserPanel
<StudyBrowserUIData
getDataSources={getDataSources}
commandsManager={commandsManager}
/>