[fixed] DropdownTitle children v. title

Prefer children for label, but default to title otherwise
kyletsang · Oct 17, 2015 · 4f4017e · 4f4017e
1 parent 44182b7
commit 4f4017e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/DropdownToggle.js b/src/DropdownToggle.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import classNames from 'classnames';
 import Button from './Button';
-import singlePropFrom from 'react-prop-types/lib/singlePropFrom';
 import SafeAnchor from './SafeAnchor';
 
 const CARET = <span> <span className="caret" /></span>;
@@ -23,17 +22,12 @@ export default class DropdownToggle extends React.Component {
         type="button"
         aria-haspopup
         aria-expanded={this.props.open}>
-        {this.props.title || this.props.children}{caret}
+        {this.props.children || this.props.title}{caret}
       </Component>
     );
   }
 }
 
-const titleAndChildrenValidation = singlePropFrom(
-  'title',
-  'children'
-);
-
 DropdownToggle.defaultProps = {
   open: false,
   useAnchor: false,
@@ -42,10 +36,9 @@ DropdownToggle.defaultProps = {
 
 DropdownToggle.propTypes = {
   bsRole: React.PropTypes.string,
-  children: titleAndChildrenValidation,
   noCaret: React.PropTypes.bool,
   open: React.PropTypes.bool,
-  title: titleAndChildrenValidation,
+  title: React.PropTypes.string,
   useAnchor: React.PropTypes.bool
 };
 

diff --git a/test/DropdownToggleSpec.js b/test/DropdownToggleSpec.js
@@ -27,7 +27,7 @@ describe('DropdownToggle', () => {
 
   it('renders title children', () => {
     const instance = ReactTestUtils.renderIntoDocument(
-      <DropdownToggle open={false}>
+      <DropdownToggle title="toggle" open={false}>
         <h3>herpa derpa</h3>
       </DropdownToggle>
     );