Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[added] trigger onAfterOpen callback when available. #154

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 11 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Accessible modal dialog component for React.JS
```xml
<Modal
isOpen={bool}
onRequestClose={fn}
onAfterOpen={afterOpenFn}
onRequestClose={requestOpenFn}
closeTimeoutMS={n}
style={customStyle}
>
Expand Down Expand Up @@ -104,6 +105,11 @@ var App = React.createClass({
this.setState({modalIsOpen: true});
},

afterOpenModal: function() {
// references are now sync'd and can be accessed.
this.refs.subtitle.style.color = '#f00';
},

closeModal: function() {
this.setState({modalIsOpen: false});
},
Expand All @@ -114,10 +120,11 @@ var App = React.createClass({
<button onClick={this.openModal}>Open Modal</button>
<Modal
isOpen={this.state.modalIsOpen}
onAfterOpen={this.afterOpenModal}
onRequestClose={this.closeModal}
style={customStyles} >

<h2>Hello</h2>
<h2 ref="subtitle">Hello</h2>
<button onClick={this.closeModal}>close</button>
<div>I am a modal</div>
<form>
Expand Down Expand Up @@ -146,7 +153,8 @@ pass the 'shouldCloseOnOverlayClick' prop with 'false' value.
```xml
<Modal
isOpen={bool}
onRequestClose={fn}
onAfterOpen={afterOpenFn}
onRequestClose={requestCloseFn}
closeTimeoutMS={n}
shouldCloseOnOverlayClick={false}
style={customStyle}>
Expand Down
12 changes: 9 additions & 3 deletions examples/basic/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,23 @@ var App = React.createClass({
this.setState({foo: 'bar'});
},

handleOnAfterOpenModal: function() {
// when ready, we can access the available refs.
this.refs.title.style.color = '#F00';
},

render: function() {
return (
<div>
<button onClick={this.openModal}>Open Modal</button>
<button onClick={this.openModal2}>Open Modal 2</button>
<Modal
ref="mymodal"
closeTimeoutMS={150}
isOpen={this.state.modalIsOpen}
onRequestClose={this.handleModalCloseRequest}
>
<h1>Hello</h1>
onAfterOpen={this.handleOnAfterOpenModal}
onRequestClose={this.handleModalCloseRequest}>
<h1 ref="title">Hello</h1>
<button onClick={this.closeModal}>close</button>
<div>I am a modal</div>
<form>
Expand Down
1 change: 1 addition & 0 deletions lib/components/Modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ var Modal = React.createClass({
overlay: React.PropTypes.object
}),
appElement: React.PropTypes.instanceOf(SafeHTMLElement),
onAfterOpen: React.PropTypes.func,
onRequestClose: React.PropTypes.func,
closeTimeoutMS: React.PropTypes.number,
ariaHideApp: React.PropTypes.bool,
Expand Down
4 changes: 4 additions & 0 deletions lib/components/ModalPortal.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ var ModalPortal = module.exports = React.createClass({
focusManager.markForFocusLater();
this.setState({isOpen: true}, function() {
this.setState({afterOpen: true});

if (this.props.isOpen && this.props.onAfterOpen) {
this.props.onAfterOpen();
}
}.bind(this));
},

Expand Down
12 changes: 12 additions & 0 deletions specs/Modal.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,18 @@ describe('Modal', function () {
unmountModal();
});

it('should trigger the onAfterOpen callback', function() {
var afterOpenCallback = sinon.spy();
var modal = renderModal({
isOpen: true,
onAfterOpen: function() {
afterOpenCallback();
}
});
ok(afterOpenCallback.called);
unmountModal();
});

describe('should close on overlay click', function() {
afterEach('Unmount modal', function() {
unmountModal();
Expand Down