Skip to content

Commit

Permalink
[added] React 0.14 support
Browse files Browse the repository at this point in the history
  • Loading branch information
jquense committed Oct 7, 2015
1 parent eac64fc commit 044100b
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"react/jsx-no-duplicate-props": 2,
"react/jsx-no-undef": 2,
"react/jsx-uses-react": 2,
"react/no-did-mount-set-state": 2,
"react/no-did-update-set-state": 2,
"react/no-did-mount-set-state": 0,
"react/no-did-update-set-state": 0,
"react/react-in-jsx-scope": 2,
"react/self-closing-comp": 2,
"react/wrap-multilines": 2,
Expand Down
6 changes: 3 additions & 3 deletions examples/App.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';

import { findDOMNode } from 'react-dom';
import Button from 'react-bootstrap/lib/Button';
import Editor from 'component-playground';
import Editor from '@jquense/component-playground';

import PropTable from './PropTable';

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

let scope = { React, Button, injectCss, ...ReactOverlays };
let scope = { React, findDOMNode, Button, injectCss, ...ReactOverlays };

const Anchor = React.createClass({
propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion examples/Overlay.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { findDOMNode } from 'react-dom';
import Overlay from 'react-overlays/Overlay';
import Button from 'react-bootstrap/lib/Button';

Expand Down Expand Up @@ -110,7 +111,7 @@ const OverlayExample = React.createClass({
onHide={() => this.setState({ show: false })}
placement={this.state.placement}
container={this}
target={ props => React.findDOMNode(this.refs.target)}
target={ props => findDOMNode(this.refs.target)}
>
<ToolTip>
I'm placed to the: <strong>{this.state.placement}</strong>
Expand Down
3 changes: 2 additions & 1 deletion examples/Position.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import { findDOMNode } from 'react-dom';
import Position from 'react-overlays/Position';
import Button from 'react-bootstrap/lib/Button';

Expand Down Expand Up @@ -80,7 +81,7 @@ const PositionExample = React.createClass({
<Position
container={this}
placement={this.state.placement}
target={props => React.findDOMNode(this.refs.target)}
target={props => findDOMNode(this.refs.target)}
>
<ToolTip>
I'm placed to the: <strong>{this.state.placement}</strong>
Expand Down
15 changes: 9 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-overlays",
"version": "0.50.0-alpha4",
"version": "0.4.4",
"description": "Utilities for creating robust overlay components",
"author": "Jason Quense <monastic.panic@gmail.com>",
"repository": "react-bootstrap/react-overlays",
Expand Down Expand Up @@ -39,7 +39,8 @@
"major": "release major"
},
"peerDependencies": {
"react": "^0.14.0-alpha"
"react": ">=0.14.0",
"react-dom": "^0.14.0"
},
"devDependencies": {
"babel": "5.6.14",
Expand All @@ -48,6 +49,7 @@
"babel-loader": "^5.3.0",
"babel-plugin-object-assign": "^1.2.1",
"chai": "^3.2.0",
"component-playground": "jquense/component-playground",
"css-loader": "^0.15.6",
"es5-shim": "^4.1.7",
"eslint": "^0.24.0",
Expand All @@ -74,19 +76,20 @@
"mt-changelog": "^0.6.1",
"node-libs-browser": "^0.5.2",
"raw-loader": "^0.5.1",
"react": "^0.14.0-beta3",
"react": "0.14.0",
"react-addons-test-utils": "^0.14.0",
"react-bootstrap": "0.24.5-react-pre.0",
"react-component-metadata": "^1.2.2",
"react-dom": "^0.14.0-beta3",
"react-dom": "^0.14.0",
"react-hot-loader": "^1.2.7",
"release-script": "^0.2.1",
"rimraf": "^2.4.2",
"simulant": "^0.1.5",
"sinon": "^1.15.4",
"sinon-chai": "^2.8.0",
"style-loader": "^0.12.3",
"webpack": "^1.9.11",
"webpack-dev-server": "^1.9.0",
"webpack": "^1.12.2",
"webpack-dev-server": "^1.12.0",
"yargs": "^3.14.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion test/ModalSpec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import ReactTestUtils from 'react/lib/ReactTestUtils';
import ReactTestUtils from 'react-addons-test-utils';
import Modal from '../src/Modal';
import { render } from './helpers';
import jquery from 'jquery';
Expand Down
2 changes: 1 addition & 1 deletion test/PortalSpec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import ReactTestUtils from 'react/lib/ReactTestUtils';
import ReactTestUtils from 'react-addons-test-utils';
import Portal from '../src/Portal';

describe('Portal', function () {
Expand Down
2 changes: 1 addition & 1 deletion test/PositionSpec.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pick from 'lodash/object/pick';
import React from 'react';
import ReactDOM from 'react-dom';
import ReactTestUtils from 'react/lib/ReactTestUtils';
import ReactTestUtils from 'react-addons-test-utils';

import Position from '../src/Position';
import overlayPositionUtils from '../src/utils/overlayPositionUtils';
Expand Down
2 changes: 1 addition & 1 deletion test/TransitionSpec.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import ReactTestUtils from 'react/lib/ReactTestUtils';
import ReactTestUtils from 'react-addons-test-utils';
import { render } from './helpers';
import Transition, {UNMOUNTED, EXITED, ENTERING, ENTERED, EXITING} from
'../src/Transition';
Expand Down

0 comments on commit 044100b

Please sign in to comment.