From ae96f211039d9d3dd5c085d507d9b18a151ed453 Mon Sep 17 00:00:00 2001
From: audyodi <audytanudjaja@gmail.com>
Date: Fri, 20 Oct 2017 23:58:48 +0700
Subject: [PATCH 1/7] Remove inputValueTracking from ReactDOMComponent-test
 dependency

---
 .../src/__tests__/ReactDOMComponent-test.js   | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index b0f205a1485..635dfeca7f5 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -14,7 +14,6 @@ describe('ReactDOMComponent', () => {
   var ReactTestUtils;
   var ReactDOM;
   var ReactDOMServer;
-  var inputValueTracking;
 
   function normalizeCodeLocInfo(str) {
     return str && str.replace(/\(at .+?:\d+\)/g, '(at **)');
@@ -26,8 +25,6 @@ describe('ReactDOMComponent', () => {
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
     ReactTestUtils = require('react-dom/test-utils');
-    // TODO: can we express this test with only public API?
-    inputValueTracking = require('../client/inputValueTracking');
   });
 
   describe('updateDOM', () => {
@@ -832,6 +829,32 @@ describe('ReactDOMComponent', () => {
 
   describe('mountComponent', () => {
     var mountComponent;
+    var getTracker = (node: any) => {
+      var descriptor = Object.getOwnPropertyDescriptor(
+        node.constructor.prototype,
+        'value',
+      );
+
+      var currentValue = '' + node.value;
+
+      Object.defineProperty(node, 'value', {
+        enumerable: descriptor.enumerable,
+        configurable: true,
+        get: () => {
+          return descriptor.get.call(this);
+        },
+        set: (value) => {
+          currentValue = '' + value;
+          descriptor.set.call(this, value);
+        },
+      });
+
+      return {
+        getValue() {
+          return currentValue;
+        },
+      };
+    };
 
     beforeEach(() => {
       mountComponent = function(props) {
@@ -1151,18 +1174,14 @@ describe('ReactDOMComponent', () => {
         <input type="text" defaultValue="foo" />,
         container,
       );
-
-      var tracker = inputValueTracking._getTrackerFromNode(inst);
-
+      var tracker = getTracker(inst);
       expect(tracker.getValue()).toEqual('foo');
     });
 
     it('should track textarea values', () => {
       var container = document.createElement('div');
       var inst = ReactDOM.render(<textarea defaultValue="foo" />, container);
-
-      var tracker = inputValueTracking._getTrackerFromNode(inst);
-
+      var tracker = getTracker(inst);
       expect(tracker.getValue()).toEqual('foo');
     });
 

From cb7b802aab62310e5d0ce3afff7459ec9020c1d1 Mon Sep 17 00:00:00 2001
From: audyodi <audytanudjaja@gmail.com>
Date: Mon, 23 Oct 2017 16:47:04 +0700
Subject: [PATCH 2/7] prettier

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

diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index 635dfeca7f5..7fc744b7a79 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -843,7 +843,7 @@ describe('ReactDOMComponent', () => {
         get: () => {
           return descriptor.get.call(this);
         },
-        set: (value) => {
+        set: value => {
           currentValue = '' + value;
           descriptor.set.call(this, value);
         },

From 3e9bfe325c54192e811735b2e523a014ab0f66aa Mon Sep 17 00:00:00 2001
From: audyodi <audytanudjaja@gmail.com>
Date: Thu, 26 Oct 2017 10:10:25 +0700
Subject: [PATCH 3/7] use node._valueTracker and add some test cases to make
 sure that value being tracked

---
 .../src/__tests__/ReactDOMComponent-test.js   | 60 +++++++++++--------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index 7fc744b7a79..ce0c4208bd4 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -9,6 +9,15 @@
 
 'use strict';
 
+type ValueTracker = {
+  getValue(): string,
+  setValue(value: string): void,
+  stopTracking(): void,
+};
+type WrapperState = {_valueTracker: ?ValueTracker};
+type ElementWithValueTracker = (HTMLInputElement | HTMLTextAreaElement) &
+  WrapperState;
+
 describe('ReactDOMComponent', () => {
   var React;
   var ReactTestUtils;
@@ -829,31 +838,8 @@ describe('ReactDOMComponent', () => {
 
   describe('mountComponent', () => {
     var mountComponent;
-    var getTracker = (node: any) => {
-      var descriptor = Object.getOwnPropertyDescriptor(
-        node.constructor.prototype,
-        'value',
-      );
-
-      var currentValue = '' + node.value;
-
-      Object.defineProperty(node, 'value', {
-        enumerable: descriptor.enumerable,
-        configurable: true,
-        get: () => {
-          return descriptor.get.call(this);
-        },
-        set: value => {
-          currentValue = '' + value;
-          descriptor.set.call(this, value);
-        },
-      });
-
-      return {
-        getValue() {
-          return currentValue;
-        },
-      };
+    var getTracker = (node: ElementWithValueTracker): ?ValueTracker => {
+      return node._valueTracker;
     };
 
     beforeEach(() => {
@@ -1175,14 +1161,38 @@ describe('ReactDOMComponent', () => {
         container,
       );
       var tracker = getTracker(inst);
+      expect(tracker).toBeTruthy();
+      expect(tracker.getValue()).toEqual('foo');
+
+      inst.defaultValue = 'new foo';
+      expect(tracker.getValue()).not.toEqual('new foo');
       expect(tracker.getValue()).toEqual('foo');
+
+      inst.value = 'bar';
+      expect(tracker.getValue()).toEqual('bar');
+
+      // even if the value changes to empty string, should not return to defaultValue
+      inst.value = '';
+      expect(tracker.getValue()).toEqual('');
     });
 
     it('should track textarea values', () => {
       var container = document.createElement('div');
       var inst = ReactDOM.render(<textarea defaultValue="foo" />, container);
       var tracker = getTracker(inst);
+      expect(tracker).toBeTruthy();
       expect(tracker.getValue()).toEqual('foo');
+
+      inst.defaultValue = 'new foo';
+      expect(tracker.getValue()).not.toEqual('new foo');
+      expect(tracker.getValue()).toEqual('foo');
+
+      inst.value = 'bar';
+      expect(tracker.getValue()).toEqual('bar');
+
+      // even if the value changes to empty string, should not return to defaultValue
+      inst.value = '';
+      expect(tracker.getValue()).toEqual('');
     });
 
     it('should throw for children on void elements', () => {

From d480ce7390b49253b7eeeb2b500283cfa3c54b6f Mon Sep 17 00:00:00 2001
From: audyodi <audytanudjaja@gmail.com>
Date: Mon, 30 Oct 2017 18:53:20 +0700
Subject: [PATCH 4/7] using Object.getOwnPropertyDescriptor to get the tracked
 value

---
 .../src/__tests__/ReactDOMComponent-test.js   | 42 ++++++++-----------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index ce0c4208bd4..9164e6a1013 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -9,15 +9,6 @@
 
 'use strict';
 
-type ValueTracker = {
-  getValue(): string,
-  setValue(value: string): void,
-  stopTracking(): void,
-};
-type WrapperState = {_valueTracker: ?ValueTracker};
-type ElementWithValueTracker = (HTMLInputElement | HTMLTextAreaElement) &
-  WrapperState;
-
 describe('ReactDOMComponent', () => {
   var React;
   var ReactTestUtils;
@@ -838,8 +829,11 @@ describe('ReactDOMComponent', () => {
 
   describe('mountComponent', () => {
     var mountComponent;
-    var getTracker = (node: ElementWithValueTracker): ?ValueTracker => {
-      return node._valueTracker;
+    var getValueTracker = (node: HTMLInputElement | HTMLTextAreaElement) => {
+      return Object.getOwnPropertyDescriptor(
+        node.constructor.prototype,
+        'value',
+      ).get;
     };
 
     beforeEach(() => {
@@ -1160,39 +1154,37 @@ describe('ReactDOMComponent', () => {
         <input type="text" defaultValue="foo" />,
         container,
       );
-      var tracker = getTracker(inst);
-      expect(tracker).toBeTruthy();
-      expect(tracker.getValue()).toEqual('foo');
+      var getTrackedValue = getValueTracker(inst);
+      expect(getTrackedValue.call(inst)).toEqual('foo');
 
       inst.defaultValue = 'new foo';
-      expect(tracker.getValue()).not.toEqual('new foo');
-      expect(tracker.getValue()).toEqual('foo');
+      expect(getTrackedValue.call(inst)).not.toEqual('new foo');
+      expect(getTrackedValue.call(inst)).toEqual('foo');
 
       inst.value = 'bar';
-      expect(tracker.getValue()).toEqual('bar');
+      expect(getTrackedValue.call(inst)).toEqual('bar');
 
       // even if the value changes to empty string, should not return to defaultValue
       inst.value = '';
-      expect(tracker.getValue()).toEqual('');
+      expect(getTrackedValue.call(inst)).toEqual('');
     });
 
     it('should track textarea values', () => {
       var container = document.createElement('div');
       var inst = ReactDOM.render(<textarea defaultValue="foo" />, container);
-      var tracker = getTracker(inst);
-      expect(tracker).toBeTruthy();
-      expect(tracker.getValue()).toEqual('foo');
+      var getTrackedValue = getValueTracker(inst);
+      expect(getTrackedValue.call(inst)).toEqual('foo');
 
       inst.defaultValue = 'new foo';
-      expect(tracker.getValue()).not.toEqual('new foo');
-      expect(tracker.getValue()).toEqual('foo');
+      expect(getTrackedValue.call(inst)).not.toEqual('new foo');
+      expect(getTrackedValue.call(inst)).toEqual('foo');
 
       inst.value = 'bar';
-      expect(tracker.getValue()).toEqual('bar');
+      expect(getTrackedValue.call(inst)).toEqual('bar');
 
       // even if the value changes to empty string, should not return to defaultValue
       inst.value = '';
-      expect(tracker.getValue()).toEqual('');
+      expect(getTrackedValue.call(inst)).toEqual('');
     });
 
     it('should throw for children on void elements', () => {

From 46146364e9f2c323fc5434a232d98cde264a2734 Mon Sep 17 00:00:00 2001
From: audyodi <audytanudjaja@gmail.com>
Date: Tue, 31 Oct 2017 22:38:25 +0700
Subject: [PATCH 5/7] move getValueTracker to each test case and use its
 corresponding prototype

---
 .../src/__tests__/ReactDOMComponent-test.js   | 40 ++++++++++---------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index 9164e6a1013..165f88a79ff 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -829,12 +829,6 @@ describe('ReactDOMComponent', () => {
 
   describe('mountComponent', () => {
     var mountComponent;
-    var getValueTracker = (node: HTMLInputElement | HTMLTextAreaElement) => {
-      return Object.getOwnPropertyDescriptor(
-        node.constructor.prototype,
-        'value',
-      ).get;
-    };
 
     beforeEach(() => {
       mountComponent = function(props) {
@@ -1154,37 +1148,47 @@ describe('ReactDOMComponent', () => {
         <input type="text" defaultValue="foo" />,
         container,
       );
-      var getTrackedValue = getValueTracker(inst);
-      expect(getTrackedValue.call(inst)).toEqual('foo');
+
+      var getValueTracker = Object.getOwnPropertyDescriptor(
+        HTMLInputElement.prototype,
+        'value',
+      ).get;
+
+      expect(getValueTracker.call(inst)).toEqual('foo');
 
       inst.defaultValue = 'new foo';
-      expect(getTrackedValue.call(inst)).not.toEqual('new foo');
-      expect(getTrackedValue.call(inst)).toEqual('foo');
+      expect(getValueTracker.call(inst)).not.toEqual('new foo');
+      expect(getValueTracker.call(inst)).toEqual('foo');
 
       inst.value = 'bar';
-      expect(getTrackedValue.call(inst)).toEqual('bar');
+      expect(getValueTracker.call(inst)).toEqual('bar');
 
       // even if the value changes to empty string, should not return to defaultValue
       inst.value = '';
-      expect(getTrackedValue.call(inst)).toEqual('');
+      expect(getValueTracker.call(inst)).toEqual('');
     });
 
     it('should track textarea values', () => {
       var container = document.createElement('div');
       var inst = ReactDOM.render(<textarea defaultValue="foo" />, container);
-      var getTrackedValue = getValueTracker(inst);
-      expect(getTrackedValue.call(inst)).toEqual('foo');
+
+      var getValueTracker = Object.getOwnPropertyDescriptor(
+        HTMLTextAreaElement.prototype,
+        'value',
+      ).get;
+
+      expect(getValueTracker.call(inst)).toEqual('foo');
 
       inst.defaultValue = 'new foo';
-      expect(getTrackedValue.call(inst)).not.toEqual('new foo');
-      expect(getTrackedValue.call(inst)).toEqual('foo');
+      expect(getValueTracker.call(inst)).not.toEqual('new foo');
+      expect(getValueTracker.call(inst)).toEqual('foo');
 
       inst.value = 'bar';
-      expect(getTrackedValue.call(inst)).toEqual('bar');
+      expect(getValueTracker.call(inst)).toEqual('bar');
 
       // even if the value changes to empty string, should not return to defaultValue
       inst.value = '';
-      expect(getTrackedValue.call(inst)).toEqual('');
+      expect(getValueTracker.call(inst)).toEqual('');
     });
 
     it('should throw for children on void elements', () => {

From aa75dde9c51d458bf5f6376064ed52fbd721c0d5 Mon Sep 17 00:00:00 2001
From: audyodi <audytanudjaja@gmail.com>
Date: Thu, 9 Nov 2017 19:38:51 +0700
Subject: [PATCH 6/7] remove tests and move the value tracker definition before
 React is imported

---
 .../src/__tests__/ReactDOMComponent-test.js   | 50 ++++++-------------
 1 file changed, 16 insertions(+), 34 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index 165f88a79ff..fd575865ac3 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -15,12 +15,26 @@ describe('ReactDOMComponent', () => {
   var ReactDOM;
   var ReactDOMServer;
 
+  var getInputValueTracker;
+  var getTextAreaValueTracker;
+
   function normalizeCodeLocInfo(str) {
     return str && str.replace(/\(at .+?:\d+\)/g, '(at **)');
   }
 
   beforeEach(() => {
     jest.resetModules();
+
+    getInputValueTracker = Object.getOwnPropertyDescriptor(
+      HTMLInputElement.prototype,
+      'value',
+    ).get;
+
+    getTextAreaValueTracker = Object.getOwnPropertyDescriptor(
+      HTMLTextAreaElement.prototype,
+      'value',
+    ).get;
+
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
@@ -1149,46 +1163,14 @@ describe('ReactDOMComponent', () => {
         container,
       );
 
-      var getValueTracker = Object.getOwnPropertyDescriptor(
-        HTMLInputElement.prototype,
-        'value',
-      ).get;
-
-      expect(getValueTracker.call(inst)).toEqual('foo');
-
-      inst.defaultValue = 'new foo';
-      expect(getValueTracker.call(inst)).not.toEqual('new foo');
-      expect(getValueTracker.call(inst)).toEqual('foo');
-
-      inst.value = 'bar';
-      expect(getValueTracker.call(inst)).toEqual('bar');
-
-      // even if the value changes to empty string, should not return to defaultValue
-      inst.value = '';
-      expect(getValueTracker.call(inst)).toEqual('');
+      expect(getInputValueTracker.call(inst)).toEqual('foo');
     });
 
     it('should track textarea values', () => {
       var container = document.createElement('div');
       var inst = ReactDOM.render(<textarea defaultValue="foo" />, container);
 
-      var getValueTracker = Object.getOwnPropertyDescriptor(
-        HTMLTextAreaElement.prototype,
-        'value',
-      ).get;
-
-      expect(getValueTracker.call(inst)).toEqual('foo');
-
-      inst.defaultValue = 'new foo';
-      expect(getValueTracker.call(inst)).not.toEqual('new foo');
-      expect(getValueTracker.call(inst)).toEqual('foo');
-
-      inst.value = 'bar';
-      expect(getValueTracker.call(inst)).toEqual('bar');
-
-      // even if the value changes to empty string, should not return to defaultValue
-      inst.value = '';
-      expect(getValueTracker.call(inst)).toEqual('');
+      expect(getTextAreaValueTracker.call(inst)).toEqual('foo');
     });
 
     it('should throw for children on void elements', () => {

From 2dadb8d6db86f4fe9f5acf38053e84ef33e7587e Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 10 Nov 2017 12:01:40 +0000
Subject: [PATCH 7/7] Delete these tests completely

---
 .../src/__tests__/ReactDOMComponent-test.js   | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
index fd575865ac3..5dbe6cf99fd 100644
--- a/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMComponent-test.js
@@ -15,26 +15,12 @@ describe('ReactDOMComponent', () => {
   var ReactDOM;
   var ReactDOMServer;
 
-  var getInputValueTracker;
-  var getTextAreaValueTracker;
-
   function normalizeCodeLocInfo(str) {
     return str && str.replace(/\(at .+?:\d+\)/g, '(at **)');
   }
 
   beforeEach(() => {
     jest.resetModules();
-
-    getInputValueTracker = Object.getOwnPropertyDescriptor(
-      HTMLInputElement.prototype,
-      'value',
-    ).get;
-
-    getTextAreaValueTracker = Object.getOwnPropertyDescriptor(
-      HTMLTextAreaElement.prototype,
-      'value',
-    ).get;
-
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
@@ -1156,23 +1142,6 @@ describe('ReactDOMComponent', () => {
       );
     });
 
-    it('should track input values', () => {
-      var container = document.createElement('div');
-      var inst = ReactDOM.render(
-        <input type="text" defaultValue="foo" />,
-        container,
-      );
-
-      expect(getInputValueTracker.call(inst)).toEqual('foo');
-    });
-
-    it('should track textarea values', () => {
-      var container = document.createElement('div');
-      var inst = ReactDOM.render(<textarea defaultValue="foo" />, container);
-
-      expect(getTextAreaValueTracker.call(inst)).toEqual('foo');
-    });
-
     it('should throw for children on void elements', () => {
       class X extends React.Component {
         render() {