Skip to content

[material-ui][Chip] Convert to support CSS extraction #41592

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

Merged
DiegoAndai merged 6 commits into from
Mar 26, 2024
Merged

[material-ui][Chip] Convert to support CSS extraction #41592

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
880aad9
Update style utils import
DiegoAndai Mar 20, 2024
f9fc0f7
Initial refactor to remove ownerState usage
DiegoAndai Mar 21, 2024
72d0e61
Test app pages
DiegoAndai Mar 21, 2024
b1facf5
Fix icon color check
DiegoAndai Mar 21, 2024
770272c
Refactor styles to avoid specificity bumps and unnecessary functions
DiegoAndai Mar 22, 2024
e7cf86c
Use a single variants array
DiegoAndai Mar 25, 2024
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
Prev Previous commit
Next Next commit
Fix icon color check
  • Loading branch information
@DiegoAndai
DiegoAndai committed Mar 21, 2024
commit b1facf5369dd5cd68fdb55765e872f706d1d30be
12 changes: 9 additions & 3 deletions packages/mui-material/src/Chip/Chip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,14 @@ const useUtilityClasses = (ownerState) => {
return composeClasses(slots, getChipUtilityClass, classes);
};

const isIconColorEqualToColor = ({ icon, color }) =>
icon && React.isValidElement(icon) && icon.props?.color === color;
const parseIconColor = (icon, color) =>
React.isValidElement(icon) ? icon.props.color || color : color;

const isIconColorEqualToColor = ({ icon, color }) => {
const iconColor = parseIconColor(icon, color);

return iconColor === color;
};

const isClickable = ({ clickable, onClick }) =>
clickable !== false && !!onClick ? true : clickable;
Expand Down Expand Up @@ -458,7 +464,7 @@ const Chip = React.forwardRef(function Chip(inProps, ref) {
disabled,
size,
color,
iconColor: React.isValidElement(iconProp) ? iconProp.props.color || color : color,
iconColor: parseIconColor(iconProp, color),
onDelete: !!onDelete,
clickable,
variant,
Expand Down