From ca1e213efdac38ed8c548789e6363c7d5f72e925 Mon Sep 17 00:00:00 2001
From: raunofreiberg <freiberggg@gmail.com>
Date: Fri, 10 Aug 2018 14:18:24 +0300
Subject: [PATCH 1/2] Provide component reference if possible in
 ReactDOMFiberTextarea.js warning

---
 packages/react-dom/src/__tests__/ReactDOMTextarea-test.js | 3 ++-
 packages/react-dom/src/client/ReactDOMFiberTextarea.js    | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index fa5d717974aae..c14e0e8917163 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -404,7 +404,8 @@ describe('ReactDOMTextarea', () => {
         <textarea value="foo" defaultValue="bar" readOnly={true} />,
       ),
     ).toWarnDev(
-      'Textarea elements must be either controlled or uncontrolled ' +
+      'A component contains an textarea with both value and defaultValue props. ' +
+        'Textarea elements must be either controlled or uncontrolled ' +
         '(specify either the value prop, or the defaultValue prop, but not ' +
         'both). Decide between using a controlled or uncontrolled textarea ' +
         'and remove one of these props. More info: ' +
diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
index b891872653e66..893a6824ce080 100644
--- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js
+++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
@@ -11,6 +11,7 @@ import invariant from 'shared/invariant';
 import warning from 'shared/warning';
 
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
+import {getCurrentFiberOwnerNameInDevOrNull} from 'react-reconciler/src/ReactCurrentFiber';
 
 let didWarnValDefaultVal = false;
 
@@ -70,11 +71,13 @@ export function initWrapperState(element: Element, props: Object) {
     ) {
       warning(
         false,
-        'Textarea elements must be either controlled or uncontrolled ' +
+        '%s contains an textarea with both value and defaultValue props. ' +
+          'Textarea elements must be either controlled or uncontrolled ' +
           '(specify either the value prop, or the defaultValue prop, but not ' +
           'both). Decide between using a controlled or uncontrolled textarea ' +
           'and remove one of these props. More info: ' +
           'https://fb.me/react-controlled-components',
+        getCurrentFiberOwnerNameInDevOrNull() || 'A component',
       );
       didWarnValDefaultVal = true;
     }

From 84db93ece21d3bb11cf6169fb9426f234b9185f1 Mon Sep 17 00:00:00 2001
From: raunofreiberg <freiberggg@gmail.com>
Date: Fri, 10 Aug 2018 16:11:27 +0300
Subject: [PATCH 2/2] Nits

---
 .../src/__tests__/ReactDOMTextarea-test.js          | 13 ++++++-------
 .../react-dom/src/client/ReactDOMFiberTextarea.js   |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index c14e0e8917163..b2872d92b503f 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -399,12 +399,13 @@ describe('ReactDOMTextarea', () => {
   });
 
   it('should warn if value and defaultValue are specified', () => {
+    const InvalidComponent = () => (
+      <textarea value="foo" defaultValue="bar" readOnly={true} />
+    );
     expect(() =>
-      ReactTestUtils.renderIntoDocument(
-        <textarea value="foo" defaultValue="bar" readOnly={true} />,
-      ),
+      ReactTestUtils.renderIntoDocument(<InvalidComponent />),
     ).toWarnDev(
-      'A component contains an textarea with both value and defaultValue props. ' +
+      'InvalidComponent contains a textarea with both value and defaultValue props. ' +
         'Textarea elements must be either controlled or uncontrolled ' +
         '(specify either the value prop, or the defaultValue prop, but not ' +
         'both). Decide between using a controlled or uncontrolled textarea ' +
@@ -413,9 +414,7 @@ describe('ReactDOMTextarea', () => {
     );
 
     // No additional warnings are expected
-    ReactTestUtils.renderIntoDocument(
-      <textarea value="foo" defaultValue="bar" readOnly={true} />,
-    );
+    ReactTestUtils.renderIntoDocument(<InvalidComponent />);
   });
 
   it('should not warn about missing onChange in uncontrolled textareas', () => {
diff --git a/packages/react-dom/src/client/ReactDOMFiberTextarea.js b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
index 893a6824ce080..ce6e0f7f0cb3b 100644
--- a/packages/react-dom/src/client/ReactDOMFiberTextarea.js
+++ b/packages/react-dom/src/client/ReactDOMFiberTextarea.js
@@ -71,7 +71,7 @@ export function initWrapperState(element: Element, props: Object) {
     ) {
       warning(
         false,
-        '%s contains an textarea with both value and defaultValue props. ' +
+        '%s contains a textarea with both value and defaultValue props. ' +
           'Textarea elements must be either controlled or uncontrolled ' +
           '(specify either the value prop, or the defaultValue prop, but not ' +
           'both). Decide between using a controlled or uncontrolled textarea ' +