From 044100b8a4a3c1df75b4e91a7c127cb62f54ca64 Mon Sep 17 00:00:00 2001 From: jquense Date: Wed, 7 Oct 2015 15:38:13 -0400 Subject: [PATCH] [added] React 0.14 support --- .eslintrc | 4 ++-- examples/App.js | 6 +++--- examples/Overlay.js | 3 ++- examples/Position.js | 3 ++- package.json | 15 +++++++++------ test/ModalSpec.js | 2 +- test/PortalSpec.js | 2 +- test/PositionSpec.js | 2 +- test/TransitionSpec.js | 2 +- 9 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.eslintrc b/.eslintrc index 89223a5d..bc41806b 100644 --- a/.eslintrc +++ b/.eslintrc @@ -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, diff --git a/examples/App.js b/examples/App.js index 5c709161..8f54c06c 100644 --- a/examples/App.js +++ b/examples/App.js @@ -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'; @@ -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: { diff --git a/examples/Overlay.js b/examples/Overlay.js index 1326ef6b..13031e8e 100644 --- a/examples/Overlay.js +++ b/examples/Overlay.js @@ -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'; @@ -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)} > I'm placed to the: {this.state.placement} diff --git a/examples/Position.js b/examples/Position.js index 57811749..5e0cb039 100644 --- a/examples/Position.js +++ b/examples/Position.js @@ -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'; @@ -80,7 +81,7 @@ const PositionExample = React.createClass({ React.findDOMNode(this.refs.target)} + target={props => findDOMNode(this.refs.target)} > I'm placed to the: {this.state.placement} diff --git a/package.json b/package.json index 8bb4a595..c168356b 100644 --- a/package.json +++ b/package.json @@ -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 ", "repository": "react-bootstrap/react-overlays", @@ -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", @@ -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", @@ -74,10 +76,11 @@ "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", @@ -85,8 +88,8 @@ "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": { diff --git a/test/ModalSpec.js b/test/ModalSpec.js index 00fc9531..5ea28dfa 100644 --- a/test/ModalSpec.js +++ b/test/ModalSpec.js @@ -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'; diff --git a/test/PortalSpec.js b/test/PortalSpec.js index c42dbe7e..84a9ea06 100644 --- a/test/PortalSpec.js +++ b/test/PortalSpec.js @@ -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 () { diff --git a/test/PositionSpec.js b/test/PositionSpec.js index a4e98237..e86224fe 100644 --- a/test/PositionSpec.js +++ b/test/PositionSpec.js @@ -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'; diff --git a/test/TransitionSpec.js b/test/TransitionSpec.js index 6317aaa1..c9a379cc 100644 --- a/test/TransitionSpec.js +++ b/test/TransitionSpec.js @@ -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';