Skip to content

Commit 044100b

Browse files
committed
[added] React 0.14 support
1 parent eac64fc commit 044100b

9 files changed

+22
-17
lines changed

Diff for: .eslintrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"react/jsx-no-duplicate-props": 2,
2929
"react/jsx-no-undef": 2,
3030
"react/jsx-uses-react": 2,
31-
"react/no-did-mount-set-state": 2,
32-
"react/no-did-update-set-state": 2,
31+
"react/no-did-mount-set-state": 0,
32+
"react/no-did-update-set-state": 0,
3333
"react/react-in-jsx-scope": 2,
3434
"react/self-closing-comp": 2,
3535
"react/wrap-multilines": 2,

Diff for: examples/App.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
2-
2+
import { findDOMNode } from 'react-dom';
33
import Button from 'react-bootstrap/lib/Button';
4-
import Editor from 'component-playground';
4+
import Editor from '@jquense/component-playground';
55

66
import PropTable from './PropTable';
77

@@ -22,7 +22,7 @@ import * as ReactOverlays from 'react-overlays';
2222
import './styles.less';
2323
import injectCss from './injectCss';
2424

25-
let scope = { React, Button, injectCss, ...ReactOverlays };
25+
let scope = { React, findDOMNode, Button, injectCss, ...ReactOverlays };
2626

2727
const Anchor = React.createClass({
2828
propTypes: {

Diff for: examples/Overlay.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import { findDOMNode } from 'react-dom';
23
import Overlay from 'react-overlays/Overlay';
34
import Button from 'react-bootstrap/lib/Button';
45

@@ -110,7 +111,7 @@ const OverlayExample = React.createClass({
110111
onHide={() => this.setState({ show: false })}
111112
placement={this.state.placement}
112113
container={this}
113-
target={ props => React.findDOMNode(this.refs.target)}
114+
target={ props => findDOMNode(this.refs.target)}
114115
>
115116
<ToolTip>
116117
I'm placed to the: <strong>{this.state.placement}</strong>

Diff for: examples/Position.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import { findDOMNode } from 'react-dom';
23
import Position from 'react-overlays/Position';
34
import Button from 'react-bootstrap/lib/Button';
45

@@ -80,7 +81,7 @@ const PositionExample = React.createClass({
8081
<Position
8182
container={this}
8283
placement={this.state.placement}
83-
target={props => React.findDOMNode(this.refs.target)}
84+
target={props => findDOMNode(this.refs.target)}
8485
>
8586
<ToolTip>
8687
I'm placed to the: <strong>{this.state.placement}</strong>

Diff for: package.json

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-overlays",
3-
"version": "0.50.0-alpha4",
3+
"version": "0.4.4",
44
"description": "Utilities for creating robust overlay components",
55
"author": "Jason Quense <[email protected]>",
66
"repository": "react-bootstrap/react-overlays",
@@ -39,7 +39,8 @@
3939
"major": "release major"
4040
},
4141
"peerDependencies": {
42-
"react": "^0.14.0-alpha"
42+
"react": ">=0.14.0",
43+
"react-dom": "^0.14.0"
4344
},
4445
"devDependencies": {
4546
"babel": "5.6.14",
@@ -48,6 +49,7 @@
4849
"babel-loader": "^5.3.0",
4950
"babel-plugin-object-assign": "^1.2.1",
5051
"chai": "^3.2.0",
52+
"component-playground": "jquense/component-playground",
5153
"css-loader": "^0.15.6",
5254
"es5-shim": "^4.1.7",
5355
"eslint": "^0.24.0",
@@ -74,19 +76,20 @@
7476
"mt-changelog": "^0.6.1",
7577
"node-libs-browser": "^0.5.2",
7678
"raw-loader": "^0.5.1",
77-
"react": "^0.14.0-beta3",
79+
"react": "0.14.0",
80+
"react-addons-test-utils": "^0.14.0",
7881
"react-bootstrap": "0.24.5-react-pre.0",
7982
"react-component-metadata": "^1.2.2",
80-
"react-dom": "^0.14.0-beta3",
83+
"react-dom": "^0.14.0",
8184
"react-hot-loader": "^1.2.7",
8285
"release-script": "^0.2.1",
8386
"rimraf": "^2.4.2",
8487
"simulant": "^0.1.5",
8588
"sinon": "^1.15.4",
8689
"sinon-chai": "^2.8.0",
8790
"style-loader": "^0.12.3",
88-
"webpack": "^1.9.11",
89-
"webpack-dev-server": "^1.9.0",
91+
"webpack": "^1.12.2",
92+
"webpack-dev-server": "^1.12.0",
9093
"yargs": "^3.14.0"
9194
},
9295
"dependencies": {

Diff for: test/ModalSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3-
import ReactTestUtils from 'react/lib/ReactTestUtils';
3+
import ReactTestUtils from 'react-addons-test-utils';
44
import Modal from '../src/Modal';
55
import { render } from './helpers';
66
import jquery from 'jquery';

Diff for: test/PortalSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3-
import ReactTestUtils from 'react/lib/ReactTestUtils';
3+
import ReactTestUtils from 'react-addons-test-utils';
44
import Portal from '../src/Portal';
55

66
describe('Portal', function () {

Diff for: test/PositionSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import pick from 'lodash/object/pick';
22
import React from 'react';
33
import ReactDOM from 'react-dom';
4-
import ReactTestUtils from 'react/lib/ReactTestUtils';
4+
import ReactTestUtils from 'react-addons-test-utils';
55

66
import Position from '../src/Position';
77
import overlayPositionUtils from '../src/utils/overlayPositionUtils';

Diff for: test/TransitionSpec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import ReactDOM from 'react-dom';
3-
import ReactTestUtils from 'react/lib/ReactTestUtils';
3+
import ReactTestUtils from 'react-addons-test-utils';
44
import { render } from './helpers';
55
import Transition, {UNMOUNTED, EXITED, ENTERING, ENTERED, EXITING} from
66
'../src/Transition';

0 commit comments

Comments
 (0)