Skip to content

Commit

Permalink
Merge pull request #2405 from subjectix/seleft-field-propagate-underl…
Browse files Browse the repository at this point in the history
…ine-styles

[SelectField] Propagate underline styles
  • Loading branch information
alitaheri committed Dec 7, 2015
2 parents d5bbcad + daa8b10 commit 3a11da2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
6 changes: 6 additions & 0 deletions docs/src/app/components/pages/components/select-fields.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ const SelectFieldsPage = React.createClass({
header: 'optional',
desc: 'Override the inline-styles of the SelectField\'s underline element when disabled.',
},
{
name: 'underlineFocusStyle',
type: 'object',
header: 'optional',
desc: 'Override the inline-styles of the SelectField\'s underline element when focussed.',
},
{
name: 'underlineStyle',
type: 'object',
Expand Down
8 changes: 8 additions & 0 deletions src/select-field.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ const SelectField = React.createClass({
selectedIndex: React.PropTypes.number,
style: React.PropTypes.object,
type: React.PropTypes.string,
underlineDisabledStyle: React.PropTypes.object,
underlineFocusStyle: React.PropTypes.object,
underlineStyle: React.PropTypes.object,
value: React.PropTypes.any,
},
Expand Down Expand Up @@ -135,6 +137,8 @@ const SelectField = React.createClass({
style,
labelStyle,
iconStyle,
underlineDisabledStyle,
underlineFocusStyle,
underlineStyle,
errorStyle,
selectFieldRoot,
Expand All @@ -161,7 +165,11 @@ const SelectField = React.createClass({
errorStyle: this.mergeAndPrefix(styles.error, errorStyle),
onFocus: onFocus,
onBlur: onBlur,
underlineDisabledStyle,
underlineFocusStyle,
underlineStyle,
};

const dropDownMenuProps = {
menuItems: menuItems,
disabled: disabled,
Expand Down

0 comments on commit 3a11da2

Please sign in to comment.