Skip to content

Commit ae09770

Browse files
BrockWillsjavivelasco
authored andcommitted
Importing PropTypes from prop-types rather than react (react-toolbox#1413)
1 parent e572dd7 commit ae09770

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+212
-123
lines changed

components/app_bar/AppBar.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { PropTypes } from 'react';
1+
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import cn from 'classnames';
34
import { themr } from 'react-css-themr';
45
import { APP_BAR } from '../identifiers';

components/autocomplete/Autocomplete.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable */
2-
import React, { Component, PropTypes } from 'react';
2+
import React, { Component } from 'react';
3+
import PropTypes from 'prop-types';
34
import ReactDOM from 'react-dom';
45
import classnames from 'classnames';
56
import { themr } from 'react-css-themr';
@@ -21,14 +22,14 @@ const factory = (Chip, Input) => {
2122
className: PropTypes.string,
2223
direction: PropTypes.oneOf(['auto', 'up', 'down']),
2324
disabled: PropTypes.bool,
24-
error: React.PropTypes.oneOfType([
25-
React.PropTypes.string,
26-
React.PropTypes.node,
25+
error: PropTypes.oneOfType([
26+
PropTypes.string,
27+
PropTypes.node,
2728
]),
2829
keepFocusOnChange: PropTypes.bool,
29-
label: React.PropTypes.oneOfType([
30-
React.PropTypes.string,
31-
React.PropTypes.node,
30+
label: PropTypes.oneOfType([
31+
PropTypes.string,
32+
PropTypes.node,
3233
]),
3334
multiple: PropTypes.bool,
3435
onBlur: PropTypes.func,

components/avatar/Avatar.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { PropTypes } from 'react';
1+
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import classnames from 'classnames';
34
import { themr } from 'react-css-themr';
45
import { AVATAR } from '../identifiers';

components/button/BrowseButton.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import classnames from 'classnames';
34
import { themr } from 'react-css-themr';
45
import { BUTTON } from '../identifiers';

components/button/Button.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import classnames from 'classnames';
34
import { themr } from 'react-css-themr';
45
import { BUTTON } from '../identifiers';

components/button/IconButton.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import classnames from 'classnames';
34
import { themr } from 'react-css-themr';
45
import { BUTTON } from '../identifiers';

components/card/Card.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { PropTypes } from 'react';
1+
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import { themr } from 'react-css-themr';
34
import classnames from 'classnames';
45
import { CARD } from '../identifiers';

components/card/CardActions.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { PropTypes } from 'react';
1+
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import { themr } from 'react-css-themr';
34
import classnames from 'classnames';
45
import { CARD } from '../identifiers';

components/card/CardMedia.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { PropTypes } from 'react';
1+
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import { themr } from 'react-css-themr';
34
import classnames from 'classnames';
45
import { CARD } from '../identifiers';

components/card/CardText.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { PropTypes } from 'react';
1+
import React from 'react';
2+
import PropTypes from 'prop-types';
23
import { themr } from 'react-css-themr';
34
import classnames from 'classnames';
45
import { CARD } from '../identifiers';

0 commit comments

Comments
 (0)