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

[material-ui][Divider] Convert to support CSS extraction #41366

Merged
merged 10 commits into from
Mar 20, 2024
Merged

[material-ui][Divider] Convert to support CSS extraction #41366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1c30dd9
set up
sai6855 Mar 5, 2024
68d6ffc
migrate
sai6855 Mar 5, 2024
b9b3a94
migrate styles
sai6855 Mar 5, 2024
6519b3a
move themprops
sai6855 Mar 5, 2024
f88ff9b
prettier
sai6855 Mar 5, 2024
0ca0dbd
fix styles
sai6855 Mar 5, 2024
1b27988
rever pnpm yml
sai6855 Mar 5, 2024
4160e28
jun review
sai6855 Mar 6, 2024
0b39bba
move flexdirection
sai6855 Mar 6, 2024
0db3b6e
Merge branch 'next' of https://github.com/mui/material-ui into migrat…
siriwatknp Mar 20, 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
58 changes: 58 additions & 0 deletions apps/pigment-css-next-app/src/app/material-ui/react-divider/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
'use client';
import * as React from 'react';
import DividerText from '../../../../../../docs/data/material/components/dividers/DividerText';
import DividerVariants from '../../../../../../docs/data/material/components/dividers/DividerVariants';
import FlexDivider from '../../../../../../docs/data/material/components/dividers/FlexDivider';
import IntroDivider from '../../../../../../docs/data/material/components/dividers/IntroDivider';
import ListDividers from '../../../../../../docs/data/material/components/dividers/ListDividers';
import VerticalDividerMiddle from '../../../../../../docs/data/material/components/dividers/VerticalDividerMiddle';
import VerticalDividers from '../../../../../../docs/data/material/components/dividers/VerticalDividers';

export default function Dividers() {
return (
<React.Fragment>
<section>
<h2> Divider Text</h2>
<div className="demo-container">
<DividerText />
</div>
</section>
<section>
<h2> Divider Variants</h2>
<div className="demo-container">
<DividerVariants />
</div>
</section>
<section>
<h2> Flex Divider</h2>
<div className="demo-container">
<FlexDivider />
</div>
</section>
<section>
<h2> Intro Divider</h2>
<div className="demo-container">
<IntroDivider />
</div>
</section>
<section>
<h2> List Dividers</h2>
<div className="demo-container">
<ListDividers />
</div>
</section>
<section>
<h2> Vertical Divider Middle</h2>
<div className="demo-container">
<VerticalDividerMiddle />
</div>
</section>
<section>
<h2> Vertical Dividers</h2>
<div className="demo-container">
<VerticalDividers />
</div>
</section>
</React.Fragment>
);
}
59 changes: 59 additions & 0 deletions apps/pigment-css-vite-app/src/pages/material-ui/react-divider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import * as React from 'react';
import MaterialUILayout from '../../Layout';
import DividerText from '../../../../../docs/data/material/components/dividers/DividerText.tsx';
import DividerVariants from '../../../../../docs/data/material/components/dividers/DividerVariants.tsx';
import FlexDivider from '../../../../../docs/data/material/components/dividers/FlexDivider.tsx';
import IntroDivider from '../../../../../docs/data/material/components/dividers/IntroDivider.tsx';
import ListDividers from '../../../../../docs/data/material/components/dividers/ListDividers.tsx';
import VerticalDividerMiddle from '../../../../../docs/data/material/components/dividers/VerticalDividerMiddle.tsx';
import VerticalDividers from '../../../../../docs/data/material/components/dividers/VerticalDividers.tsx';

export default function Dividers() {
return (
<MaterialUILayout>
<h1>Dividers</h1>
<section>
<h2> Divider Text</h2>
<div className="demo-container">
<DividerText />
</div>
</section>
<section>
<h2> Divider Variants</h2>
<div className="demo-container">
<DividerVariants />
</div>
</section>
<section>
<h2> Flex Divider</h2>
<div className="demo-container">
<FlexDivider />
</div>
</section>
<section>
<h2> Intro Divider</h2>
<div className="demo-container">
<IntroDivider />
</div>
</section>
<section>
<h2> List Dividers</h2>
<div className="demo-container">
<ListDividers />
</div>
</section>
<section>
<h2> Vertical Divider Middle</h2>
<div className="demo-container">
<VerticalDividerMiddle />
</div>
</section>
<section>
<h2> Vertical Dividers</h2>
<div className="demo-container">
<VerticalDividers />
</div>
</section>
</MaterialUILayout>
);
}
202 changes: 126 additions & 76 deletions packages/mui-material/src/Divider/Divider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import PropTypes from 'prop-types';
import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import { alpha } from '@mui/system/colorManipulator';
import styled from '../styles/styled';
import useThemeProps from '../styles/useThemeProps';
import { styled, createUseThemeProps } from '../zero-styled';
import { getDividerUtilityClass } from './dividerClasses';

const useThemeProps = createUseThemeProps('MuiDivider');

const useUtilityClasses = (ownerState) => {
const { absolute, children, classes, flexItem, light, orientation, textAlign, variant } =
ownerState;
Expand Down Expand Up @@ -54,100 +55,140 @@ const DividerRoot = styled('div', {
styles.textAlignLeft,
];
},
})(
({ theme, ownerState }) => ({
margin: 0, // Reset browser default style.
flexShrink: 0,
borderWidth: 0,
borderStyle: 'solid',
borderColor: (theme.vars || theme).palette.divider,
borderBottomWidth: 'thin',
...(ownerState.absolute && {
position: 'absolute',
bottom: 0,
left: 0,
width: '100%',
}),
...(ownerState.light && {
borderColor: theme.vars
? `rgba(${theme.vars.palette.dividerChannel} / 0.08)`
: alpha(theme.palette.divider, 0.08),
}),
...(ownerState.variant === 'inset' && {
marginLeft: 72,
}),
...(ownerState.variant === 'middle' &&
ownerState.orientation === 'horizontal' && {
})(({ theme }) => ({
margin: 0, // Reset browser default style.
flexShrink: 0,
borderWidth: 0,
borderStyle: 'solid',
borderColor: (theme.vars || theme).palette.divider,
borderBottomWidth: 'thin',
variants: [
{
props: {
absolute: true,
},
style: {
position: 'absolute',
bottom: 0,
left: 0,
width: '100%',
},
},
{
props: {
light: true,
},
style: {
borderColor: theme.vars
? `rgba(${theme.vars.palette.dividerChannel} / 0.08)`
: alpha(theme.palette.divider, 0.08),
},
},
{
props: {
variant: 'inset',
},
style: {
marginLeft: 72,
},
},
{
props: {
variant: 'middle',
orientation: 'horizontal',
},
style: {
marginLeft: theme.spacing(2),
marginRight: theme.spacing(2),
}),
...(ownerState.variant === 'middle' &&
ownerState.orientation === 'vertical' && {
},
},
{
props: {
variant: 'middle',
orientation: 'vertical',
},
style: {
marginTop: theme.spacing(1),
marginBottom: theme.spacing(1),
}),
...(ownerState.orientation === 'vertical' && {
height: '100%',
borderBottomWidth: 0,
borderRightWidth: 'thin',
}),
...(ownerState.flexItem && {
alignSelf: 'stretch',
height: 'auto',
}),
}),
({ ownerState }) => ({
...(ownerState.children && {
display: 'flex',
whiteSpace: 'nowrap',
textAlign: 'center',
border: 0,
'&::before, &::after': {
content: '""',
alignSelf: 'center',
},
}),
}),
({ theme, ownerState }) => ({
...(ownerState.children &&
ownerState.orientation !== 'vertical' && {
},
{
props: {
orientation: 'vertical',
},
style: {
height: '100%',
borderBottomWidth: 0,
borderRightWidth: 'thin',
},
},
{
props: {
flexItem: true,
},
style: {
alignSelf: 'stretch',
height: 'auto',
},
},
{
props: ({ ownerState }) => !!ownerState.children,
style: {
display: 'flex',
whiteSpace: 'nowrap',
textAlign: 'center',
border: 0,
'&::before, &::after': {
content: '""',
alignSelf: 'center',
},
},
},
{
props: ({ ownerState }) => ownerState.children && ownerState.orientation !== 'vertical',
style: {
'&::before, &::after': {
width: '100%',
borderTop: `thin solid ${(theme.vars || theme).palette.divider}`,
},
}),
}),
({ theme, ownerState }) => ({
...(ownerState.children &&
ownerState.orientation === 'vertical' && {
},
},
{
props: ({ ownerState }) => ownerState.orientation === 'vertical' && ownerState.children,
siriwatknp marked this conversation as resolved.
Show resolved Hide resolved
style: {
flexDirection: 'column',
'&::before, &::after': {
height: '100%',
borderLeft: `thin solid ${(theme.vars || theme).palette.divider}`,
},
}),
}),
({ ownerState }) => ({
...(ownerState.textAlign === 'right' &&
ownerState.orientation !== 'vertical' && {
},
},
{
props: ({ ownerState }) =>
ownerState.textAlign === 'right' && ownerState.orientation !== 'vertical',
style: {
'&::before': {
width: '90%',
},
'&::after': {
width: '10%',
},
}),
...(ownerState.textAlign === 'left' &&
ownerState.orientation !== 'vertical' && {
},
},
{
props: ({ ownerState }) =>
ownerState.textAlign === 'left' && ownerState.orientation !== 'vertical',
style: {
'&::before': {
width: '10%',
},
'&::after': {
width: '90%',
},
}),
}),
);
},
},
],
}));

const DividerWrapper = styled('span', {
name: 'MuiDivider',
Expand All @@ -157,14 +198,21 @@ const DividerWrapper = styled('span', {

return [styles.wrapper, ownerState.orientation === 'vertical' && styles.wrapperVertical];
},
})(({ theme, ownerState }) => ({
})(({ theme }) => ({
display: 'inline-block',
paddingLeft: `calc(${theme.spacing(1)} * 1.2)`,
paddingRight: `calc(${theme.spacing(1)} * 1.2)`,
...(ownerState.orientation === 'vertical' && {
paddingTop: `calc(${theme.spacing(1)} * 1.2)`,
paddingBottom: `calc(${theme.spacing(1)} * 1.2)`,
}),
variants: [
{
props: {
orientation: 'vertical',
},
style: {
paddingTop: `calc(${theme.spacing(1)} * 1.2)`,
paddingBottom: `calc(${theme.spacing(1)} * 1.2)`,
},
},
],
}));

const Divider = React.forwardRef(function Divider(inProps, ref) {
Expand Down Expand Up @@ -219,7 +267,9 @@ const Divider = React.forwardRef(function Divider(inProps, ref) {
* The following flag is used to ensure that this component isn't tabbable i.e.
* does not get highlight/focus inside of MUI List.
*/
Divider.muiSkipListHighlight = true;
if (Divider) {
Divider.muiSkipListHighlight = true;
}

Divider.propTypes /* remove-proptypes */ = {
// ┌────────────────────────────── Warning ──────────────────────────────┐
Expand Down
Loading