From 5f5b235429f8dd9e32c647c12f9d31c776289787 Mon Sep 17 00:00:00 2001
From: nessunkim <nessunkim@gmail.com>
Date: Wed, 25 Jan 2017 01:50:51 +0900
Subject: [PATCH 1/5] Add support for rows attribute of textarea widget

---
 README.md                                | 13 +++++++++++++
 playground/samples/widgets.js            |  3 ++-
 src/components/widgets/TextareaWidget.js |  8 +++++++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f4cb9bfc20..bd49b74c54 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,7 @@ A [live playground](https://mozilla-services.github.io/react-jsonschema-form/) i
      - [Form action buttons](#form-action-buttons)
      - [Help texts](#help-texts)
      - [Auto focus](#auto-focus)
+     - [Textarea rows](#textarea-rows)
      - [Placeholders](#placeholders)
      - [Form attributes](#form-attributes)
   - [Advanced customization](#advanced-customization)
@@ -641,6 +642,18 @@ const uiSchema = {
 }
 ```
 
+### Textarea rows
+
+You can set initial height of a textarea widget by specifying a `ui:rows` uiSchema directive.
+
+```js
+const schema = {type: "string"};
+const uiSchema = {
+  "ui:widget": "textarea",
+  "ui:rows": 15
+}
+```
+
 ### Placeholders
 
 Text fields can benefit from placeholders by using the `ui:placeholder` uiSchema directive:
diff --git a/playground/samples/widgets.js b/playground/samples/widgets.js
index a918205985..a013af8bda 100644
--- a/playground/samples/widgets.js
+++ b/playground/samples/widgets.js
@@ -95,7 +95,8 @@ module.exports = {
     },
     string: {
       textarea: {
-        "ui:widget": "textarea"
+        "ui:widget": "textarea",
+        "ui:rows": 5
       },
       color: {
         "ui:widget": "color"
diff --git a/src/components/widgets/TextareaWidget.js b/src/components/widgets/TextareaWidget.js
index 70aa3d9f40..88ac2c6456 100644
--- a/src/components/widgets/TextareaWidget.js
+++ b/src/components/widgets/TextareaWidget.js
@@ -4,6 +4,7 @@ import React, {PropTypes} from "react";
 function TextareaWidget({
   schema,
   id,
+  options,
   placeholder,
   value,
   required,
@@ -15,7 +16,7 @@ function TextareaWidget({
 }) {
   const _onChange = ({target: {value}}) => {
     return onChange(value === "" ? undefined : value);
-  };  
+  };
   return (
     <textarea
       id={id}
@@ -26,6 +27,7 @@ function TextareaWidget({
       disabled={disabled}
       readOnly={readonly}
       autoFocus={autofocus}
+      rows={options.rows}
       onBlur={onBlur && (event => onBlur(id, event.target.value))}
       onChange={_onChange} />
   );
@@ -40,6 +42,10 @@ if (process.env.NODE_ENV !== "production") {
     schema: PropTypes.object.isRequired,
     id: PropTypes.string.isRequired,
     placeholder: PropTypes.string,
+    options: PropTypes.shape({
+      enumOptions: PropTypes.bool,
+      rows: PropTypes.number
+    }).isRequired,
     value: PropTypes.string,
     required: PropTypes.bool,
     autofocus: PropTypes.bool,

From 4c568a331048df1d4a6b428ff2f57070007f6f76 Mon Sep 17 00:00:00 2001
From: nessunkim <nessunkim@gmail.com>
Date: Wed, 25 Jan 2017 02:19:23 +0900
Subject: [PATCH 2/5] add test for textarea

---
 test/StringField_test.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/StringField_test.js b/test/StringField_test.js
index 1dac260406..dc7f7b9f2d 100644
--- a/test/StringField_test.js
+++ b/test/StringField_test.js
@@ -89,7 +89,7 @@ describe("StringField", () => {
 
       expect(onBlur.calledWith(input.id, "yo")).to.be.true;
     });
-    
+
     it("should handle an empty string change event", () => {
       const {comp, node} = createFormComponent({
         schema: {type: "string"},
@@ -243,6 +243,16 @@ describe("StringField", () => {
 
       expect(comp.state.formData).eql(undefined);
     });
+
+    it("should render a textarea field with rows", () => {
+      const {node} = createFormComponent({
+        schema: {type: "string"},
+        uiSchema: {"ui:widget": "textarea", "ui:rows": 20},
+        formData: "x",
+      });
+
+      expect(node.querySelector("textarea").getAttribute("rows")).eql("20");
+    });
   });
 
   describe("DateTimeWidget", () => {

From 54922827e79b17cd03b47bf53260aac696b24b89 Mon Sep 17 00:00:00 2001
From: nessunkim <nessunkim@gmail.com>
Date: Mon, 30 Jan 2017 18:36:02 +0900
Subject: [PATCH 3/5] update defaultProps

---
 src/components/widgets/TextareaWidget.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/widgets/TextareaWidget.js b/src/components/widgets/TextareaWidget.js
index 88ac2c6456..7c9aa200e6 100644
--- a/src/components/widgets/TextareaWidget.js
+++ b/src/components/widgets/TextareaWidget.js
@@ -29,12 +29,13 @@ function TextareaWidget({
       autoFocus={autofocus}
       rows={options.rows}
       onBlur={onBlur && (event => onBlur(id, event.target.value))}
-      onChange={_onChange} />
+      onChange={_onChange}/>
   );
 }
 
 TextareaWidget.defaultProps = {
-  autofocus: false
+  autofocus: false,
+  options: {}
 };
 
 if (process.env.NODE_ENV !== "production") {
@@ -43,9 +44,8 @@ if (process.env.NODE_ENV !== "production") {
     id: PropTypes.string.isRequired,
     placeholder: PropTypes.string,
     options: PropTypes.shape({
-      enumOptions: PropTypes.bool,
       rows: PropTypes.number
-    }).isRequired,
+    }),
     value: PropTypes.string,
     required: PropTypes.bool,
     autofocus: PropTypes.bool,

From ccaa5bda318a5f957cf10237ce8493d73e2b2624 Mon Sep 17 00:00:00 2001
From: nessunkim <nessunkim@gmail.com>
Date: Thu, 23 Feb 2017 17:30:47 +0900
Subject: [PATCH 4/5] use rows option in ui:options instead of ui:rows

---
 README.md                     | 10 ++++++----
 playground/samples/widgets.js |  4 +++-
 test/StringField_test.js      |  5 ++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index bd49b74c54..859104c90e 100644
--- a/README.md
+++ b/README.md
@@ -642,15 +642,17 @@ const uiSchema = {
 }
 ```
 
-### Textarea rows
+### Textarea `rows` option
 
-You can set initial height of a textarea widget by specifying a `ui:rows` uiSchema directive.
+You can set initial height of a textarea widget by specifying `rows` option.
 
 ```js
 const schema = {type: "string"};
 const uiSchema = {
   "ui:widget": "textarea",
-  "ui:rows": 15
+  "ui:options": {
+    rows: 15
+  }
 }
 ```
 
@@ -1198,7 +1200,7 @@ render((
 
 ### Custom error messages
 
-Validation error messages are provided by the JSON Schema validation by default. If you need to change these messages or make any other modifications to the errors from the JSON Schema validation, you can define a transform function that receives the list of JSON Schema errors and returns a new list. 
+Validation error messages are provided by the JSON Schema validation by default. If you need to change these messages or make any other modifications to the errors from the JSON Schema validation, you can define a transform function that receives the list of JSON Schema errors and returns a new list.
 
 ```js
 function transformErrors(errors) {
diff --git a/playground/samples/widgets.js b/playground/samples/widgets.js
index a013af8bda..cca38b1f05 100644
--- a/playground/samples/widgets.js
+++ b/playground/samples/widgets.js
@@ -96,7 +96,9 @@ module.exports = {
     string: {
       textarea: {
         "ui:widget": "textarea",
-        "ui:rows": 5
+        "ui:options": {
+          rows: 5
+        }
       },
       color: {
         "ui:widget": "color"
diff --git a/test/StringField_test.js b/test/StringField_test.js
index dc7f7b9f2d..835e89edd5 100644
--- a/test/StringField_test.js
+++ b/test/StringField_test.js
@@ -247,7 +247,10 @@ describe("StringField", () => {
     it("should render a textarea field with rows", () => {
       const {node} = createFormComponent({
         schema: {type: "string"},
-        uiSchema: {"ui:widget": "textarea", "ui:rows": 20},
+        uiSchema: {
+          "ui:widget": "textarea",
+          "ui:options": {rows: 20}
+        },
         formData: "x",
       });
 

From 9ae69a808a897cddad6913d75346511ba419704e Mon Sep 17 00:00:00 2001
From: nessunkim <nessunkim@gmail.com>
Date: Thu, 23 Feb 2017 17:36:19 +0900
Subject: [PATCH 5/5] fix readme link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 859104c90e..761e1b498b 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ A [live playground](https://mozilla-services.github.io/react-jsonschema-form/) i
      - [Form action buttons](#form-action-buttons)
      - [Help texts](#help-texts)
      - [Auto focus](#auto-focus)
-     - [Textarea rows](#textarea-rows)
+     - [Textarea rows option](#textarea-rows-option)
      - [Placeholders](#placeholders)
      - [Form attributes](#form-attributes)
   - [Advanced customization](#advanced-customization)