othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: #1312 Cine dialog remains on screen (#1540)

Browse Source 
Co-authored-by: kedar.netelixir <kedar.choudhary@netelixir.com>
Co-authored-by: Danny Brown <danny.ri.brown@gmail.com>
This commit is contained in:
Kedar 2020-03-26 08:55:04 +05:30 committed by GitHub
parent 36822cc6ce
commit 7d22bb7d5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
platform/viewer/src/connectedComponents/ToolbarRow.js
View File

@ -136,12 +136,32 @@ class ToolbarRow extends Component {
} }
if (activeContextsChanged) { if (activeContextsChanged) {
this.setState({ this.setState(
toolbarButtons: _getVisibleToolbarButtons.call(this), {
}); toolbarButtons: _getVisibleToolbarButtons.call(this),
},
this.closeCineDialogIfNotApplicable
);
} }
} }
closeCineDialogIfNotApplicable = () => {
const { dialog } = this.props;
let { dialogId, activeButtons, toolbarButtons } = this.state;
if (dialogId) {
const cineButtonPresent = toolbarButtons.find(
button => button.options && button.options.behavior === 'CINE'
);
if (!cineButtonPresent) {
dialog.dismiss({ id: dialogId });
activeButtons = activeButtons.filter(
button => button.options && button.options.behavior !== 'CINE'
);
this.setState({ dialogId: null, activeButtons });
}
}
};
render() { render() {
const buttonComponents = _getButtonComponents.call( const buttonComponents = _getButtonComponents.call(
this, this,