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][FloatingActionButton] Convert to support CSS extraction #41851

Merged
merged 4 commits into from
Apr 12, 2024
Merged

[material-ui][FloatingActionButton] Convert to support CSS extraction #41851

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
ec33779
converted Fab to support css extraction
gijsbotje Apr 10, 2024
c1e600c
move useCreateThemeProps outside component
gijsbotje Apr 11, 2024
904ad8d
Merge branch 'next' of https://github.com/mui/material-ui into pigmen…
siriwatknp Apr 12, 2024
a6a3db2
Merge branch 'next' of https://github.com/mui/material-ui into pigmen…
siriwatknp Apr 12, 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
37 changes: 37 additions & 0 deletions apps/pigment-css-next-app/src/app/material-ui/react-floating-action-button/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
'use client';
import * as React from 'react';
import FloatingActionButtonExtendedSize from '../../../../../../docs/data/material/components/floating-action-button/FloatingActionButtonExtendedSize';
import FloatingActionButtonSize from '../../../../../../docs/data/material/components/floating-action-button/FloatingActionButtonSize';
import FloatingActionButtonZoom from '../../../../../../docs/data/material/components/floating-action-button/FloatingActionButtonZoom';
import FloatingActionButtons from '../../../../../../docs/data/material/components/floating-action-button/FloatingActionButtons';

export default function FloatingActionButton() {
return (
<React.Fragment>
<section>
<h2> Floating Action Button Extended Size</h2>
<div className="demo-container">
<FloatingActionButtonExtendedSize />
</div>
</section>
<section>
<h2> Floating Action Button Size</h2>
<div className="demo-container">
<FloatingActionButtonSize />
</div>
</section>
<section>
<h2> Floating Action Button Zoom</h2>
<div className="demo-container">
<FloatingActionButtonZoom />
</div>
</section>
<section>
<h2> Floating Action Buttons</h2>
<div className="demo-container">
<FloatingActionButtons />
</div>
</section>
</React.Fragment>
);
}
38 changes: 38 additions & 0 deletions apps/pigment-css-vite-app/src/pages/material-ui/react-floating-action-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import * as React from 'react';
import MaterialUILayout from '../../Layout';
import FloatingActionButtonExtendedSize from '../../../../../docs/data/material/components/floating-action-button/FloatingActionButtonExtendedSize.tsx';
import FloatingActionButtonSize from '../../../../../docs/data/material/components/floating-action-button/FloatingActionButtonSize.tsx';
import FloatingActionButtonZoom from '../../../../../docs/data/material/components/floating-action-button/FloatingActionButtonZoom.tsx';
import FloatingActionButtons from '../../../../../docs/data/material/components/floating-action-button/FloatingActionButtons.tsx';

export default function FloatingActionButton() {
return (
<MaterialUILayout>
<h1>FloatingActionButton</h1>
<section>
<h2> Floating Action Button Extended Size</h2>
<div className="demo-container">
<FloatingActionButtonExtendedSize />
</div>
</section>
<section>
<h2> Floating Action Button Size</h2>
<div className="demo-container">
<FloatingActionButtonSize />
</div>
</section>
<section>
<h2> Floating Action Button Zoom</h2>
<div className="demo-container">
<FloatingActionButtonZoom />
</div>
</section>
<section>
<h2> Floating Action Buttons</h2>
<div className="demo-container">
<FloatingActionButtons />
</div>
</section>
</MaterialUILayout>
);
}
127 changes: 76 additions & 51 deletions packages/mui-material/src/Fab/Fab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import clsx from 'clsx';
import composeClasses from '@mui/utils/composeClasses';
import ButtonBase from '../ButtonBase';
import capitalize from '../utils/capitalize';
import useThemeProps from '../styles/useThemeProps';
import fabClasses, { getFabUtilityClass } from './fabClasses';
import styled, { rootShouldForwardProp } from '../styles/styled';
import { rootShouldForwardProp } from '../styles/styled';
import { styled, createUseThemeProps } from '../zero-styled';

const useThemeProps = createUseThemeProps('MuiFab');

const useUtilityClasses = (ownerState) => {
const { color, variant, classes, size } = ownerState;
Expand Down Expand Up @@ -46,7 +48,7 @@ const FabRoot = styled(ButtonBase, {
];
},
})(
({ theme, ownerState }) => ({
({ theme }) => ({
...theme.typography.button,
minHeight: 36,
transition: theme.transitions.create(['background-color', 'box-shadow', 'border-color'], {
Expand Down Expand Up @@ -77,56 +79,79 @@ const FabRoot = styled(ButtonBase, {
[`&.${fabClasses.focusVisible}`]: {
boxShadow: (theme.vars || theme).shadows[6],
},
...(ownerState.size === 'small' && {
width: 40,
height: 40,
}),
...(ownerState.size === 'medium' && {
width: 48,
height: 48,
}),
...(ownerState.variant === 'extended' && {
borderRadius: 48 / 2,
padding: '0 16px',
width: 'auto',
minHeight: 'auto',
minWidth: 48,
height: 48,
}),
...(ownerState.variant === 'extended' &&
ownerState.size === 'small' && {
width: 'auto',
padding: '0 8px',
borderRadius: 34 / 2,
minWidth: 34,
height: 34,
}),
...(ownerState.variant === 'extended' &&
ownerState.size === 'medium' && {
width: 'auto',
padding: '0 16px',
borderRadius: 40 / 2,
minWidth: 40,
height: 40,
}),
...(ownerState.color === 'inherit' && {
color: 'inherit',
}),
variants: [
{
props: { size: 'small' },
style: {
width: 40,
height: 40,
},
},
{
props: { size: 'medium' },
style: {
width: 48,
height: 48,
},
},
{
props: { variant: 'extended' },
style: {
borderRadius: 48 / 2,
padding: '0 16px',
width: 'auto',
minHeight: 'auto',
minWidth: 48,
height: 48,
},
},
{
props: { variant: 'extended', size: 'small' },
style: {
width: 'auto',
padding: '0 8px',
borderRadius: 34 / 2,
minWidth: 34,
height: 34,
},
},
{
props: { variant: 'extended', size: 'medium' },
style: {
width: 'auto',
padding: '0 16px',
borderRadius: 40 / 2,
minWidth: 40,
height: 40,
},
},
{
props: { color: 'inherit' },
style: {
color: 'inherit',
},
},
],
}),
({ theme, ownerState }) => ({
...(ownerState.color !== 'inherit' &&
ownerState.color !== 'default' &&
(theme.vars || theme).palette[ownerState.color] != null && {
color: (theme.vars || theme).palette[ownerState.color].contrastText,
backgroundColor: (theme.vars || theme).palette[ownerState.color].main,
'&:hover': {
backgroundColor: (theme.vars || theme).palette[ownerState.color].dark,
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: (theme.vars || theme).palette[ownerState.color].main,
({ theme }) => ({
variants: [
...Object.entries(theme.palette)
.filter(([, value]) => value.main && value.dark && value.contrastText) // check all the used fields in the style below
.map(([color]) => ({
props: { color },
style: {
color: (theme.vars || theme).palette[color].contrastText,
backgroundColor: (theme.vars || theme).palette[color].main,
'&:hover': {
backgroundColor: (theme.vars || theme).palette[color].dark,
// Reset on touch devices, it doesn't add specificity
'@media (hover: none)': {
backgroundColor: (theme.vars || theme).palette[color].main,
},
},
},
},
}),
})),
],
}),
({ theme }) => ({
[`&.${fabClasses.disabled}`]: {
Expand Down
Loading