fix(hotkeys): Fix the issues with hotkeys (#488)

* wip viewport

* refactoring to do not use dispatch from window

* fixing server active testing

* fix(dependencies): Bump ohif-core to 0.5.5
This commit is contained in:
Evren Ozkan authored and GitHub committed 2019-05-27 11:31:39 -04:00
1 parent c2eb5f342f
commit 3bae254a6f
7 files changed
+128 -98

No files matched your search

+35 -24
View File
@@ -1,33 +1,44 @@
import { connect } from 'react-redux';
import ViewerMain from './ViewerMain';
import OHIF from 'ohif-core';
import { connect } from 'react-redux'
import ViewerMain from './ViewerMain'
import OHIF from 'ohif-core'
const { setViewportSpecificData, clearViewportSpecificData } = OHIF.redux.actions;
const {
setViewportSpecificData,
clearViewportSpecificData,
setToolActive,
setActiveViewportSpecificData,
} = OHIF.redux.actions
const mapStateToProps = state => {
const { activeViewportIndex, layout, viewportSpecificData } = state.viewports;
const { activeViewportIndex, layout, viewportSpecificData } = state.viewports
return {
activeViewportIndex,
layout,
viewportSpecificData
}
};
return {
activeViewportIndex,
layout,
viewportSpecificData,
}
}
const mapDispatchToProps = dispatch => {
return {
setViewportSpecificData: (viewportIndex, data) => {
dispatch(setViewportSpecificData(viewportIndex, data));
},
clearViewportSpecificData: () => {
dispatch(clearViewportSpecificData());
}
};
};
return {
setViewportSpecificData: (viewportIndex, data) => {
dispatch(setViewportSpecificData(viewportIndex, data))
},
clearViewportSpecificData: () => {
dispatch(clearViewportSpecificData())
},
setToolActive: tool => {
dispatch(setToolActive(tool))
},
setActiveViewportSpecificData: viewport => {
dispatch(setActiveViewportSpecificData(viewport))
},
}
}
const ConnectedViewerMain = connect(
mapStateToProps,
mapDispatchToProps
)(ViewerMain);
mapStateToProps,
mapDispatchToProps
)(ViewerMain)
export default ConnectedViewerMain;
export default ConnectedViewerMain