Cleanup and bug fixes for merge.

facebook · Apr 4, 2016 · 9aabd4c · 9aabd4c
1 parent 574328a
commit 9aabd4c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 11 deletions.
diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMTextarea-test.js b/src/renderers/dom/client/wrappers/__tests__/ReactDOMTextarea-test.js
@@ -50,7 +50,7 @@ describe('ReactDOMTextarea', function() {
 
     // Changing `defaultValue` should change if no value set.
     renderTextarea(<textarea defaultValue="gorilla" />, container, true);
-    expect(node.value).toEqual('gorilla');
+    expect(node.value).toEqual('giraffe');
 
     node.value = 'cat';
 
@@ -163,27 +163,27 @@ describe('ReactDOMTextarea', function() {
   it('should take updates to `defaultValue` for uncontrolled textarea', function() {
     var container = document.createElement('div');
 
-    var node = ReactDOM.render(<textarea type="text" defaultValue="0" />, container);
+    var node = ReactDOM.render(<textarea defaultValue="0" />, container);
 
     expect(node.value).toBe('0');
 
-    ReactDOM.render(<textarea type="text" defaultValue="1" />, container);
+    ReactDOM.render(<textarea defaultValue="1" />, container);
 
-    expect(node.value).toBe('1');
+    expect(node.value).toBe('0');
   });
 
   it('should take updates to children in lieu of `defaultValue` for uncontrolled textarea', function() {
     var container = document.createElement('div');
 
-    var node = ReactDOM.render(<textarea type="text" defaultValue="0" />, container);
+    var node = ReactDOM.render(<textarea defaultValue="0" />, container);
 
     expect(node.value).toBe('0');
 
     spyOn(console, 'error'); // deprecation warning for `children` content
 
-    ReactDOM.render(<textarea type="text">1</textarea>, container);
+    ReactDOM.render(<textarea>1</textarea>, container);
 
-    expect(node.value).toBe('1');
+    expect(node.value).toBe('0');
   });
 
   it('should not incur unnecessary DOM mutations', function() {
@@ -206,7 +206,7 @@ describe('ReactDOMTextarea', function() {
     expect(nodeValueSetter.mock.calls.length).toBe(0);
 
     ReactDOM.render(<textarea value="b" onChange={emptyFunction} />, container);
-    expect(nodeValueSetter.mock.calls.length).toBe(1);
+    expect(nodeValueSetter.mock.calls.length).toBe(2); // must update both value and defaultValue
   });
 
   it('should properly control a value of number `0`', function() {
@@ -230,7 +230,7 @@ describe('ReactDOMTextarea', function() {
 
     // Changing children should cause value to change (new behavior of `defaultValue`)
     stub = ReactDOM.render(<textarea>gorilla</textarea>, container);
-    expect(node.value).toEqual('gorilla');
+    expect(node.value).toEqual('giraffe');
   });
 
   it('should not keep value when switching to uncontrolled element if not changed', function() {
@@ -242,7 +242,7 @@ describe('ReactDOMTextarea', function() {
 
     ReactDOM.render(<textarea defaultValue="gorilla"></textarea>, container);
 
-    expect(node.value).toEqual('gorilla');
+    expect(node.value).toEqual('kitten');
   });
 
   it('should keep value when switching to uncontrolled element if changed', function() {

diff --git a/src/renderers/dom/shared/DOMPropertyOperations.js b/src/renderers/dom/shared/DOMPropertyOperations.js
@@ -153,7 +153,15 @@ var DOMPropertyOperations = {
             ('' + node[propName]) !== ('' + value)) {
           // Contrary to `setAttribute`, object properties are properly
           // `toString`ed by IE8/9.
-          node[propName] = value;
+
+          if (propName === 'defaultValue') {
+            var tmp = node.value;
+            node[propName] = value;
+            node.value = tmp;
+          }
+          else {
+            node[propName] = value;
+          }
         }
       } else {
         var attributeName = propertyInfo.attributeName;

diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/shared/ReactDOMComponent.js
@@ -345,6 +345,13 @@ function trapBubbledEventsLocal() {
   }
 }
 
+function initializeInitialInputValue() {
+  var inst = this;
+  invariant(inst._rootNodeID, 'Must be mounted to initialize initial input value');
+  var node = getNode(inst);
+  node.value = node.defaultValue;
+}
+
 function postUpdateSelectWrapper() {
   ReactDOMSelect.postUpdateWrapper(this);
 }
@@ -502,6 +509,9 @@ ReactDOMComponent.Mixin = {
         ReactDOMTextarea.mountWrapper(this, props, nativeParent);
         props = ReactDOMTextarea.getNativeProps(this, props);
         transaction.getReactMountReady().enqueue(trapBubbledEventsLocal, this);
+        if (!props.value && props.defaultValue) {
+          transaction.getReactMountReady().enqueue(initializeInitialInputValue, this);
+        }
         break;
     }