ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity

Merge pull request #15 from ascribe/AD-1256-refactor-modalwrapper-to-not-be-

Browse Source 
Refactor ModalWrapper to not require a trigger component
This commit is contained in:
Tim Daubenschütz 2015-11-03 17:21:11 +01:00
commit 9a54ebdbd7
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/components/ascribe_modal/modal_wrapper.js
View File

@ -7,7 +7,7 @@ import Modal from 'react-bootstrap/lib/Modal';
let ModalWrapper = React.createClass({
propTypes: {
trigger: React.PropTypes.element.isRequired,
trigger: React.PropTypes.element,
title: React.PropTypes.oneOfType([
React.PropTypes.arrayOf(React.PropTypes.element),
React.PropTypes.element,
@ -38,7 +38,7 @@ let ModalWrapper = React.createClass({
});
},
handleSuccess(response){
handleSuccess(response) {
this.props.handleSuccess(response);
this.hide();
},
@ -52,17 +52,19 @@ let ModalWrapper = React.createClass({
},
render() {
// this adds the onClick method show of modal_wrapper to the trigger component
// which is in most cases a button.
let trigger = React.cloneElement(this.props.trigger, {onClick: this.show});
const { trigger, title } = this.props;
// If the trigger component exists, we add the ModalWrapper's show() as its onClick method.
// The trigger component should, in most cases, be a button.
const clonedTrigger = React.isValidElement(trigger) ? React.cloneElement(trigger, {onClick: this.show})
: null;
return (
<span>
{trigger}
{clonedTrigger}
<Modal show={this.state.showModal} onHide={this.hide}>
<Modal.Header closeButton>
<Modal.Title>
{this.props.title}
{title}
</Modal.Title>
</Modal.Header>
<div className="modal-body" >