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

Jump to bottom

Add 'size' prop to options for FormSelect #186

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add 'size' prop to options for FormSelect #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8500a06
Add 'size' prop to options for FormSelect
Nov 7, 2016
dd3608d
FormSelect sizes: use translate instead of margin to future proof cha…
Nov 15, 2016
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
11 changes: 11 additions & 0 deletions less/components/FormInput.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,27 @@ textarea.FormInput {

.FormSelect__arrows {
bottom: 0;
height: @component-height;
line-height: @component-height;
pointer-events: none;
position: absolute;
right: 0;
text-align: center;
width: @component-height;

&--lg { font-size: @font-size-lg }
&--sm { font-size: @font-size-sm }
&--xs { font-size: @font-size-xs }

& > svg {
display: block;
fill: @text-color;
left: 50%;
transform: translate(-50%, -50%);
position: absolute;
top: 50%;
}

}
.FormSelect__arrows--disabled > svg {
fill: @gray-light;
Expand Down
32 changes: 32 additions & 0 deletions site/src/pages/Forms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,38 @@ var Forms = React.createClass({
`}
</ExampleSource>
</div>
<div className="code-example">
<div className="code-example__example">
<FormField label="Select" htmlFor="supported-controls-select">
<FormSelect name="supported-controls-select" options={controlOptions} firstOption="Select" onChange={updateSelect} />
</FormField>
<FormField label="Large Select" htmlFor="supported-controls-select-lg">
<FormSelect name="supported-controls-select-lg" size="lg" options={controlOptions} firstOption="Select Large" onChange={updateSelect} />
</FormField>
<FormField label="Small Select" htmlFor="supported-controls-select-sm">
<FormSelect name="supported-controls-select-sm" size="sm" options={controlOptions} firstOption="Select Small" onChange={updateSelect} />
</FormField>
<FormField label="Extra Small Select" htmlFor="supported-controls-select-xs">
<FormSelect name="supported-controls-select-xs" size="xs" options={controlOptions} firstOption="Select Extra Small" onChange={updateSelect} />
</FormField>
</div>
<ExampleSource>
{`
<FormField label="Select" htmlFor="supported-controls-select">
<FormSelect name="supported-controls-select" options={controlOptions} firstOption="Select" onChange={updateSelect} />
</FormField>
<FormField label="Large Select" htmlFor="supported-controls-select-lg">
<FormSelect name="supported-controls-select-lg" size="lg" options={controlOptions} firstOption="Select Large" onChange={updateSelect} />
</FormField>
<FormField label="Small Select" htmlFor="supported-controls-select-sm">
<FormSelect name="supported-controls-select-sm" size="sm" options={controlOptions} firstOption="Select Small" onChange={updateSelect} />
</FormField>
<FormField label="Extra Small Select" htmlFor="supported-controls-select-xs">
<FormSelect name="supported-controls-select-xs" size="xs" options={controlOptions} firstOption="Select Extra Small" onChange={updateSelect} />
</FormField>
`}
</ExampleSource>
</div>



Expand Down
22 changes: 17 additions & 5 deletions src/components/FormSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ module.exports = React.createClass({
prependEmptyOption: React.PropTypes.bool,
required: React.PropTypes.bool,
requiredMessage: React.PropTypes.string,
size: React.PropTypes.oneOf(['lg', 'sm', 'xs']),
value: React.PropTypes.string,
},
getDefaultProps () {
Expand Down Expand Up @@ -79,14 +80,19 @@ module.exports = React.createClass({
this.setState(newState);
},
renderIcon (icon) {
let iconClassname = classNames('FormSelect__arrows', {
'FormSelect__arrows--disabled': this.props.disabled,
});
const { size } = this.props;
let iconClassname = classNames(
'FormSelect__arrows',
{
'FormSelect__arrows--disabled': this.props.disabled,
},
size ? ('FormSelect__arrows--' + size) : null
);
return <span dangerouslySetInnerHTML={{ __html: icon }} className={iconClassname} />;
},
render () {
// props
let props = blacklist(this.props, 'prependEmptyOption', 'firstOption', 'alwaysValidate', 'htmlFor', 'id', 'label', 'onChange', 'options', 'required', 'requiredMessage', 'className');
let props = blacklist(this.props, 'prependEmptyOption', 'firstOption', 'alwaysValidate', 'htmlFor', 'id', 'label', 'onChange', 'options', 'required', 'requiredMessage', 'className', 'size');

// classes
let componentClass = classNames('FormField', {
Expand Down Expand Up @@ -115,11 +121,17 @@ module.exports = React.createClass({
);
}

const selectClasses = classNames(
'FormInput',
'FormSelect',
this.props.size ? ('FormInput--' + this.props.size) : null
);

return (
<div className={componentClass}>
{componentLabel}
<div className="u-pos-relative">
<select className="FormInput FormSelect" id={forAndID} onChange={this.handleChange} onBlur={this.handleBlur} {...props}>
<select className={selectClasses} id={forAndID} onChange={this.handleChange} onBlur={this.handleBlur} {...props}>
{options}
</select>
{this.renderIcon(icons.selectArrows)}
Expand Down