Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some options cannot be selected alone in <select multiple /> #673

Merged
merged 2 commits into from
Dec 21, 2013
Merged

Some options cannot be selected alone in <select multiple /> #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a4a8aa
Do not automatically select other options
quark-zju Dec 18, 2013
3c57101
Fix a perf issue of <select multiple />
quark-zju Dec 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/dom/components/ReactDOMSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,23 @@ function selectValueType(props, propName, componentName) {
*/
function updateOptions() {
/*jshint validthis:true */
var multiple = this.props.multiple;
var propValue = this.getValue();
var value = propValue != null ? propValue : this.state.value;
var options = this.getDOMNode().options;
var selectedValue = '' + value;

for (var i = 0, l = options.length; i < l; i++) {
var selected = this.props.multiple ?
selectedValue.indexOf(options[i].value) >= 0 :
selected = options[i].value === selectedValue;
var selectedValue, i, l;
if (multiple) {
selectedValue = {};
for (i = 0, l = value.length; i < l; ++i) {
selectedValue['' + value[i]] = true;
}
} else {
selectedValue = '' + value;
}
for (i = 0, l = options.length; i < l; i++) {
var selected = multiple ?
selectedValue.hasOwnProperty(options[i].value) :
options[i].value === selectedValue;

if (selected !== options[i].selected) {
options[i].selected = selected;
Expand Down
14 changes: 14 additions & 0 deletions src/dom/components/__tests__/ReactDOMSelect-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,20 @@ describe('ReactDOMSelect', function() {
expect(node.options[2].selected).toBe(false); // gorilla
});

it('should not select other options automatically', function() {
var stub =
<select multiple={true} value={['12']}>
<option value="1">one</option>
<option value="2">two</option>
<option value="12">twelve</option>
</select>;
var node = renderSelect(stub);

expect(node.options[0].selected).toBe(false); // one
expect(node.options[1].selected).toBe(false); // two
expect(node.options[2].selected).toBe(true); // twelve
});

it('should allow setting `value` with `objectToString`', function() {
var objectToString = {
animal: "giraffe",
Expand Down