{"body":"","commit":{"authoredAt":"2016-04-07T16:30:51-06:00","revision":"b102e256634ce7973eee6695e9aa8cb46ad14e42","authorName":"Trevor Smith","authorEmail":"trevorlynnsmith@gmail.com","shortRevision":"b102e25663","subject":"Correctly select options when nested inside an optgroup"},"parents":["2e8f28c29fd366d83cdbfc00e2b2dcb526e25202"],"files":[{"path":"src\/renderers\/dom\/client\/wrappers\/ReactDOMOption.js","status":"M"},{"path":"src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMSelect-test.js","status":"M"}],"patch":"diff --git a\/src\/renderers\/dom\/client\/wrappers\/ReactDOMOption.js b\/src\/renderers\/dom\/client\/wrappers\/ReactDOMOption.js\nindex 917ed0ee4a..a7e479d7e7 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/ReactDOMOption.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/ReactDOMOption.js\n@@ -32,8 +32,16 @@ var ReactDOMOption = {\n \n \/\/ Look up whether this option is 'selected'\n var selectValue = null;\n- if (nativeParent != null && nativeParent._tag === 'select') {\n- selectValue = ReactDOMSelect.getSelectValueContext(nativeParent);\n+ if (nativeParent != null) {\n+ var selectParent = nativeParent;\n+\n+ if (selectParent._tag === 'optgroup') {\n+ selectParent = selectParent._nativeParent;\n+ }\n+\n+ if (selectParent._tag === 'select') {\n+ selectValue = ReactDOMSelect.getSelectValueContext(selectParent);\n+ }\n }\n \n \/\/ If the value is null (e.g., no specified value or after initial mount)\ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMSelect-test.js b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMSelect-test.js\nindex 97736bc99a..406c0306a2 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMSelect-test.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/__tests__\/ReactDOMSelect-test.js\n@@ -537,4 +537,22 @@ describe('ReactDOMSelect', function() {\n \"Cannot set property 'pendingUpdate' of null\"\n );\n });\n+\n+ it('should select grandchild options nested inside an optgroup', function() {\n+ var stub =\n+

dillon1000/react

Files changed