This repository has been archived by the owner on Mar 4, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 54
fix(MenuItem): Merge Menu and MenuItem variables #1447
Merged
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
miroslavstastny
requested review from
dvdzkwsk,
kuzhelov,
layershifter,
levithomason and
mnajdova
as code owners
June 3, 2019 20:49
Codecov Report
@@ Coverage Diff @@
## master #1447 +/- ##
==========================================
+ Coverage 73.27% 73.29% +0.01%
==========================================
Files 802 802
Lines 6025 6028 +3
Branches 1775 1775
==========================================
+ Hits 4415 4418 +3
Misses 1604 1604
Partials 6 6
Continue to review full report at Codecov.
|
Codecov Report
@@ Coverage Diff @@
## master #1447 +/- ##
==========================================
+ Coverage 73.46% 73.67% +0.21%
==========================================
Files 807 807
Lines 6086 6089 +3
Branches 1772 1753 -19
==========================================
+ Hits 4471 4486 +15
+ Misses 1610 1598 -12
Partials 5 5
Continue to review full report at Codecov.
|
mnajdova
reviewed
Jun 4, 2019
mnajdova
approved these changes
Jun 4, 2019
kuzhelov
reviewed
Jun 4, 2019
kuzhelov
reviewed
Jun 4, 2019
kuzhelov
reviewed
Jun 4, 2019
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.
Problem description
Menu
and all itsMenuItem
s share the same variables.Menu
passes its variables down toMenuItem
asdefaultProps
. That means that if a consumer defines a variable directly on aMenuItem
, it overwrites the variables passed from theMenu
:Solution
Instead of Menu passing its variables via
defaultProps
, it now does it throughoverrideProps
and shallow-merges Menu variables with MenuItem variables.Fixes #1392.