diff --git a/assets/js/src/common/modal/header.jsx b/assets/js/src/common/modal/header.jsx index d505c624fa..a17a52df56 100644 --- a/assets/js/src/common/modal/header.jsx +++ b/assets/js/src/common/modal/header.jsx @@ -10,11 +10,9 @@ const ModalHeader = ({ }) => (
- { title && ( -

- { title } -

- ) } +

+ { title } +

{ isDismissible && ( @@ -23,13 +21,12 @@ const ModalHeader = ({ ); ModalHeader.propTypes = { - title: PropTypes.string, + title: PropTypes.string.isRequired, onClose: PropTypes.func, isDismissible: PropTypes.bool, }; ModalHeader.defaultProps = { - title: null, onClose: () => {}, isDismissible: true, }; diff --git a/assets/js/src/common/modal/modal.jsx b/assets/js/src/common/modal/modal.jsx index 26d6e792b4..b152754c5b 100644 --- a/assets/js/src/common/modal/modal.jsx +++ b/assets/js/src/common/modal/modal.jsx @@ -8,7 +8,6 @@ import ModalHeader from './header.jsx'; function Modal({ onRequestClose, title, - displayTitle, children, isDismissible, shouldCloseOnEsc, @@ -32,15 +31,13 @@ function Modal({ className="mailpoet-modal-content" role="document" > - { - displayTitle && ( - - ) - } + { title && ( + + ) } { children }
, @@ -55,7 +52,6 @@ Modal.propTypes = { overlayClassName: PropTypes.string, title: PropTypes.string, onRequestClose: PropTypes.func, - displayTitle: PropTypes.bool, fullScreen: PropTypes.bool, focusOnMount: PropTypes.bool, shouldCloseOnEsc: PropTypes.bool, @@ -72,7 +68,6 @@ Modal.defaultProps = { shouldCloseOnEsc: true, shouldCloseOnClickOutside: true, isDismissible: true, - displayTitle: true, fullScreen: false, };