diff --git a/components/autocomplete/Autocomplete.js b/components/autocomplete/Autocomplete.js index c2e69758..ed08d6fa 100644 --- a/components/autocomplete/Autocomplete.js +++ b/components/autocomplete/Autocomplete.js @@ -383,7 +383,7 @@ const factory = (Chip, Input) => { render() { const { placeholder, allowClear, className, clearTooltip, disabled, - error, label, value, selectedPosition, theme, multiple + error, label, value, selectedPosition, style, theme, multiple } = this.props; const inputProps = this.props.inputProps || {}; const outerClassName = classnames(theme.autocomplete, { @@ -393,7 +393,7 @@ const factory = (Chip, Input) => { ? value && Object.keys(value).length > 0 : value != null); return ( -
+
{selectedPosition === 'above' ? this.renderSelected() : null} {withClear ? { className={className} onMouseEnter={onMouseEnter} onMouseLeave={onMouseLeave} + style={style} > { checked={checked} disabled={disabled} rippleClassName={theme.ripple} - style={style} theme={theme} /> {label ? {label} : null} diff --git a/components/dialog/Dialog.js b/components/dialog/Dialog.js index 7687c23c..042ebe3b 100644 --- a/components/dialog/Dialog.js +++ b/components/dialog/Dialog.js @@ -20,6 +20,8 @@ const factory = (Overlay, Button) => { [props.theme.active]: props.active, }, props.className); + const style = props.style; // eslint-disable-line + return ( { theme={props.theme} themeNamespace="overlay" /> -
+
{props.title ?
{props.title}
: null} {props.children} diff --git a/components/input/Input.js b/components/input/Input.js index d18388d3..cdbd5fd2 100644 --- a/components/input/Input.js +++ b/components/input/Input.js @@ -163,7 +163,7 @@ const factory = (FontIcon) => { render() { const { children, defaultValue, disabled, error, floating, hint, icon, name, label: labelText, maxLength, multiline, required, role, - theme, type, value, onKeyPress, rows = 1, ...others } = this.props; + theme, type, value, onKeyPress, rows = 1, style, ...others } = this.props; // eslint-disable-line const length = maxLength && value ? value.length : 0; const labelClassName = classnames(theme.label, { [theme.fixed]: !floating }); @@ -198,7 +198,7 @@ const factory = (FontIcon) => { } return ( -
+
{React.createElement(multiline ? 'textarea' : 'input', inputElementProps)} {icon ? : null} diff --git a/components/switch/Switch.js b/components/switch/Switch.js index 3dee9b25..833a4868 100644 --- a/components/switch/Switch.js +++ b/components/switch/Switch.js @@ -58,12 +58,13 @@ const factory = (Thumb) => { disabled, onChange, // eslint-disable-line no-unused-vars ripple, + style, // eslint-disable-line theme, ...others } = this.props; const _className = classnames(theme[disabled ? 'disabled' : 'field'], className); return ( -