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

[material-ui][Checkbox] Convert to support CSS extraction #41957

Merged
merged 4 commits into from
Apr 22, 2024
Merged

[material-ui][Checkbox] Convert to support CSS extraction #41957

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f80c3c
change components to use css extraction
lhilgert9 Apr 18, 2024
c71da24
fix missing css selector
lhilgert9 Apr 18, 2024
f290d22
fix import
siriwatknp Apr 22, 2024
e3a8249
Merge branch 'next' of https://github.com/mui/material-ui into checkb…
siriwatknp Apr 22, 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
79 changes: 79 additions & 0 deletions apps/pigment-css-next-app/src/app/material-ui/react-checkbox/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
'use client';
import * as React from 'react';
import CheckboxLabels from '../../../../../../docs/data/material/components/checkboxes/CheckboxLabels';
import CheckboxesComponent from '../../../../../../docs/data/material/components/checkboxes/Checkboxes';
import CheckboxesGroup from '../../../../../../docs/data/material/components/checkboxes/CheckboxesGroup';
import ColorCheckboxes from '../../../../../../docs/data/material/components/checkboxes/ColorCheckboxes';
import ControlledCheckbox from '../../../../../../docs/data/material/components/checkboxes/ControlledCheckbox';
import CustomizedCheckbox from '../../../../../../docs/data/material/components/checkboxes/CustomizedCheckbox';
import FormControlLabelPosition from '../../../../../../docs/data/material/components/checkboxes/FormControlLabelPosition';
import IconCheckboxes from '../../../../../../docs/data/material/components/checkboxes/IconCheckboxes';
import IndeterminateCheckbox from '../../../../../../docs/data/material/components/checkboxes/IndeterminateCheckbox';
import SizeCheckboxes from '../../../../../../docs/data/material/components/checkboxes/SizeCheckboxes';

export default function Checkboxes() {
return (
<React.Fragment>
<section>
<h2> Checkbox Labels</h2>
<div className="demo-container">
<CheckboxLabels />
</div>
</section>
<section>
<h2> Checkboxes</h2>
<div className="demo-container">
<CheckboxesComponent />
</div>
</section>
<section>
<h2> Checkboxes Group</h2>
<div className="demo-container">
<CheckboxesGroup />
</div>
</section>
<section>
<h2> Color Checkboxes</h2>
<div className="demo-container">
<ColorCheckboxes />
</div>
</section>
<section>
<h2> Controlled Checkbox</h2>
<div className="demo-container">
<ControlledCheckbox />
</div>
</section>
<section>
<h2> Customized Checkbox</h2>
<div className="demo-container">
<CustomizedCheckbox />
</div>
</section>
<section>
<h2> Form Control Label Position</h2>
<div className="demo-container">
<FormControlLabelPosition />
</div>
</section>
<section>
<h2> Icon Checkboxes</h2>
<div className="demo-container">
<IconCheckboxes />
</div>
</section>
<section>
<h2> Indeterminate Checkbox</h2>
<div className="demo-container">
<IndeterminateCheckbox />
</div>
</section>
<section>
<h2> Size Checkboxes</h2>
<div className="demo-container">
<SizeCheckboxes />
</div>
</section>
</React.Fragment>
);
}
80 changes: 80 additions & 0 deletions apps/pigment-css-vite-app/src/pages/material-ui/react-checkbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
import * as React from 'react';
import MaterialUILayout from '../../Layout';
import CheckboxLabels from '../../../../../docs/data/material/components/checkboxes/CheckboxLabels.tsx';
import CheckboxesComponent from '../../../../../docs/data/material/components/checkboxes/Checkboxes.tsx';
import CheckboxesGroup from '../../../../../docs/data/material/components/checkboxes/CheckboxesGroup.tsx';
import ColorCheckboxes from '../../../../../docs/data/material/components/checkboxes/ColorCheckboxes.tsx';
import ControlledCheckbox from '../../../../../docs/data/material/components/checkboxes/ControlledCheckbox.tsx';
import CustomizedCheckbox from '../../../../../docs/data/material/components/checkboxes/CustomizedCheckbox.tsx';
import FormControlLabelPosition from '../../../../../docs/data/material/components/checkboxes/FormControlLabelPosition.tsx';
import IconCheckboxes from '../../../../../docs/data/material/components/checkboxes/IconCheckboxes.tsx';
import IndeterminateCheckbox from '../../../../../docs/data/material/components/checkboxes/IndeterminateCheckbox.tsx';
import SizeCheckboxes from '../../../../../docs/data/material/components/checkboxes/SizeCheckboxes.tsx';

export default function Checkboxes() {
return (
<MaterialUILayout>
<h1>Checkboxes</h1>
<section>
<h2> Checkbox Labels</h2>
<div className="demo-container">
<CheckboxLabels />
</div>
</section>
<section>
<h2> Checkboxes</h2>
<div className="demo-container">
<CheckboxesComponent />
</div>
</section>
<section>
<h2> Checkboxes Group</h2>
<div className="demo-container">
<CheckboxesGroup />
</div>
</section>
<section>
<h2> Color Checkboxes</h2>
<div className="demo-container">
<ColorCheckboxes />
</div>
</section>
<section>
<h2> Controlled Checkbox</h2>
<div className="demo-container">
<ControlledCheckbox />
</div>
</section>
<section>
<h2> Customized Checkbox</h2>
<div className="demo-container">
<CustomizedCheckbox />
</div>
</section>
<section>
<h2> Form Control Label Position</h2>
<div className="demo-container">
<FormControlLabelPosition />
</div>
</section>
<section>
<h2> Icon Checkboxes</h2>
<div className="demo-container">
<IconCheckboxes />
</div>
</section>
<section>
<h2> Indeterminate Checkbox</h2>
<div className="demo-container">
<IndeterminateCheckbox />
</div>
</section>
<section>
<h2> Size Checkboxes</h2>
<div className="demo-container">
<SizeCheckboxes />
</div>
</section>
</MaterialUILayout>
);
}
79 changes: 51 additions & 28 deletions packages/mui-material/src/Checkbox/Checkbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ import CheckBoxOutlineBlankIcon from '../internal/svg-icons/CheckBoxOutlineBlank
import CheckBoxIcon from '../internal/svg-icons/CheckBox';
import IndeterminateCheckBoxIcon from '../internal/svg-icons/IndeterminateCheckBox';
import capitalize from '../utils/capitalize';
import useThemeProps from '../styles/useThemeProps';
import styled, { rootShouldForwardProp } from '../styles/styled';
import rootShouldForwardProp from '../styles/rootShouldForwardProp';
import checkboxClasses, { getCheckboxUtilityClass } from './checkboxClasses';
import { createUseThemeProps, styled } from '../zero-styled';

const useThemeProps = createUseThemeProps('MuiCheckbox');

const useUtilityClasses = (ownerState) => {
const { classes, indeterminate, color, size } = ownerState;
Expand Down Expand Up @@ -48,36 +50,57 @@ const CheckboxRoot = styled(SwitchBase, {
ownerState.color !== 'default' && styles[`color${capitalize(ownerState.color)}`],
];
},
})(({ theme, ownerState }) => ({
})(({ theme }) => ({
color: (theme.vars || theme).palette.text.secondary,
...(!ownerState.disableRipple && {
'&:hover': {
backgroundColor: theme.vars
? `rgba(${
ownerState.color === 'default'
? theme.vars.palette.action.activeChannel
: theme.vars.palette[ownerState.color].mainChannel
} / ${theme.vars.palette.action.hoverOpacity})`
: alpha(
ownerState.color === 'default'
? theme.palette.action.active
: theme.palette[ownerState.color].main,
theme.palette.action.hoverOpacity,
),
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: 'transparent',
variants: [
{
props: { color: 'default', disableRipple: false },
style: {
'&:hover': {
backgroundColor: theme.vars
? `rgba(${theme.vars.palette.action.activeChannel} / ${theme.vars.palette.action.hoverOpacity})`
: alpha(theme.palette.action.active, theme.palette.action.hoverOpacity),
},
},
},
}),
...(ownerState.color !== 'default' && {
[`&.${checkboxClasses.checked}, &.${checkboxClasses.indeterminate}`]: {
color: (theme.vars || theme).palette[ownerState.color].main,
},
[`&.${checkboxClasses.disabled}`]: {
color: (theme.vars || theme).palette.action.disabled,
...Object.entries(theme.palette)
.filter(([, palette]) => palette.main)
.map(([color]) => ({
props: { color, disableRipple: false },
style: {
'&:hover': {
backgroundColor: theme.vars
? `rgba(${theme.vars.palette[color].mainChannel} / ${theme.vars.palette.action.hoverOpacity})`
: alpha(theme.palette[color].main, theme.palette.action.hoverOpacity),
},
},
})),
...Object.entries(theme.palette)
.filter(([, palette]) => palette.main)
.map(([color]) => ({
props: { color },
style: {
[`&.${checkboxClasses.checked}, &.${checkboxClasses.indeterminate}`]: {
color: (theme.vars || theme).palette[color].main,
},
[`&.${checkboxClasses.disabled}`]: {
color: (theme.vars || theme).palette.action.disabled,
},
},
})),
{
// Should be last to override other colors
props: { disableRipple: false },
style: {
// Reset on touch devices, it doesn't add specificity
'&:hover': {
'@media (hover: none)': {
backgroundColor: 'transparent',
},
},
},
},
}),
],
}));

const defaultCheckedIcon = <CheckBoxIcon />;
Expand Down
Loading