diff --git a/src/DropdownToggle.js b/src/DropdownToggle.js index 30aceb9803..10fe3d234a 100644 --- 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 = ; @@ -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} ); } } -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 index f8ae74e999..cb8ebe20c7 100644 --- a/test/DropdownToggleSpec.js +++ b/test/DropdownToggleSpec.js @@ -27,7 +27,7 @@ describe('DropdownToggle', () => { it('renders title children', () => { const instance = ReactTestUtils.renderIntoDocument( - +

herpa derpa

);