Stop using children

This commit is contained in:
Erik Ziegler committed 2020-05-18 19:49:32 +02:00
1 parent 488bb5d266
commit 1bb204b9a5
3 files changed
+14 -12

No files matched your search

@@ -1,13 +1,15 @@
/**
* CSS Grid Reference: http://grid.malven.co/
*/
import React, { useState } from 'react';
import React, { useState, useCallback, useEffect } from 'react';
import PropTypes from 'prop-types';
import { ViewportGrid, ViewportPane } from '@ohif/ui';
// import DefaultViewport from './DefaultViewport.js';
// import EmptyViewport from './EmptyViewport.js';
function ViewerViewportGrid(props) {
debugger;
const {
activeViewportIndex,
servicesManager,
@@ -15,8 +17,6 @@ function ViewerViewportGrid(props) {
dataSource,
} = props;
debugger;
// TODO -> Need some way of selecting which displaySets hit the viewports.
const { DisplaySetService } = servicesManager.services;
@@ -50,7 +50,11 @@ function ViewerViewportGrid(props) {
}, []);
// From ViewportGridService and/or ContextProvider
const [viewportGrid, setViewportGrid] = useState({});
const [viewportGrid, setViewportGrid] = useState({
numCols: 1,
numRows: 1,
viewports: []
});
// viewportData --> displaySets
+2 -3
View File
@@ -54,6 +54,7 @@ export default function ModeRoute({
Compose({ components: contextModuleProviders, children });
function ViewportGridWithDataSource(props) {
debugger;
return ViewportGrid({ ...props, dataSource });
}
@@ -88,9 +89,7 @@ export default function ModeRoute({
* Use it from there instead of passing as a prop here.
*/}
<DragAndDropProvider>
<LayoutComponent {...layoutTemplateData.props}>
<div>test</div>
</LayoutComponent>
<LayoutComponent {...layoutTemplateData.props} ViewportGridComp={ViewportGridWithDataSource}/>
</DragAndDropProvider>
</CombinedContextProvider>
{/*</ToolbarLayoutProvider>*/}