Skip to content

Commit f88c2f3

Browse files
authored
Merge pull request #3 from americanexpress/bugfix/prop-types
Migrate React.PropTypes to prop-types
2 parents efd890f + 97e4699 commit f88c2f3

File tree

10 files changed

+22
-13
lines changed

10 files changed

+22
-13
lines changed

__tests__/components/Wizard.spec.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* the License.
1313
*/
1414

15-
import React, { PropTypes } from 'react';
15+
import React from 'react';
16+
import PropTypes from 'prop-types';
1617
import { mount } from 'enzyme';
1718

1819
import { Wizard } from '../../src';

examples/Animated.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*/
1414

1515
import React from 'react';
16-
import ReactCSSTransitionGroup from 'react-addons-css-transition-group';
16+
import ReactCSSTransitionGroup from 'react-transition-group/CSSTransitionGroup';
1717
import { Wizard, Step, Steps, Navigation } from '../src';
1818
import FirstStep from './components/FirstStep';
1919
import SecondStep from './components/SecondStep';

examples/navigation/Next.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* the License.
1313
*/
1414

15-
import React, { PropTypes } from 'react';
15+
import React from 'react';
16+
import PropTypes from 'prop-types';
1617

1718
const Next = ({ className, disabled, label, next }) =>
1819
<button className={className} onClick={next} disabled={disabled}>{label}</button>;

examples/navigation/Previous.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* the License.
1313
*/
1414

15-
import React, { PropTypes } from 'react';
15+
import React from 'react';
16+
import PropTypes from 'prop-types';
1617

1718
const Previous = ({ className, disabled, label, previous }) =>
1819
<button className={className} onClick={previous} disabled={disabled}>{label}</button>;

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-albus",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "React component library for building declarative multi-step flows.",
55
"files": [
66
"lib"
@@ -37,6 +37,7 @@
3737
},
3838
"dependencies": {
3939
"history": "^4.6.0",
40+
"prop-types": "^15.5.8",
4041
"react": "^15.4.2"
4142
},
4243
"devDependencies": {
@@ -59,10 +60,10 @@
5960
"import-glob-loader": "^1.1.0",
6061
"jest": "^19.0.0",
6162
"node-sass": "^4.5.0",
62-
"react-addons-css-transition-group": "^15.4.2",
63-
"react-addons-test-utils": "^15.4.2",
64-
"react-dom": "^15.0.1",
63+
"react-dom": "^15.5.4",
6564
"react-router-dom": "^4.0.0",
65+
"react-test-renderer": "^15.5.4",
66+
"react-transition-group": "^1.1.1",
6667
"rimraf": "^2.5.2",
6768
"sass-loader": "^6.0.2",
6869
"style-loader": "^0.13.2",

src/components/Navigation.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* the License.
1313
*/
1414

15-
import React, { PropTypes } from 'react';
15+
import React from 'react';
16+
import PropTypes from 'prop-types';
1617

1718
import withWizard from '../withWizard';
1819

src/components/Step.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* the License.
1313
*/
1414

15-
import React, { PropTypes } from 'react';
15+
import React from 'react';
16+
import PropTypes from 'prop-types';
1617

1718
const Step = ({ children, className }) => <div className={className}>{children}</div>;
1819

src/components/Steps.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* the License.
1313
*/
1414

15-
import React, { Component, PropTypes } from 'react';
15+
import React, { Component } from 'react';
16+
import PropTypes from 'prop-types';
1617

1718
class Steps extends Component {
1819
componentWillMount() {

src/components/Wizard.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* the License.
1313
*/
1414

15-
import React, { Component, PropTypes } from 'react';
15+
import React, { Component } from 'react';
16+
import PropTypes from 'prop-types';
1617
import { createMemoryHistory } from 'history';
1718
import fixPath from '../utils';
1819

src/withWizard.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
* the License.
1313
*/
1414

15-
import React, { PropTypes } from 'react';
15+
import React from 'react';
16+
import PropTypes from 'prop-types';
1617

1718
const withWizard = (component) => {
1819
const WithWizard = (props, { wizard }) =>

0 commit comments

Comments
 (0)