Fix the withRef mess #3740
Merged
Fix the withRef mess #3740
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
taion
force-pushed
the
fix-withRef
branch
2 times, most recently
from
57184e5
to
b11c1fd
Compare
|
Beat you to it :P |
|
There were a few more things to clean up in the test code, including how e.g. https://github.com/reactjs/react-router/blob/master/modules/__tests__/withRouter-test.js#L77-L78 calls I'll rebase and merge. |
|
|
||
| function getDisplayName(WrappedComponent) { | ||
| return WrappedComponent.displayName || WrappedComponent.name || 'Component' | ||
| } | ||
|
|
||
| export default function withRouter(WrappedComponent, options) { | ||
| const { withRef } = options || {} |
There was a problem hiding this comment.
I'd rather do destructuring in case the options grow. If they won't ever (I dunno, maybe?) then this should just be a simple boolean arg.
There was a problem hiding this comment.
I figure deal with that when we get there, and for now skip creating an empty object that doesn't get any use.
|
Updated to simplify the render branch a bit |
|
Gah okay tests should actually pass now |
1 task
Closed
1 task
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cleans up code style, variable naming, and tests