diff --git a/src/DropDownMenu/DropDownMenu.jsx b/src/DropDownMenu/DropDownMenu.jsx index 8e671eac17c79b..b1e2f1525af6e2 100644 --- a/src/DropDownMenu/DropDownMenu.jsx +++ b/src/DropDownMenu/DropDownMenu.jsx @@ -7,7 +7,6 @@ import ClearFix from '../clearfix'; import getMuiTheme from '../styles/getMuiTheme'; import Popover from '../popover/popover'; import PopoverAnimationFromTop from '../popover/popover-animation-from-top'; -import {mergeStyles, prepareStyles} from '../utils/styles'; import warning from 'warning'; import deprecated from '../utils/deprecatedPropType'; @@ -341,6 +340,10 @@ const DropDownMenu = React.createClass({ muiTheme, } = this.state; + const { + prepareStyles, + } = muiTheme; + const styles = this.getStyles(); let value; @@ -405,14 +408,16 @@ const DropDownMenu = React.createClass({ {...other} ref="root" className={className} - style={prepareStyles(muiTheme, mergeStyles(styles.root, open && styles.rootWhenOpen, style))} + style={prepareStyles(Object.assign({}, styles.root, open && styles.rootWhenOpen, style))} > - -
+ +
{displayValue}
- -
+ +
{ ...other, } = props; + const { + prepareStyles, + } = muiTheme; + const styles = { root: { boxSizing: 'border-box', @@ -52,7 +55,7 @@ let Subheader = (props) => { }; return ( -
+
{children}
); diff --git a/src/TextField/TextFieldHint.jsx b/src/TextField/TextFieldHint.jsx index de38e8a18cc955..c8ea75b41b83c3 100644 --- a/src/TextField/TextFieldHint.jsx +++ b/src/TextField/TextFieldHint.jsx @@ -1,6 +1,5 @@ import React from 'react'; import Transitions from '../styles/transitions'; -import {mergeStyles, prepareStyles} from '../utils/styles'; const propTypes = { /** @@ -38,6 +37,7 @@ const TextFieldHint = (props) => { } = props; const { + prepareStyles, textField: { hintColor, }, @@ -54,7 +54,7 @@ const TextFieldHint = (props) => { }; return ( -
+
{text}
); diff --git a/src/TextField/TextFieldLabel.jsx b/src/TextField/TextFieldLabel.jsx index 7c6c61818a3655..549688a705708b 100644 --- a/src/TextField/TextFieldLabel.jsx +++ b/src/TextField/TextFieldLabel.jsx @@ -1,6 +1,5 @@ import React from 'react'; import Transitions from '../styles/transitions'; -import {mergeStyles, prepareStyles} from '../utils/styles'; const propTypes = { /** @@ -79,10 +78,14 @@ const TextFieldLabel = (props) => { }, }; + const { + prepareStyles, + } = muiTheme; + return (