This repository has been archived by the owner on Mar 4, 2020. It is now read-only.
feat(Provider): add overwrite prop #1780
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
layershifter
requested review from
dvdzkwsk,
kuzhelov,
levithomason,
miroslavstastny and
mnajdova
as code owners
layershifter
commented
Aug 9, 2019
| @@ -177,7 +181,7 @@ class Provider extends React.Component<WithAsProp<ProviderProps>> { | |||
| target={target} | |||
| {...{ rehydrate: false }} | |||
| > | |||
| <ThemeProvider theme={outgoingContext}> | |||
| <ThemeProvider theme={outgoingContext} overwrite> | |||
There was a problem hiding this comment.
ThemeProvider comes from Fela, we should always use overwrite as Fela has own shallow merging.
https://github.com/robinweser/fela/blob/v10.6.1/packages/fela-bindings/src/ThemeProviderFactory.js
|
Let's test this change. |
Codecov Report
@@ Coverage Diff @@
## master #1780 +/- ##
==========================================
+ Coverage 69.76% 69.77% +<.01%
==========================================
Files 867 867
Lines 7353 7354 +1
Branches 2158 2136 -22
==========================================
+ Hits 5130 5131 +1
Misses 2215 2215
Partials 8 8
Continue to review full report at Codecov.
|
miroslavstastny
approved these changes
Aug 12, 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.
♻️
overwritepropThis PR adds
overwriteprop forProvidercomponent. It allows to reset current context and avoid merging with existing themes. Existing behavior is preserved.overwrite=falseoverwrite=true