Importing PropTypes from prop-types rather than react (#1413)

react-toolbox · Apr 17, 2017 · ae09770 · ae09770
1 parent e572dd7
commit ae09770
Show file tree

Hide file tree

Showing 83 changed files with 212 additions and 123 deletions.
diff --git a/components/app_bar/AppBar.js b/components/app_bar/AppBar.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import cn from 'classnames';
 import { themr } from 'react-css-themr';
 import { APP_BAR } from '../identifiers';

diff --git a/components/autocomplete/Autocomplete.js b/components/autocomplete/Autocomplete.js
@@ -1,5 +1,6 @@
 /* eslint-disable */
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
@@ -21,14 +22,14 @@ const factory = (Chip, Input) => {
       className: PropTypes.string,
       direction: PropTypes.oneOf(['auto', 'up', 'down']),
       disabled: PropTypes.bool,
-      error: React.PropTypes.oneOfType([
-        React.PropTypes.string,
-        React.PropTypes.node,
+      error: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.node,
       ]),
       keepFocusOnChange: PropTypes.bool,
-      label: React.PropTypes.oneOfType([
-        React.PropTypes.string,
-        React.PropTypes.node,
+      label: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.node,
       ]),
       multiple: PropTypes.bool,
       onBlur: PropTypes.func,

diff --git a/components/avatar/Avatar.js b/components/avatar/Avatar.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { AVATAR } from '../identifiers';

diff --git a/components/button/BrowseButton.js b/components/button/BrowseButton.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { BUTTON } from '../identifiers';

diff --git a/components/button/Button.js b/components/button/Button.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { BUTTON } from '../identifiers';

diff --git a/components/button/IconButton.js b/components/button/IconButton.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { BUTTON } from '../identifiers';

diff --git a/components/card/Card.js b/components/card/Card.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { themr } from 'react-css-themr';
 import classnames from 'classnames';
 import { CARD } from '../identifiers';

diff --git a/components/card/CardActions.js b/components/card/CardActions.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { themr } from 'react-css-themr';
 import classnames from 'classnames';
 import { CARD } from '../identifiers';

diff --git a/components/card/CardMedia.js b/components/card/CardMedia.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { themr } from 'react-css-themr';
 import classnames from 'classnames';
 import { CARD } from '../identifiers';

diff --git a/components/card/CardText.js b/components/card/CardText.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { themr } from 'react-css-themr';
 import classnames from 'classnames';
 import { CARD } from '../identifiers';

diff --git a/components/card/CardTitle.js b/components/card/CardTitle.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { CARD } from '../identifiers';

diff --git a/components/checkbox/Check.js b/components/checkbox/Check.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import styleShape from 'react-style-proptype';
 

diff --git a/components/checkbox/Checkbox.js b/components/checkbox/Checkbox.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import styleShape from 'react-style-proptype';
 import { themr } from 'react-css-themr';

diff --git a/components/chip/Chip.js b/components/chip/Chip.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { CHIP } from '../identifiers';

diff --git a/components/date_picker/Calendar.js b/components/date_picker/Calendar.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import CssTransitionGroup from 'react-addons-css-transition-group';
 import { range, getAnimationModule } from '../utils/utils';
 import time from '../utils/time';
@@ -9,19 +10,19 @@ const DIRECTION_STEPS = { left: -1, right: 1 };
 const factory = (IconButton) => {
   class Calendar extends Component {
     static propTypes = {
-      disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
+      disabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
       display: PropTypes.oneOf(['months', 'years']),
-      enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
+      enabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
       handleSelect: PropTypes.func,
-      locale: React.PropTypes.oneOfType([
-        React.PropTypes.string,
-        React.PropTypes.object,
+      locale: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.object,
       ]),
       maxDate: PropTypes.instanceOf(Date),
       minDate: PropTypes.instanceOf(Date),
       onChange: PropTypes.func,
       selectedDate: PropTypes.instanceOf(Date),
-      sundayFirstDayOfWeek: React.PropTypes.bool,
+      sundayFirstDayOfWeek: PropTypes.bool,
       theme: PropTypes.shape({
         active: PropTypes.string,
         calendar: PropTypes.string,

diff --git a/components/date_picker/CalendarDay.js b/components/date_picker/CalendarDay.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import time from '../utils/time';
 

diff --git a/components/date_picker/CalendarMonth.js b/components/date_picker/CalendarMonth.js
@@ -1,21 +1,22 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { range } from '../utils/utils';
 import time from '../utils/time';
 import CalendarDay from './CalendarDay';
 
 class Month extends Component {
   static propTypes = {
-    disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
-    enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
-    locale: React.PropTypes.oneOfType([
-      React.PropTypes.string,
-      React.PropTypes.object,
+    disabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
+    enabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
+    locale: PropTypes.oneOfType([
+      PropTypes.string,
+      PropTypes.object,
     ]),
     maxDate: PropTypes.instanceOf(Date),
     minDate: PropTypes.instanceOf(Date),
     onDayClick: PropTypes.func,
     selectedDate: PropTypes.instanceOf(Date),
-    sundayFirstDayOfWeek: React.PropTypes.bool,
+    sundayFirstDayOfWeek: PropTypes.bool,
     theme: PropTypes.shape({
       days: PropTypes.string,
       month: PropTypes.string,

diff --git a/components/date_picker/DatePicker.js b/components/date_picker/DatePicker.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { DATE_PICKER } from '../identifiers';
@@ -18,8 +19,8 @@ const factory = (Input, DatePickerDialog) => {
       autoOk: PropTypes.bool,
       cancelLabel: PropTypes.string,
       className: PropTypes.string,
-      disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
-      enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
+      disabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
+      enabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
       error: PropTypes.string,
       icon: PropTypes.oneOfType([
         PropTypes.string,
@@ -28,9 +29,9 @@ const factory = (Input, DatePickerDialog) => {
       inputClassName: PropTypes.string,
       inputFormat: PropTypes.func,
       label: PropTypes.string,
-      locale: React.PropTypes.oneOfType([
-        React.PropTypes.string,
-        React.PropTypes.object,
+      locale: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.object,
       ]),
       maxDate: PropTypes.instanceOf(Date),
       minDate: PropTypes.instanceOf(Date),
@@ -43,7 +44,7 @@ const factory = (Input, DatePickerDialog) => {
       onKeyPress: PropTypes.func,
       onOverlayClick: PropTypes.func,
       readonly: PropTypes.bool,
-      sundayFirstDayOfWeek: React.PropTypes.bool,
+      sundayFirstDayOfWeek: PropTypes.bool,
       theme: PropTypes.shape({
         container: PropTypes.string,
         input: PropTypes.string,

diff --git a/components/date_picker/DatePickerDialog.js b/components/date_picker/DatePickerDialog.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import time from '../utils/time';
 
@@ -9,11 +10,11 @@ const factory = (Dialog, Calendar) => {
       autoOk: PropTypes.bool,
       cancelLabel: PropTypes.string,
       className: PropTypes.string,
-      disabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
-      enabledDates: React.PropTypes.arrayOf(PropTypes.instanceOf(Date)),
-      locale: React.PropTypes.oneOfType([
-        React.PropTypes.string,
-        React.PropTypes.object,
+      disabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
+      enabledDates: PropTypes.arrayOf(PropTypes.instanceOf(Date)),
+      locale: PropTypes.oneOfType([
+        PropTypes.string,
+        PropTypes.object,
       ]),
       maxDate: PropTypes.instanceOf(Date),
       minDate: PropTypes.instanceOf(Date),
@@ -23,7 +24,7 @@ const factory = (Dialog, Calendar) => {
       onEscKeyDown: PropTypes.func,
       onOverlayClick: PropTypes.func,
       onSelect: PropTypes.func,
-      sundayFirstDayOfWeek: React.PropTypes.bool,
+      sundayFirstDayOfWeek: PropTypes.bool,
       theme: PropTypes.shape({
         button: PropTypes.string,
         calendarWrapper: PropTypes.string,

diff --git a/components/dialog/Dialog.js b/components/dialog/Dialog.js
@@ -1,5 +1,6 @@
 /* eslint-disable jsx-a11y/aria-role */
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { themr } from 'react-css-themr';
 import classnames from 'classnames';
 import { DIALOG } from '../identifiers';

diff --git a/components/drawer/Drawer.js b/components/drawer/Drawer.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { themr } from 'react-css-themr';
 import classnames from 'classnames';
 import Portal from '../hoc/Portal';

diff --git a/components/dropdown/Dropdown.js b/components/dropdown/Dropdown.js
@@ -1,5 +1,6 @@
 /* eslint-disable */
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';

diff --git a/components/font_icon/FontIcon.js b/components/font_icon/FontIcon.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
 const FontIcon = ({ alt, children, className, theme, value, ...other}) => ( // eslint-disable-line

diff --git a/components/hoc/ActivableRenderer.js b/components/hoc/ActivableRenderer.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 
 const ActivableRendererFactory = (options = { delay: 500 }) =>
   ActivableComponent => class ActivableRenderer extends Component {

diff --git a/components/hoc/Portal.js b/components/hoc/Portal.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 
 class Portal extends Component {

diff --git a/components/input/Input.js b/components/input/Input.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { INPUT } from '../identifiers';

diff --git a/components/layout/Layout.js b/components/layout/Layout.js
@@ -1,4 +1,5 @@
-import React, { cloneElement, Component, PropTypes } from 'react';
+import React, { cloneElement, Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { getViewport } from '../utils/utils';

diff --git a/components/layout/NavDrawer.js b/components/layout/NavDrawer.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import InjectDrawer from '../drawer/Drawer';

diff --git a/components/layout/Panel.js b/components/layout/Panel.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import cn from 'classnames';
 import { themr } from 'react-css-themr';
 import { LAYOUT } from '../identifiers';

diff --git a/components/layout/Sidebar.js b/components/layout/Sidebar.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import InjectDrawer from '../drawer/Drawer';

diff --git a/components/link/Link.js b/components/link/Link.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { LINK } from '../identifiers';

diff --git a/components/list/List.js b/components/list/List.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { LIST } from '../identifiers';

diff --git a/components/list/ListCheckbox.js b/components/list/ListCheckbox.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { LIST } from '../identifiers';

diff --git a/components/list/ListDivider.js b/components/list/ListDivider.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { themr } from 'react-css-themr';
 import { LIST } from '../identifiers';
 

diff --git a/components/list/ListItem.js b/components/list/ListItem.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { themr } from 'react-css-themr';
 import { LIST } from '../identifiers';
 import InjectListItemContent from './ListItemContent';

diff --git a/components/list/ListItemAction.js b/components/list/ListItemAction.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { themr } from 'react-css-themr';
 import { LIST } from '../identifiers';
 

diff --git a/components/list/ListItemActions.js b/components/list/ListItemActions.js
@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { themr } from 'react-css-themr';
 import { LIST } from '../identifiers';
 import InjectListItemAction from './ListItemAction';

diff --git a/components/list/ListItemContent.js b/components/list/ListItemContent.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react';
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { themr } from 'react-css-themr';
 import { LIST } from '../identifiers';