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.

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

[material-ui] Migrate components to support CSS extraction #42001

Merged
merged 66 commits into from May 6, 2024

Conversation

siriwatknp
Copy link
Member

@siriwatknp siriwatknp commented Apr 22, 2024

Use styled-v6 codemod + edge case manual adjustment for the rest of the components in #41273

@siriwatknp siriwatknp added component: dialog This is the name of the generic UI component, not the React module! component: drawer This is the name of the generic UI component, not the React module! component: Icon The React component. component: menu This is the name of the generic UI component, not the React module! component: Paper This is the name of the generic UI component, not the React module! component: snackbar This is the name of the generic UI component, not the React module! component: tabs This is the name of the generic UI component, not the React module! component: tooltip This is the name of the generic UI component, not the React module! component: speed dial This is the name of the generic UI component, not the React module! package: material-ui Specific to @mui/material labels Apr 22, 2024
@@ -104,6 +111,26 @@ const pigmentOptions = {
transformLibraries: ['local-ui-lib'],
sourceMap: true,
displayName: true,
overrideContext: (context) => {
Copy link
Member Author

Choose a reason for hiding this comment

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

A workaround for mui/pigment-css#10

Copy link
Contributor

Choose a reason for hiding this comment

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

Adding this here fixes the issue? Should this then be made part of the library itself?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I can confirm that this prevents the error. I added here just to be a workaround but if you think it should be a part of Pigment, I am happy to add it. However, I think it should be a separate package for integrating with MUI system, not a part of nextjs/vite plugin.

Copy link
Member

Choose a reason for hiding this comment

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

If this would be required for every project that uses Material UI and Pigment CSS, we should make it part of the library. Do we know why it is required tough? Maybe we are fixing a symptom, not the problem

Copy link

Choose a reason for hiding this comment

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

probably related issue: mui/pigment-css#8

@siriwatknp siriwatknp requested a review from DiegoAndai May 3, 2024 11:19
@siriwatknp siriwatknp added component: LoadingButton The React component. component: Typography The React component. component: link This is the name of the generic UI component, not the React module! labels May 3, 2024
Copy link
Member

@DiegoAndai DiegoAndai left a comment

Choose a reason for hiding this comment

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

Amazing job with the codemod Jun, congrats 🎉

I just have some comments but they're not blockers, LGTM

@@ -117,6 +117,7 @@ const Checkbox = React.forwardRef(function Checkbox(inProps, ref) {
indeterminateIcon: indeterminateIconProp = defaultIndeterminateIcon,
inputProps,
size = 'medium',
disableRipple = false,
Copy link
Member

Choose a reason for hiding this comment

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

What's with this change?

Copy link
Member Author

@siriwatknp siriwatknp May 6, 2024

Choose a reason for hiding this comment

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

Otherwise, variants won't work because disabled=undefined

variants: [
  { props: { color: 'default', disableRipple: false } }, style: {} },
]

@@ -104,6 +111,26 @@ const pigmentOptions = {
transformLibraries: ['local-ui-lib'],
sourceMap: true,
displayName: true,
overrideContext: (context) => {
Copy link
Member

Choose a reason for hiding this comment

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

If this would be required for every project that uses Material UI and Pigment CSS, we should make it part of the library. Do we know why it is required tough? Maybe we are fixing a symptom, not the problem

@@ -107,6 +113,22 @@ const Paper = React.forwardRef(function Paper(inProps, ref) {
className={clsx(classes.root, className)}
ref={ref}
{...other}
style={{
...other.style,
Copy link
Member

Choose a reason for hiding this comment

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

This should come last, props' style should override the predefined CSS vars if needed.

@@ -137,6 +175,10 @@ const Typography = React.forwardRef(function Typography(inProps, ref) {
className={clsx(classes.root, className)}
{...other}
ownerState={ownerState}
style={{
...other.style,
Copy link
Member

Choose a reason for hiding this comment

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

Same here, this should come last.

@siriwatknp siriwatknp enabled auto-merge (squash) May 6, 2024 11:22
@siriwatknp siriwatknp merged commit ad85002 into mui:next May 6, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component: dialog This is the name of the generic UI component, not the React module! component: drawer This is the name of the generic UI component, not the React module! component: Icon The React component. component: input This is the name of the generic UI component, not the React module! component: link This is the name of the generic UI component, not the React module! component: LoadingButton The React component. component: menu This is the name of the generic UI component, not the React module! component: Paper This is the name of the generic UI component, not the React module! component: skeleton This is the name of the generic UI component, not the React module! component: snackbar This is the name of the generic UI component, not the React module! component: speed dial This is the name of the generic UI component, not the React module! component: TablePagination The React component. component: tabs This is the name of the generic UI component, not the React module! component: tooltip This is the name of the generic UI component, not the React module! component: Typography The React component. package: material-ui Specific to @mui/material v6.x
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

None yet

7 participants