-
Notifications
You must be signed in to change notification settings - Fork 675
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.
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
fix(color-modes): combine colors in nested providers #1838
Merged
Merged
+550
−279
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
This pull request is being automatically deployed with Vercel (learn more). 🔍 Inspect: https://vercel.com/systemui/theme-ui/4WMhRKkksBBLWRqEdXrAAjZtpUm8 |
90ae984
to
2846c63
Compare
2846c63
to
10c3c95
Compare
072289a
to
d8b54dc
Compare
Hey @fcisio, I got it to work :) |
fcisio
approved these changes
Jul 19, 2021
🚀 PR was released in |
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.
Should close #1456.
Updated repro: https://codesandbox.io/s/theme-ui-nested-color-modes-bug-qm0lt?file=/src/index.js.
Okay, as we discovered with @fcisio, this PR needs one more change.
Neted theme providers are not updated after SSR with local storage scenario. This could be fixed either by mutating nested theme provider div custom CSS properties or rerendering with proper color mode after hydration (what would also solve derived colors not refreshing after SSR + localStorage read).
📦 Published PR as canary version:
0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0
✨ Test out this PR locally via:
npm install @theme-ui/color-modes@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/color@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/components@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/core@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/css@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/custom-properties@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/editor@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install gatsby-plugin-theme-ui@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install gatsby-theme-style-guide@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install gatsby-theme-ui-layout@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/match-media@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/mdx@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/parse-props@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-base@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-bootstrap@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-bulma@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-dark@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-deep@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-funk@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-future@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-polaris@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-roboto@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-sketchy@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-swiss@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-system@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-tailwind@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/preset-tosh@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/presets@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/prism@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/sidenav@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/style-guide@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/tachyons@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/tailwind@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/theme-provider@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install theme-ui@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 npm install @theme-ui/typography@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 # or yarn add @theme-ui/color-modes@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/color@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/components@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/core@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/css@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/custom-properties@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/editor@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add gatsby-plugin-theme-ui@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add gatsby-theme-style-guide@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add gatsby-theme-ui-layout@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/match-media@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/mdx@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/parse-props@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-base@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-bootstrap@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-bulma@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-dark@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-deep@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-funk@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-future@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-polaris@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-roboto@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-sketchy@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-swiss@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-system@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-tailwind@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/preset-tosh@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/presets@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/prism@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/sidenav@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/style-guide@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/tachyons@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/tailwind@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/theme-provider@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add theme-ui@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0 yarn add @theme-ui/typography@0.11.0-canary.1838.cb3f895316aec940d67cb30e112b2ba2f67e2190.0
Version
Published prerelease version:
v0.11.0-develop.0
Changelog
🎉 This release contains work from a new contributor! 🎉
Thank you, null@jordie23, for all your work!
🚀 Enhancement
@theme-ui/color-modes
,@theme-ui/core
,@theme-ui/editor
,@theme-ui/theme-provider
,theme-ui
🐛 Bug Fix
@theme-ui/color-modes
,@theme-ui/components
,@theme-ui/core
,@theme-ui/editor
,gatsby-theme-style-guide
,gatsby-theme-ui-layout
,@theme-ui/match-media
,@theme-ui/mdx
,@theme-ui/parse-props
,@theme-ui/sidenav
,@theme-ui/style-guide
,@theme-ui/theme-provider
,theme-ui
🏠 Internal
theme-ui
Authors: 2