Use deprecated prop type where applicable

Author: taion

src/Collapse.js

@@ -1,8 +1,8 @@
+import css from 'dom-helpers/style';
 import React from 'react';
 import Transition from 'react-overlays/lib/Transition';
-import css from 'dom-helpers/style';
-import all from 'react-prop-types/lib/all';
-import deprecationWarning from './utils/deprecationWarning';
+import deprecated from 'react-prop-types/lib/deprecated';
+
 import createChainedFunction from './utils/createChainedFunction';
 
 let capitalize = str => str[0].toUpperCase() + str.substr(1);
@@ -145,15 +145,7 @@ Collapse.propTypes = {
    * duration
    * @private
    */
-  duration: all(
-    React.PropTypes.number,
-    (props)=> {
-      if (props.duration != null) {
-        deprecationWarning('Collapse `duration`', 'the `timeout` prop');
-      }
-      return null;
-    }
-  ),
+  duration: deprecated(React.PropTypes.number, 'Use `timeout`.'),
 
   /**
    * Callback fired before the component expands

src/Fade.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import Transition from 'react-overlays/lib/Transition';
-import all from 'react-prop-types/lib/all';
-import deprecationWarning from './utils/deprecationWarning';
+import deprecated from 'react-prop-types/lib/deprecated';
 
 class Fade extends React.Component {
   render() {
@@ -51,15 +50,7 @@ Fade.propTypes = {
    * duration
    * @private
    */
-  duration: all(
-    React.PropTypes.number,
-    (props)=> {
-      if (props.duration != null) {
-        deprecationWarning('Fade `duration`', 'the `timeout` prop');
-      }
-      return null;
-    }
-  ),
+  duration: deprecated(React.PropTypes.number, 'Use `timeout`.'),
 
   /**
    * Callback fired before the component fades in

src/Navbar.js

@@ -1,13 +1,13 @@
 import classNames from 'classnames';
 import React from 'react';
+import deprecated from 'react-prop-types/lib/deprecated';
 import elementType from 'react-prop-types/lib/elementType';
 
 import BootstrapMixin from './BootstrapMixin';
 import Grid from './Grid';
 import NavBrand from './NavBrand';
 
 import createChainedFunction from './utils/createChainedFunction';
-import deprecationWarning from './utils/deprecationWarning';
 import ValidComponentChildren from './utils/ValidComponentChildren';
 
 const Navbar = React.createClass({
@@ -24,7 +24,7 @@ const Navbar = React.createClass({
      * You can use a custom element for this component
      */
     componentClass: elementType,
-    brand: React.PropTypes.node,
+    brand: deprecated(React.PropTypes.node, 'Use the `NavBrand` component.'),
     toggleButton: React.PropTypes.node,
     toggleNavKey: React.PropTypes.oneOfType([
       React.PropTypes.string,
@@ -61,13 +61,6 @@ const Navbar = React.createClass({
     return !this._isChanging;
   },
 
-  componentWillMount() {
-    // TODO: Use the `deprecated` PropType once we're on React 0.14.
-    if (this.props.brand) {
-      deprecationWarning('Navbar brand attribute', 'NavBrand Component');
-    }
-  },
-
   handleToggle() {
     if (this.props.onToggle) {
       this._isChanging = true;

test/NavbarSpec.js

@@ -90,6 +90,8 @@ describe('Navbar', () => {
     assert.ok(brand);
     assert.equal(brand.nodeName, 'SPAN');
     assert.equal(brand.innerText, 'Brand');
+
+    shouldWarn('deprecated');
   });
 
   it('Should add span element with navbar-brand class using NavBrand Component', () => {
@@ -120,6 +122,8 @@ describe('Navbar', () => {
     assert.ok(brand);
     assert.equal(brand.nodeName, 'A');
     assert.equal(brand.innerText, 'Brand');
+
+    shouldWarn('deprecated');
   });
 
   it('Should add link element with navbar-brand class using NavBrand Component', () => {
@@ -148,6 +152,8 @@ describe('Navbar', () => {
     assert.equal(brands.length, 1);
     assert.equal(brands[0].nodeName, 'SPAN');
     assert.equal(brands[0].innerText, 'Brand');
+
+    shouldWarn('deprecated');
   });
 
   it('Should pass navbar prop to navs', () => {