Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SelectField] Propagate underline styles #2405

Merged
merged 1 commit into from
Dec 7, 2015
Merged

[SelectField] Propagate underline styles #2405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docs/src/app/components/pages/components/select-fields.jsx
View file
Open in desktop
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
View file
Open in desktop
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