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

Prevent "when" childProps from clobbering "listen" chlidProps in RootElement #677

Merged
merged 1 commit into from
Sep 30, 2016
Merged

Prevent "when" childProps from clobbering "listen" chlidProps in RootElement #677

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
4 changes: 3 additions & 1 deletion packages/react-server/core/components/RootElement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ RootElement.scheduleRender = function(element) {
.then(el => el && (rendered = el))
.then(() => when)
.then(childProps => childProps
?React.cloneElement(rendered, {childProps})
// merge "when" childProps and "listen" childProps preemptively
// to prevent cloneElement shallow merge from clobbering "listen" childProps
?React.cloneElement(rendered, {childProps: _.assign({}, rendered.props.childProps || {}, childProps)})
Copy link
Contributor Author

Choose a reason for hiding this comment

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

it's a bit awkward that I have to "reach in" to grab the existing childProps

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah... no real way around it, though.

:rendered
)
}