Commit 7302f61

committed

fix titles for checkboxes and input[type=number]

1 parent 727705b commit 7302f61Copy full SHA for 7302f61

File tree

3 files changed

+37

-12

lines changed

elm.json
src/Json/Schema/Form
- Fields.elm
tests
- FieldsTest.elm

3 files changed

+37

-12

lines changed

`‎elm.json`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`"elm/html": "1.0.0 <= v < 2.0.0",`
`18`	`18`	`"elm/json": "1.1.2 <= v < 2.0.0",`
`19`	`19`	`"elm/regex": "1.0.0 <= v < 2.0.0",`
	`20`	`+ "elm-community/html-extra": "3.4.0 <= v < 4.0.0",`
`20`	`21`	`"elmcraft/core-extra": "2.0.0 <= v < 3.0.0",`
`21`	`22`	`"json-tools/json-schema": "1.0.2 <= v < 2.0.0",`
`22`	`23`	`"kutyel/elm-form": "1.0.0 <= v < 2.0.0",`

`‎src/Json/Schema/Form/Fields.elm`

Lines changed: 12 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ import Html.Attributes`
`19`	`19`	`, tabindex`
`20`	`20`	`, type_`
`21`	`21`	`)`
	`22`	`+import Html.Attributes.Extra as Attr`
`22`	`23`	`import Html.Events exposing (preventDefaultOn)`
`23`	`24`	`import Html.Keyed`
`24`	`25`	`import Json.Decode`
`@@ -97,24 +98,24 @@ fieldView options path schema type_ form =`
`97`	`98`	`select options path schema (getFieldAsString path form)`
`98`	`99`
`99`	`100`	`else`
`100`		`- txt options path schema (getFieldAsString path form)`
	`101`	`+ txt options path schema (getFieldAsString path form){ isNumber =True}`
`101`	`102`
`102`	`103`	`NumberType ->`
`103`	`104`	`if schema.oneOf /= Nothing \|\| schema.anyOf /= Nothing then`
`104`	`105`	`select options path schema (getFieldAsString path form)`
`105`	`106`
`106`	`107`	`else`
`107`		`- txt options path schema (getFieldAsString path form)`
	`108`	`+ txt options path schema (getFieldAsString path form){ isNumber =True}`
`108`	`109`
`109`	`110`	`StringType ->`
`110`	`111`	`if schema.oneOf /= Nothing \|\| schema.anyOf /= Nothing then`
`111`	`112`	`select options path schema (getFieldAsString path form)`
`112`	`113`
`113`	`114`	`else`
`114`		`- txt options path schema (getFieldAsString path form)`
	`115`	`+ txt options path schema (getFieldAsString path form){ isNumber =False}`
`115`	`116`
`116`	`117`	`BooleanType ->`
`117`		`- checkbox options schema (getFieldAsBool path form)`
	`118`	`+ checkbox options path schema (getFieldAsBool path form)`
`118`	`119`
`119`	`120`	`ArrayType ->`
`120`	`121`	`let`
`@@ -146,8 +147,8 @@ fieldView options path schema type_ form =`
`146`	`147`	`div [] []`
`147`	`148`
`148`	`149`
`149`		`-txt : Options -> Path -> SubSchema -> F.FieldState ErrorValue String -> Html F.Msg`
`150`		`-txt options path schema f =`
	`150`	`+txt : Options -> Path -> SubSchema -> F.FieldState ErrorValue String -> { isNumber : Bool } ->Html F.Msg`
	`151`	`+txt options path schema f { isNumber }=`
`151`	`152`	`let`
`152`	`153`	`format : Format`
`153`	`154`	`format =`
`@@ -180,7 +181,8 @@ txt options path schema f =`
`180`	`181`	`attributes =`
`181`	`182`	`[ classList classes`
`182`	`183`	`, id f.path`
`183`		`- , placeholder (format.placeholder \|> Maybe.withDefault "")`
	`184`	`+ , Attr.attributeIf isNumber <\| attribute "type" "number"`
	`185`	`+ , Attr.attributeMaybe placeholder format.placeholder`
`184`	`186`	`, case format.autocomplete of`
`185`	`187`	`Just "on" ->`
`186`	`188`	`autocomplete True`
`@@ -267,8 +269,8 @@ txt options path schema f =`
`267`	`269`	`]`
`268`	`270`
`269`	`271`
`270`		`-checkbox : Options -> SubSchema -> F.FieldState ErrorValue Bool -> Html F.Msg`
`271`		`-checkbox options schema f =`
	`272`	`+checkbox : Options -> Path->SubSchema -> F.FieldState ErrorValue Bool -> Html F.Msg`
	`273`	`+checkbox options path schema f =`
`272`	`274`	`let`
`273`	`275`	`content : List (Html F.Msg)`
`274`	`276`	`content =`
`@@ -280,7 +282,7 @@ checkbox options schema f =`
`280`	`282`	`]`
`281`	`283`	`, id f.path`
`282`	`284`	`]`
`283`		`- , text (schema.title \|> Maybe.withDefault "")`
	`285`	`+ , fieldTitle schema path \|> Maybe.withDefault(text "")`
`284`	`286`	`]`
`285`	`287`	`]`
`286`	`288`

`‎tests/FieldsTest.elm`

Lines changed: 24 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ singleTypes =`
`151`	`151`	`\_ ->`
`152`	`152`	`buildSchema`
`153`	`153`	`\|> withType "integer"`
`154`		`- \|> isTextField`
	`154`	`+ \|> isInputTypeNumber`
`155`	`155`	`, describe "oneOf"`
`156`	`156`	`[ test "should be a select" <\|`
`157`	`157`	`\_ ->`
`@@ -172,7 +172,7 @@ singleTypes =`
`172`	`172`	`\_ ->`
`173`	`173`	`buildSchema`
`174`	`174`	`\|> withType "number"`
`175`		`- \|> isTextField`
	`175`	`+ \|> isInputTypeNumber`
`176`	`176`	`, describe "oneOf"`
`177`	`177`	`[ test "should be a select" <\|`
`178`	`178`	`\_ ->`
`@@ -335,6 +335,7 @@ isCheckbox schema =`
`335`	`335`	`\|> withTitle "Test"`
`336`	`336`	`\|> Expect.all`
`337`	`337`	`[ isField`
	`338`	`+ , hasFieldTitle`
`338`	`339`	`, hasFieldDescription`
`339`	`340`	`, view`
`340`	`341`	`(Expect.all`
`@@ -377,6 +378,27 @@ isTextField =`
`377`	`378`	`]`
`378`	`379`
`379`	`380`
	`381`	`+isInputTypeNumber : SchemaBuilder -> Expectation`
	`382`	`+isInputTypeNumber =`
	`383`	`+ Expect.all`
	`384`	`+ [ isField`
	`385`	`+ , hasFieldTitle`
	`386`	`+ , hasFieldDescription`
	`387`	`+ , view`
	`388`	`+ (Expect.all`
	`389`	`+ [ Query.find [ tag "input" ]`
	`390`	`+ >> Query.has`
	`391`	`+ [ attribute`
	`392`	`+ (Html.Attributes.attribute`
	`393`	`+ "type"`
	`394`	`+ "number"`
	`395`	`+ )`
	`396`	`+ ]`
	`397`	`+ ]`
	`398`	`+ )`
	`399`	`+ ]`
	`400`	`+`
	`401`	`+`
`380`	`402`	`isFieldset : SchemaBuilder -> Expectation`
`381`	`403`	`isFieldset schema =`
`382`	`404`	`schema`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 7302f61

File tree

3 files changed

3 files changed

`‎elm.json`

`‎src/Json/Schema/Form/Fields.elm`

`‎tests/FieldsTest.elm`

0 commit comments