From 9c5c1ed90253b3d3f90d1d53b89d94fdba273b47 Mon Sep 17 00:00:00 2001
From: Ben Alpert <spicyjalapeno@gmail.com>
Date: Wed, 15 Jan 2014 13:44:24 -0800
Subject: [PATCH 1/3] Make uncontrolled select not set value on update

---
 src/browser/dom/components/ReactDOMSelect.js    | 15 ++++++++++++---
 .../components/__tests__/ReactDOMSelect-test.js | 17 +++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/browser/dom/components/ReactDOMSelect.js b/src/browser/dom/components/ReactDOMSelect.js
index 4e625aad8b..14284376dd 100644
--- a/src/browser/dom/components/ReactDOMSelect.js
+++ b/src/browser/dom/components/ReactDOMSelect.js
@@ -56,12 +56,17 @@ function selectValueType(props, propName, componentName) {
 
 /**
  * If `value` is supplied, updates <option> elements on mount and update.
+ * @param {boolean} force If true, updates the value even on an uncontrolled
+ * component.
  * @private
  */
-function updateOptions() {
+function updateOptions(force) {
   /*jshint validthis:true */
   var multiple = this.props.multiple;
   var propValue = LinkedValueUtils.getValue(this);
+  if (propValue == null && !force) {
+    return;
+  }
   var value = propValue != null ? propValue : this.state.value;
   var options = this.getDOMNode().options;
   var selectedValue, i, l;
@@ -136,9 +141,13 @@ var ReactDOMSelect = ReactCompositeComponent.createClass({
     return select(props, this.props.children);
   },
 
-  componentDidMount: updateOptions,
+  componentDidMount: function() {
+    updateOptions.call(this, true);
+  },
 
-  componentDidUpdate: updateOptions,
+  componentDidUpdate: function() {
+    updateOptions.call(this, false);
+  },
 
   _handleChange: function(event) {
     var returnValue;
diff --git a/src/browser/dom/components/__tests__/ReactDOMSelect-test.js b/src/browser/dom/components/__tests__/ReactDOMSelect-test.js
index ee4c9746ec..1419122bbe 100644
--- a/src/browser/dom/components/__tests__/ReactDOMSelect-test.js
+++ b/src/browser/dom/components/__tests__/ReactDOMSelect-test.js
@@ -58,6 +58,23 @@ describe('ReactDOMSelect', function() {
     expect(node.value).toEqual('giraffe');
   });
 
+  it('should not control when using `defaultValue`', function() {
+    var stub =
+      <select defaultValue="giraffe">
+        <option value="monkey">A monkey!</option>
+        <option value="giraffe">A giraffe!</option>
+        <option value="gorilla">A gorilla!</option>
+      </select>;
+    var node = renderSelect(stub);
+
+    expect(node.value).toBe('giraffe');
+
+    node.value = 'monkey';
+    stub.forceUpdate();
+    // Uncontrolled selects shouldn't change the value after first mounting
+    expect(node.value).toEqual('monkey');
+  });
+
   it('should allow setting `defaultValue` with multiple', function() {
     var stub =
       <select multiple={true} defaultValue={['giraffe', 'gorilla']}>

From c7dd8d4217f7f3535b09627b091007031327fec5 Mon Sep 17 00:00:00 2001
From: Ben Alpert <spicyjalapeno@gmail.com>
Date: Wed, 5 Feb 2014 11:46:34 -0800
Subject: [PATCH 2/3] Refactor updateOptions to take value

---
 src/browser/dom/components/ReactDOMSelect.js | 26 ++++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/browser/dom/components/ReactDOMSelect.js b/src/browser/dom/components/ReactDOMSelect.js
index 14284376dd..e867e44bac 100644
--- a/src/browser/dom/components/ReactDOMSelect.js
+++ b/src/browser/dom/components/ReactDOMSelect.js
@@ -56,19 +56,15 @@ function selectValueType(props, propName, componentName) {
 
 /**
  * If `value` is supplied, updates <option> elements on mount and update.
- * @param {boolean} force If true, updates the value even on an uncontrolled
- * component.
+ * @param {ReactComponent} component Instance of ReactDOMSelect
+ * @param {?*} propValue For uncontrolled components, null/undefined. For
+ * controlled components, a string (or with `multiple`, a list of strings).
  * @private
  */
-function updateOptions(force) {
-  /*jshint validthis:true */
-  var multiple = this.props.multiple;
-  var propValue = LinkedValueUtils.getValue(this);
-  if (propValue == null && !force) {
-    return;
-  }
-  var value = propValue != null ? propValue : this.state.value;
-  var options = this.getDOMNode().options;
+function updateOptions(component, propValue) {
+  var multiple = component.props.multiple;
+  var value = propValue != null ? propValue : component.state.value;
+  var options = component.getDOMNode().options;
   var selectedValue, i, l;
   if (multiple) {
     selectedValue = {};
@@ -142,11 +138,15 @@ var ReactDOMSelect = ReactCompositeComponent.createClass({
   },
 
   componentDidMount: function() {
-    updateOptions.call(this, true);
+    var value = LinkedValueUtils.getValue(this);
+    updateOptions(this, value);
   },
 
   componentDidUpdate: function() {
-    updateOptions.call(this, false);
+    var value = LinkedValueUtils.getValue(this);
+    if (value != null) {
+      updateOptions(this, value);
+    }
   },
 
   _handleChange: function(event) {

From e0262d50f91d5e18d1d525099987170229632ec8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= <paul@oshannessy.com>
Date: Wed, 5 Feb 2014 16:41:57 -0800
Subject: [PATCH 3/3] Skip assignment, just call updateOptions directly

---
 src/browser/dom/components/ReactDOMSelect.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/browser/dom/components/ReactDOMSelect.js b/src/browser/dom/components/ReactDOMSelect.js
index e867e44bac..98243b6a3c 100644
--- a/src/browser/dom/components/ReactDOMSelect.js
+++ b/src/browser/dom/components/ReactDOMSelect.js
@@ -138,8 +138,7 @@ var ReactDOMSelect = ReactCompositeComponent.createClass({
   },
 
   componentDidMount: function() {
-    var value = LinkedValueUtils.getValue(this);
-    updateOptions(this, value);
+    updateOptions(this, LinkedValueUtils.getValue(this));
   },
 
   componentDidUpdate: function() {