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

Correctly select options when nested inside an optgroup #6442

Merged
merged 3 commits into from
Apr 8, 2016
Merged

Correctly select options when nested inside an optgroup #6442

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b102e25
Correctly select options when nested inside an optgroup
trevorsmith Apr 7, 2016
8577600
Add a null check when checking for the native parent of an option ele…
trevorsmith Apr 7, 2016
f7181e0
Remove an unnecessary call to findDOMNode in the select optgroup test.
trevorsmith Apr 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Correctly select options when nested inside an optgroup
  • Loading branch information
@trevorsmith
trevorsmith committed Apr 7, 2016
commit b102e256634ce7973eee6695e9aa8cb46ad14e42
12 changes: 10 additions & 2 deletions src/renderers/dom/client/wrappers/ReactDOMOption.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,16 @@ var ReactDOMOption = {

// Look up whether this option is 'selected'
var selectValue = null;
if (nativeParent != null && nativeParent._tag === 'select') {
selectValue = ReactDOMSelect.getSelectValueContext(nativeParent);
if (nativeParent != null) {
var selectParent = nativeParent;

if (selectParent._tag === 'optgroup') {
selectParent = selectParent._nativeParent;
}

if (selectParent._tag === 'select') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need a null check here, because selectParent could be null at this point, right?

selectValue = ReactDOMSelect.getSelectValueContext(selectParent);
}
}

// If the value is null (e.g., no specified value or after initial mount)
Expand Down
18 changes: 18 additions & 0 deletions src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,4 +537,22 @@ describe('ReactDOMSelect', function() {
"Cannot set property 'pendingUpdate' of null"
);
});

it('should select grandchild options nested inside an optgroup', function() {
var stub =
<select value="b" onChange={noop}>
<optgroup label="group">
<option value="a">a</option>
<option value="b">b</option>
<option value="c">c</option>
</optgroup>
</select>;
var container = document.createElement('div');
stub = ReactDOM.render(stub, container);
var node = ReactDOM.findDOMNode(stub);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to do a findDOMNode here. The value returned by render is the node, so var node = ReactDOM.render(stub, container); is sufficient.


expect(node.options[0].selected).toBe(false); // a
expect(node.options[1].selected).toBe(true); // b
expect(node.options[2].selected).toBe(false); // c
});
});