Fix: A SelectField made of numbers don't pass on validation (#116)

* Fix number SelectField * Fix example
aerogear · Dec 22, 2022 · 95f78e4 · 95f78e4
1 parent bb4624b
commit 95f78e4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 3 deletions.
diff --git a/__tests__/SelectField.tsx b/__tests__/SelectField.tsx
@@ -252,6 +252,20 @@ test('<SelectField> - renders a label', () => {
   );
 });
 
+test('<SelectField> - renders a number label', () => {
+  const element = <SelectField required={true} name="x" label={1} />;
+  const wrapper = mount(
+    element,
+    createContext({ x: { type: Number, allowedValues: [1, 2] } }),
+  );
+
+  expect(wrapper.find('label')).toHaveLength(1);
+  expect(wrapper.find('label').text()).toBe('1 *');
+  expect(wrapper.find('label').prop('htmlFor')).toBe(
+    wrapper.find(Select).prop('id'),
+  );
+});
+
 test('<SelectField> - renders a wrapper with unknown props', () => {
   const element = <SelectField name="x" data-x="x" data-y="y" data-z="z" />;
   const wrapper = mount(

diff --git a/examples/App.js b/examples/App.js
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { AutoForm } from 'uniforms-patternfly';
+import { AutoForm } from 'uniforms-patternfly/dist/es6';
 
 import { CodeBlock } from './CodeBlock';
 import schema from './schema/json-schema';

diff --git a/examples/package.json b/examples/package.json
@@ -19,7 +19,7 @@
     "uniforms-bridge-json-schema": "3.5.1",
     "uniforms-bridge-simple-schema": "3.5.1",
     "uniforms-bridge-simple-schema-2": "3.5.1",
-    "uniforms-patternfly": "4.7.5"
+    "uniforms-patternfly": "4.7.7"
   },
   "devDependencies": {
     "parcel-bundler": "^1.12.5",

diff --git a/examples/schema/json-schema.js b/examples/schema/json-schema.js
@@ -59,6 +59,11 @@ const schema = {
         },
         room: {
           type: 'string'
+        },
+        numberOfBeds: {
+          placeholder: "Select...",
+          enum: [1, 2, 3],
+          type: 'number'
         }
       },
     }

diff --git a/src/SelectField.tsx b/src/SelectField.tsx
@@ -62,7 +62,9 @@ type SelectInputProps = FieldProps<
 function isSelectOptionObject(
   toBeDetermined: string | SelectOptionObject
 ): toBeDetermined is SelectOptionObject {
-  return toBeDetermined.toString !== undefined;
+  return typeof toBeDetermined === 'object' &&
+    !Array.isArray(toBeDetermined) &&
+    toBeDetermined !== null
 }
 
 export type SelectFieldProps = CheckboxesProps | SelectInputProps;