[IconMenu] Change IconMenu to conditionally merge button styles

src/IconMenu/IconMenu.js

@@ -5,6 +5,7 @@ import propTypes from '../utils/propTypes';
 import Menu from '../Menu/Menu';
 import Popover from '../Popover/Popover';
 import warning from 'warning';
+import deprecated from '../utils/deprecatedPropType';
 
 class IconMenu extends Component {
   static muiName = 'IconMenu';
@@ -42,7 +43,7 @@ class IconMenu extends Component {
     /**
      * Override the inline-styles of the underlying icon element.
      */
-    iconStyle: PropTypes.object,
+    iconStyle: deprecated(PropTypes.object, 'Add the "iconStyle" prop to the "iconButtonElement" instead.'),
     /**
      * Override the inline-styles of the menu element.
      */
@@ -268,10 +269,11 @@ class IconMenu extends Component {
     warning(iconButtonElement.type.muiName !== 'SvgIcon',
       `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, {
       onKeyboardFocus: onKeyboardFocus,
-      iconStyle: Object.assign({}, iconStyle, iconButtonElement.props.iconStyle),
+      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) {

src/IconMenu/IconMenu.spec.js

@@ -0,0 +1,23 @@
+/* eslint-env mocha */
+import React from 'react';
+import {shallow} from 'enzyme';
+import {assert} from 'chai';
+import getMuiTheme from '../styles/getMuiTheme';
+
+import IconMenu from './IconMenu';
+
+describe('<IconMenu />', function() {
+  const muiTheme = getMuiTheme();
+  const shallowWithContext = (node) => shallow(node, {context: {muiTheme}});
+  it('should not leak an iconStyle property', () => {
+    const wrapper = shallowWithContext(
+      <IconMenu
+        iconButtonElement={<div className="my-icon-button" />}
+      >
+        <div className="some-div" />
+      </IconMenu>
+    );
+    const buttonProps = wrapper.find('.my-icon-button').props();
+    assert.strictEqual(buttonProps.iconStyle, undefined);
+  });
+});