diff --git a/src/DropDownMenu/DropDownMenu.jsx b/src/DropDownMenu/DropDownMenu.jsx index 08e284a6ae09c2..a76bcf6f9ab976 100644 --- a/src/DropDownMenu/DropDownMenu.jsx +++ b/src/DropDownMenu/DropDownMenu.jsx @@ -8,7 +8,7 @@ import ClearFix from '../clearfix'; import ThemeManager from '../styles/theme-manager'; import Popover from '../popover/popover'; import PopoverAnimationFromTop from '../popover/popover-animation-from-top'; -import styleUtils from '../utils/styles'; +import {mergeStyles, prepareStyles} from '../utils/styles'; import warning from 'warning'; import deprecated from '../utils/deprecatedPropType'; @@ -405,14 +405,14 @@ const DropDownMenu = React.createClass({ {...other} ref="root" className={className} - style={styleUtils.prepareStyles(muiTheme, styles.root, open && styles.rootWhenOpen, style)} + style={prepareStyles(muiTheme, mergeStyles(styles.root, open && styles.rootWhenOpen, style))} > - -
+ +
{displayValue}
- -
+ +
{ return (
{text} + style={prepareStyles(muiTheme, mergeStyles(styles.root, style))}>{text}
); }; diff --git a/src/TextField/TextFieldLabel.jsx b/src/TextField/TextFieldLabel.jsx index a9cb8779d576c5..7c6c61818a3655 100644 --- a/src/TextField/TextFieldLabel.jsx +++ b/src/TextField/TextFieldLabel.jsx @@ -1,6 +1,6 @@ import React from 'react'; import Transitions from '../styles/transitions'; -import styleUtils from '../utils/styles'; +import {mergeStyles, prepareStyles} from '../utils/styles'; const propTypes = { /** @@ -82,7 +82,7 @@ const TextFieldLabel = (props) => { return (