From 08fdb10f6d128ee970803f6a46511a568d703409 Mon Sep 17 00:00:00 2001 From: Igor Date: Thu, 14 Nov 2019 11:42:25 -0300 Subject: [PATCH] CR Update: Improve ohifmodal proptypes --- .../ui/src/components/ohifModal/OHIFModal.js | 7 ++++++- platform/ui/src/utils/ModalProvider.js | 19 +++++++++++++------ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/platform/ui/src/components/ohifModal/OHIFModal.js b/platform/ui/src/components/ohifModal/OHIFModal.js index f69c9376e..caad4ec08 100644 --- a/platform/ui/src/components/ohifModal/OHIFModal.js +++ b/platform/ui/src/components/ohifModal/OHIFModal.js @@ -54,7 +54,12 @@ OHIFModal.propTypes = { onHide: PropTypes.func, footer: PropTypes.node, header: PropTypes.node, - children: PropTypes.node, + children: PropTypes.oneOfType([ + PropTypes.arrayOf(PropTypes.node), + PropTypes.node, + PropTypes.object, + PropTypes.func, + ]).isRequired, }; export default OHIFModal; diff --git a/platform/ui/src/utils/ModalProvider.js b/platform/ui/src/utils/ModalProvider.js index 2f66692e9..0378faa75 100644 --- a/platform/ui/src/utils/ModalProvider.js +++ b/platform/ui/src/utils/ModalProvider.js @@ -40,10 +40,9 @@ const ModalProvider = ({ children, modal: Modal, service }) => { * * @returns void */ - const show = useCallback((component, props = {}) => { - setOptions(Object.assign({}, options, props, { component })); - console.log(component, props); - }); + const show = useCallback((component, props = {}) => + setOptions(Object.assign({}, options, props, { component })) + ); /** * Hide the modal and set its properties to default. @@ -80,8 +79,16 @@ const ModalProvider = ({ children, modal: Modal, service }) => { }; ModalProvider.propTypes = { - children: PropTypes.node.isRequired, - modal: PropTypes.node.isRequired, + children: PropTypes.oneOfType([ + PropTypes.arrayOf(PropTypes.node), + PropTypes.node, + PropTypes.func, + ]).isRequired, + modal: PropTypes.oneOfType([ + PropTypes.arrayOf(PropTypes.node), + PropTypes.node, + PropTypes.func, + ]).isRequired, service: PropTypes.shape({ setServiceImplementation: PropTypes.func, }).isRequired,