Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
26 changes: 25 additions & 1 deletion src/__tests__/themes.bootstrap3.ChoiceWidget.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe("ChoiceWidget", () => {
expect(wrapper.find("option").length).toEqual(3);
});

it("required renders no extra field", () => {
it("required attr renders required field", () => {
const schema = {
title: "A schema",
properties: {
Expand All @@ -45,6 +45,30 @@ describe("ChoiceWidget", () => {
</FormFrame>
);

const wrapper = render(Component);
expect(wrapper.find("select").length).toEqual(1);
expect(wrapper.find("option").length).toEqual(3);
expect(wrapper.find("select").prop('required')).toEqual(true);
});

it("default=false renders no extra field", () => {
const schema = {
title: "A schema",
properties: {
choice: {
default: false,
type: "string",
enum: ["foo", "bar"]
}
}
};

const Component = (
<FormFrame>
<Liform schema={schema} />
</FormFrame>
);

const wrapper = render(Component);
expect(wrapper.find("select").length).toEqual(1);
expect(wrapper.find("option").length).toEqual(2);
Expand Down
3 changes: 1 addition & 2 deletions src/themes/bootstrap3/ChoiceWidget.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ const renderSelect = field => {
required={field.required}
multiple={field.multiple}
>
{!field.required &&
!field.multiple && (
{false !== field.placeholder && (
<option key={""} value={""}>
{field.placeholder}
</option>
Expand Down
2 changes: 1 addition & 1 deletion src/themes/bootstrap3/DateSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const DateSelector = props => {
id={"props-" + props.name}
required={props.required}
>
{!props.required && (
{props.emptyOption && (
<option key={""} value={""}>
{props.emptyOption}
</option>
Expand Down