Merge pull request react-bootstrap#1231 from AlexKVal/uniform-id

Make 'id' prop type uniform throughout the project
viktorrusakov · Aug 27, 2015 · 1173725 · 1173725
2 parents 47cb2d6 + 1bee466
commit 1173725
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.