From c8a4951bcf8fb80ea0f5f3735c707052acfbb70f Mon Sep 17 00:00:00 2001
From: Evan Purkhiser <evanpurkhiser@gmail.com>
Date: Fri, 27 Jul 2018 15:19:59 -0700
Subject: [PATCH 1/2] fix(forms): Correct ref and prop passing for textareas

---
 .../components/forms/controls/textarea.jsx    | 70 ++++++-------------
 1 file changed, 20 insertions(+), 50 deletions(-)

diff --git a/src/sentry/static/sentry/app/views/settings/components/forms/controls/textarea.jsx b/src/sentry/static/sentry/app/views/settings/components/forms/controls/textarea.jsx
index 1d03658c25d095..6d0ee6db49a1e4 100644
--- a/src/sentry/static/sentry/app/views/settings/components/forms/controls/textarea.jsx
+++ b/src/sentry/static/sentry/app/views/settings/components/forms/controls/textarea.jsx
@@ -2,59 +2,29 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import TextareaAutosize from 'react-autosize-textarea';
 import styled from 'react-emotion';
+import isPropValid from '@emotion/is-prop-valid';
 
 import {inputStyles} from 'app/styles/input';
 
-class TextareaOrAutosize extends React.Component {
-  static propTypes = {
-    /**
-     * Enable autosizing of the textarea.
-     */
-    autosize: PropTypes.bool,
-
-    /**
-     * Number of rows to start with if autosize
-     */
-    rows: PropTypes.number,
-
-    innerRef: PropTypes.func,
-  };
-
-  render() {
-    let {
-      autosize,
-      rows,
-      innerRef,
-      highlighted, // eslint-disable-line
-      stacked, // eslint-disable-line
-      inline, // eslint-disable-line
-      field, // eslint-disable-line
-      multiline, // eslint-disable-line
-      getValue, // eslint-disable-line
-      setValue, // eslint-disable-line
-      error, // eslint-disable-line
-      initialData, // eslint-disable-line
-      getData, // eslint-disable-line
-      extraHelp, // eslint-disable-line
-      ...props
-    } = this.props;
-
-    if (autosize) {
-      return (
-        <TextareaAutosize
-          rows={rows ? rows : 2}
-          async={true}
-          innerRef={innerRef}
-          {...props}
-        />
-      );
-    }
-
-    return <textarea {...props} ref={innerRef} />;
-  }
-}
-
-const TextArea = styled(TextareaOrAutosize)`
+const TextAreaControl = React.forwardRef(
+  ({autosize, ...p}, ref) =>
+    autosize ? (
+      <TextareaAutosize async innerRef={ref} rows={p.rows ? p.rows : 2} {...p} />
+    ) : (
+      <textarea ref={ref} {...p} />
+    )
+);
+
+TextAreaControl.propTypes = {
+  /**
+   * Enable autosizing of the textarea.
+   */
+  autosize: PropTypes.bool,
+};
+
+const propFilter = p => ['autosize', 'rows', 'maxRows'].includes(p) || isPropValid(p);
+
+const TextArea = styled(TextAreaControl, {shouldForwardProp: propFilter})`
   ${inputStyles};
 `;
 

From 0696d78a4609cb10b8ce7fcb7e5a69975c36cee3 Mon Sep 17 00:00:00 2001
From: Evan Purkhiser <evanpurkhiser@gmail.com>
Date: Thu, 30 Aug 2018 15:21:14 -0700
Subject: [PATCH 2/2] rows from props

---
 .../app/views/settings/components/forms/controls/textarea.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sentry/static/sentry/app/views/settings/components/forms/controls/textarea.jsx b/src/sentry/static/sentry/app/views/settings/components/forms/controls/textarea.jsx
index 6d0ee6db49a1e4..24226312f9f20e 100644
--- a/src/sentry/static/sentry/app/views/settings/components/forms/controls/textarea.jsx
+++ b/src/sentry/static/sentry/app/views/settings/components/forms/controls/textarea.jsx
@@ -7,9 +7,9 @@ import isPropValid from '@emotion/is-prop-valid';
 import {inputStyles} from 'app/styles/input';
 
 const TextAreaControl = React.forwardRef(
-  ({autosize, ...p}, ref) =>
+  ({autosize, rows, ...p}, ref) =>
     autosize ? (
-      <TextareaAutosize async innerRef={ref} rows={p.rows ? p.rows : 2} {...p} />
+      <TextareaAutosize async innerRef={ref} rows={rows ? rows : 2} {...p} />
     ) : (
       <textarea ref={ref} {...p} />
     )