Skip to content

Commit 0f7423f

Browse files
committed
Merge pull request facebook#1661 from spicyj/test-ie10-select-multiple
Fix select switching to multiple in IE
2 parents 3eb3641 + eaa68b8 commit 0f7423f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/browser/ui/dom/components/ReactDOMSelect.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,11 @@ var ReactDOMSelect = ReactCompositeComponent.createClass({
141141
updateOptions(this, LinkedValueUtils.getValue(this));
142142
},
143143

144-
componentDidUpdate: function() {
144+
componentDidUpdate: function(prevProps) {
145145
var value = LinkedValueUtils.getValue(this);
146-
if (value != null) {
146+
var prevMultiple = !!prevProps.multiple;
147+
var multiple = !!this.props.multiple;
148+
if (value != null || prevMultiple !== multiple) {
147149
updateOptions(this, value);
148150
}
149151
},

0 commit comments

Comments
 (0)