Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[muiStyled] Support default theme when none is available #22791

Merged
merged 40 commits into from
Oct 2, 2020
Merged

[muiStyled] Support default theme when none is available #22791

Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
c2d31cc
add emotion peer dependencies
mnajdova Sep 25, 2020
5ae933f
fixed types & tests
mnajdova Sep 25, 2020
18b0668
prettier
mnajdova Sep 25, 2020
f0ef95c
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Sep 28, 2020
c7bebb8
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Sep 28, 2020
92b2d6e
Merge branch 'next' of https://github.com/mui-org/material-ui into next
mnajdova Sep 28, 2020
76256f1
wip
mnajdova Sep 28, 2020
8661306
added ThemeProvider
mnajdova Sep 28, 2020
61d7fac
exported ThemeProvider from styled-engine-sc
mnajdova Sep 28, 2020
c9fcdc1
tests wip
mnajdova Sep 28, 2020
48305e9
tests
mnajdova Sep 28, 2020
1c04d40
prettier
mnajdova Sep 28, 2020
27d9f73
Update packages/material-ui/src/styles/muiStyled.d.ts
mnajdova Sep 29, 2020
b149da5
Update packages/material-ui/src/styles/customStyled.d.ts
mnajdova Sep 29, 2020
05217a7
renamed styled -> legacy_styled, renamed customStyled -> styled
mnajdova Sep 29, 2020
3bf96aa
fixed tests
mnajdova Sep 29, 2020
551157f
added migration step, exported styled with deprecation warning
mnajdova Sep 29, 2020
a03252c
prettier
mnajdova Sep 29, 2020
179a6e2
renamed legacy_styled back to styled
mnajdova Sep 29, 2020
9878176
renamed styled to experimentalStyled
mnajdova Sep 29, 2020
17ce5d4
fix
mnajdova Sep 29, 2020
b7ccb20
specify ThemeProvider as export from emotion-theming
mnajdova Sep 29, 2020
72398c8
refactored muiStyled to be used as simple styled utility too
mnajdova Sep 29, 2020
58a1fb9
fix lint issues
mnajdova Sep 29, 2020
aac9e83
renamed muiStyled to experimentalStyled
mnajdova Sep 30, 2020
5774c19
refactored to use ThemeContext
mnajdova Sep 30, 2020
8016f92
Update packages/material-ui-styles/README.md
mnajdova Sep 30, 2020
6bc05c1
Update packages/material-ui-styles/README.md
mnajdova Sep 30, 2020
9757a00
Update packages/material-ui-styles/package.json
mnajdova Sep 30, 2020
bb880fe
Moved nesting ThemeProvider to core
mnajdova Oct 1, 2020
73d6589
Update packages/material-ui/src/styles/experimentalStyled.d.ts
mnajdova Oct 1, 2020
6e2b480
Update packages/material-ui/src/styles/experimentalStyled.d.ts
mnajdova Oct 1, 2020
0c8be58
added test
mnajdova Oct 1, 2020
a001588
fixed docs generation
mnajdova Oct 1, 2020
e676780
Update packages/material-ui/src/styles/ThemeProvider.js
mnajdova Oct 1, 2020
0298222
Update packages/material-ui/src/styles/experimentalStyled.d.ts
mnajdova Oct 1, 2020
c96062d
addressed comments
mnajdova Oct 1, 2020
3e419ac
Update packages/material-ui/src/styles/ThemeProvider.js
mnajdova Oct 2, 2020
4fccc26
Update packages/material-ui/src/styles/ThemeProvider.js
mnajdova Oct 2, 2020
dcc97fa
docs:api
mnajdova Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/material-ui/src/styles/ThemeProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ InnerThemeProvider.propTypes = {
};

/**
* This component takes a `theme` prop.
* It makes the `theme` available down the React tree thanks to React context.
* It makes the `theme` available down the React tree.
mnajdova marked this conversation as resolved.
Show resolved Hide resolved
* This component should preferably be used at **the root of your component tree**.
mnajdova marked this conversation as resolved.
Show resolved Hide resolved
*/
function ThemeProvider(props) {
Expand Down