Skip to content

[docs] Migrate Chip demos to emotion #25268

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.

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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 12 additions & 16 deletions docs/src/pages/components/chips/Chips.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
import * as React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Box from '@material-ui/core/Box';
import Avatar from '@material-ui/core/Avatar';
import Chip from '@material-ui/core/Chip';
import FaceIcon from '@material-ui/icons/Face';
import DoneIcon from '@material-ui/icons/Done';

const useStyles = makeStyles((theme) => ({
root: {
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
'& > *': {
margin: theme.spacing(0.5),
},
},
}));

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

const handleDelete = () => {
console.info('You clicked the delete icon.');
};
Expand All @@ -28,7 +15,16 @@ export default function Chips() {
};

return (
<div className={classes.root}>
<Box
sx={{
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
'& > :not(style)': {
m: 0.5,
},
}}
>
<Chip label="Basic" />
<Chip label="Disabled" disabled />
<Chip avatar={<Avatar>M</Avatar>} label="Clickable" onClick={handleClick} />
Expand Down Expand Up @@ -73,6 +69,6 @@ export default function Chips() {
onDelete={handleDelete}
color="secondary"
/>
</div>
</Box>
);
}
30 changes: 12 additions & 18 deletions docs/src/pages/components/chips/Chips.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
import * as React from 'react';
import { createStyles, Theme, makeStyles } from '@material-ui/core/styles';
import Box from '@material-ui/core/Box';
import Avatar from '@material-ui/core/Avatar';
import Chip from '@material-ui/core/Chip';
import FaceIcon from '@material-ui/icons/Face';
import DoneIcon from '@material-ui/icons/Done';

const useStyles = makeStyles((theme: Theme) =>
createStyles({
root: {
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
'& > *': {
margin: theme.spacing(0.5),
},
},
}),
);

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

const handleDelete = () => {
console.info('You clicked the delete icon.');
};
Expand All @@ -30,7 +15,16 @@ export default function Chips() {
};

return (
<div className={classes.root}>
<Box
sx={{
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
'& > :not(style)': {
m: 0.5,
},
}}
>
<Chip label="Basic" />
<Chip label="Disabled" disabled />
<Chip avatar={<Avatar>M</Avatar>} label="Clickable" onClick={handleClick} />
Expand Down Expand Up @@ -75,6 +69,6 @@ export default function Chips() {
onDelete={handleDelete}
color="secondary"
/>
</div>
</Box>
);
}
34 changes: 16 additions & 18 deletions docs/src/pages/components/chips/ChipsArray.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,14 @@
import * as React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import { experimentalStyled as styled } from '@material-ui/core/styles';
import Chip from '@material-ui/core/Chip';
import Paper from '@material-ui/core/Paper';
import TagFacesIcon from '@material-ui/icons/TagFaces';

const useStyles = makeStyles((theme) => ({
root: {
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
listStyle: 'none',
padding: theme.spacing(0.5),
margin: 0,
},
chip: {
margin: theme.spacing(0.5),
},
const ListItem = styled('li')(({ theme }) => ({
margin: theme.spacing(0.5),
}));

export default function ChipsArray() {
const classes = useStyles();
const [chipData, setChipData] = React.useState([
{ key: 0, label: 'Angular' },
{ key: 1, label: 'jQuery' },
Expand All @@ -33,7 +22,17 @@ export default function ChipsArray() {
};

return (
<Paper component="ul" className={classes.root}>
<Paper
sx={{
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
listStyle: 'none',
p: 0.5,
m: 0,
}}
component="ul"
>
{chipData.map((data) => {
let icon;

Expand All @@ -42,14 +41,13 @@ export default function ChipsArray() {
}

return (
<li key={data.key}>
<ListItem key={data.key}>
<Chip
icon={icon}
label={data.label}
onDelete={data.label === 'React' ? undefined : handleDelete(data)}
className={classes.chip}
/>
</li>
</ListItem>
);
})}
</Paper>
Expand Down
38 changes: 17 additions & 21 deletions docs/src/pages/components/chips/ChipsArray.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
import { experimentalStyled as styled } from '@material-ui/core/styles';
import Chip from '@material-ui/core/Chip';
import Paper from '@material-ui/core/Paper';
import TagFacesIcon from '@material-ui/icons/TagFaces';
Expand All @@ -9,24 +9,11 @@ interface ChipData {
label: string;
}

const useStyles = makeStyles((theme: Theme) =>
createStyles({
root: {
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
listStyle: 'none',
padding: theme.spacing(0.5),
margin: 0,
},
chip: {
margin: theme.spacing(0.5),
},
}),
);
const ListItem = styled('li')(({ theme }) => ({
margin: theme.spacing(0.5),
}));

export default function ChipsArray() {
const classes = useStyles();
const [chipData, setChipData] = React.useState<ChipData[]>([
{ key: 0, label: 'Angular' },
{ key: 1, label: 'jQuery' },
Expand All @@ -40,7 +27,17 @@ export default function ChipsArray() {
};

return (
<Paper component="ul" className={classes.root}>
<Paper
sx={{
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
listStyle: 'none',
p: 0.5,
m: 0,
}}
component="ul"
>
{chipData.map((data) => {
let icon;

Expand All @@ -49,14 +46,13 @@ export default function ChipsArray() {
}

return (
<li key={data.key}>
<ListItem key={data.key}>
<Chip
icon={icon}
label={data.label}
onDelete={data.label === 'React' ? undefined : handleDelete(data)}
className={classes.chip}
/>
</li>
</ListItem>
);
})}
</Paper>
Expand Down
28 changes: 12 additions & 16 deletions docs/src/pages/components/chips/OutlinedChips.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
import * as React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Box from '@material-ui/core/Box';
import Avatar from '@material-ui/core/Avatar';
import Chip from '@material-ui/core/Chip';
import FaceIcon from '@material-ui/icons/Face';
import DoneIcon from '@material-ui/icons/Done';

const useStyles = makeStyles((theme) => ({
root: {
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
'& > *': {
margin: theme.spacing(0.5),
},
},
}));

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

const handleDelete = () => {
console.info('You clicked the delete icon.');
};
Expand All @@ -28,7 +15,16 @@ export default function OutlinedChips() {
};

return (
<div className={classes.root}>
<Box
sx={{
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
'& > :not(style)': {
m: 0.5,
},
}}
>
<Chip label="Basic" variant="outlined" />
<Chip label="Disabled" disabled variant="outlined" />
<Chip
Expand Down Expand Up @@ -95,6 +91,6 @@ export default function OutlinedChips() {
color="secondary"
variant="outlined"
/>
</div>
</Box>
);
}
30 changes: 12 additions & 18 deletions docs/src/pages/components/chips/OutlinedChips.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
import * as React from 'react';
import { createStyles, Theme, makeStyles } from '@material-ui/core/styles';
import Box from '@material-ui/core/Box';
import Avatar from '@material-ui/core/Avatar';
import Chip from '@material-ui/core/Chip';
import FaceIcon from '@material-ui/icons/Face';
import DoneIcon from '@material-ui/icons/Done';

const useStyles = makeStyles((theme: Theme) =>
createStyles({
root: {
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
'& > *': {
margin: theme.spacing(0.5),
},
},
}),
);

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

const handleDelete = () => {
console.info('You clicked the delete icon.');
};
Expand All @@ -30,7 +15,16 @@ export default function OutlinedChips() {
};

return (
<div className={classes.root}>
<Box
sx={{
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
'& > :not(style)': {
m: 0.5,
},
}}
>
<Chip label="Basic" variant="outlined" />
<Chip label="Disabled" disabled variant="outlined" />
<Chip
Expand Down Expand Up @@ -97,6 +91,6 @@ export default function OutlinedChips() {
color="secondary"
variant="outlined"
/>
</div>
</Box>
);
}
28 changes: 12 additions & 16 deletions docs/src/pages/components/chips/SmallChips.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,11 @@
import * as React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Box from '@material-ui/core/Box';
import Avatar from '@material-ui/core/Avatar';
import Chip from '@material-ui/core/Chip';
import FaceIcon from '@material-ui/icons/Face';
import DoneIcon from '@material-ui/icons/Done';

const useStyles = makeStyles((theme) => ({
root: {
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
'& > *': {
margin: theme.spacing(0.5),
},
},
}));

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

const handleDelete = () => {
console.info('You clicked the delete icon.');
};
Expand All @@ -28,7 +15,16 @@ export default function SmallChips() {
};

return (
<div className={classes.root}>
<Box
sx={{
display: 'flex',
justifyContent: 'center',
flexWrap: 'wrap',
'& > :not(style)': {
m: 0.5,
},
}}
>
<Chip size="small" label="Basic" />
<Chip
size="small"
Expand Down Expand Up @@ -94,6 +90,6 @@ export default function SmallChips() {
onDelete={handleDelete}
color="secondary"
/>
</div>
</Box>
);
}
Loading