Handle multiple children in <Badge>. Fixes react-bootstrap#532

uptrend-tech · Apr 19, 2015 · a3f9008 · a3f9008
1 parent a07ea20
commit a3f9008
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/Badge.js b/src/Badge.js
@@ -10,6 +10,7 @@ const Badge = React.createClass({
 
   hasContent() {
     return ValidComponentChildren.hasValidComponent(this.props.children) ||
+      (React.Children.count(this.props.children) > 1) ||
       (typeof this.props.children === 'string') ||
       (typeof this.props.children === 'number');
   },

diff --git a/test/BadgeSpec.js b/test/BadgeSpec.js
@@ -31,6 +31,16 @@ describe('Badge', function () {
     assert.ok(instance.getDOMNode().className.match(/\bbadge\b/));
   });
 
+  it('Should have a badge using a a mix of content', function () {
+    let count = 42;
+    let instance = ReactTestUtils.renderIntoDocument(
+      <Badge>
+        £{count}
+      </Badge>
+    );
+    assert.ok(instance.getDOMNode().className.match(/\bbadge\b/));
+  });
+
   it('Should have a badge class pulled right', function () {
     let instance = ReactTestUtils.renderIntoDocument(
       <Badge pullRight>