Merge branch 'master' into supportOneOf

Author: fbessou

README.md

@@ -45,6 +45,8 @@ A [live playground](https://mozilla-services.github.io/react-jsonschema-form/) i
      - [Autogenerated widget ids](#autogenerated-widget-ids)
      - [Form action buttons](#form-action-buttons)
      - [Help texts](#help-texts)
+     - [Title texts](#title-texts)
+     - [Description texts](#description-texts)
      - [Auto focus](#auto-focus)
      - [Textarea rows option](#textarea-rows-option)
      - [Placeholders](#placeholders)
@@ -640,6 +642,30 @@ const uiSchema = {
 
 Help texts work for any kind of field at any level, and will always be rendered immediately below the field component widget(s), but after contextualized errors, if any.
 
+### Title texts
+
+Sometimes it's convenient to change title a field; this is the purpose of the `ui:title` uiSchema directive:
+
+```js
+const schema = {type: "string"};
+const uiSchema = {
+  "ui:widget": "password",
+  "ui:title": "Your password"
+};
+```
+
+### Description texts
+
+Sometimes it's convenient to change description a field; this is the purpose of the `ui:description` uiSchema directive:
+
+```js
+const schema = {type: "string"};
+const uiSchema = {
+  "ui:widget": "password",
+  "ui:description": "The best password"
+};
+```
+
 ### Auto focus
 
 If you want to focus on a text input or textarea input/on a widget automatically, just set `ui:autofocus` uiSchema directive to `true`.

playground/samples/simple.js

@@ -40,6 +40,8 @@ module.exports = {
     },
     age: {
       "ui:widget": "updown",
+      "ui:title": "Age of person",
+      "ui:description": "(earthian year)",
     },
     bio: {
       "ui:widget": "textarea",

src/components/fields/SchemaField.js

@@ -193,8 +193,12 @@ function SchemaFieldRender(props) {
 
   const { type } = schema;
   const id = idSchema.$id;
-  const label = props.schema.title || schema.title || name;
-  const description = props.schema.description || schema.description;
+  const label =
+    uiSchema["ui:title"] || props.schema.title || schema.title || name;
+  const description =
+    uiSchema["ui:description"] ||
+    props.schema.description ||
+    schema.description;
   const errors = __errors;
   const help = uiSchema["ui:help"];
   const hidden = uiSchema["ui:widget"] === "hidden";

src/utils.js

@@ -128,7 +128,7 @@ function computeDefaults(schema, parentDefaults, definitions = {}) {
   switch (schema.type) {
     // We need to recur for object schema inner default values.
     case "object":
-      return Object.keys(schema.properties).reduce((acc, key) => {
+      return Object.keys(schema.properties || {}).reduce((acc, key) => {
         // Compute the defaults for this node, with the parent defaults we might
         // have from a previous run: defaults[key].
         acc[key] = computeDefaults(
@@ -304,21 +304,21 @@ export function isSelect(_schema, definitions = {}) {
   }
   return false;
 }
-
+  
 export function isMultiSelect(schema, definitions = {}) {
   const itemsSchema = retrieveSchema(schema.items, definitions);
-  if (!schema.uniqueItems) {
-    return false;
-  } else {
-    return isSelect(itemsSchema);
-  }
+  return schema.items
+    ? schema.uniqueItems && isSelect(itemsSchema, definitions)
+    : false;
 }
+
 export function isFilesArray(schema, uiSchema, definitions = {}) {
-  const itemsSchema = retrieveSchema(schema.items, definitions);
-  return (
-    (itemsSchema.type === "string" && itemsSchema.format === "data-url") ||
-    uiSchema["ui:widget"] === "files"
-  );
+  if (uiSchema["ui:widget"] === "files") {
+    return true;
+  } else if (schema.items) {
+    const itemsSchema = retrieveSchema(schema.items, definitions);
+    return (itemsSchema.type === "string" && itemsSchema.format === "data-url")
+  }
 }
 
 export function isFixedItems(schema) {

test/uiSchema_test.js

@@ -355,6 +355,28 @@ describe("uiSchema", () => {
     });
   });
 
+  describe("ui:title", () => {
+    it("should render the provided title text", () => {
+      const schema = { type: "string" };
+      const uiSchema = { "ui:title": "plop" };
+
+      const { node } = createFormComponent({ schema, uiSchema });
+
+      expect(node.querySelector("label.control-label").textContent).eql("plop");
+    });
+  });
+
+  describe("ui:description", () => {
+    it("should render the provided description text", () => {
+      const schema = { type: "string" };
+      const uiSchema = { "ui:description": "plop" };
+
+      const { node } = createFormComponent({ schema, uiSchema });
+
+      expect(node.querySelector("p.field-description").textContent).eql("plop");
+    });
+  });
+
   it("should accept a react element as help", () => {
     const schema = { type: "string" };
     const uiSchema = { "ui:help": <b>plop</b> };

test/utils_test.js

@@ -7,6 +7,7 @@ import {
   getDefaultFormState,
   isConstant,
   toConstant,
+  isFilesArray,
   isMultiSelect,
   mergeObjects,
   pad,
@@ -45,6 +46,14 @@ describe("utils", () => {
         ).to.eql({ string: "foo" });
       });
 
+      it("should default to empty object if no properties are defined", () => {
+        expect(
+          getDefaultFormState({
+            type: "object",
+          })
+        ).to.eql({});
+      });
+
       it("should recursively map schema object default to form state", () => {
         expect(
           getDefaultFormState({
@@ -305,6 +314,7 @@ describe("utils", () => {
     });
   });
 
+
   describe("isMultiSelect()", () => {
     describe("uniqueItems is true", () => {
       describe("schema items enum is an array", () => {
@@ -348,16 +358,35 @@ describe("utils", () => {
         const definitions = { FooItem: { type: "string", enum: ["foo"] } };
         expect(isMultiSelect(schema, definitions)).to.be.true;
       });
+
+      it("should be false if items is undefined", () => {
+        const schema = {};
+        expect(isMultiSelect(schema)).to.be.false;
+      });
     });
 
     describe("uniqueItems is false", () => {
-      it("should be false if uniqueItems is false", () => {
+      it("should be false", () => {
         const schema = { items: { enum: ["foo", "bar"] }, uniqueItems: false };
         expect(isMultiSelect(schema)).to.be.false;
       });
     });
   });
 
+  describe("isFilesArray()", () => {
+    it("should be true if items have data-url format", () => {
+      const schema = { items: { type: "string", format: "data-url" } };
+      const uiSchema = {};
+      expect(isFilesArray(schema, uiSchema)).to.be.true;
+    });
+
+    it("should be false if items is undefined", () => {
+      const schema = {};
+      const uiSchema = {};
+      expect(isFilesArray(schema, uiSchema)).to.be.false;
+    });
+  });
+
   describe("mergeObjects()", () => {
     it("should't mutate the provided objects", () => {
       const obj1 = { a: 1 };