{"body":"Fix behavior of ReactDOMSelect with `defaultValue`","files":[{"status":"M","path":"src\/dom\/components\/ReactDOMSelect.js"},{"status":"A","path":"src\/dom\/components\/__tests__\/ReactDOMSelect-test.js"}],"commit":{"revision":"e1c1d869debd2fc4f81cc210a6e3dfd309d8131a","shortRevision":"e1c1d869de","authorName":"Timothy Yung","authorEmail":"yungsters@gmail.com","subject":"Merge pull request #251 from spicyj\/select-value","authoredAt":"2013-08-17T21:50:13-07:00"},"parents":["1f8ef4c90390287fa9931633ae6f3da950323942","25e2cd0db6673f0ae80534b983b57a8cde1a0be4"],"patch":"diff --git a\/src\/dom\/components\/ReactDOMSelect.js b\/src\/dom\/components\/ReactDOMSelect.js\nindex 0709eaf5b1..22a7b2e3d2 100644\n--- a\/src\/dom\/components\/ReactDOMSelect.js\n+++ b\/src\/dom\/components\/ReactDOMSelect.js\n@@ -58,11 +58,9 @@ function selectValueType(props, propName, componentName) {\n *\/\n function updateOptions() {\n \/*jshint validthis:true *\/\n- if (this.props.value == null) {\n- return;\n- }\n+ var value = this.props.value != null ? this.props.value : this.state.value;\n var options = this.getDOMNode().options;\n- var selectedValue = '' + this.props.value;\n+ var selectedValue = '' + value;\n \n for (var i = 0, l = options.length; i < l; i++) {\n var selected = this.props.multiple ?\ndiff --git a\/src\/dom\/components\/__tests__\/ReactDOMSelect-test.js b\/src\/dom\/components\/__tests__\/ReactDOMSelect-test.js\nnew file mode 100644\nindex 0000000000..9c8cb08751\n--- \/dev\/null\n+++ b\/src\/dom\/components\/__tests__\/ReactDOMSelect-test.js\n@@ -0,0 +1,157 @@\n+\/**\n+ * Copyright 2013 Facebook, Inc.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http:\/\/www.apache.org\/licenses\/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ * @jsx React.DOM\n+ * @emails react-core\n+ *\/\n+\n+\"use strict\";\n+\n+\/*jshint evil:true *\/\n+\n+describe('ReactDOMSelect', function() {\n+ var React;\n+ var ReactTestUtils;\n+\n+ var renderSelect;\n+\n+ beforeEach(function() {\n+ React = require('React');\n+ ReactTestUtils = require('ReactTestUtils');\n+\n+ renderSelect = function(component) {\n+ var stub = ReactTestUtils.renderIntoDocument(component);\n+ var node = stub.getDOMNode();\n+ return node;\n+ };\n+ });\n+\n+ it('should allow setting `defaultValue`', function() {\n+ var stub =\n+ \n+

dillon1000/react

Files changed