List values in enum attribute on useRadio

Author: eitoball

src/hooks/__mocks__/mockSchema.ts

@@ -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',

src/hooks/__tests__/useRadio.test.tsx

@@ -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()
+})

src/hooks/useRadio.ts

@@ -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') {

src/hooks/validators/getEnum.ts

@@ -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 ''