Merge branch 'master' of github.com:OHIF/Viewers into IDC-2251
This commit is contained in:
commit
d97270f995
24 files changed
+185
-70
No files matched your search
@@ -3,6 +3,14 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [2.12.2](https://github.com/OHIF/Viewers/compare/@ohif/core@2.12.1...@ohif/core@2.12.2) (2021-02-05)
|
||||
|
||||
**Note:** Version bump only for package @ohif/core
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## [2.12.1](https://github.com/OHIF/Viewers/compare/@ohif/core@2.12.0...@ohif/core@2.12.1) (2021-01-21)
|
||||
|
||||
**Note:** Version bump only for package @ohif/core
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@ohif/core",
|
||||
"version": "2.12.1",
|
||||
"version": "2.12.2",
|
||||
"description": "Generic business logic for web-based medical imaging applications",
|
||||
"author": "OHIF Core Team",
|
||||
"license": "MIT",
|
||||
@@ -39,7 +39,7 @@
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.5.5",
|
||||
"ajv": "^6.10.0",
|
||||
"dcmjs": "0.17.0",
|
||||
"dcmjs": "0.17.2",
|
||||
"dicomweb-client": "^0.6.0",
|
||||
"immer": "6.0.2",
|
||||
"isomorphic-base64": "^1.0.2",
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
* @property {boolean} [closeButton=true] Should the modal body render the close button.
|
||||
* @property {string} [title=null] Should the modal render the title independently of the body content.
|
||||
* @property {string} [customClassName=null] The custom class to style the modal.
|
||||
* @property {boolean} [showScrollbar=null] Show or hide scrollbar.
|
||||
* @property {boolean} [showScrollbar=false] Show or hide scrollbar.
|
||||
* @property {boolean} [noScroll=false] Disable or not the scrollbar.
|
||||
*/
|
||||
|
||||
const name = 'UIModalService';
|
||||
@@ -29,7 +30,7 @@ const serviceImplementation = {
|
||||
/**
|
||||
* Show a new UI modal;
|
||||
*
|
||||
* @param {ModalProps} props { content, contentProps, shouldCloseOnEsc, isOpen, onClose, closeButton, title, customClassName, showScrollbar }
|
||||
* @param {ModalProps} props { content, contentProps, shouldCloseOnEsc, isOpen, onClose, closeButton, title, customClassName, showScrollbar, noScroll }
|
||||
*/
|
||||
function _show({
|
||||
content = null,
|
||||
@@ -41,7 +42,8 @@ function _show({
|
||||
title = null,
|
||||
fullscreen = false,
|
||||
customClassName = null,
|
||||
showScrollbar = false
|
||||
showScrollbar = false,
|
||||
noScroll = false,
|
||||
}) {
|
||||
return serviceImplementation._show({
|
||||
content,
|
||||
@@ -53,7 +55,8 @@ function _show({
|
||||
title,
|
||||
fullscreen,
|
||||
customClassName,
|
||||
showScrollbar
|
||||
showScrollbar,
|
||||
noScroll,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -32,6 +32,10 @@
|
||||
max-height: 90vh;
|
||||
overflow-y: auto;
|
||||
|
||||
&.noScroll &__content {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
&:not(.visibleScrollbar) &__content
|
||||
overflow-x: hidden;
|
||||
scrollbar-width: none;
|
||||
|
||||
@@ -82,14 +82,20 @@ const ModalProvider = ({ children, modal: Modal, service }) => {
|
||||
shouldCloseOnEsc,
|
||||
fullscreen,
|
||||
closeButton,
|
||||
showScrollbar
|
||||
showScrollbar,
|
||||
noScroll,
|
||||
} = options;
|
||||
|
||||
return (
|
||||
<Provider value={{ show, hide }}>
|
||||
{ModalContent && (
|
||||
<Modal
|
||||
className={classNames(customClassName, ModalContent.className, { 'visibleScrollbar': showScrollbar })}
|
||||
className={classNames(
|
||||
customClassName,
|
||||
ModalContent.className,
|
||||
{ visibleScrollbar: showScrollbar },
|
||||
{ noScroll }
|
||||
)}
|
||||
shouldCloseOnEsc={shouldCloseOnEsc}
|
||||
isOpen={isOpen}
|
||||
title={title}
|
||||
|
||||
@@ -28,7 +28,13 @@ class Range extends Component {
|
||||
className="range"
|
||||
/>
|
||||
{this.props.showPercentage && <span>{`${this.state.value}%`}</span>}
|
||||
{this.props.showValue && <span>{this.state.value}</span>}
|
||||
{this.props.showValue && (
|
||||
<span>
|
||||
{this.props.valueRenderer
|
||||
? this.props.valueRenderer(this.state.value)
|
||||
: this.state.value}
|
||||
</span>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -40,6 +46,7 @@ Range.propTypes = {
|
||||
max: PropTypes.number.isRequired,
|
||||
step: PropTypes.number,
|
||||
id: PropTypes.string,
|
||||
valueRenderer: PropTypes.func,
|
||||
onChange: PropTypes.func,
|
||||
showPercentage: PropTypes.bool,
|
||||
showValue: PropTypes.bool,
|
||||
|
||||
@@ -3,6 +3,14 @@
|
||||
All notable changes to this project will be documented in this file.
|
||||
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
||||
|
||||
## [4.8.8](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.8.7...@ohif/viewer@4.8.8) (2021-02-05)
|
||||
|
||||
**Note:** Version bump only for package @ohif/viewer
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
## [4.8.7](https://github.com/OHIF/Viewers/compare/@ohif/viewer@4.8.6...@ohif/viewer@4.8.7) (2021-01-28)
|
||||
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@ohif/viewer",
|
||||
"version": "4.8.7",
|
||||
"version": "4.8.8",
|
||||
"description": "OHIF Viewer",
|
||||
"author": "OHIF Contributors",
|
||||
"license": "MIT",
|
||||
@@ -49,16 +49,16 @@
|
||||
},
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.5.5",
|
||||
"@ohif/core": "^2.12.1",
|
||||
"@ohif/extension-cornerstone": "^2.10.0",
|
||||
"@ohif/core": "^2.12.2",
|
||||
"@ohif/extension-cornerstone": "^2.10.1",
|
||||
"@ohif/extension-debugging": "^0.1.6",
|
||||
"@ohif/extension-dicom-html": "^1.3.0",
|
||||
"@ohif/extension-dicom-html": "^1.3.1",
|
||||
"@ohif/extension-dicom-microscopy": "^0.51.4",
|
||||
"@ohif/extension-dicom-pdf": "^1.0.6",
|
||||
"@ohif/extension-dicom-rt": "^0.6.3",
|
||||
"@ohif/extension-dicom-segmentation": "^0.5.1",
|
||||
"@ohif/extension-dicom-rt": "^0.6.4",
|
||||
"@ohif/extension-dicom-segmentation": "^0.5.2",
|
||||
"@ohif/extension-lesion-tracker": "^0.2.1",
|
||||
"@ohif/extension-vtk": "^1.10.2",
|
||||
"@ohif/extension-vtk": "^1.10.3",
|
||||
"@ohif/i18n": "^0.53.0",
|
||||
"@ohif/ui": "^1.8.1",
|
||||
"@tanem/react-nprogress": "^1.1.25",
|
||||
@@ -68,7 +68,7 @@
|
||||
"cornerstone-math": "^0.1.8",
|
||||
"cornerstone-tools": "^4.20.1",
|
||||
"cornerstone-wado-image-loader": "^3.1.0",
|
||||
"dcmjs": "0.17.0",
|
||||
"dcmjs": "0.17.2",
|
||||
"dicom-parser": "^1.8.3",
|
||||
"dicomweb-client": "^0.4.4",
|
||||
"hammerjs": "^2.0.8",
|
||||
|
||||
Reference in new issue
Block a user