[ToolbarGroup] Correctly transfer inline styles of direct children

mui · Jun 26, 2015 · e579df5 · e579df5
1 parent df8427b
commit e579df5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/toolbar/toolbar-group.jsx b/src/toolbar/toolbar-group.jsx
@@ -92,24 +92,24 @@ let ToolbarGroup = React.createClass({
       switch (currentChild.type.displayName) {
         case 'DropDownMenu' :
           return React.cloneElement(currentChild, {
-            style: styles.dropDownMenu.root,
+            style: this.mergeStyles(styles.dropDownMenu.root, currentChild.props.style),
             styleControlBg: styles.dropDownMenu.controlBg,
             styleUnderline: styles.dropDownMenu.underline
           });
         case 'DropDownIcon' :
           return React.cloneElement(currentChild, {
-            style: {float: 'left'},
+            style: this.mergeStyles({float: 'left'}, currentChild.props.style),
             iconStyle: styles.icon.root,
             onMouseOver: this._handleMouseOverDropDownMenu,
             onMouseOut: this._handleMouseOutDropDownMenu
           });
         case 'RaisedButton' : case 'FlatButton' :
           return React.cloneElement(currentChild, {
-            style: styles.button
+            style: this.mergeStyles(styles.button, currentChild.props.style),
           });
         case 'FontIcon' :
           return React.cloneElement(currentChild, {
-            style: styles.icon.root,
+            style: this.mergeStyles(styles.icon.root, currentChild.props.style),
             onMouseOver: this._handleMouseOverFontIcon,
             onMouseOut: this._handleMouseOutFontIcon
           });