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.

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

Allow deselection of optional SelectField #120

Merged
merged 8 commits into from
Oct 28, 2016
Merged
Changes from 6 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -41,9 +41,9 @@ const renderSelect = props =>
ref={props.inputRef}
value={props.value}
>
{!!props.placeholder && (
<option value="" disabled hidden>
{props.placeholder}
{(!!props.placeholder || !props.required) && (
<option value="" disabled={props.required} hidden={props.required}>
{props.placeholder ? props.placeholder : props.label}
</option>
)}

@@ -64,4 +64,3 @@ const Select = props =>
;

export default connectField(Select);

Original file line number Diff line number Diff line change
@@ -41,9 +41,9 @@ const renderSelect = props =>
ref={props.inputRef}
value={props.value}
>
{!!props.placeholder && (
<option value="" disabled hidden>
{props.placeholder}
{(!!props.placeholder || !props.required) && (
<option value="" disabled={props.required} hidden={props.required}>
{props.placeholder ? props.placeholder : props.label}
</option>
)}

@@ -64,4 +64,3 @@ const Select = props =>
;

export default connectField(Select);

41 changes: 21 additions & 20 deletions packages/uniforms-semantic/src/components/fields/SelectField.js
Original file line number Diff line number Diff line change
@@ -33,27 +33,28 @@ const renderCheckboxes = ({allowedValues, disabled, fieldType, id, name, onChang
)
;

const renderSelect = ({allowedValues, disabled, id, inputRef, name, onChange, placeholder, transform, value}) =>
<select
disabled={disabled}
id={id}
name={name}
onChange={event => onChange(event.target.value)}
ref={inputRef}
value={value}
>
{!!placeholder && (
<option value="" disabled hidden>
{placeholder}
</option>
)}
const renderSelect = ({allowedValues, disabled, id, inputRef, label, name, onChange, placeholder,
required, transform, value}) =>
<select
disabled={disabled}
id={id}
name={name}
onChange={event => onChange(event.target.value)}
ref={inputRef}
value={value}
>
{(!!placeholder || !required) && (
<option value="" disabled={required} hidden={required}>
{placeholder ? placeholder : label}
</option>
)}

{allowedValues.map(value =>
<option key={value} value={value}>
{transform ? transform(value) : value}
</option>
)}
</select>
{allowedValues.map(value =>
<option key={value} value={value}>
{transform ? transform(value) : value}
</option>
)}
</select>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please do it exactly the same like in the other places? Like here.

;

const Select = ({
41 changes: 21 additions & 20 deletions packages/uniforms-unstyled/src/components/fields/SelectField.js
Original file line number Diff line number Diff line change
@@ -30,27 +30,28 @@ const renderCheckboxes = ({allowedValues, disabled, fieldType, id, name, onChang
)
;

const renderSelect = ({allowedValues, disabled, id, inputRef, name, onChange, placeholder, transform, value}) =>
<select
disabled={disabled}
id={id}
name={name}
onChange={event => onChange(event.target.value)}
ref={inputRef}
value={value}
>
{!!placeholder && (
<option value="" disabled hidden>
{placeholder}
</option>
)}
const renderSelect = ({allowedValues, disabled, id, inputRef, label, name, onChange, placeholder,
required, transform, value}) =>
<select
disabled={disabled}
id={id}
name={name}
onChange={event => onChange(event.target.value)}
ref={inputRef}
value={value}
>
{(!!placeholder || !required) && (
<option value="" disabled={required} hidden={required}>
{placeholder ? placeholder : label}
</option>
)}

{allowedValues.map(value =>
<option key={value} value={value}>
{transform ? transform(value) : value}
</option>
)}
</select>
{allowedValues.map(value =>
<option key={value} value={value}>
{transform ? transform(value) : value}
</option>
)}
</select>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

;

const Select = ({