Skip to content

Commit 399b386

Browse files
committed
Merge pull request #8 from leoasis/update_react_version
[changed] Update to React 0.12. Fix warnings.
2 parents a8faa92 + 4a85cd2 commit 399b386

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

lib/components/Modal.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
/** @jsx React.DOM */
21
var React = require('react');
3-
var ModalPortal = require('./ModalPortal');
2+
var ModalPortal = React.createFactory(require('./ModalPortal'));
43
var ariaAppHider = require('../helpers/ariaAppHider');
54
var injectCSS = require('../helpers/injectCSS');
65

@@ -53,7 +52,7 @@ var Modal = module.exports = React.createClass({
5352
if (this.portal)
5453
this.portal.setProps(props);
5554
else
56-
this.portal = React.renderComponent(ModalPortal(props), this.node);
55+
this.portal = React.render(ModalPortal(props), this.node);
5756
},
5857

5958
render: function () {

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
"karma-firefox-launcher": "0.1.3",
3434
"karma-mocha": "0.1.3",
3535
"mocha": "1.20.1",
36-
"react": ">=0.11.0",
36+
"react": ">=0.12.0",
3737
"reactify": "^0.14.0",
3838
"rf-release": "0.3.1",
3939
"uglify-js": "2.4.15",
4040
"webpack-dev-server": "1.6.5"
4141
},
4242
"peerDependencies": {
43-
"react": ">=0.11.0"
43+
"react": ">=0.12.0"
4444
},
4545
"dependencies": {},
4646
"tags": [
@@ -57,4 +57,4 @@
5757
"browserify-shim": {
5858
"react": "global:React"
5959
}
60-
}
60+
}

specs/Modal.spec.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require('./helper');
2-
var Modal = require('../lib/components/Modal');
32
var React = require('react/addons');
3+
var Modal = require('../lib/components/Modal');
44
var Simulate = React.addons.TestUtils.Simulate;
55
var ariaAppHider = require('../lib/helpers/ariaAppHider');
66
var button = React.DOM.button;
@@ -26,7 +26,7 @@ describe('Modal', function () {
2626
it('throws without an appElement', function() {
2727
var node = document.createElement('div');
2828
throws(function() {
29-
React.renderComponent(Modal({isOpen: true}), node);
29+
React.render(React.createElement(Modal, {isOpen: true}), node);
3030
});
3131
React.unmountComponentAtNode(node);
3232
});
@@ -35,7 +35,7 @@ describe('Modal', function () {
3535
var app = document.createElement('div');
3636
var node = document.createElement('div');
3737
Modal.setAppElement(app);
38-
React.renderComponent(Modal({isOpen: true}), node);
38+
React.render(React.createElement(Modal, {isOpen: true}), node);
3939
equal(app.getAttribute('aria-hidden'), 'true');
4040
ariaAppHider.resetForTesting();
4141
React.unmountComponentAtNode(node);
@@ -44,7 +44,7 @@ describe('Modal', function () {
4444
it('accepts appElement as a prop', function() {
4545
var el = document.createElement('div');
4646
var node = document.createElement('div');
47-
React.renderComponent(Modal({
47+
React.render(React.createElement(Modal, {
4848
isOpen: true,
4949
appElement: el
5050
}), node);
@@ -56,10 +56,10 @@ describe('Modal', function () {
5656
var node = document.createElement('div');
5757
var App = React.createClass({
5858
render: function() {
59-
return React.DOM.div({}, Modal({isOpen: true, ariaHideApp: false}, 'hello'));
59+
return React.DOM.div({}, React.createElement(Modal, {isOpen: true, ariaHideApp: false}, 'hello'));
6060
}
6161
});
62-
React.renderComponent(App(), node);
62+
React.render(React.createElement(App), node);
6363
var modalParent = document.body.querySelector('.ReactModalPortal').parentNode;
6464
equal(modalParent, document.body);
6565
React.unmountComponentAtNode(node);
@@ -75,7 +75,7 @@ describe('Modal', function () {
7575
it('has default props', function() {
7676
var node = document.createElement('div');
7777
Modal.setAppElement(document.createElement('div'));
78-
var component = React.renderComponent(Modal(), node);
78+
var component = React.render(React.createElement(Modal), node);
7979
var props = component.props;
8080
equal(props.isOpen, false);
8181
equal(props.ariaHideApp, true);
@@ -122,13 +122,13 @@ describe('Modal', function () {
122122
//it('adds --before-close for animations', function() {
123123
//var node = document.createElement('div');
124124

125-
//var component = React.renderComponent(Modal({
125+
//var component = React.render(React.createElement(Modal, {
126126
//isOpen: true,
127127
//ariaHideApp: false,
128128
//closeTimeoutMS: 50,
129129
//}), node);
130130

131-
//component = React.renderComponent(Modal({
131+
//component = React.render(React.createElement(Modal, {
132132
//isOpen: false,
133133
//ariaHideApp: false,
134134
//closeTimeoutMS: 50,

specs/helper.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
assert = require('assert');
22
React = require('react/addons');
3-
var Modal = require('../lib/components/Modal');
3+
var Modal = React.createFactory(require('../lib/components/Modal'));
44

55
ReactTestUtils = React.addons.TestUtils;
66
ok = assert.ok;
@@ -14,7 +14,7 @@ renderModal = function(props, children, callback) {
1414
props.ariaHideApp = false;
1515
_currentDiv = document.createElement('div');
1616
document.body.appendChild(_currentDiv);
17-
return React.renderComponent(Modal(props, children), _currentDiv, callback);
17+
return React.render(Modal(props, children), _currentDiv, callback);
1818
};
1919

2020
unmountModal = function() {

0 commit comments

Comments
 (0)