Merge pull request #2389 from subjectix/drop-down-menu-style

[DropDownMenu] menuStyle prop
mui · Dec 6, 2015 · 0749065 · 0749065
2 parents 66ff79b + df0c3f6
commit 0749065
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/docs/src/app/components/pages/components/drop-down-menu.jsx b/docs/src/app/components/pages/components/drop-down-menu.jsx
@@ -63,6 +63,13 @@ export default class DropDownMenuPage extends React.Component {
             desc: 'Overrides the inline-styles of the MenuItems when the ' +
                   'DropDownMenu is expanded.',
           },
+          {
+            name: 'menuStyle',
+            type: 'object',
+            header: 'optional',
+            desc: 'Overrides the inline-styles of the Menu when the ' +
+                  'DropDownMenu is expanded.',
+          },
           {
             name: 'selectedIndex',
             type: 'number',

diff --git a/src/drop-down-menu.jsx b/src/drop-down-menu.jsx
@@ -43,6 +43,7 @@ const DropDownMenu = React.createClass({
     labelStyle:React.PropTypes.object,
     menuItemStyle: React.PropTypes.object,
     menuItems: React.PropTypes.array.isRequired,
+    menuStyle: React.PropTypes.object,
     onChange: React.PropTypes.func,
     openImmediately: React.PropTypes.bool,
     selectedIndex: React.PropTypes.number,
@@ -190,6 +191,7 @@ const DropDownMenu = React.createClass({
       iconStyle,
       underlineStyle,
       menuItemStyle,
+      menuStyle,
       labelMember,
       ...other,
     } = this.props;
@@ -248,7 +250,7 @@ const DropDownMenu = React.createClass({
             autoWidth={autoWidth}
             selectedIndex={selectedIndex}
             menuItems={menuItems}
-            style={styles.menu}
+            style={this.mergeStyles(styles.menu, menuStyle)}
             menuItemStyle={this.mergeStyles(styles.menuItem, menuItemStyle)}
             hideable={true}
             visible={this.state.open}