Merge pull request #5843 from olee/master

[IconMenu] Changed IconMenu to conditionally add button iconStyle
mui · Dec 28, 2016 · 9363b3a · 9363b3a
2 parents 4d5de14 + 69ad9fa
commit 9363b3a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/IconMenu/IconMenu.js b/src/IconMenu/IconMenu.js
@@ -274,19 +274,22 @@ class IconMenu extends Component {
       `Material-UI: You shoud not provide an <SvgIcon /> to the 'iconButtonElement' property of <IconMenu />.
 You should wrapped it with an <IconButton />.`);
 
-    const iconButton = React.cloneElement(iconButtonElement, {
+    const iconButtonProps = {
       onKeyboardFocus: onKeyboardFocus,
-      iconStyle: iconStyle ?
-        Object.assign({}, iconStyle, iconButtonElement.props.iconStyle) :
-        iconButtonElement.props.iconStyle,
       onTouchTap: (event) => {
         this.open(Events.isKeyboard(event) ? 'keyboard' : 'iconTap', event);
         if (iconButtonElement.props.onTouchTap) {
           iconButtonElement.props.onTouchTap(event);
         }
       },
       ref: 'iconButton',
-    });
+    };
+    if (iconStyle || iconButtonElement.props.iconStyle) {
+      iconButtonProps.iconStyle = iconStyle ?
+        Object.assign({}, iconStyle, iconButtonElement.props.iconStyle) :
+        iconButtonElement.props.iconStyle;
+    }
+    const iconButton = React.cloneElement(iconButtonElement, iconButtonProps);
 
     const menu = (
       <Menu

diff --git a/src/IconMenu/IconMenu.spec.js b/src/IconMenu/IconMenu.spec.js
@@ -14,7 +14,7 @@ describe('<IconMenu />', function() {
       <IconMenu iconButtonElement={<div data-test="my-icon-button" />} />
     );
 
-    assert.strictEqual(wrapper.find('[data-test="my-icon-button"]').props().iconStyle,
-      undefined, 'should leak property on the div');
+    assert.strictEqual(wrapper.find('[data-test="my-icon-button"]').props().hasOwnProperty('iconStyle'), false,
+      'should leak property on the div');
   });
 });