From 1bee466855fdb20c7229b406ded122fbf498fffe Mon Sep 17 00:00:00 2001 From: AlexKVal Date: Thu, 27 Aug 2015 13:21:55 +0300 Subject: [PATCH] [changed] 'id' prop-type made uniform throughout the project React.PropTypes.oneOfType([ React.PropTypes.string, React.PropTypes.number ]) --- docs/src/Anchor.js | 5 ++++- src/InputBase.js | 5 ++++- src/ListGroup.js | 5 ++++- src/Nav.js | 5 ++++- src/Panel.js | 5 ++++- src/Popover.js | 7 ++++++- src/Tabs.js | 5 ++++- src/Tooltip.js | 7 ++++++- 8 files changed, 36 insertions(+), 8 deletions(-) diff --git a/docs/src/Anchor.js b/docs/src/Anchor.js index 144bdb66b0..3eb995c35e 100644 --- a/docs/src/Anchor.js +++ b/docs/src/Anchor.js @@ -2,7 +2,10 @@ import React from 'react'; const Anchor = React.createClass({ propTypes: { - id: React.PropTypes.string + id: React.PropTypes.oneOfType([ + React.PropTypes.string, + React.PropTypes.number + ]) }, render() { return ( diff --git a/src/InputBase.js b/src/InputBase.js index c1e193053e..5d5c58e148 100644 --- a/src/InputBase.js +++ b/src/InputBase.js @@ -220,7 +220,10 @@ InputBase.propTypes = { bsStyle: React.PropTypes.oneOf(['success', 'warning', 'error']), hasFeedback: React.PropTypes.bool, feedbackIcon: React.PropTypes.node, - id: React.PropTypes.string, + id: React.PropTypes.oneOfType([ + React.PropTypes.string, + React.PropTypes.number + ]), groupClassName: React.PropTypes.string, wrapperClassName: React.PropTypes.string, labelClassName: React.PropTypes.string, diff --git a/src/ListGroup.js b/src/ListGroup.js index 32765ce3a6..bb3f931f34 100644 --- a/src/ListGroup.js +++ b/src/ListGroup.js @@ -59,7 +59,10 @@ class ListGroup extends React.Component { ListGroup.propTypes = { className: React.PropTypes.string, - id: React.PropTypes.string + id: React.PropTypes.oneOfType([ + React.PropTypes.string, + React.PropTypes.number + ]) }; export default ListGroup; diff --git a/src/Nav.js b/src/Nav.js index 407befebb1..63f614836b 100644 --- a/src/Nav.js +++ b/src/Nav.js @@ -24,7 +24,10 @@ const Nav = React.createClass({ /** * HTML id for the wrapper `nav` element */ - id: React.PropTypes.string, + id: React.PropTypes.oneOfType([ + React.PropTypes.string, + React.PropTypes.number + ]), /** * CSS classes for the inner `ul` element */ diff --git a/src/Panel.js b/src/Panel.js index 56b2974806..4c20bf0ad7 100644 --- a/src/Panel.js +++ b/src/Panel.js @@ -11,7 +11,10 @@ const Panel = React.createClass({ collapsible: React.PropTypes.bool, onSelect: React.PropTypes.func, header: React.PropTypes.node, - id: React.PropTypes.string, + id: React.PropTypes.oneOfType([ + React.PropTypes.string, + React.PropTypes.number + ]), footer: React.PropTypes.node, defaultExpanded: React.PropTypes.bool, expanded: React.PropTypes.bool, diff --git a/src/Popover.js b/src/Popover.js index 7b8ed17f9a..6ccc5c2ada 100644 --- a/src/Popover.js +++ b/src/Popover.js @@ -13,7 +13,12 @@ const Popover = React.createClass({ * @type {string} * @required */ - id: CustomPropTypes.isRequiredForA11y(React.PropTypes.string), + id: CustomPropTypes.isRequiredForA11y( + React.PropTypes.oneOfType([ + React.PropTypes.string, + React.PropTypes.number + ]) + ), /** * Sets the direction the Popover is positioned towards. diff --git a/src/Tabs.js b/src/Tabs.js index ffcd338549..cb06ddb363 100644 --- a/src/Tabs.js +++ b/src/Tabs.js @@ -36,7 +36,10 @@ const Tabs = React.createClass({ */ bsStyle: React.PropTypes.oneOf(['tabs', 'pills']), animation: React.PropTypes.bool, - id: React.PropTypes.string, + id: React.PropTypes.oneOfType([ + React.PropTypes.string, + React.PropTypes.number + ]), onSelect: React.PropTypes.func, position: React.PropTypes.oneOf(['top', 'left', 'right']), /** diff --git a/src/Tooltip.js b/src/Tooltip.js index 2691b14abf..8767c96595 100644 --- a/src/Tooltip.js +++ b/src/Tooltip.js @@ -12,7 +12,12 @@ const Tooltip = React.createClass({ * @type {string} * @required */ - id: CustomPropTypes.isRequiredForA11y(React.PropTypes.string), + id: CustomPropTypes.isRequiredForA11y( + React.PropTypes.oneOfType([ + React.PropTypes.string, + React.PropTypes.number + ]) + ), /** * Sets the direction the Tooltip is positioned towards.