Fixes rjsf-team#156: Propagate resolved schema definitions to field c…

…omponents. (rjsf-team#157)
AirHelp · Apr 22, 2016 · 497620f · 497620f
1 parent c94491b
commit 497620f
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/playground/samples/large.js b/playground/samples/large.js
@@ -8,23 +8,26 @@ function largeEnum(n) {
 
 module.exports = {
   schema: {
+    definitions: {
+      largeEnum: {type: "string", enum: largeEnum(100)}
+    },
     title: "A rather large form",
     type: "object",
     properties: {
       string: {
         type: "string",
         title: "Some string",
       },
-      choice1: {type: "string", enum: largeEnum(100)},
-      choice2: {type: "string", enum: largeEnum(100)},
-      choice3: {type: "string", enum: largeEnum(100)},
-      choice4: {type: "string", enum: largeEnum(100)},
-      choice5: {type: "string", enum: largeEnum(100)},
-      choice6: {type: "string", enum: largeEnum(100)},
-      choice7: {type: "string", enum: largeEnum(100)},
-      choice8: {type: "string", enum: largeEnum(100)},
-      choice9: {type: "string", enum: largeEnum(100)},
-      choice10: {type: "string", enum: largeEnum(100)},
+      choice1: {$ref: "#/definitions/largeEnum"},
+      choice2: {$ref: "#/definitions/largeEnum"},
+      choice3: {$ref: "#/definitions/largeEnum"},
+      choice4: {$ref: "#/definitions/largeEnum"},
+      choice5: {$ref: "#/definitions/largeEnum"},
+      choice6: {$ref: "#/definitions/largeEnum"},
+      choice7: {$ref: "#/definitions/largeEnum"},
+      choice8: {$ref: "#/definitions/largeEnum"},
+      choice9: {$ref: "#/definitions/largeEnum"},
+      choice10: {$ref: "#/definitions/largeEnum"},
     }
   },
   uiSchema: {},

diff --git a/src/components/fields/SchemaField.js b/src/components/fields/SchemaField.js
@@ -132,7 +132,7 @@ function SchemaField(props) {
 
   return (
     <Wrapper
-      label={schema.title || name}
+      label={props.schema.title || schema.title || name}
       errorSchema={errorSchema}
       hidden={uiSchema["ui:widget"] === "hidden"}
       help={uiSchema["ui:help"]}
@@ -141,7 +141,7 @@ function SchemaField(props) {
       displayLabel={displayLabel}
       id={idSchema.id}
       classNames={uiSchema.classNames}>
-      <FieldComponent {...props} />
+      <FieldComponent {...props} schema={schema} />
     </Wrapper>
   );
 }

diff --git a/test/Form_test.js b/test/Form_test.js
@@ -230,6 +230,23 @@ describe("Form", () => {
       expect(node.querySelectorAll("input[type=text]"))
         .to.have.length.of(2);
     });
+
+    it("should propagate and handle a resolved schema definition", () => {
+      const schema = {
+        definitions: {
+          enumDef: {type: "string", enum: ["a", "b"]}
+        },
+        type: "object",
+        properties: {
+          name: {$ref: "#/definitions/enumDef"}
+        },
+      };
+
+      const {node} = createFormComponent({schema});
+
+      expect(node.querySelectorAll("option"))
+        .to.have.length.of(2);
+    });
   });
 
   describe("Defaults array items default propagation", () => {