Merge pull request react-bootstrap#1223 from AlexKVal/r-p-t

Use 'react-prop-types' instead of 'utils/CustomPropTypes'

package.json

@@ -95,6 +95,7 @@
     "react": "^0.13.3",
     "react-component-metadata": "^1.3.0",
     "react-hot-loader": "^1.2.8",
+    "react-prop-types": "^0.2.2",
     "react-router": "^0.13.3",
     "rimraf": "^2.4.2",
     "semver": "^5.0.1",

src/BootstrapMixin.js

@@ -1,14 +1,14 @@
 import React from 'react';
 import styleMaps from './styleMaps';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { keyOf } from 'react-prop-types';
 
 const BootstrapMixin = {
   propTypes: {
     /**
      * bootstrap className
      * @private
      */
-    bsClass: CustomPropTypes.keyOf(styleMaps.CLASSES),
+    bsClass: keyOf(styleMaps.CLASSES),
     /**
      * Style variants
      * @type {("default"|"primary"|"success"|"info"|"warning"|"danger"|"link")}
@@ -18,7 +18,7 @@ const BootstrapMixin = {
      * Size variants
      * @type {("xsmall"|"small"|"medium"|"large"|"xs"|"sm"|"md"|"lg")}
      */
-    bsSize: CustomPropTypes.keyOf(styleMaps.SIZES)
+    bsSize: keyOf(styleMaps.SIZES)
   },
 
   getBsClassSet() {

src/Button.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { elementType } from 'react-prop-types';
 import ButtonInput from './ButtonInput';
 
 const Button = React.createClass({
@@ -16,7 +16,7 @@ const Button = React.createClass({
     /**
      * You can use a custom element for this component
      */
-    componentClass: CustomPropTypes.elementType,
+    componentClass: elementType,
     href: React.PropTypes.string,
     target: React.PropTypes.string,
     /**

src/ButtonGroup.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { all } from 'react-prop-types';
 
 const ButtonGroup = React.createClass({
   mixins: [BootstrapMixin],
@@ -13,7 +13,7 @@ const ButtonGroup = React.createClass({
      * Display block buttons, only useful when used with the "vertical" prop.
      * @type {bool}
      */
-    block: CustomPropTypes.all([
+    block: all([
       React.PropTypes.bool,
       function(props, propName, componentName) {
         if (props.block && !props.vertical) {

src/Col.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import styleMaps from './styleMaps';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { elementType } from 'react-prop-types';
 
 const Col = React.createClass({
   propTypes: {
@@ -136,7 +136,7 @@ const Col = React.createClass({
     /**
      * You can use a custom element for this component
      */
-    componentClass: CustomPropTypes.elementType
+    componentClass: elementType
   },
 
   getDefaultProps() {

src/Collapse.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import Transition from 'react-overlays/lib/Transition';
 import domUtils from './utils/domUtils';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { all } from 'react-prop-types';
 import deprecationWarning from './utils/deprecationWarning';
 import createChainedFunction from './utils/createChainedFunction';
 
@@ -145,7 +145,7 @@ Collapse.propTypes = {
    * duration
    * @private
    */
-  duration: CustomPropTypes.all([
+  duration: all([
     React.PropTypes.number,
     (props)=> {
       if (props.duration != null){

src/Dropdown.js

@@ -9,6 +9,7 @@ import CustomPropTypes from './utils/CustomPropTypes';
 import createChainedFunction from './utils/createChainedFunction';
 import find from 'lodash/collection/find';
 import omit from 'lodash/object/omit';
+import { all, elementType, isRequiredForA11y } from 'react-prop-types';
 
 const TOGGLE_REF = 'toggle-btn';
 
@@ -229,20 +230,20 @@ Dropdown.propTypes = {
    * @type {string|number}
    * @required
    */
-  id: CustomPropTypes.isRequiredForA11y(
+  id: isRequiredForA11y(
     React.PropTypes.oneOfType([
       React.PropTypes.string,
       React.PropTypes.number
     ])
   ),
 
-  componentClass: CustomPropTypes.elementType,
+  componentClass: elementType,
 
   /**
    * The children of a Dropdown may be a `<Dropdown.Toggle/>` or a `<Dropdown.Menu/>`.
    * @type {node}
    */
-  children: CustomPropTypes.all([
+  children: all([
     CustomPropTypes.requiredRoles(TOGGLE_ROLE, MENU_ROLE),
     CustomPropTypes.exclusiveRoles(MENU_ROLE)
   ]),

src/DropdownButton.js

@@ -2,7 +2,7 @@ import React from 'react';
 import BootstrapMixin from './BootstrapMixin';
 import Dropdown from './Dropdown';
 import NavDropdown from './NavDropdown';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { all } from 'react-prop-types';
 import deprecationWarning from './utils/deprecationWarning';
 import omit from 'lodash/object/omit';
 
@@ -46,7 +46,7 @@ DropdownButton.propTypes = {
    * @type {bool}
    * @deprecated Use the `NavDropdown` instead.
    */
-  navItem: CustomPropTypes.all([
+  navItem: all([
     React.PropTypes.bool,
     function(props, propName, componentName) {
       if (props.navItem) {

src/DropdownToggle.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import Button from './Button';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { singlePropFrom } from 'react-prop-types';
 import SafeAnchor from './SafeAnchor';
 
 const CARET = <span> <span className='caret' /></span>;
@@ -29,7 +29,7 @@ export default class DropdownToggle extends React.Component {
   }
 }
 
-const titleAndChildrenValidation = CustomPropTypes.singlePropFrom([
+const titleAndChildrenValidation = singlePropFrom([
   'title',
   'children'
 ]);

src/Fade.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import Transition from 'react-overlays/lib/Transition';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { all } from 'react-prop-types';
 import deprecationWarning from './utils/deprecationWarning';
 
 class Fade extends React.Component {
@@ -51,7 +51,7 @@ Fade.propTypes = {
    * duration
    * @private
    */
-  duration: CustomPropTypes.all([
+  duration: all([
     React.PropTypes.number,
     (props)=> {
       if (props.duration != null){
@@ -95,4 +95,3 @@ Fade.defaultProps = {
 };
 
 export default Fade;
-

src/Grid.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { elementType } from 'react-prop-types';
 
 const Grid = React.createClass({
   propTypes: {
@@ -13,7 +13,7 @@ const Grid = React.createClass({
     /**
      * You can use a custom element for this component
      */
-    componentClass: CustomPropTypes.elementType
+    componentClass: elementType
   },
 
   getDefaultProps() {

src/Jumbotron.js

@@ -1,13 +1,13 @@
 import React from 'react';
 import classNames from 'classnames';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { elementType } from 'react-prop-types';
 
 const Jumbotron = React.createClass({
   propTypes: {
     /**
      * You can use a custom element for this component
      */
-    componentClass: CustomPropTypes.elementType
+    componentClass: elementType
   },
 
   getDefaultProps() {

src/MenuItem.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import classnames from 'classnames';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { all } from 'react-prop-types';
 import SafeAnchor from './SafeAnchor';
 
 export default class MenuItem extends React.Component {
@@ -62,7 +62,7 @@ export default class MenuItem extends React.Component {
 
 MenuItem.propTypes = {
   disabled: React.PropTypes.bool,
-  divider: CustomPropTypes.all([
+  divider: all([
     React.PropTypes.bool,
     function(props, propName, componentName) {
       if (props.divider && props.children) {

src/Modal.js

@@ -5,7 +5,7 @@ import domUtils from './utils/domUtils';
 import getScrollbarSize from 'dom-helpers/util/scrollbarSize';
 import EventListener from './utils/EventListener';
 import createChainedFunction from './utils/createChainedFunction';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { elementType } from 'react-prop-types';
 
 import Portal from 'react-overlays/lib/Portal';
 import Fade from './Fade';
@@ -93,7 +93,7 @@ const Modal = React.createClass({
      * A Component type that provides the modal content Markup. This is a useful prop when you want to use your own
      * styles and markup to create a custom modal component.
      */
-    dialogComponent: CustomPropTypes.elementType,
+    dialogComponent: elementType,
 
     /**
      * When `true` The modal will automatically shift focus to itself when it opens, and replace it to the last focused element when it closes.

src/Navbar.js

@@ -4,7 +4,7 @@ import classNames from 'classnames';
 
 import ValidComponentChildren from './utils/ValidComponentChildren';
 import createChainedFunction from './utils/createChainedFunction';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { elementType } from 'react-prop-types';
 
 const Navbar = React.createClass({
   mixins: [BootstrapMixin],
@@ -19,7 +19,7 @@ const Navbar = React.createClass({
     /**
      * You can use a custom element for this component
      */
-    componentClass: CustomPropTypes.elementType,
+    componentClass: elementType,
     brand: React.PropTypes.node,
     toggleButton: React.PropTypes.node,
     toggleNavKey: React.PropTypes.oneOfType([

src/Overlay.js

@@ -3,7 +3,7 @@
 
 import React, { cloneElement } from 'react';
 import BaseOverlay from 'react-overlays/lib/Overlay';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { elementType } from 'react-prop-types';
 import Fade from './Fade';
 import classNames from 'classnames';
 
@@ -57,7 +57,7 @@ Overlay.propTypes = {
    */
   animation: React.PropTypes.oneOfType([
       React.PropTypes.bool,
-      CustomPropTypes.elementType
+      elementType
   ]),
 
   /**

src/Pagination.js

@@ -2,7 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';
 import PaginationButton from './PaginationButton';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { elementType } from 'react-prop-types';
 import SafeAnchor from './SafeAnchor';
 
 const Pagination = React.createClass({
@@ -21,7 +21,7 @@ const Pagination = React.createClass({
     /**
      * You can use a custom element for the buttons
      */
-    buttonComponentClass: CustomPropTypes.elementType
+    buttonComponentClass: elementType
   },
 
   getDefaultProps() {

src/PaginationButton.js

@@ -2,7 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';
 import createSelectedEvent from './utils/createSelectedEvent';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { elementType } from 'react-prop-types';
 
 const PaginationButton = React.createClass({
   mixins: [BootstrapMixin],
@@ -19,7 +19,7 @@ const PaginationButton = React.createClass({
     /**
      * You can use a custom element for this component
      */
-    buttonComponentClass: CustomPropTypes.elementType
+    buttonComponentClass: elementType
   },
 
   getDefaultProps() {

src/Popover.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { isRequiredForA11y } from 'react-prop-types';
 
 const Popover = React.createClass({
 
@@ -13,7 +13,7 @@ const Popover = React.createClass({
      * @type {string}
      * @required
      */
-    id: CustomPropTypes.isRequiredForA11y(React.PropTypes.string),
+    id: isRequiredForA11y(React.PropTypes.string),
 
     /**
      * Sets the direction the Popover is positioned towards.

src/Portal.js

@@ -8,4 +8,3 @@ export default deprecationWarning.wrapper(Portal, {
     'http://react-bootstrap.github.io/react-overlays/examples/#portal and ' +
     'https://github.com/react-bootstrap/react-bootstrap/issues/1084'
 });
-

src/Row.js

@@ -1,13 +1,13 @@
 import React from 'react';
 import classNames from 'classnames';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { elementType } from 'react-prop-types';
 
 const Row = React.createClass({
   propTypes: {
     /**
      * You can use a custom element for this component
      */
-    componentClass: CustomPropTypes.elementType
+    componentClass: elementType
   },
 
   getDefaultProps() {

src/Tooltip.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import classNames from 'classnames';
 import BootstrapMixin from './BootstrapMixin';
-import CustomPropTypes from './utils/CustomPropTypes';
+import { isRequiredForA11y } from 'react-prop-types';
 
 const Tooltip = React.createClass({
   mixins: [BootstrapMixin],
@@ -12,7 +12,7 @@ const Tooltip = React.createClass({
      * @type {string}
      * @required
      */
-    id: CustomPropTypes.isRequiredForA11y(React.PropTypes.string),
+    id: isRequiredForA11y(React.PropTypes.string),
 
     /**
      * Sets the direction the Tooltip is positioned towards.