Skip to content
New issue

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

#

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

Already on GitHub? # to your account

fix choice and date selector default value #56

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

fix choice and date selector default value #56

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
c990ca3
fix choice and date selector default value
4rthem Jun 13, 2019
94edda2
fix choice test
4rthem Jun 13, 2019
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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