Merge pull request react-bootstrap#105 from react-bootstrap/update-rpt

Upgrade react-prop-types

Author: taion

package.json

@@ -74,11 +74,11 @@
     "mocha": "^2.5.3",
     "node-libs-browser": "^1.0.0",
     "raw-loader": "^0.5.1",
-    "react": "^15.2.1",
-    "react-addons-test-utils": "^15.2.1",
+    "react": "^15.3.0",
+    "react-addons-test-utils": "^15.3.0",
     "react-bootstrap": "^0.29.5",
     "react-component-metadata": "^3.0.0",
-    "react-dom": "^15.2.1",
+    "react-dom": "^15.3.0",
     "react-hot-loader": "^1.3.0",
     "release-script": "^1.0.2",
     "rimraf": "^2.5.3",
@@ -94,7 +94,7 @@
   "dependencies": {
     "classnames": "^2.2.5",
     "dom-helpers": "^2.4.0",
-    "react-prop-types": "^0.3.2",
+    "react-prop-types": "^0.4.0",
     "warning": "^3.0.0"
   }
 }

src/AutoAffix.js

@@ -1,7 +1,7 @@
 import getOffset from 'dom-helpers/query/offset';
 import requestAnimationFrame from 'dom-helpers/util/requestAnimationFrame';
 import React from 'react';
-import mountable from 'react-prop-types/lib/mountable';
+import componentOrElement from 'react-prop-types/lib/componentOrElement';
 
 import Affix from './Affix';
 import addEventListener from './utils/addEventListener';
@@ -155,7 +155,7 @@ AutoAffix.propTypes = {
    * of viewport, or a function that returns it
    */
   container: React.PropTypes.oneOfType([
-    mountable,
+    componentOrElement,
     React.PropTypes.func
   ]),
   /**

src/Modal.js

@@ -1,7 +1,7 @@
 /*eslint-disable react/prop-types */
 import React, { cloneElement } from 'react';
 import warning from 'warning';
-import mountable from 'react-prop-types/lib/mountable';
+import componentOrElement from 'react-prop-types/lib/componentOrElement';
 import elementType from 'react-prop-types/lib/elementType';
 
 import Portal from './Portal';
@@ -54,7 +54,7 @@ const Modal = React.createClass({
      * page content can be placed behind a virtual backdrop as well as a visual one.
      */
     container: React.PropTypes.oneOfType([
-      mountable,
+      componentOrElement,
       React.PropTypes.func
     ]),
 

src/Overlay.js

@@ -121,11 +121,13 @@ Overlay.propTypes = {
    *
    * @type func
    */
-  onHide(props, name, cname) {
-    let pt = React.PropTypes.func;
+  onHide(props, ...args) {
+    let propType = React.PropTypes.func;
+    if (props.rootClose) {
+      propType = propType.isRequired;
+    }
 
-    if (props.rootClose) pt = pt.isRequired
-    return pt(props, name, cname)
+    return propType(props, ...args)
   },
 
   /**

src/Portal.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import mountable from 'react-prop-types/lib/mountable';
+import componentOrElement from 'react-prop-types/lib/componentOrElement';
 import ownerDocument from './utils/ownerDocument';
 import getContainer from './utils/getContainer';
 
@@ -19,7 +19,7 @@ let Portal = React.createClass({
      * appended to it.
      */
     container: React.PropTypes.oneOfType([
-      mountable,
+      componentOrElement,
       React.PropTypes.func
     ])
   },

src/Position.js

@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import React, { cloneElement } from 'react';
 import ReactDOM from 'react-dom';
-import mountable from 'react-prop-types/lib/mountable';
+import componentOrElement from 'react-prop-types/lib/componentOrElement';
 
 import calculatePosition from './utils/calculatePosition';
 import getContainer from './utils/getContainer';
@@ -131,14 +131,14 @@ Position.propTypes = {
    * be positioned next to the `target` specified.
    */
   target: React.PropTypes.oneOfType([
-    mountable, React.PropTypes.func
+    componentOrElement, React.PropTypes.func
   ]),
 
   /**
    * "offsetParent" of the component
    */
   container: React.PropTypes.oneOfType([
-    mountable, React.PropTypes.func
+    componentOrElement, React.PropTypes.func
   ]),
   /**
    * Minimum spacing in pixels between container border and component border