Skip to content

Don't use owner to determine if the auto-bailout should be used #4089

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

Merged
sebmarkbage merged 1 commit into from
Aug 19, 2015
Merged

Don't use owner to determine if the auto-bailout should be used #4089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion 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 @@ -226,7 +226,14 @@ describe('ReactDOMSelect', function() {

// Changing the `value` prop should change the selected options.
objectToString.animal = 'monkey';
ReactDOM.render(el, container);

var el2 =
<select multiple={true} value={[objectToString]}>
<option value="monkey">A monkey!</option>
<option value="giraffe">A giraffe!</option>
<option value="gorilla">A gorilla!</option>
</select>;
ReactDOM.render(el2, container);

expect(node.options[0].selected).toBe(true); // monkey
expect(node.options[1].selected).toBe(false); // giraffe
Expand Down
2 changes: 1 addition & 1 deletion src/renderers/shared/reconciler/ReactReconciler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ var ReactReconciler = {
internalInstance, nextElement, transaction, context
) {
var prevElement = internalInstance._currentElement;

if (nextElement === prevElement &&
nextElement._owner != null &&
context === internalInstance._context
) {
// Since elements are immutable after the owner is rendered,
Expand Down