Merge pull request #5196 from oliviertassinari/raised-button-style

[RaisedButton] Add a buttonStyle property

Author: oliviertassinari

src/RaisedButton/RaisedButton.js

@@ -120,6 +120,10 @@ class RaisedButton extends Component {
      * (use `disabledBackgroundColor` for this).
      */
     backgroundColor: PropTypes.string,
+    /**
+     * Override the inline-styles of the button element.
+     */
+    buttonStyle: PropTypes.object,
     /**
      * The content of the button.
      * If a label is provided via the `label` prop, the text within the label
@@ -327,6 +331,7 @@ class RaisedButton extends Component {
   render() {
     const {
       backgroundColor, // eslint-disable-line no-unused-vars
+      buttonStyle,
       children,
       className,
       disabled,
@@ -341,6 +346,7 @@ class RaisedButton extends Component {
       primary, // eslint-disable-line no-unused-vars
       rippleStyle,
       secondary, // eslint-disable-line no-unused-vars
+      style,
       ...other,
     } = this.props;
 
@@ -386,15 +392,15 @@ class RaisedButton extends Component {
     return (
       <Paper
         className={className}
-        style={Object.assign(styles.root, this.props.style)}
+        style={Object.assign(styles.root, style)}
         zDepth={this.state.zDepth}
       >
         <EnhancedButton
           {...other}
           {...buttonEventHandlers}
           ref="container"
           disabled={disabled}
-          style={styles.button}
+          style={Object.assign(styles.button, buttonStyle)}
           focusRippleColor={mergedRippleStyles.color}
           touchRippleColor={mergedRippleStyles.color}
           focusRippleOpacity={mergedRippleStyles.opacity}

src/RaisedButton/RaisedButton.spec.js

@@ -147,7 +147,7 @@ describe('<RaisedButton />', () => {
     });
   });
 
-  describe('props: icon', () => {
+  describe('prop: icon', () => {
     it('should keep the style set on the icon', () => {
       const wrapper = shallowWithContext(
         <RaisedButton icon={<ActionAndroid style={{foo: 'bar'}} />} />