improve examples

rjsf-team · Jul 19, 2018 · b0f7f63 · b0f7f63
1 parent 9e16801
commit b0f7f63
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 49 deletions.
diff --git a/playground/samples/anyOf.js b/playground/samples/anyOf.js
@@ -1,55 +1,71 @@
 module.exports = {
   schema: {
-    "title": "Any of",
-    "type": "object",
-    "properties": {
-      "List of widgets": {
-        "type": "array",
-        "items": {
-          "anyOf": [
-            {
-              "title": "string",
-              "type": "string",
-              "default": ""
+    type: 'object',
+    definitions: {
+      option: {
+        type: 'object',
+        required: ['label', 'value'],
+        properties: {
+          label: {
+            type: 'string',
+          },
+          value: {
+            type: 'string',
+          },
+        },
+        default: { label: '', value: '' }
+      },
+      optGroup: {
+        type: 'object',
+        required: ['label', 'items'],
+        properties: {
+          label: {
+            type: 'string',
+          },
+          items: {
+            type: 'array',
+            items: {
+              $ref: '#/definitions/option',
             },
+          },
+        },
+        default: {
+          label: '',
+          items: [],
+        },
+      },
+    },
+    properties: {
+      options: {
+        type: 'array',
+        title: 'Options',
+        items: {
+          anyOf: [
             {
-              "title": "integer",
-              "type": "integer",
-              "default": 0
+              $ref: '#/definitions/option',
+              title: 'option',
             },
             {
-              "title": "array",
-              "type": "array",
-              "items": {
-                "anyOf": [
-                  {
-                    "title": "string",
-                    "type": "string",
-                    "default": ""
-                  },
-                  {
-                    "title": "integer",
-                    "type": "integer",
-                    "default": 0
-                  }
-                ]
-              },
-              "default": [""],
-            }
-          ]
-        }
-      }
-    }
+              $ref: '#/definitions/optGroup',
+              title: 'optGroup',
+            },
+          ],
+        },
+      },
+    },
   },
   uiSchema: {},
   formData: {
-    "List of widgets": [
-      27,
-      "Batman",
-      [
-        "Bruce",
-        "Wayne"
-      ]
+    options: [
+      { label: 'car', value: 'car' },
+      { label: 'house', value: 'house' },
+      {
+        label: 'fruit',
+        items: [
+          { label: 'apple', value: 'apple' },
+          { label: 'banana', value: 'banana' },
+        ],
+      },
     ]
-  }
+  },
 };
diff --git a/src/components/fields/ArrayField.js b/src/components/fields/ArrayField.js
@@ -22,17 +22,17 @@ function resolveSchemaRecursively(schema, definitions) {
   let unwrappedSchema = schema;
   if (schema.$ref) {
     unwrappedSchema = retrieveSchema(schema, definitions);
+  } else if (schema.anyOf) {
+    unwrappedSchema.anyOf.forEach((ele, index) => {
+      unwrappedSchema.anyOf[index] = resolveSchemaRecursively(unwrappedSchema.anyOf[index], definitions);
+    });
   }
 
   if (unwrappedSchema.properties) {
     Object.keys(unwrappedSchema.properties).forEach(p => {
       const prop = unwrappedSchema.properties[p];
       if (prop.type === "array") {
-        if (prop.items.anyOf) {
-          prop.items.anyOf.forEach((ele, index) => {
-            prop.items.anyOf[index] = resolveSchemaRecursively(prop.items[index], definitions);
-          });
-        } else if (prop.items.$ref) {
+        if (prop.items.anyOf || prop.items.$ref) {
           prop.items = resolveSchemaRecursively(prop.items, definitions);
         }
         // else: do nothing since there is no other type pointer