[Menus] Remove style-propable mixin #3219
Merged
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
90 tasks
| } | ||
|
|
||
| let mergedChildrenStyles = this.mergeStyles( | ||
| let mergedChildrenStyles = Object.assign( | ||
| child.props.style || {}, |
There was a problem hiding this comment.
hmmmm this is dangerous. Object.assign({}, child.props.style, selectedChildrenStyles)
There was a problem hiding this comment.
Oh good catch @alitaheri!
newoga
added
PR: needs revision
|
newoga
added
PR: Needs Review
and removed
PR: needs revision
|
All good 👍 ^_^ |
| @@ -547,7 +544,7 @@ const Menu = React.createClass({ | |||
| transitionDelay = cumulativeDelay; | |||
| } | |||
|
|
|||
| childrenContainerStyles = this.mergeStyles(styles.menuItemContainer, { | |||
| childrenContainerStyles = Object.assign(styles.menuItemContainer, { | |||
There was a problem hiding this comment.
Thanks missed the loop that time, though it didn't seem to cause an issue during testing.
I'm going to add it anyway though.
|
|
@newoga Thanks! |
oliviertassinari
added a commit
that referenced
this pull request
Feb 8, 2016
[Menus] Remove style-propable mixin
zannager
added
the
component: menu
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.