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

[docs] Migrate Fab demos to emotion #25251

Merged
merged 10 commits into from
Mar 7, 2021
Merged

[docs] Migrate Fab demos to emotion #25251

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
f702520
docs: Migrate basic fab demo to emotion
vicasas Mar 7, 2021
fb57d3f
docs: Migrate sizes fab demo to emotion
vicasas Mar 7, 2021
404262f
docs: Migrate animation fab demo to emotion
vicasas Mar 7, 2021
b4c1cee
fix build
oliviertassinari Mar 7, 2021
e5ada82
developers should be able to copy and paste cases
oliviertassinari Mar 7, 2021
9a8dd37
Stack won't work here as it needs to wrap
oliviertassinari Mar 7, 2021
0a028ea
smaller demos for more inline previews
oliviertassinari Mar 7, 2021
c9cb45b
size large isn't intuitive as a default
oliviertassinari Mar 7, 2021
4966a42
prefer public imports for the tests
oliviertassinari Mar 7, 2021
7af1e5f
fix build
oliviertassinari Mar 7, 2021
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
27 changes: 27 additions & 0 deletions docs/src/pages/components/floating-action-button/FloatingActionButtonExtendedSize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import * as React from 'react';
import Box from '@material-ui/core/Box';
import Fab from '@material-ui/core/Fab';
import NavigationIcon from '@material-ui/icons/Navigation';

export default function FloatingActionButtonExtendedSize() {
return (
<Box
sx={{
'& button': { m: 1 },
}}
>
<Fab variant="extended" size="small" color="primary" aria-label="add">
<NavigationIcon sx={{ mr: 1 }} />
Extended
</Fab>
<Fab variant="extended" size="medium" color="primary" aria-label="add">
<NavigationIcon sx={{ mr: 1 }} />
Extended
</Fab>
<Fab variant="extended" color="primary" aria-label="add">
<NavigationIcon sx={{ mr: 1 }} />
Extended
</Fab>
</Box>
);
}
27 changes: 27 additions & 0 deletions docs/src/pages/components/floating-action-button/FloatingActionButtonExtendedSize.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import * as React from 'react';
import Box from '@material-ui/core/Box';
import Fab from '@material-ui/core/Fab';
import NavigationIcon from '@material-ui/icons/Navigation';

export default function FloatingActionButtonExtendedSize() {
return (
<Box
sx={{
'& button': { m: 1 },
}}
>
<Fab variant="extended" size="small" color="primary" aria-label="add">
<NavigationIcon sx={{ mr: 1 }} />
Extended
</Fab>
<Fab variant="extended" size="medium" color="primary" aria-label="add">
<NavigationIcon sx={{ mr: 1 }} />
Extended
</Fab>
<Fab variant="extended" color="primary" aria-label="add">
<NavigationIcon sx={{ mr: 1 }} />
Extended
</Fab>
</Box>
);
}
83 changes: 16 additions & 67 deletions docs/src/pages/components/floating-action-button/FloatingActionButtonSize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,75 +1,24 @@
import * as React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Box from '@material-ui/core/Box';
import Fab from '@material-ui/core/Fab';
import AddIcon from '@material-ui/icons/Add';
import NavigationIcon from '@material-ui/icons/Navigation';

const useStyles = makeStyles((theme) => ({
margin: {
margin: theme.spacing(1),
},
extendedIcon: {
marginRight: theme.spacing(1),
},
}));

export default function FloatingActionButtonSize() {
const classes = useStyles();

return (
<div>
<div>
<Fab
size="small"
color="secondary"
aria-label="add"
className={classes.margin}
>
<AddIcon />
</Fab>
<Fab
size="medium"
color="secondary"
aria-label="add"
className={classes.margin}
>
<AddIcon />
</Fab>
<Fab color="secondary" aria-label="add" className={classes.margin}>
<AddIcon />
</Fab>
</div>
<div>
<Fab
variant="extended"
size="small"
color="primary"
aria-label="add"
className={classes.margin}
>
<NavigationIcon className={classes.extendedIcon} />
Extended
</Fab>
<Fab
variant="extended"
size="medium"
color="primary"
aria-label="add"
className={classes.margin}
>
<NavigationIcon className={classes.extendedIcon} />
Extended
</Fab>
<Fab
variant="extended"
color="primary"
aria-label="add"
className={classes.margin}
>
<NavigationIcon className={classes.extendedIcon} />
Extended
</Fab>
</div>
</div>
<Box
sx={{
'& :not(style)': { m: 1 },
}}
>
<Fab size="small" color="secondary" aria-label="add">
<AddIcon />
</Fab>
<Fab size="medium" color="secondary" aria-label="add">
<AddIcon />
</Fab>
<Fab color="secondary" aria-label="add">
<AddIcon />
</Fab>
</Box>
);
}
85 changes: 16 additions & 69 deletions docs/src/pages/components/floating-action-button/FloatingActionButtonSize.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,77 +1,24 @@
import * as React from 'react';
import { createStyles, Theme, makeStyles } from '@material-ui/core/styles';
import Box from '@material-ui/core/Box';
import Fab from '@material-ui/core/Fab';
import AddIcon from '@material-ui/icons/Add';
import NavigationIcon from '@material-ui/icons/Navigation';

const useStyles = makeStyles((theme: Theme) =>
createStyles({
margin: {
margin: theme.spacing(1),
},
extendedIcon: {
marginRight: theme.spacing(1),
},
}),
);

export default function FloatingActionButtonSize() {
const classes = useStyles();

return (
<div>
<div>
<Fab
size="small"
color="secondary"
aria-label="add"
className={classes.margin}
>
<AddIcon />
</Fab>
<Fab
size="medium"
color="secondary"
aria-label="add"
className={classes.margin}
>
<AddIcon />
</Fab>
<Fab color="secondary" aria-label="add" className={classes.margin}>
<AddIcon />
</Fab>
</div>
<div>
<Fab
variant="extended"
size="small"
color="primary"
aria-label="add"
className={classes.margin}
>
<NavigationIcon className={classes.extendedIcon} />
Extended
</Fab>
<Fab
variant="extended"
size="medium"
color="primary"
aria-label="add"
className={classes.margin}
>
<NavigationIcon className={classes.extendedIcon} />
Extended
</Fab>
<Fab
variant="extended"
color="primary"
aria-label="add"
className={classes.margin}
>
<NavigationIcon className={classes.extendedIcon} />
Extended
</Fab>
</div>
</div>
<Box
sx={{
'& :not(style)': { m: 1 },
}}
>
<Fab size="small" color="secondary" aria-label="add">
<AddIcon />
</Fab>
<Fab size="medium" color="secondary" aria-label="add">
<AddIcon />
</Fab>
<Fab color="secondary" aria-label="add">
<AddIcon />
</Fab>
</Box>
);
}
54 changes: 26 additions & 28 deletions docs/src/pages/components/floating-action-button/FloatingActionButtonZoom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import clsx from 'clsx';
import SwipeableViews from 'react-swipeable-views';
import { makeStyles, useTheme } from '@material-ui/core/styles';
import { useTheme } from '@material-ui/core/styles';
import AppBar from '@material-ui/core/AppBar';
import Tabs from '@material-ui/core/Tabs';
import Tab from '@material-ui/core/Tab';
Expand Down Expand Up @@ -45,29 +44,21 @@ function a11yProps(index) {
};
}

const useStyles = makeStyles((theme) => ({
root: {
backgroundColor: theme.palette.background.paper,
width: 500,
position: 'relative',
minHeight: 200,
},
fab: {
position: 'absolute',
bottom: theme.spacing(2),
right: theme.spacing(2),
},
fabGreen: {
color: theme.palette.common.white,
backgroundColor: green[500],
'&:hover': {
backgroundColor: green[600],
},
const fabStyle = {
position: 'absolute',
bottom: 16,
right: 16,
};

const fabGreenStyle = {
color: 'common.white',
bgcolor: green[500],
'&:hover': {
bgcolor: green[600],
},
}));
};

export default function FloatingActionButtonZoom() {
const classes = useStyles();
const theme = useTheme();
const [value, setValue] = React.useState(0);

Expand All @@ -87,26 +78,33 @@ export default function FloatingActionButtonZoom() {
const fabs = [
{
color: 'primary',
className: classes.fab,
sx: fabStyle,
icon: <AddIcon />,
label: 'Add',
},
{
color: 'secondary',
className: classes.fab,
sx: fabStyle,
icon: <EditIcon />,
label: 'Edit',
},
{
color: 'inherit',
className: clsx(classes.fab, classes.fabGreen),
sx: { ...fabStyle, ...fabGreenStyle },
icon: <UpIcon />,
label: 'Expand',
},
];

return (
<div className={classes.root}>
<Box
sx={{
bgcolor: 'background.paper',
width: 500,
position: 'relative',
minHeight: 200,
}}
>
<AppBar position="static" color="default">
<Tabs
value={value}
Expand Down Expand Up @@ -146,11 +144,11 @@ export default function FloatingActionButtonZoom() {
}}
unmountOnExit
>
<Fab aria-label={fab.label} className={fab.className} color={fab.color}>
<Fab sx={fab.sx} aria-label={fab.label} color={fab.color}>
{fab.icon}
</Fab>
</Zoom>
))}
</div>
</Box>
);
}
Loading