[RaisedButton] Fix the icon style override as done in mui#4754

Author: oliviertassinari

src/FlatButton/FlatButton.spec.js

@@ -181,4 +181,14 @@ describe('<FlatButton />', () => {
       assert.strictEqual(wrapper.state().hovered, false, 'should reset the state');
     });
   });
+
+  describe('props: icon', () => {
+    it('should keep the style set on the icon', () => {
+      const wrapper = shallowWithContext(
+        <FlatButton icon={<ActionAndroid style={{foo: 'bar'}} />} />
+      );
+
+      assert.strictEqual(wrapper.find(ActionAndroid).props().style.foo, 'bar');
+    });
+  });
 });

src/RaisedButton/RaisedButton.js

@@ -1,4 +1,4 @@
-import React, {Component, PropTypes} from 'react';
+import React, {Component, cloneElement, PropTypes} from 'react';
 import transitions from '../styles/transitions';
 import {fade} from '../utils/colorManipulator';
 import {createChildFragment} from '../utils/childUtils';
@@ -362,9 +362,9 @@ class RaisedButton extends Component {
       </span>
     );
 
-    const iconCloned = icon && React.cloneElement(icon, {
+    const iconCloned = icon && cloneElement(icon, {
       color: icon.props.color || styles.label.color,
-      style: styles.icon,
+      style: Object.assign(styles.icon, icon.props.style),
     });
 
     // Place label before or after children.

src/RaisedButton/RaisedButton.spec.js

@@ -146,4 +146,14 @@ describe('<RaisedButton />', () => {
       assert.strictEqual(wrapper.state().hovered, false, 'should reset the state');
     });
   });
+
+  describe('props: icon', () => {
+    it('should keep the style set on the icon', () => {
+      const wrapper = shallowWithContext(
+        <RaisedButton icon={<ActionAndroid style={{foo: 'bar'}} />} />
+      );
+
+      assert.strictEqual(wrapper.find(ActionAndroid).props().style.foo, 'bar');
+    });
+  });
 });