Wire up EmailConfirmationModal's close button

This commit is contained in:
seotts 2021-11-12 16:00:51 -05:00
parent 8b62fb9f63
commit 2af9b673ff
4 changed files with 21 additions and 4 deletions
src
components
dropdown-banner/email-confirmation
modal/email-confirmation
views/preview

View file

@ -10,7 +10,12 @@ const EmailConfirmationBanner = ({onRequestDismiss}) => {
const [showEmailConfirmationModal, setShowEmailConfirmationModal] = useState(false);
return (
<React.Fragment>
{(showEmailConfirmationModal && <EmailConfirmationModal />)}
{(showEmailConfirmationModal && <EmailConfirmationModal
isOpen
onRequestClose={() => {
setShowEmailConfirmationModal(false);
}}
/>)}
<DropdownBanner
className="warning"
key="confirmedEmail"

View file

@ -12,7 +12,8 @@ import ModalTitle from '../base/modal-title.jsx';
const EmailConfirmationModal = props => (
<Modal
isOpen
isOpen={props.isOpen}
onRequestClose={props.onRequestClose}
>
<ModalTitle />
<p>{props.email}</p>
@ -21,7 +22,8 @@ const EmailConfirmationModal = props => (
EmailConfirmationModal.propTypes = {
email: PropTypes.string,
handleClose: PropTypes.func
isOpen: PropTypes.bool,
onRequestClose: PropTypes.func
};
const mapStateToProps = state => ({
email: state.session.session.user.email

View file

@ -93,6 +93,7 @@ const PreviewPresentation = ({
onAddToStudioClicked,
onAddToStudioClosed,
onCloseAdminPanel,
onCloseEmailConfirmationModal,
onDeleteComment,
onFavoriteClicked,
onGreenFlag,
@ -223,7 +224,10 @@ const PreviewPresentation = ({
);
return (
<div className="preview">
{showEmailConfirmationModal && <EmailConfirmationModal />}
{showEmailConfirmationModal && <EmailConfirmationModal
isOpen={true}
onRequestClose={onCloseEmailConfirmationModal}
/>}
{showAdminPanel && (
<AdminPanel
className={classNames('project-admin-panel', {
@ -746,6 +750,7 @@ PreviewPresentation.propTypes = {
onAddToStudioClicked: PropTypes.func,
onAddToStudioClosed: PropTypes.func,
onCloseAdminPanel: PropTypes.func,
onCloseEmailConfirmationModal: PropTypes.func,
onDeleteComment: PropTypes.func,
onFavoriteClicked: PropTypes.func,
onGreenFlag: PropTypes.func,

View file

@ -62,6 +62,7 @@ class Preview extends React.Component {
'handleMessage',
'handlePopState',
'handleCloseAdminPanel',
'handleCloseEmailConfirmationModal',
'handleIsRemixing',
'handleOpenAdminPanel',
'handleReportClick',
@ -626,6 +627,9 @@ class Preview extends React.Component {
showEmailConfirmationModal: true
});
}
handleCloseEmailConfirmationModal () {
this.setState({showEmailConfirmationModal: false});
}
handleUpdateProjectTitle (title) {
this.props.updateProject(
this.props.projectInfo.id,
@ -781,6 +785,7 @@ class Preview extends React.Component {
onAddToStudioClicked={this.handleAddToStudioClick}
onAddToStudioClosed={this.handleAddToStudioClose}
onCloseAdminPanel={this.handleCloseAdminPanel}
onCloseEmailConfirmationModal={this.handleCloseEmailConfirmationModal}
onDeleteComment={this.handleDeleteComment}
onFavoriteClicked={this.handleFavoriteToggle}
onGreenFlag={this.handleGreenFlag}