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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Added

- List values in `enum` attribute on `useRadio`

## [0.2.0] - 2021-08-03

## [0.2.0-beta.13] - 2020-03-26
Expand Down
5 changes: 5 additions & 0 deletions src/hooks/__mocks__/mockSchema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ const mockSchema = {
maximum: 6,
multipleOf: 2,
},
integerEnumTest: {
type: 'integer',
title: 'test-useSelectIntegerEnum',
enum: [0, 1, 2, 3, 5, 7, 11, 13],
},
numberTest: {
type: 'number',
title: 'test-useSelectNumber',
Expand Down
17 changes: 17 additions & 0 deletions src/hooks/__tests__/useRadio.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,20 @@ test('should raise error', async () => {

await wait(() => expect(getByText('This is an error!')).toBeDefined())
})

test('should integer enum values', () => {
const { getByText } = render(
<FormContext schema={mockRadioSchema}>
<MockRadio pointer="#/properties/integerEnumTest" />
</FormContext>
)

expect(getByText('0')).toBeDefined()
expect(getByText('1')).toBeDefined()
expect(getByText('2')).toBeDefined()
expect(getByText('3')).toBeDefined()
expect(getByText('5')).toBeDefined()
expect(getByText('7')).toBeDefined()
expect(getByText('11')).toBeDefined()
expect(getByText('13')).toBeDefined()
})
20 changes: 12 additions & 8 deletions src/hooks/useRadio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,20 @@ export const getRadioCustomFields = (
currentObject.type === 'number' ||
currentObject.type === 'integer'
) {
const stepAndDecimalPlaces = getNumberStep(currentObject)
step = stepAndDecimalPlaces[0]
decimalPlaces = stepAndDecimalPlaces[1]
if (currentObject.enum) {
items = getEnumAsStringArray(currentObject)
} else {
const stepAndDecimalPlaces = getNumberStep(currentObject)
step = stepAndDecimalPlaces[0]
decimalPlaces = stepAndDecimalPlaces[1]

minimum = getNumberMinimum(currentObject)
maximum = getNumberMaximum(currentObject)
minimum = getNumberMinimum(currentObject)
maximum = getNumberMaximum(currentObject)

if (minimum !== undefined && maximum !== undefined && step != 'any') {
for (let i = minimum; i <= maximum; i += step) {
items.push(toFixed(i, decimalPlaces ? decimalPlaces : 0))
if (minimum !== undefined && maximum !== undefined && step != 'any') {
for (let i = minimum; i <= maximum; i += step) {
items.push(toFixed(i, decimalPlaces ? decimalPlaces : 0))
}
}
}
} else if (currentObject.type === 'boolean') {
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/validators/getEnum.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { JSONSchemaType, JSONSchemaBaseInstanceTypes } from '../../JSONSchema'

const mapEnumItemsToString = (obj: JSONSchemaBaseInstanceTypes): string => {
if (obj) {
if (obj !== null && obj !== undefined) {
return obj.toString()
}
return ''
Expand Down