Merge pull request #2964 from oliviertassinari/flat-button-fix-memory…

…-shared [FlatButton] Fix shared memory property modification
mui · Jan 17, 2016 · e964506 · e964506
2 parents a99f624 + d31557b
commit e964506
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/buttons/flat-button-label.jsx b/src/buttons/flat-button-label.jsx
@@ -66,7 +66,8 @@ const FlatButtonLabel = React.createClass({
 
     const mergedRootStyles = this.mergeStyles({
       position: 'relative',
-      padding: '0 ' + contextKeys.spacingDesktopGutterLess + 'px',
+      paddingLeft: contextKeys.spacingDesktopGutterLess,
+      paddingRight: contextKeys.spacingDesktopGutterLess,
     }, style);
 
     return (

diff --git a/src/flat-button.jsx b/src/flat-button.jsx
@@ -267,6 +267,7 @@ const FlatButton = React.createClass({
     }, style);
 
     let iconCloned;
+    const labelStyleIcon = {};
 
     if (icon) {
       iconCloned = React.cloneElement(icon, {
@@ -279,14 +280,14 @@ const FlatButton = React.createClass({
       });
 
       if (labelPosition === 'before') {
-        labelStyle.paddingRight = 8;
+        labelStyleIcon.paddingRight = 8;
       } else {
-        labelStyle.paddingLeft = 8;
+        labelStyleIcon.paddingLeft = 8;
       }
     }
 
     const labelElement = label ? (
-      <FlatButtonLabel label={label} style={labelStyle} />
+      <FlatButtonLabel label={label} style={mergeStyles(labelStyle, labelStyleIcon)} />
     ) : undefined;
 
     // Place label before or after children.