0.14.0

Author: mtscout6

DropdownButton.js

@@ -22,7 +22,8 @@ var DropdownButton = React.createClass({displayName: "DropdownButton",
     href:      React.PropTypes.string,
     onClick:   React.PropTypes.func,
     onSelect:  React.PropTypes.func,
-    navItem:   React.PropTypes.bool
+    navItem:   React.PropTypes.bool,
+    noCaret:   React.PropTypes.bool
   },
 
   render: function () {
@@ -31,6 +32,9 @@ var DropdownButton = React.createClass({displayName: "DropdownButton",
     var renderMethod = this.props.navItem ?
       'renderNavItem' : 'renderButtonGroup';
 
+    var caret = this.props.noCaret ?
+        null : (React.createElement("span", {className: "caret"}));
+
     return this[renderMethod]([
       React.createElement(Button, React.__spread({}, 
         this.props, 
@@ -44,7 +48,7 @@ var DropdownButton = React.createClass({displayName: "DropdownButton",
         pullRight: null, 
         dropup: null}), 
         this.props.title, ' ', 
-        React.createElement("span", {className: "caret"})
+        caret
       ),
       React.createElement(DropdownMenu, {
         ref: "menu", 

Input.js

@@ -37,7 +37,11 @@ var Input = React.createClass({displayName: "Input",
       return this.props.value;
     }
     else if (this.props.type) {
-      return this.getInputDOMNode().value;
+      if (this.props.type == "select" && this.props.multiple) {
+        return this.getSelectedOptions();
+      } else {
+        return this.getInputDOMNode().value;
+      }
     }
     else {
       throw Error('Cannot use getValue without specifying input type.');
@@ -48,6 +52,23 @@ var Input = React.createClass({displayName: "Input",
     return this.getInputDOMNode().checked;
   },
 
+  getSelectedOptions: function () {
+    var values = [];
+
+    Array.prototype.forEach.call(
+      this.getInputDOMNode().getElementsByTagName('option'),
+      function (option) {
+        if (option.selected) {
+          var value = option.getAttribute('value') || option.innerHTML;
+
+          values.push(value);
+        }
+      }
+    );
+
+    return values;
+  },
+
   isCheckboxOrRadio: function () {
     return this.props.type === 'radio' || this.props.type === 'checkbox';
   },

Panel.js

@@ -42,7 +42,7 @@ var Panel = React.createClass({displayName: "Panel",
   },
 
   getCollapsableDimensionValue: function () {
-    return this.refs.body.getDOMNode().offsetHeight;
+    return this.refs.panel.getDOMNode().scrollHeight;
   },
 
   getCollapsableDOMNode: function () {
@@ -76,11 +76,51 @@ var Panel = React.createClass({displayName: "Panel",
   },
 
   renderBody: function () {
-    return (
-      React.createElement("div", {className: "panel-body", ref: "body"}, 
-        this.props.children
-      )
-    );
+    var allChildren = this.props.children;
+    var bodyElements = [];
+
+    function getProps() {
+      return {key: bodyElements.length};
+    }
+
+    function addPanelBody (children) {
+      bodyElements.push(
+        React.createElement("div", React.__spread({className: "panel-body"},  getProps()), 
+          children
+        )
+      );
+    }
+
+    // Handle edge cases where we should not iterate through children.
+    if (!Array.isArray(allChildren) || allChildren.length == 0) {
+      addPanelBody(allChildren);
+    } else {
+      var panelBodyChildren = [];
+
+      function maybeRenderPanelBody () {
+        if (panelBodyChildren.length == 0) {
+          return;
+        }
+
+        addPanelBody(panelBodyChildren);
+        panelBodyChildren = [];
+      }
+
+      allChildren.forEach(function(child) {
+        if (React.isValidElement(child) && child.props.fill != null) {
+          maybeRenderPanelBody();
+
+          // Separately add the filled element.
+          bodyElements.push(cloneWithProps(child, getProps()));
+        } else {
+          panelBodyChildren.push(child);
+        }
+      });
+
+      maybeRenderPanelBody();
+    }
+
+    return bodyElements;
   },
 
   renderHeading: function () {
@@ -143,4 +183,4 @@ var Panel = React.createClass({displayName: "Panel",
   }
 });
 
-module.exports = Panel;
+module.exports = Panel;

constants.js

@@ -41,6 +41,7 @@ module.exports = {
     'asterisk',
     'plus',
     'euro',
+    'eur',
     'minus',
     'cloud',
     'envelope',
@@ -237,6 +238,64 @@ module.exports = {
     'cloud-download',
     'cloud-upload',
     'tree-conifer',
-    'tree-deciduous'
+    'tree-deciduous',
+    'cd',
+    'save-file',
+    'open-file',
+    'level-up',
+    'copy',
+    'paste',
+    'alert',
+    'equalizer',
+    'king',
+    'queen',
+    'pawn',
+    'bishop',
+    'knight',
+    'baby-formula',
+    'tent',
+    'blackboard',
+    'bed',
+    'apple',
+    'erase',
+    'hourglass',
+    'lamp',
+    'duplicate',
+    'piggy-bank',
+    'scissors',
+    'bitcoin',
+    'yen',
+    'ruble',
+    'scale',
+    'ice-lolly',
+    'ice-lolly-tasted',
+    'education',
+    'option-horizontal',
+    'option-vertical',
+    'menu-hamburger',
+    'modal-window',
+    'oil',
+    'grain',
+    'sunglasses',
+    'text-size',
+    'text-color',
+    'text-background',
+    'object-align-top',
+    'object-align-bottom',
+    'object-align-horizontal',
+    'object-align-left',
+    'object-align-vertical',
+    'object-align-right',
+    'triangle-right',
+    'triangle-left',
+    'triangle-bottom',
+    'triangle-top',
+    'console',
+    'superscript',
+    'subscript',
+    'menu-left',
+    'menu-right',
+    'menu-down',
+    'menu-up'
   ]
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-bootstrap",
-  "version": "0.13.3",
+  "version": "0.14.0",
   "description": "Bootstrap 3 components build with React",
   "homepage": "http://react-bootstrap.github.io/",
   "main": "main.js",