Fix for bug introduced by new deprecation code.

AndreasKlein · May 1, 2015 · 92c57ef · 92c57ef
1 parent 274c9cb
commit 92c57ef
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/CollapsableMixin.js b/src/CollapsableMixin.js
@@ -30,9 +30,11 @@ const CollapsableMixin = assign({}, CollapsibleMixin, {
       link
     );
     return this.getCollapsableDimensionValue();
+  },
+
+  componentDidMount() {
+    deprecationWarning('CollapsableMixin', 'CollapsibleMixin', link);
   }
 });
 
-deprecationWarning('CollapsableMixin', 'CollapsibleMixin', link);
-
 export default CollapsableMixin;
diff --git a/src/CollapsableNav.js b/src/CollapsableNav.js
@@ -1,12 +1,7 @@
-import deprecationWarning from './utils/deprecationWarning';
 import CollapsibleNav from './CollapsibleNav';
 
 let CollapsableNav = CollapsibleNav;
 
-deprecationWarning(
-  'CollapsableNav',
-  'CollapsibleNav',
-  'https://github.com/react-bootstrap/react-bootstrap/issues/425#issuecomment-97110963'
-);
+CollapsableNav.__deprecated__ = true;
 
 export default CollapsableNav;
diff --git a/src/CollapsibleNav.js b/src/CollapsibleNav.js
@@ -3,6 +3,7 @@ import BootstrapMixin from './BootstrapMixin';
 import CollapsibleMixin from './CollapsibleMixin';
 import classNames from 'classnames';
 import domUtils from './utils/domUtils';
+import deprecationWarning from './utils/deprecationWarning';
 
 import ValidComponentChildren from './utils/ValidComponentChildren';
 import createChainedFunction from './utils/createChainedFunction';
@@ -42,6 +43,16 @@ const CollapsibleNav = React.createClass({
     return height;
   },
 
+  componentDidMount() {
+    if (this.constructor.__deprecated__) {
+      deprecationWarning(
+        'CollapsableNav',
+        'CollapsibleNav',
+        'https://github.com/react-bootstrap/react-bootstrap/issues/425#issuecomment-97110963'
+      );
+    }
+  },
+
   render() {
     /*
      * this.props.collapsable is set in NavBar when a eventKey is supplied.