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

[Grid] Migrate to emotion #24395

Merged
merged 24 commits into from
Jan 15, 2021
Merged

[Grid] Migrate to emotion #24395

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8a19199
init
mnajdova Jan 13, 2021
68021d0
grid
mnajdova Jan 13, 2021
c6be491
buildAPI fix support for kebab case classes
mnajdova Jan 13, 2021
4d3f4cb
wip
mnajdova Jan 13, 2021
7016ed7
prettier
mnajdova Jan 13, 2021
c2c8f9d
test
mnajdova Jan 13, 2021
118b489
use longhand props
mnajdova Jan 13, 2021
6e03c35
screen size agnostic grid tests
eps1lon Jan 13, 2021
40d664d
sx prop typings
mnajdova Jan 13, 2021
142c0a8
Merge pull request #22 from eps1lon/feat/grid-migrate-to-emotion-test…
mnajdova Jan 13, 2021
961aa8f
sort asc
oliviertassinari Jan 13, 2021
5c8c572
share box sizing style
oliviertassinari Jan 13, 2021
5c2ae96
avoid indirection
oliviertassinari Jan 13, 2021
9730ffc
remove default value {}
oliviertassinari Jan 13, 2021
1785a4a
sort asc
oliviertassinari Jan 13, 2021
d1eb86c
styleProps can't be undefined
oliviertassinari Jan 13, 2021
0a361d9
no need to share the component in the state
oliviertassinari Jan 13, 2021
edd89ca
apply the same trick as CssBaseline
oliviertassinari Jan 13, 2021
747801f
implemented proposal
mnajdova Jan 14, 2021
6e25d37
Sebastian's review
mnajdova Jan 14, 2021
7da608c
Merge pull request #23 from mnajdova/feat/fix-requirePropFactory
mnajdova Jan 14, 2021
a886a9e
prettier
mnajdova Jan 14, 2021
bfa61f5
prettier & lint
mnajdova Jan 14, 2021
eb4c9e1
reverted requirePropFactory changes
mnajdova Jan 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/pages/api-docs/grid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,5 @@
"filename": "/packages/material-ui/src/Grid/Grid.js",
"inheritance": null,
"demos": "<ul><li><a href=\"/components/grid/\">Grid</a></li></ul>",
"styledComponent": false
"styledComponent": true
}
9 changes: 8 additions & 1 deletion docs/scripts/buildApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,8 +709,15 @@ async function updateStylesDefinition(context: {
if (members) {
styles.descriptions = styles.descriptions || {};
members.forEach((member) => {
const className = ((member as babel.types.TSPropertySignature)
let className = ((member as babel.types.TSPropertySignature)
.key as babel.types.Identifier).name;

if(!className) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need this change in order to support classess that are in kebab-case like grid-xs-auto for example

// Necessary for classes defined as kebab case
className = ((member as babel.types.TSPropertySignature)
.key as babel.types.StringLiteral).value;
}

styles.classes.push(className);
if (member.leadingComments) {
styles.descriptions[className] = trimComment(member.leadingComments[0].value);
Expand Down
Loading