From 49851ff1e557c9b6021dbcb9e21f9848bbbd81ba Mon Sep 17 00:00:00 2001
From: Nicole Levy <n.levy@raceroster.com>
Date: Mon, 16 Apr 2018 21:52:30 -0400
Subject: [PATCH 01/18] throw warning for falsey `value` prop

---
 packages/react-dom/src/shared/ReactControlledValuePropTypes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
index 5b8dbdde2f262..a3dc7383d1cc1 100644
--- a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
+++ b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
@@ -25,7 +25,7 @@ if (__DEV__) {
   const propTypes = {
     value: function(props, propName, componentName) {
       if (
-        !props[propName] ||
+        !(propName in props) ||
         hasReadOnlyValue[props.type] ||
         props.onChange ||
         props.readOnly ||

From 32547ff3b67b4f7115e14210bf56ac3361d6b70e Mon Sep 17 00:00:00 2001
From: Nicole Levy <n.levy@raceroster.com>
Date: Mon, 16 Apr 2018 21:54:40 -0400
Subject: [PATCH 02/18] add nop onChange handler to tests for `value` prop

---
 .../__tests__/DOMPropertyOperations-test.js   |  4 ++-
 .../src/__tests__/ReactDOMInput-test.js       | 30 +++++++++----------
 .../src/__tests__/ReactDOMSelect-test.js      | 10 ++++---
 .../src/__tests__/ReactDOMTextarea-test.js    |  6 ++--
 4 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js b/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
index aabb3e995f864..d93a4b071cfb8 100644
--- a/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
+++ b/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
@@ -9,6 +9,8 @@
 
 'use strict';
 
+const emptyFunction = require('fbjs/lib/emptyFunction');
+
 describe('DOMPropertyOperations', () => {
   let React;
   let ReactDOM;
@@ -79,7 +81,7 @@ describe('DOMPropertyOperations', () => {
 
     it('should not remove empty attributes for special properties', () => {
       const container = document.createElement('div');
-      ReactDOM.render(<input value="" />, container);
+      ReactDOM.render(<input value="" onChange={emptyFunction} />, container);
       expect(container.firstChild.getAttribute('value')).toBe('');
       expect(container.firstChild.value).toBe('');
     });
diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 03eed7bc1ec65..60b10c3cb1557 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -475,7 +475,7 @@ describe('ReactDOMInput', () => {
   });
 
   it('should display `value` of number 0', () => {
-    let stub = <input type="text" value={0} />;
+    let stub = <input type="text" value={0} onChange={emptyFunction} />;
     stub = ReactTestUtils.renderIntoDocument(stub);
     const node = ReactDOM.findDOMNode(stub);
 
@@ -625,8 +625,8 @@ describe('ReactDOMInput', () => {
   it('should properly transition from an empty value to 0', function() {
     const container = document.createElement('div');
 
-    ReactDOM.render(<input type="text" value="" />, container);
-    ReactDOM.render(<input type="text" value={0} />, container);
+    ReactDOM.render(<input type="text" value="" onChange={emptyFunction} />, container);
+    ReactDOM.render(<input type="text" value={0} onChange={emptyFunction} />, container);
 
     const node = container.firstChild;
 
@@ -637,8 +637,8 @@ describe('ReactDOMInput', () => {
   it('should properly transition from 0 to an empty value', function() {
     const container = document.createElement('div');
 
-    ReactDOM.render(<input type="text" value={0} />, container);
-    ReactDOM.render(<input type="text" value="" />, container);
+    ReactDOM.render(<input type="text" value={0} onChange={emptyFunction} />, container);
+    ReactDOM.render(<input type="text" value="" onChange={emptyFunction} />, container);
 
     const node = container.firstChild;
 
@@ -649,8 +649,8 @@ describe('ReactDOMInput', () => {
   it('should properly transition a text input from 0 to an empty 0.0', function() {
     const container = document.createElement('div');
 
-    ReactDOM.render(<input type="text" value={0} />, container);
-    ReactDOM.render(<input type="text" value="0.0" />, container);
+    ReactDOM.render(<input type="text" value={0} onChange={emptyFunction} />, container);
+    ReactDOM.render(<input type="text" value="0.0" onChange={emptyFunction} />, container);
 
     const node = container.firstChild;
 
@@ -661,8 +661,8 @@ describe('ReactDOMInput', () => {
   it('should properly transition a number input from "" to 0', function() {
     const container = document.createElement('div');
 
-    ReactDOM.render(<input type="number" value="" />, container);
-    ReactDOM.render(<input type="number" value={0} />, container);
+    ReactDOM.render(<input type="number" value="" onChange={emptyFunction} />, container);
+    ReactDOM.render(<input type="number" value={0} onChange={emptyFunction} />, container);
 
     const node = container.firstChild;
 
@@ -673,8 +673,8 @@ describe('ReactDOMInput', () => {
   it('should properly transition a number input from "" to "0"', function() {
     const container = document.createElement('div');
 
-    ReactDOM.render(<input type="number" value="" />, container);
-    ReactDOM.render(<input type="number" value="0" />, container);
+    ReactDOM.render(<input type="number" value="" onChange={emptyFunction} />, container);
+    ReactDOM.render(<input type="number" value="0" onChange={emptyFunction} />, container);
 
     const node = container.firstChild;
 
@@ -937,14 +937,14 @@ describe('ReactDOMInput', () => {
 
   it('should warn if value is null', () => {
     expect(() =>
-      ReactTestUtils.renderIntoDocument(<input type="text" value={null} />),
+      ReactTestUtils.renderIntoDocument(<input type="text" value={null} onChange={emptyFunction} />),
     ).toWarnDev(
       '`value` prop on `input` should not be null. ' +
         'Consider using an empty string to clear the component or `undefined` ' +
         'for uncontrolled components.',
     );
 
-    ReactTestUtils.renderIntoDocument(<input type="text" value={null} />);
+    ReactTestUtils.renderIntoDocument(<input type="text" value={null} onChange={emptyFunction} />);
   });
 
   it('should warn if checked and defaultChecked props are specified', () => {
@@ -1054,7 +1054,7 @@ describe('ReactDOMInput', () => {
     const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(<input type="text" value="controlled" />, container),
+      ReactDOM.render(<input type="text" value="controlled" onChange={emptyFunction} />, container),
     ).toWarnDev(
       'Warning: A component is changing an uncontrolled input of type text to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
@@ -1065,7 +1065,7 @@ describe('ReactDOMInput', () => {
   });
 
   it('should warn if uncontrolled input (value is null) switches to controlled', () => {
-    const stub = <input type="text" value={null} />;
+    const stub = <input type="text" value={null} onChange={emptyFunction} />;
     const container = document.createElement('div');
     expect(() => ReactDOM.render(stub, container)).toWarnDev(
       '`value` prop on `input` should not be null. ' +
diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 19b1e00be93ad..20b2a3a58e02a 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -9,6 +9,8 @@
 
 'use strict';
 
+const emptyFunction = require('fbjs/lib/emptyFunction');
+
 describe('ReactDOMSelect', () => {
   let React;
   let ReactDOM;
@@ -534,7 +536,7 @@ describe('ReactDOMSelect', () => {
   it('should warn if value is null', () => {
     expect(() =>
       ReactTestUtils.renderIntoDocument(
-        <select value={null}>
+        <select value={null} onChange={emptyFunction}>
           <option value="test" />
         </select>,
       ),
@@ -545,7 +547,7 @@ describe('ReactDOMSelect', () => {
     );
 
     ReactTestUtils.renderIntoDocument(
-      <select value={null}>
+      <select value={null} onChange={emptyFunction}>
         <option value="test" />
       </select>,
     );
@@ -575,7 +577,7 @@ describe('ReactDOMSelect', () => {
   it('should warn if value is null and multiple is true', () => {
     expect(() =>
       ReactTestUtils.renderIntoDocument(
-        <select value={null} multiple={true}>
+        <select value={null} multiple={true} onChange={emptyFunction}>
           <option value="test" />
         </select>,
       ),
@@ -587,7 +589,7 @@ describe('ReactDOMSelect', () => {
     );
 
     ReactTestUtils.renderIntoDocument(
-      <select value={null} multiple={true}>
+      <select value={null} multiple={true}  onChange={emptyFunction}>
         <option value="test" />
       </select>,
     );
diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index 9ba7f06674a13..8310bf7fc81b1 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -97,7 +97,7 @@ describe('ReactDOMTextarea', () => {
   });
 
   it('should display `value` of number 0', () => {
-    const stub = <textarea value={0} />;
+    const stub = <textarea value={0} onChange={emptyFunction} />;
     const node = renderTextarea(stub);
 
     expect(node.value).toBe('0');
@@ -373,7 +373,7 @@ describe('ReactDOMTextarea', () => {
 
   it('should warn if value is null', () => {
     expect(() =>
-      ReactTestUtils.renderIntoDocument(<textarea value={null} />),
+      ReactTestUtils.renderIntoDocument(<textarea value={null} onChange={emptyFunction} />),
     ).toWarnDev(
       '`value` prop on `textarea` should not be null. ' +
         'Consider using an empty string to clear the component or `undefined` ' +
@@ -381,7 +381,7 @@ describe('ReactDOMTextarea', () => {
     );
 
     // No additional warnings are expected
-    ReactTestUtils.renderIntoDocument(<textarea value={null} />);
+    ReactTestUtils.renderIntoDocument(<textarea value={null} onChange={emptyFunction} />);
   });
 
   it('should warn if value and defaultValue are specified', () => {

From 9e0be3de1cce1e514fcdce1173098ba715c55671 Mon Sep 17 00:00:00 2001
From: Nicole Levy <n.levy@raceroster.com>
Date: Mon, 16 Apr 2018 21:56:15 -0400
Subject: [PATCH 03/18] prettier

---
 .../src/__tests__/ReactDOMInput-test.js       | 63 +++++++++++++++----
 .../src/__tests__/ReactDOMSelect-test.js      |  2 +-
 .../src/__tests__/ReactDOMTextarea-test.js    |  8 ++-
 3 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 60b10c3cb1557..dedb8f34ed266 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -625,8 +625,14 @@ describe('ReactDOMInput', () => {
   it('should properly transition from an empty value to 0', function() {
     const container = document.createElement('div');
 
-    ReactDOM.render(<input type="text" value="" onChange={emptyFunction} />, container);
-    ReactDOM.render(<input type="text" value={0} onChange={emptyFunction} />, container);
+    ReactDOM.render(
+      <input type="text" value="" onChange={emptyFunction} />,
+      container,
+    );
+    ReactDOM.render(
+      <input type="text" value={0} onChange={emptyFunction} />,
+      container,
+    );
 
     const node = container.firstChild;
 
@@ -637,8 +643,14 @@ describe('ReactDOMInput', () => {
   it('should properly transition from 0 to an empty value', function() {
     const container = document.createElement('div');
 
-    ReactDOM.render(<input type="text" value={0} onChange={emptyFunction} />, container);
-    ReactDOM.render(<input type="text" value="" onChange={emptyFunction} />, container);
+    ReactDOM.render(
+      <input type="text" value={0} onChange={emptyFunction} />,
+      container,
+    );
+    ReactDOM.render(
+      <input type="text" value="" onChange={emptyFunction} />,
+      container,
+    );
 
     const node = container.firstChild;
 
@@ -649,8 +661,14 @@ describe('ReactDOMInput', () => {
   it('should properly transition a text input from 0 to an empty 0.0', function() {
     const container = document.createElement('div');
 
-    ReactDOM.render(<input type="text" value={0} onChange={emptyFunction} />, container);
-    ReactDOM.render(<input type="text" value="0.0" onChange={emptyFunction} />, container);
+    ReactDOM.render(
+      <input type="text" value={0} onChange={emptyFunction} />,
+      container,
+    );
+    ReactDOM.render(
+      <input type="text" value="0.0" onChange={emptyFunction} />,
+      container,
+    );
 
     const node = container.firstChild;
 
@@ -661,8 +679,14 @@ describe('ReactDOMInput', () => {
   it('should properly transition a number input from "" to 0', function() {
     const container = document.createElement('div');
 
-    ReactDOM.render(<input type="number" value="" onChange={emptyFunction} />, container);
-    ReactDOM.render(<input type="number" value={0} onChange={emptyFunction} />, container);
+    ReactDOM.render(
+      <input type="number" value="" onChange={emptyFunction} />,
+      container,
+    );
+    ReactDOM.render(
+      <input type="number" value={0} onChange={emptyFunction} />,
+      container,
+    );
 
     const node = container.firstChild;
 
@@ -673,8 +697,14 @@ describe('ReactDOMInput', () => {
   it('should properly transition a number input from "" to "0"', function() {
     const container = document.createElement('div');
 
-    ReactDOM.render(<input type="number" value="" onChange={emptyFunction} />, container);
-    ReactDOM.render(<input type="number" value="0" onChange={emptyFunction} />, container);
+    ReactDOM.render(
+      <input type="number" value="" onChange={emptyFunction} />,
+      container,
+    );
+    ReactDOM.render(
+      <input type="number" value="0" onChange={emptyFunction} />,
+      container,
+    );
 
     const node = container.firstChild;
 
@@ -937,14 +967,18 @@ describe('ReactDOMInput', () => {
 
   it('should warn if value is null', () => {
     expect(() =>
-      ReactTestUtils.renderIntoDocument(<input type="text" value={null} onChange={emptyFunction} />),
+      ReactTestUtils.renderIntoDocument(
+        <input type="text" value={null} onChange={emptyFunction} />,
+      ),
     ).toWarnDev(
       '`value` prop on `input` should not be null. ' +
         'Consider using an empty string to clear the component or `undefined` ' +
         'for uncontrolled components.',
     );
 
-    ReactTestUtils.renderIntoDocument(<input type="text" value={null} onChange={emptyFunction} />);
+    ReactTestUtils.renderIntoDocument(
+      <input type="text" value={null} onChange={emptyFunction} />,
+    );
   });
 
   it('should warn if checked and defaultChecked props are specified', () => {
@@ -1054,7 +1088,10 @@ describe('ReactDOMInput', () => {
     const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(<input type="text" value="controlled" onChange={emptyFunction} />, container),
+      ReactDOM.render(
+        <input type="text" value="controlled" onChange={emptyFunction} />,
+        container,
+      ),
     ).toWarnDev(
       'Warning: A component is changing an uncontrolled input of type text to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 20b2a3a58e02a..889e8e87bf6cf 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -589,7 +589,7 @@ describe('ReactDOMSelect', () => {
     );
 
     ReactTestUtils.renderIntoDocument(
-      <select value={null} multiple={true}  onChange={emptyFunction}>
+      <select value={null} multiple={true} onChange={emptyFunction}>
         <option value="test" />
       </select>,
     );
diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index 8310bf7fc81b1..3cba0fe24cc5e 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -373,7 +373,9 @@ describe('ReactDOMTextarea', () => {
 
   it('should warn if value is null', () => {
     expect(() =>
-      ReactTestUtils.renderIntoDocument(<textarea value={null} onChange={emptyFunction} />),
+      ReactTestUtils.renderIntoDocument(
+        <textarea value={null} onChange={emptyFunction} />,
+      ),
     ).toWarnDev(
       '`value` prop on `textarea` should not be null. ' +
         'Consider using an empty string to clear the component or `undefined` ' +
@@ -381,7 +383,9 @@ describe('ReactDOMTextarea', () => {
     );
 
     // No additional warnings are expected
-    ReactTestUtils.renderIntoDocument(<textarea value={null} onChange={emptyFunction} />);
+    ReactTestUtils.renderIntoDocument(
+      <textarea value={null} onChange={emptyFunction} />,
+    );
   });
 
   it('should warn if value and defaultValue are specified', () => {

From 15302d65539fc6b14a84f1d6ec72ee007832cb13 Mon Sep 17 00:00:00 2001
From: Nicole Levy <n.levy@raceroster.com>
Date: Mon, 16 Apr 2018 22:18:01 -0400
Subject: [PATCH 04/18] check for falsey checked

---
 packages/react-dom/src/shared/ReactControlledValuePropTypes.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
index a3dc7383d1cc1..c799dc7181127 100644
--- a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
+++ b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
@@ -42,7 +42,7 @@ if (__DEV__) {
     },
     checked: function(props, propName, componentName) {
       if (
-        !props[propName] ||
+        !(propName in props) ||
         props.onChange ||
         props.readOnly ||
         props.disabled

From d8fbf0465e7d59681e25b1dead7c4efddd13781a Mon Sep 17 00:00:00 2001
From: Nicole Levy <n.levy@raceroster.com>
Date: Mon, 16 Apr 2018 22:27:57 -0400
Subject: [PATCH 05/18] fix tests for `checked` prop

---
 .../src/__tests__/ReactDOMInput-test.js       | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index dedb8f34ed266..be7c17ac192ce 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -1178,7 +1178,10 @@ describe('ReactDOMInput', () => {
     const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(<input type="checkbox" checked={true} />, container),
+      ReactDOM.render(
+        <input type="checkbox" checked={true} onChange={emptyFunction} />,
+        container,
+      ),
     ).toWarnDev(
       'Warning: A component is changing an uncontrolled input of type checkbox to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
@@ -1189,11 +1192,16 @@ describe('ReactDOMInput', () => {
   });
 
   it('should warn if uncontrolled checkbox (checked is null) switches to controlled', () => {
-    const stub = <input type="checkbox" checked={null} />;
+    const stub = (
+      <input type="checkbox" checked={null} onChange={emptyFunction} />
+    );
     const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(<input type="checkbox" checked={true} />, container),
+      ReactDOM.render(
+        <input type="checkbox" checked={true} onChange={emptyFunction} />,
+        container,
+      ),
     ).toWarnDev(
       'Warning: A component is changing an uncontrolled input of type checkbox to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
@@ -1221,7 +1229,10 @@ describe('ReactDOMInput', () => {
     const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(<input type="radio" checked={null} />, container),
+      ReactDOM.render(
+        <input type="radio" checked={null} onChange={emptyFunction} />,
+        container,
+      ),
     ).toWarnDev(
       'Warning: A component is changing a controlled input of type radio to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
@@ -1262,11 +1273,14 @@ describe('ReactDOMInput', () => {
   });
 
   it('should warn if uncontrolled radio (checked is null) switches to controlled', () => {
-    const stub = <input type="radio" checked={null} />;
+    const stub = <input type="radio" checked={null} onChange={emptyFunction} />;
     const container = document.createElement('div');
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(<input type="radio" checked={true} />, container),
+      ReactDOM.render(
+        <input type="radio" checked={true} onChange={emptyFunction} />,
+        container,
+      ),
     ).toWarnDev(
       'Warning: A component is changing an uncontrolled input of type radio to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +

From d4a0e3c89137ac07bf87af18b31c8bc4858e5326 Mon Sep 17 00:00:00 2001
From: Nicole Levy <n.levy@raceroster.com>
Date: Mon, 16 Apr 2018 22:53:35 -0400
Subject: [PATCH 06/18] new tests for `value` prop

---
 .../src/__tests__/ReactDOMInput-test.js       | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index be7c17ac192ce..3a84247d4e0a0 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -36,6 +36,36 @@ describe('ReactDOMInput', () => {
     ReactTestUtils = require('react-dom/test-utils');
   });
 
+  it('should warn of no event listener with a falsey value of 0', () => {
+    const container = document.createElement('div');
+
+    expect(() => {
+      ReactDOM.render(<input type="text" value={0} />, container);
+    }).toWarnDev(
+      'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
+    );
+  });
+
+  it('should warn of no event listener with a falsey value of ""', () => {
+    const container = document.createElement('div');
+
+    expect(() => {
+      ReactDOM.render(<input type="text" value="" />, container);
+    }).toWarnDev(
+      'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
+    );
+  });
+
+  it('should warn of no event listener with a value of "0" (truthy value that == false)', () => {
+    const container = document.createElement('div');
+
+    expect(() => {
+      ReactDOM.render(<input type="text" value="" />, container);
+    }).toWarnDev(
+      'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
+    );
+  });
+
   it('should properly control a value even if no event listener exists', () => {
     const container = document.createElement('div');
     let stub;

From f2fcf3c68b848fd2158fc4d6690b4bf98a23bc71 Mon Sep 17 00:00:00 2001
From: Nicole Levy <n.levy@raceroster.com>
Date: Mon, 16 Apr 2018 23:01:02 -0400
Subject: [PATCH 07/18] test formatting

---
 .../react-dom/src/__tests__/ReactDOMInput-test.js    | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 3a84247d4e0a0..74bb0aecd0775 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -37,30 +37,24 @@ describe('ReactDOMInput', () => {
   });
 
   it('should warn of no event listener with a falsey value of 0', () => {
-    const container = document.createElement('div');
-
     expect(() => {
-      ReactDOM.render(<input type="text" value={0} />, container);
+      ReactTestUtils.renderIntoDocument(<input type="text" value={0} />);
     }).toWarnDev(
       'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
     );
   });
 
   it('should warn of no event listener with a falsey value of ""', () => {
-    const container = document.createElement('div');
-
     expect(() => {
-      ReactDOM.render(<input type="text" value="" />, container);
+      ReactTestUtils.renderIntoDocument(<input type="text" value="" />);
     }).toWarnDev(
       'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
     );
   });
 
   it('should warn of no event listener with a value of "0" (truthy value that == false)', () => {
-    const container = document.createElement('div');
-
     expect(() => {
-      ReactDOM.render(<input type="text" value="" />, container);
+      ReactTestUtils.renderIntoDocument(<input type="text" value="" />);
     }).toWarnDev(
       'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
     );

From 41f431129a5b7ead78cfba42a241508bcd0c3d62 Mon Sep 17 00:00:00 2001
From: Nicole Levy <n.levy@raceroster.com>
Date: Mon, 16 Apr 2018 23:10:27 -0400
Subject: [PATCH 08/18] forgot 0 (:

---
 packages/react-dom/src/__tests__/ReactDOMInput-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 74bb0aecd0775..e387d4b2b0ca8 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -54,7 +54,7 @@ describe('ReactDOMInput', () => {
 
   it('should warn of no event listener with a value of "0" (truthy value that == false)', () => {
     expect(() => {
-      ReactTestUtils.renderIntoDocument(<input type="text" value="" />);
+      ReactTestUtils.renderIntoDocument(<input type="text" value="0" />);
     }).toWarnDev(
       'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
     );

From b17fab1dcc43e5fa3c6bafcadbe203ce28b68b82 Mon Sep 17 00:00:00 2001
From: Nicole Levy <n.levy@raceroster.com>
Date: Mon, 16 Apr 2018 23:15:56 -0400
Subject: [PATCH 09/18] test for falsey `checked` prop

---
 packages/react-dom/src/__tests__/ReactDOMInput-test.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index e387d4b2b0ca8..3e1529a559207 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -966,6 +966,16 @@ describe('ReactDOMInput', () => {
     ReactTestUtils.Simulate.change(instance);
   });
 
+  it('should warn of no event listener with a falsey checked prop', () => {
+    expect(() =>
+      ReactTestUtils.renderIntoDocument(
+        <input type="checkbox" checked="false" />,
+      ),
+    ).toWarnDev(
+      'Failed prop type: You provided a `checked` prop to a form field without an `onChange` handler.',
+    );
+  });
+
   it('should warn with checked and no onChange handler with readOnly specified', () => {
     ReactTestUtils.renderIntoDocument(
       <input type="checkbox" checked="false" readOnly={true} />,

From b91c2b0ca2c187499a024f74d0a5f412a35317fd Mon Sep 17 00:00:00 2001
From: Nicole Levy <seriff@protonmail.com>
Date: Tue, 15 May 2018 20:35:46 -0400
Subject: [PATCH 10/18] add null check

---
 .../react-dom/src/shared/ReactControlledValuePropTypes.js   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
index c799dc7181127..ac130d4b3af9e 100644
--- a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
+++ b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
@@ -29,7 +29,8 @@ if (__DEV__) {
         hasReadOnlyValue[props.type] ||
         props.onChange ||
         props.readOnly ||
-        props.disabled
+        props.disabled ||
+        props.value === null
       ) {
         return null;
       }
@@ -45,7 +46,8 @@ if (__DEV__) {
         !(propName in props) ||
         props.onChange ||
         props.readOnly ||
-        props.disabled
+        props.disabled ||
+        props.value === null
       ) {
         return null;
       }

From e68c16af4cf202e4f5249764e44da95963763dad Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 16 May 2018 14:55:30 +0100
Subject: [PATCH 11/18] Update ReactDOMInput-test.js

---
 packages/react-dom/src/__tests__/ReactDOMInput-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 42a8576c7fb68..188e6990b9758 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -52,7 +52,7 @@ describe('ReactDOMInput', () => {
     );
   });
 
-  it('should warn of no event listener with a value of "0" (truthy value that == false)', () => {
+  it('should warn of no event listener with a value of "0"', () => {
     expect(() => {
       ReactTestUtils.renderIntoDocument(<input type="text" value="0" />);
     }).toWarnDev(

From 3804ecdad128649f0c34f0036712a83f79ccb20e Mon Sep 17 00:00:00 2001
From: Nicole Levy <seriff@protonmail.com>
Date: Sun, 3 Jun 2018 15:58:34 -0400
Subject: [PATCH 12/18] revert unneeded change

---
 packages/react-dom/src/__tests__/ReactDOMInput-test.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 188e6990b9758..b3d20155becd7 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -1000,18 +1000,14 @@ describe('ReactDOMInput', () => {
 
   it('should warn if value is null', () => {
     expect(() =>
-      ReactTestUtils.renderIntoDocument(
-        <input type="text" value={null} onChange={emptyFunction} />,
-      ),
+        ReactTestUtils.renderIntoDocument(<input type="text" value={null} />),
     ).toWarnDev(
       '`value` prop on `input` should not be null. ' +
         'Consider using an empty string to clear the component or `undefined` ' +
         'for uncontrolled components.',
     );
 
-    ReactTestUtils.renderIntoDocument(
-      <input type="text" value={null} onChange={emptyFunction} />,
-    );
+      ReactTestUtils.renderIntoDocument(<input type="text" value={null} />);
   });
 
   it('should warn if checked and defaultChecked props are specified', () => {

From 70235aef5fa0d8bbc1ba1e18f92c609efd929c0b Mon Sep 17 00:00:00 2001
From: Nicole Levy <seriff@protonmail.com>
Date: Sun, 3 Jun 2018 16:22:24 -0400
Subject: [PATCH 13/18] prettier

---
 packages/react-dom/src/__tests__/ReactDOMInput-test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index b3d20155becd7..642bd5e5bc2b6 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -1000,14 +1000,14 @@ describe('ReactDOMInput', () => {
 
   it('should warn if value is null', () => {
     expect(() =>
-        ReactTestUtils.renderIntoDocument(<input type="text" value={null} />),
+      ReactTestUtils.renderIntoDocument(<input type="text" value={null} />),
     ).toWarnDev(
       '`value` prop on `input` should not be null. ' +
         'Consider using an empty string to clear the component or `undefined` ' +
         'for uncontrolled components.',
     );
 
-      ReactTestUtils.renderIntoDocument(<input type="text" value={null} />);
+    ReactTestUtils.renderIntoDocument(<input type="text" value={null} />);
   });
 
   it('should warn if checked and defaultChecked props are specified', () => {

From 6a03a7a13ecf7cac150b2c1862582f745d9239c3 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 17 Jul 2018 20:58:44 +0100
Subject: [PATCH 14/18] Update DOMPropertyOperations-test.js

---
 .../react-dom/src/__tests__/DOMPropertyOperations-test.js     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js b/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
index d2872b2cecf61..56319c95d76a7 100644
--- a/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
+++ b/packages/react-dom/src/__tests__/DOMPropertyOperations-test.js
@@ -9,8 +9,6 @@
 
 'use strict';
 
-const emptyFunction = require('fbjs/lib/emptyFunction');
-
 describe('DOMPropertyOperations', () => {
   let React;
   let ReactDOM;
@@ -81,7 +79,7 @@ describe('DOMPropertyOperations', () => {
 
     it('should not remove empty attributes for special properties', () => {
       const container = document.createElement('div');
-      ReactDOM.render(<input value="" onChange={emptyFunction} />, container);
+      ReactDOM.render(<input value="" onChange={() => {}} />, container);
       expect(container.firstChild.getAttribute('value')).toBe('');
       expect(container.firstChild.value).toBe('');
     });

From 731e3e0f4a33bb615b90e944d171236af164adb9 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 17 Jul 2018 21:03:07 +0100
Subject: [PATCH 15/18] Update ReactDOMInput-test.js

---
 packages/react-dom/src/__tests__/ReactDOMInput-test.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index ff42c12ab5f98..206d725f06390 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -1099,7 +1099,7 @@ describe('ReactDOMInput', () => {
   });
 
   it('should warn if uncontrolled input (value is null) switches to controlled', () => {
-    const stub = <input type="text" value={null} onChange={emptyFunction} />;
+    const stub = <input type="text" value={null} />;
     expect(() => ReactDOM.render(stub, container)).toWarnDev(
       '`value` prop on `input` should not be null. ' +
         'Consider using an empty string to clear the component or `undefined` for uncontrolled components.',
@@ -1185,12 +1185,12 @@ describe('ReactDOMInput', () => {
 
   it('should warn if uncontrolled checkbox (checked is null) switches to controlled', () => {
     const stub = (
-      <input type="checkbox" checked={null} onChange={emptyFunction} />
+      <input type="checkbox" checked={null} />
     );
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(
-        <input type="checkbox" checked={true} onChange={emptyFunction} />,
+        <input type="checkbox" checked={true} />,
         container,
       ),
     ).toWarnDev(
@@ -1219,7 +1219,7 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(
-        <input type="radio" checked={null} onChange={emptyFunction} />,
+        <input type="radio" checked={null} />,
         container,
       ),
     ).toWarnDev(
@@ -1260,7 +1260,7 @@ describe('ReactDOMInput', () => {
   });
 
   it('should warn if uncontrolled radio (checked is null) switches to controlled', () => {
-    const stub = <input type="radio" checked={null} onChange={emptyFunction} />;
+    const stub = <input type="radio" checked={null} />;
     ReactDOM.render(stub, container);
     expect(() =>
       ReactDOM.render(

From 8bf0648686cdf07fe9addbcd33b9099b7b2539e7 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 17 Jul 2018 21:03:43 +0100
Subject: [PATCH 16/18] Update ReactDOMSelect-test.js

---
 .../react-dom/src/__tests__/ReactDOMSelect-test.js     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 5e787cc0bf188..5548c039316a8 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -9,8 +9,6 @@
 
 'use strict';
 
-const emptyFunction = require('fbjs/lib/emptyFunction');
-
 describe('ReactDOMSelect', () => {
   let React;
   let ReactDOM;
@@ -550,7 +548,7 @@ describe('ReactDOMSelect', () => {
   it('should warn if value is null', () => {
     expect(() =>
       ReactTestUtils.renderIntoDocument(
-        <select value={null} onChange={emptyFunction}>
+        <select value={null}>
           <option value="test" />
         </select>,
       ),
@@ -561,7 +559,7 @@ describe('ReactDOMSelect', () => {
     );
 
     ReactTestUtils.renderIntoDocument(
-      <select value={null} onChange={emptyFunction}>
+      <select value={null}>
         <option value="test" />
       </select>,
     );
@@ -588,7 +586,7 @@ describe('ReactDOMSelect', () => {
   it('should warn if value is null and multiple is true', () => {
     expect(() =>
       ReactTestUtils.renderIntoDocument(
-        <select value={null} multiple={true} onChange={emptyFunction}>
+        <select value={null} multiple={true}>
           <option value="test" />
         </select>,
       ),
@@ -600,7 +598,7 @@ describe('ReactDOMSelect', () => {
     );
 
     ReactTestUtils.renderIntoDocument(
-      <select value={null} multiple={true} onChange={emptyFunction}>
+      <select value={null} multiple={true}>
         <option value="test" />
       </select>,
     );

From 1e2d2a3218a9840dbab21cb13b820113f0d4c3ce Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 17 Jul 2018 22:15:50 +0100
Subject: [PATCH 17/18] Fixes and tests

---
 .../src/__tests__/ReactDOMInput-test.js       | 95 ++++++++++---------
 .../src/__tests__/ReactDOMSelect-test.js      |  7 ++
 .../src/__tests__/ReactDOMTextarea-test.js    | 15 +--
 .../shared/ReactControlledValuePropTypes.js   |  4 +-
 4 files changed, 67 insertions(+), 54 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 206d725f06390..73b5f5ef815f8 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -47,30 +47,70 @@ describe('ReactDOMInput', () => {
     document.body.removeChild(container);
   });
 
-  it('should warn of no event listener with a falsey value of 0', () => {
+  it('should warn for controlled value of 0 with missing onChange', () => {
     expect(() => {
-      ReactTestUtils.renderIntoDocument(<input type="text" value={0} />);
+      ReactDOM.render(<input type="text" value={0} />, container);
     }).toWarnDev(
       'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
     );
   });
 
-  it('should warn of no event listener with a falsey value of ""', () => {
+  it('should warn for controlled value of "" with missing onChange', () => {
     expect(() => {
-      ReactTestUtils.renderIntoDocument(<input type="text" value="" />);
+      ReactDOM.render(<input type="text" value="" />, container);
     }).toWarnDev(
       'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
     );
   });
 
-  it('should warn of no event listener with a value of "0"', () => {
+  it('should warn for controlled value of "0" with missing onChange', () => {
     expect(() => {
-      ReactTestUtils.renderIntoDocument(<input type="text" value="0" />);
+      ReactDOM.render(<input type="text" value="0" />, container);
     }).toWarnDev(
       'Failed prop type: You provided a `value` prop to a form field without an `onChange` handler.',
     );
   });
 
+  it('should warn for controlled value of false with missing onChange', () => {
+    expect(() =>
+      ReactDOM.render(<input type="checkbox" checked={false} />, container),
+    ).toWarnDev(
+      'Failed prop type: You provided a `checked` prop to a form field without an `onChange` handler.',
+    );
+  });
+
+  it('should warn with checked and no onChange handler with readOnly specified', () => {
+    ReactDOM.render(
+      <input type="checkbox" checked={false} readOnly={true} />,
+      container,
+    );
+    ReactDOM.unmountComponentAtNode(container);
+
+    expect(() =>
+      ReactDOM.render(
+        <input type="checkbox" checked={false} readOnly={false} />,
+        container,
+      ),
+    ).toWarnDev(
+      'Failed prop type: You provided a `checked` prop to a form field without an `onChange` handler. ' +
+        'This will render a read-only field. If the field should be mutable use `defaultChecked`. ' +
+        'Otherwise, set either `onChange` or `readOnly`.',
+    );
+  });
+
+  it('should not warn about missing onChange in uncontrolled inputs', () => {
+    ReactDOM.render(<input />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<input value={undefined} />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<input type="text" />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<input type="text" value={undefined} />, container);
+    ReactDOM.render(<input type="checkbox" />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<input type="checkbox" checked={undefined} />, container);
+  });
+
   it('should properly control a value even if no event listener exists', () => {
     let node;
 
@@ -928,35 +968,6 @@ describe('ReactDOMInput', () => {
     dispatchEventOnNode(node, 'input');
   });
 
-  it('should warn of no event listener with a falsey checked prop', () => {
-    expect(() =>
-      ReactTestUtils.renderIntoDocument(
-        <input type="checkbox" checked="false" />,
-      ),
-    ).toWarnDev(
-      'Failed prop type: You provided a `checked` prop to a form field without an `onChange` handler.',
-    );
-  });
-
-  it('should warn with checked and no onChange handler with readOnly specified', () => {
-    ReactDOM.render(
-      <input type="checkbox" checked="false" readOnly={true} />,
-      container,
-    );
-    ReactDOM.unmountComponentAtNode(container);
-
-    expect(() =>
-      ReactDOM.render(
-        <input type="checkbox" checked="false" readOnly={false} />,
-        container,
-      ),
-    ).toWarnDev(
-      'Failed prop type: You provided a `checked` prop to a form field without an `onChange` handler. ' +
-        'This will render a read-only field. If the field should be mutable use `defaultChecked`. ' +
-        'Otherwise, set either `onChange` or `readOnly`.',
-    );
-  });
-
   it('should update defaultValue to empty string', () => {
     ReactDOM.render(<input type="text" defaultValue={'foo'} />, container);
     ReactDOM.render(<input type="text" defaultValue={''} />, container);
@@ -1184,15 +1195,10 @@ describe('ReactDOMInput', () => {
   });
 
   it('should warn if uncontrolled checkbox (checked is null) switches to controlled', () => {
-    const stub = (
-      <input type="checkbox" checked={null} />
-    );
+    const stub = <input type="checkbox" checked={null} />;
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(
-        <input type="checkbox" checked={true} />,
-        container,
-      ),
+      ReactDOM.render(<input type="checkbox" checked={true} />, container),
     ).toWarnDev(
       'Warning: A component is changing an uncontrolled input of type checkbox to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
@@ -1218,10 +1224,7 @@ describe('ReactDOMInput', () => {
     const stub = <input type="radio" checked={true} onChange={emptyFunction} />;
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(
-        <input type="radio" checked={null} />,
-        container,
-      ),
+      ReactDOM.render(<input type="radio" checked={null} />, container),
     ).toWarnDev(
       'Warning: A component is changing a controlled input of type radio to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
diff --git a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
index 5548c039316a8..e94cc7895cbbb 100644
--- a/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMSelect-test.js
@@ -654,6 +654,13 @@ describe('ReactDOMSelect', () => {
     );
   });
 
+  it('should not warn about missing onChange in uncontrolled textareas', () => {
+    const container = document.createElement('div');
+    ReactDOM.render(<select />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<select value={undefined} />, container);
+  });
+
   it('should be able to safely remove select onChange', () => {
     function changeView() {
       ReactDOM.unmountComponentAtNode(container);
diff --git a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
index 0910e38fe2c27..fa5d717974aae 100644
--- a/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMTextarea-test.js
@@ -387,9 +387,7 @@ describe('ReactDOMTextarea', () => {
 
   it('should warn if value is null', () => {
     expect(() =>
-      ReactTestUtils.renderIntoDocument(
-        <textarea value={null} onChange={emptyFunction} />,
-      ),
+      ReactTestUtils.renderIntoDocument(<textarea value={null} />),
     ).toWarnDev(
       '`value` prop on `textarea` should not be null. ' +
         'Consider using an empty string to clear the component or `undefined` ' +
@@ -397,9 +395,7 @@ describe('ReactDOMTextarea', () => {
     );
 
     // No additional warnings are expected
-    ReactTestUtils.renderIntoDocument(
-      <textarea value={null} onChange={emptyFunction} />,
-    );
+    ReactTestUtils.renderIntoDocument(<textarea value={null} />);
   });
 
   it('should warn if value and defaultValue are specified', () => {
@@ -420,4 +416,11 @@ describe('ReactDOMTextarea', () => {
       <textarea value="foo" defaultValue="bar" readOnly={true} />,
     );
   });
+
+  it('should not warn about missing onChange in uncontrolled textareas', () => {
+    const container = document.createElement('div');
+    ReactDOM.render(<textarea />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    ReactDOM.render(<textarea value={undefined} />, container);
+  });
 });
diff --git a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
index 10c8bc848a2ee..65e16ffbe2eaa 100644
--- a/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
+++ b/packages/react-dom/src/shared/ReactControlledValuePropTypes.js
@@ -35,7 +35,7 @@ if (__DEV__) {
         props.onChange ||
         props.readOnly ||
         props.disabled ||
-        props.value === null
+        props[propName] == null
       ) {
         return null;
       }
@@ -52,7 +52,7 @@ if (__DEV__) {
         props.onChange ||
         props.readOnly ||
         props.disabled ||
-        props.value === null
+        props[propName] == null
       ) {
         return null;
       }

From 9cfbed6763b2d1d65195fe1fe4033e3a917b11cf Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 17 Jul 2018 22:20:29 +0100
Subject: [PATCH 18/18] Remove unnecessary changes

---
 .../src/__tests__/ReactDOMInput-test.js          | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMInput-test.js b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
index 73b5f5ef815f8..5afa9dcf7aaf4 100644
--- a/packages/react-dom/src/__tests__/ReactDOMInput-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMInput-test.js
@@ -106,6 +106,7 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(<input type="text" />, container);
     ReactDOM.unmountComponentAtNode(container);
     ReactDOM.render(<input type="text" value={undefined} />, container);
+    ReactDOM.unmountComponentAtNode(container);
     ReactDOM.render(<input type="checkbox" />, container);
     ReactDOM.unmountComponentAtNode(container);
     ReactDOM.render(<input type="checkbox" checked={undefined} />, container);
@@ -1096,10 +1097,7 @@ describe('ReactDOMInput', () => {
     const stub = <input type="text" />;
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(
-        <input type="text" value="controlled" onChange={emptyFunction} />,
-        container,
-      ),
+      ReactDOM.render(<input type="text" value="controlled" />, container),
     ).toWarnDev(
       'Warning: A component is changing an uncontrolled input of type text to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
@@ -1181,10 +1179,7 @@ describe('ReactDOMInput', () => {
     const stub = <input type="checkbox" />;
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(
-        <input type="checkbox" checked={true} onChange={emptyFunction} />,
-        container,
-      ),
+      ReactDOM.render(<input type="checkbox" checked={true} />, container),
     ).toWarnDev(
       'Warning: A component is changing an uncontrolled input of type checkbox to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
@@ -1266,10 +1261,7 @@ describe('ReactDOMInput', () => {
     const stub = <input type="radio" checked={null} />;
     ReactDOM.render(stub, container);
     expect(() =>
-      ReactDOM.render(
-        <input type="radio" checked={true} onChange={emptyFunction} />,
-        container,
-      ),
+      ReactDOM.render(<input type="radio" checked={true} />, container),
     ).toWarnDev(
       'Warning: A component is changing an uncontrolled input of type radio to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +