Skip to content

Commit ae09770

Browse files
BrockWillsjavivelasco
BrockWills
authored and
javivelasco
committed
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

+2-1
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

+8-7
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

+2-1
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

+2-1
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

+2-1
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

+2-1
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

+2-1
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

+2-1
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

+2-1
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

+2-1
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/CardTitle.js

+2-1
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 { CARD } from '../identifiers';

‎components/checkbox/Check.js

+2-1
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 styleShape from 'react-style-proptype';
45

‎components/checkbox/Checkbox.js

+2-1
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 styleShape from 'react-style-proptype';
45
import { themr } from 'react-css-themr';

‎components/chip/Chip.js

+2-1
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 { CHIP } from '../identifiers';

‎components/date_picker/Calendar.js

+8-7
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 CssTransitionGroup from 'react-addons-css-transition-group';
34
import { range, getAnimationModule } from '../utils/utils';
45
import time from '../utils/time';
@@ -9,19 +10,19 @@ const DIRECTION_STEPS = { left: -1, right: 1 };
910
const factory = (IconButton) => {
1011
class Calendar extends Component {
1112
static propTypes = {
12-
disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
13+
disabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
1314
display: PropTypes.oneOf(['months', 'years']),
14-
enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
15+
enabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
1516
handleSelect: PropTypes.func,
16-
locale: React.PropTypes.oneOfType([
17-
React.PropTypes.string,
18-
React.PropTypes.object,
17+
locale: PropTypes.oneOfType([
18+
PropTypes.string,
19+
PropTypes.object,
1920
]),
2021
maxDate: PropTypes.instanceOf(Date),
2122
minDate: PropTypes.instanceOf(Date),
2223
onChange: PropTypes.func,
2324
selectedDate: PropTypes.instanceOf(Date),
24-
sundayFirstDayOfWeek: React.PropTypes.bool,
25+
sundayFirstDayOfWeek: PropTypes.bool,
2526
theme: PropTypes.shape({
2627
active: PropTypes.string,
2728
calendar: PropTypes.string,

‎components/date_picker/CalendarDay.js

+2-1
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 time from '../utils/time';
45

‎components/date_picker/CalendarMonth.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
import React, { Component, PropTypes } from 'react';
1+
import React, { Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import { range } from '../utils/utils';
34
import time from '../utils/time';
45
import CalendarDay from './CalendarDay';
56

67
class Month extends Component {
78
static propTypes = {
8-
disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
9-
enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
10-
locale: React.PropTypes.oneOfType([
11-
React.PropTypes.string,
12-
React.PropTypes.object,
9+
disabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
10+
enabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
11+
locale: PropTypes.oneOfType([
12+
PropTypes.string,
13+
PropTypes.object,
1314
]),
1415
maxDate: PropTypes.instanceOf(Date),
1516
minDate: PropTypes.instanceOf(Date),
1617
onDayClick: PropTypes.func,
1718
selectedDate: PropTypes.instanceOf(Date),
18-
sundayFirstDayOfWeek: React.PropTypes.bool,
19+
sundayFirstDayOfWeek: PropTypes.bool,
1920
theme: PropTypes.shape({
2021
days: PropTypes.string,
2122
month: PropTypes.string,

‎components/date_picker/DatePicker.js

+8-7
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 { DATE_PICKER } from '../identifiers';
@@ -18,8 +19,8 @@ const factory = (Input, DatePickerDialog) => {
1819
autoOk: PropTypes.bool,
1920
cancelLabel: PropTypes.string,
2021
className: PropTypes.string,
21-
disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
22-
enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
22+
disabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
23+
enabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
2324
error: PropTypes.string,
2425
icon: PropTypes.oneOfType([
2526
PropTypes.string,
@@ -28,9 +29,9 @@ const factory = (Input, DatePickerDialog) => {
2829
inputClassName: PropTypes.string,
2930
inputFormat: PropTypes.func,
3031
label: PropTypes.string,
31-
locale: React.PropTypes.oneOfType([
32-
React.PropTypes.string,
33-
React.PropTypes.object,
32+
locale: PropTypes.oneOfType([
33+
PropTypes.string,
34+
PropTypes.object,
3435
]),
3536
maxDate: PropTypes.instanceOf(Date),
3637
minDate: PropTypes.instanceOf(Date),
@@ -43,7 +44,7 @@ const factory = (Input, DatePickerDialog) => {
4344
onKeyPress: PropTypes.func,
4445
onOverlayClick: PropTypes.func,
4546
readonly: PropTypes.bool,
46-
sundayFirstDayOfWeek: React.PropTypes.bool,
47+
sundayFirstDayOfWeek: PropTypes.bool,
4748
theme: PropTypes.shape({
4849
container: PropTypes.string,
4950
input: PropTypes.string,

‎components/date_picker/DatePickerDialog.js

+8-7
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 time from '../utils/time';
45

@@ -9,11 +10,11 @@ const factory = (Dialog, Calendar) => {
910
autoOk: PropTypes.bool,
1011
cancelLabel: PropTypes.string,
1112
className: PropTypes.string,
12-
disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
13-
enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
14-
locale: React.PropTypes.oneOfType([
15-
React.PropTypes.string,
16-
React.PropTypes.object,
13+
disabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
14+
enabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
15+
locale: PropTypes.oneOfType([
16+
PropTypes.string,
17+
PropTypes.object,
1718
]),
1819
maxDate: PropTypes.instanceOf(Date),
1920
minDate: PropTypes.instanceOf(Date),
@@ -23,7 +24,7 @@ const factory = (Dialog, Calendar) => {
2324
onEscKeyDown: PropTypes.func,
2425
onOverlayClick: PropTypes.func,
2526
onSelect: PropTypes.func,
26-
sundayFirstDayOfWeek: React.PropTypes.bool,
27+
sundayFirstDayOfWeek: PropTypes.bool,
2728
theme: PropTypes.shape({
2829
button: PropTypes.string,
2930
calendarWrapper: PropTypes.string,

‎components/dialog/Dialog.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable jsx-a11y/aria-role */
2-
import React, { PropTypes } from 'react';
2+
import React from 'react';
3+
import PropTypes from 'prop-types';
34
import { themr } from 'react-css-themr';
45
import classnames from 'classnames';
56
import { DIALOG } from '../identifiers';

‎components/drawer/Drawer.js

+2-1
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 Portal from '../hoc/Portal';

‎components/dropdown/Dropdown.js

+2-1
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';

‎components/font_icon/FontIcon.js

+2-1
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

45
const FontIcon = ({ alt, children, className, theme, value, ...other}) => ( // eslint-disable-line

‎components/hoc/ActivableRenderer.js

+2-1
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

34
const ActivableRendererFactory = (options = { delay: 500 }) =>
45
ActivableComponent => class ActivableRenderer extends Component {

‎components/hoc/Portal.js

+2-1
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 ReactDOM from 'react-dom';
34

45
class Portal extends Component {

‎components/input/Input.js

+2-1
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 { INPUT } from '../identifiers';

‎components/layout/Layout.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import React, { cloneElement, Component, PropTypes } from 'react';
1+
import React, { cloneElement, Component } from 'react';
2+
import PropTypes from 'prop-types';
23
import classnames from 'classnames';
34
import { themr } from 'react-css-themr';
45
import { getViewport } from '../utils/utils';

‎components/layout/NavDrawer.js

+2-1
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 InjectDrawer from '../drawer/Drawer';

‎components/layout/Panel.js

+2-1
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 { LAYOUT } from '../identifiers';

‎components/layout/Sidebar.js

+2-1
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 InjectDrawer from '../drawer/Drawer';

‎components/link/Link.js

+2-1
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 { LINK } from '../identifiers';

‎components/list/List.js

+2-1
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 { LIST } from '../identifiers';

‎components/list/ListCheckbox.js

+2-1
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 { LIST } from '../identifiers';

‎components/list/ListDivider.js

+2-1
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 { LIST } from '../identifiers';
45

‎components/list/ListItem.js

+2-1
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 { themr } from 'react-css-themr';
34
import { LIST } from '../identifiers';
45
import InjectListItemContent from './ListItemContent';

‎components/list/ListItemAction.js

+2-1
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 { LIST } from '../identifiers';
45

‎components/list/ListItemActions.js

+2-1
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 { LIST } from '../identifiers';
45
import InjectListItemAction from './ListItemAction';

‎components/list/ListItemContent.js

+2-1
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 { LIST } from '../identifiers';

0 commit comments

Comments
 (0)