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

[Joy] Fix Checkbox prop type custom color warning #36691

Merged
merged 7 commits into from
Mar 31, 2023
Merged

[Joy] Fix Checkbox prop type custom color warning #36691

merged 7 commits into from
Mar 31, 2023
+6 −3

Conversation

amal-qb
Copy link
Contributor

@amal-qb amal-qb commented Mar 30, 2023

Fixes #36678

Sorry, something went wrong.

amal-qb and others added 2 commits March 30, 2023 12:07
@amal-qb
Fix Checkbox prop type color warning (mui#36678)
f788b88
@amal-qb
Merge pull request #1 from qburst/mui#36678--Fix-Checkbox-prop-type-c…

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
1d2b554 
…olor-warning

Fix: Checkbox prop type color warning (mui#36678)
@mui-bot
Copy link

mui-bot commented Mar 30, 2023 •
edited
Loading

Netlify deploy preview

https://deploy-preview-36691--material-ui.netlify.app/

Bundle size report

No bundle size changes

Generated by 🚫 dangerJS against ab37136

@amal-qb amal-qb mentioned this pull request Mar 30, 2023
Closed
2 tasks
@siriwatknp siriwatknp added bug 🐛 Something doesn't work package: joy-ui Specific to @mui/joy labels Mar 30, 2023
siriwatknp
siriwatknp reviewed Mar 30, 2023
View reviewed changes
packages/mui-joy/src/Checkbox/Checkbox.tsx Outdated
Comment on lines 388 to 391
color: PropTypes.oneOfType([
PropTypes.oneOf(['danger', 'info', 'neutral', 'primary', 'success', 'warning']),
PropTypes.string,
]),
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
color: PropTypes.oneOfType([
PropTypes.oneOf(['danger', 'info', 'neutral', 'primary', 'success', 'warning']),
PropTypes.string,
]),
color: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([
PropTypes.oneOf(['danger', 'info', 'neutral', 'primary', 'success', 'warning']),
PropTypes.string,
]),

Copy link
Member

Choose a reason for hiding this comment

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

Need to add it so that the PropTypes.string is not removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added

amal-qb and others added 2 commits March 30, 2023 12:22
@amal-qb
Code review fix (mui#36678)
3ab40e2
@amal-qb
Merge pull request #2 from qburst/mui#36678--Fix-Checkbox-prop-type-c…

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
6d15a94 
…olor-warning

Code review fix (mui#36678)
@amal-qb
Copy link
Contributor Author

amal-qb commented Mar 30, 2023

@siriwatknp I have made the review changes. But one of the CircleCI checks failed. Can you please provide the next step?

@kriskw1999
Copy link
Contributor

@amal-qb the couple of commands that make fail your CI are yarn docs:api && git diff --exit-code
This is because the docs:api command generates some files that should be committed. The check if all the commands are committed is done by git diff --exit-code.

How can we solve it? Run these commands locally, if the result satisfies your expectations commit it.

amal-qb and others added 3 commits March 31, 2023 12:39
@amal-qb
Merge branch 'mui:master' into master

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
3b65f84
@amal-qb
Code review fix (mui#36678)
db1af19
@amal-qb
Merge pull request #3 from qburst/mui#36678--Fix-Checkbox-prop-type-c…

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
ab37136 
…olor-warning

Fix: Checkbox prop type color warning (mui#36678) - code review fixes
@ZeeshanTamboli ZeeshanTamboli changed the title Fix: Checkbox prop type color warning (#36678) [Joy] Fix Checkbox prop type custom color warning Mar 31, 2023
ZeeshanTamboli
ZeeshanTamboli approved these changes Mar 31, 2023
View reviewed changes
Copy link
Member

@ZeeshanTamboli ZeeshanTamboli left a comment

Choose a reason for hiding this comment

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

@amal-qb Looks good. Thanks for the first PR. Looking forward for more.

@ZeeshanTamboli ZeeshanTamboli merged commit f459692 into mui:master Mar 31, 2023
@ZeeshanTamboli ZeeshanTamboli added the component: checkbox This is the name of the generic UI component, not the React module! label Mar 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@siriwatknp siriwatknp

@ZeeshanTamboli ZeeshanTamboli

Assignees
No one assigned
Labels
bug 🐛 Something doesn't work component: checkbox This is the name of the generic UI component, not the React module! package: joy-ui Specific to @mui/joy
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Joy] Checkbox: prop-type "color" warns when using a custom palette color
5 participants
@amal-qb @mui-bot @kriskw1999 @siriwatknp @ZeeshanTamboli