From 258e591e458f5443bf74caaa57562aa50e7ea48a Mon Sep 17 00:00:00 2001
From: Jim <jsproch@fb.com>
Date: Thu, 7 Apr 2016 14:08:03 -0700
Subject: [PATCH] Merge pull request #6341 from borisyankov/master

Add more information to warning 'Input elements must be either controlled or uncontrolled'
(cherry picked from commit 006058daa5e1413bc46bd52f87385a1297101b63)
---
 src/renderers/dom/client/wrappers/ReactDOMInput.js   | 12 ++++++++++--
 .../client/wrappers/__tests__/ReactDOMInput-test.js  |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/renderers/dom/client/wrappers/ReactDOMInput.js b/src/renderers/dom/client/wrappers/ReactDOMInput.js
index 859177f354e9a..d4ce97698e3d0 100644
--- a/src/renderers/dom/client/wrappers/ReactDOMInput.js
+++ b/src/renderers/dom/client/wrappers/ReactDOMInput.js
@@ -92,6 +92,8 @@ var ReactDOMInput = {
         inst._currentElement._owner
       );
 
+      var owner = inst._currentElement._owner;
+
       if (props.valueLink !== undefined && !didWarnValueLink) {
         warning(
           false,
@@ -113,11 +115,14 @@ var ReactDOMInput = {
       ) {
         warning(
           false,
+          '%s contains an input of type %s with both checked and defaultChecked props. ' +
           'Input elements must be either controlled or uncontrolled ' +
           '(specify either the checked prop, or the defaultChecked prop, but not ' +
           'both). Decide between using a controlled or uncontrolled input ' +
           'element and remove one of these props. More info: ' +
-          'https://fb.me/react-controlled-components'
+          'https://fb.me/react-controlled-components',
+          owner && owner.getName() || 'A component',
+          props.type
         );
         didWarnCheckedDefaultChecked = true;
       }
@@ -128,11 +133,14 @@ var ReactDOMInput = {
       ) {
         warning(
           false,
+          '%s contains an input of type %s with both value and defaultValue props. ' +
           'Input 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 input ' +
           'element and remove one of these props. More info: ' +
-          'https://fb.me/react-controlled-components'
+          'https://fb.me/react-controlled-components',
+          owner && owner.getName() || 'A component',
+          props.type
         );
         didWarnValueDefaultValue = true;
       }
diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js
index 664f67e89e457..c7496752624fd 100644
--- a/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js
+++ b/src/renderers/dom/client/wrappers/__tests__/ReactDOMInput-test.js
@@ -422,6 +422,7 @@ describe('ReactDOMInput', function() {
       <input type="radio" checked={true} defaultChecked={true} readOnly={true} />
     );
     expect(console.error.argsForCall[0][0]).toContain(
+      'A component contains an input of type radio with both checked and defaultChecked props. ' +
       'Input elements must be either controlled or uncontrolled ' +
       '(specify either the checked prop, or the defaultChecked prop, but not ' +
       'both). Decide between using a controlled or uncontrolled input ' +
@@ -440,6 +441,7 @@ describe('ReactDOMInput', function() {
       <input type="text" value="foo" defaultValue="bar" readOnly={true} />
     );
     expect(console.error.argsForCall[0][0]).toContain(
+      'A component contains an input of type text with both value and defaultValue props. ' +
       'Input 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 input ' +