Add support to oneOf/anyOf with constant schemas in StringField

rjsf-team · Jun 12, 2017 · cc6d17d · cc6d17d
1 parent d1a515c
commit cc6d17d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/components/fields/StringField.js b/src/components/fields/StringField.js
@@ -4,6 +4,7 @@ import PropTypes from "prop-types";
 import {
   getWidget,
   getUiOptions,
+  isSelect,
   optionsList,
   getDefaultRegistry,
 } from "../../utils";
@@ -25,7 +26,7 @@ function StringField(props) {
   } = props;
   const { title, format } = schema;
   const { widgets, formContext } = registry;
-  const enumOptions = Array.isArray(schema.enum) && optionsList(schema);
+  const enumOptions = isSelect(schema) && optionsList(schema);
   const defaultWidget = format || (enumOptions ? "select" : "text");
   const { widget = defaultWidget, placeholder = "", ...options } = getUiOptions(
     uiSchema

diff --git a/src/utils.js b/src/utils.js
@@ -299,20 +299,24 @@ export function toConstant(schema) {
   }
 }
 
-export function isMultiSelect(schema, definitions = {}) {
-  if (!schema.uniqueItems || !schema.items) {
-    return false;
-  }
-  const itemsSchema = retrieveSchema(schema.items, definitions);
-  const altSchemas = itemsSchema.oneOf || itemsSchema.anyOf;
-  if (Array.isArray(itemsSchema.enum)) {
+export function isSelect(_schema, definitions = {}) {
+  const schema = retrieveSchema(_schema, definitions);
+  const altSchemas = schema.oneOf || schema.anyOf;
+  if (Array.isArray(schema.enum)) {
     return true;
   } else if (Array.isArray(altSchemas)) {
     return altSchemas.every(altSchemas => isConstant(altSchemas));
   }
   return false;
 }
 
+export function isMultiSelect(schema, definitions = {}) {
+  if (!schema.uniqueItems || !schema.items) {
+    return false;
+  }
+  return isSelect(schema.items, definitions);
+}
+
 export function isFilesArray(schema, uiSchema, definitions = {}) {
   if (uiSchema["ui:widget"] === "files") {
     return true;