Skip to content

Commit af3b825

Browse files
oliviertassinarioliviertassinari
authored
Merge branch 'next' into list-specification
2 parents 4a9254f + 71d4ebe commit af3b825

File tree

121 files changed

+1076
-1074
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+1076
-1074
lines changed

‎docs/src/pages/demos/breadcrumbs/CollapsedBreadcrumbs.js‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
/* eslint-disable jsx-a11y/anchor-is-valid */
22

33
import React from 'react';
4-
import PropTypes from 'prop-types';
5-
import { withStyles } from '@material-ui/core/styles';
4+
import { makeStyles } from '@material-ui/core/styles';
65
import Paper from '@material-ui/core/Paper';
76
import Breadcrumbs from '@material-ui/core/Breadcrumbs';
87
import Typography from '@material-ui/core/Typography';
98
import Link from '@material-ui/core/Link';
109

11-
const styles = theme => ({
10+
const useStyles = makeStyles(theme => ({
1211
root: {
1312
justifyContent: 'center',
1413
flexWrap: 'wrap',
1514
},
1615
paper: {
1716
padding: theme.spacing(1, 2),
1817
},
19-
});
18+
}));
2019

2120
function handleClick(event) {
2221
event.preventDefault();
2322
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
2423
}
2524

26-
function CollapsedBreadcrumbs(props) {
27-
const { classes } = props;
25+
function CollapsedBreadcrumbs() {
26+
const classes = useStyles();
2827

2928
return (
3029
<Paper elevation={0} className={classes.paper}>
@@ -47,8 +46,4 @@ function CollapsedBreadcrumbs(props) {
4746
);
4847
}
4948

50-
CollapsedBreadcrumbs.propTypes = {
51-
classes: PropTypes.object.isRequired,
52-
};
53-
54-
export default withStyles(styles)(CollapsedBreadcrumbs);
49+
export default CollapsedBreadcrumbs;

‎docs/src/pages/demos/breadcrumbs/CollapsedBreadcrumbs.tsx‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
/* eslint-disable jsx-a11y/anchor-is-valid */
22

33
import React from 'react';
4-
import PropTypes from 'prop-types';
5-
import { withStyles, Theme, createStyles, WithStyles } from '@material-ui/core/styles';
4+
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles';
65
import Paper from '@material-ui/core/Paper';
76
import Breadcrumbs from '@material-ui/core/Breadcrumbs';
87
import Typography from '@material-ui/core/Typography';
98
import Link from '@material-ui/core/Link';
109

11-
interface CollapsedBreadcrumbsProps extends WithStyles<typeof styles> {}
12-
13-
const styles = (theme: Theme) =>
10+
const useStyles = makeStyles((theme: Theme) =>
1411
createStyles({
1512
root: {
1613
justifyContent: 'center',
@@ -19,15 +16,16 @@ const styles = (theme: Theme) =>
1916
paper: {
2017
padding: theme.spacing(1, 2),
2118
},
22-
});
19+
}),
20+
);
2321

2422
function handleClick(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) {
2523
event.preventDefault();
2624
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
2725
}
2826

29-
function CollapsedBreadcrumbs(props: CollapsedBreadcrumbsProps) {
30-
const { classes } = props;
27+
function CollapsedBreadcrumbs() {
28+
const classes = useStyles();
3129

3230
return (
3331
<Paper elevation={0} className={classes.paper}>
@@ -50,8 +48,4 @@ function CollapsedBreadcrumbs(props: CollapsedBreadcrumbsProps) {
5048
);
5149
}
5250

53-
CollapsedBreadcrumbs.propTypes = {
54-
classes: PropTypes.object.isRequired,
55-
} as any;
56-
57-
export default withStyles(styles)(CollapsedBreadcrumbs);
51+
export default CollapsedBreadcrumbs;

‎docs/src/pages/demos/breadcrumbs/CustomSeparator.js‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
3-
import { withStyles } from '@material-ui/core/styles';
2+
import { makeStyles } from '@material-ui/core/styles';
43
import Paper from '@material-ui/core/Paper';
54
import Breadcrumbs from '@material-ui/core/Breadcrumbs';
65
import Typography from '@material-ui/core/Typography';
76
import Link from '@material-ui/core/Link';
87
import NavigateNextIcon from '@material-ui/icons/NavigateNext';
98

10-
const styles = theme => ({
9+
const useStyles = makeStyles(theme => ({
1110
root: {
1211
justifyContent: 'center',
1312
flexWrap: 'wrap',
1413
},
1514
paper: {
1615
padding: theme.spacing(1, 2),
1716
},
18-
});
17+
}));
1918

2019
function handleClick(event) {
2120
event.preventDefault();
2221
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
2322
}
2423

25-
function CustomSeparator(props) {
26-
const { classes } = props;
24+
function CustomSeparator() {
25+
const classes = useStyles();
2726

2827
return (
2928
<div className={classes.root}>
@@ -66,8 +65,4 @@ function CustomSeparator(props) {
6665
);
6766
}
6867

69-
CustomSeparator.propTypes = {
70-
classes: PropTypes.object.isRequired,
71-
};
72-
73-
export default withStyles(styles)(CustomSeparator);
68+
export default CustomSeparator;

‎docs/src/pages/demos/breadcrumbs/CustomSeparator.tsx‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
3-
import { withStyles, Theme, createStyles, WithStyles } from '@material-ui/core/styles';
2+
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles';
43
import Paper from '@material-ui/core/Paper';
54
import Breadcrumbs from '@material-ui/core/Breadcrumbs';
65
import Typography from '@material-ui/core/Typography';
76
import Link from '@material-ui/core/Link';
87
import NavigateNextIcon from '@material-ui/icons/NavigateNext';
98

10-
interface CustomSeparatorProps extends WithStyles<typeof styles> {}
11-
12-
const styles = (theme: Theme) =>
9+
const useStyles = makeStyles((theme: Theme) =>
1310
createStyles({
1411
root: {
1512
justifyContent: 'center',
@@ -18,15 +15,16 @@ const styles = (theme: Theme) =>
1815
paper: {
1916
padding: theme.spacing(1, 2),
2017
},
21-
});
18+
}),
19+
);
2220

2321
function handleClick(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) {
2422
event.preventDefault();
2523
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
2624
}
2725

28-
function CustomSeparator(props: CustomSeparatorProps) {
29-
const { classes } = props;
26+
function CustomSeparator() {
27+
const classes = useStyles();
3028

3129
return (
3230
<div className={classes.root}>
@@ -69,8 +67,4 @@ function CustomSeparator(props: CustomSeparatorProps) {
6967
);
7068
}
7169

72-
CustomSeparator.propTypes = {
73-
classes: PropTypes.object.isRequired,
74-
} as any;
75-
76-
export default withStyles(styles)(CustomSeparator);
70+
export default CustomSeparator;

‎docs/src/pages/demos/breadcrumbs/IconBreadcrumbs.js‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
3-
import { withStyles } from '@material-ui/core/styles';
2+
import { makeStyles } from '@material-ui/core/styles';
43
import Paper from '@material-ui/core/Paper';
54
import Typography from '@material-ui/core/Typography';
65
import Breadcrumbs from '@material-ui/core/Breadcrumbs';
@@ -9,7 +8,7 @@ import HomeIcon from '@material-ui/icons/Home';
98
import WhatshotIcon from '@material-ui/icons/Whatshot';
109
import GrainIcon from '@material-ui/icons/Grain';
1110

12-
const styles = theme => ({
11+
const useStyles = makeStyles(theme => ({
1312
root: {
1413
padding: theme.spacing(1, 2),
1514
},
@@ -21,15 +20,15 @@ const styles = theme => ({
2120
width: 20,
2221
height: 20,
2322
},
24-
});
23+
}));
2524

2625
function handleClick(event) {
2726
event.preventDefault();
2827
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
2928
}
3029

31-
function IconBreadcrumbs(props) {
32-
const { classes } = props;
30+
function IconBreadcrumbs() {
31+
const classes = useStyles();
3332
return (
3433
<Paper elevation={0} className={classes.root}>
3534
<Breadcrumbs aria-label="Breadcrumb">
@@ -55,8 +54,4 @@ function IconBreadcrumbs(props) {
5554
);
5655
}
5756

58-
IconBreadcrumbs.propTypes = {
59-
classes: PropTypes.object.isRequired,
60-
};
61-
62-
export default withStyles(styles)(IconBreadcrumbs);
57+
export default IconBreadcrumbs;

‎docs/src/pages/demos/breadcrumbs/IconBreadcrumbs.tsx‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
3-
import { withStyles, Theme, createStyles, WithStyles } from '@material-ui/core/styles';
2+
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles';
43
import Paper from '@material-ui/core/Paper';
54
import Typography from '@material-ui/core/Typography';
65
import Breadcrumbs from '@material-ui/core/Breadcrumbs';
@@ -9,9 +8,7 @@ import HomeIcon from '@material-ui/icons/Home';
98
import WhatshotIcon from '@material-ui/icons/Whatshot';
109
import GrainIcon from '@material-ui/icons/Grain';
1110

12-
interface IconBreadcrumbsProps extends WithStyles<typeof styles> {}
13-
14-
const styles = (theme: Theme) =>
11+
const useStyles = makeStyles((theme: Theme) =>
1512
createStyles({
1613
root: {
1714
padding: theme.spacing(1, 2),
@@ -24,15 +21,16 @@ const styles = (theme: Theme) =>
2421
width: 20,
2522
height: 20,
2623
},
27-
});
24+
}),
25+
);
2826

2927
function handleClick(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) {
3028
event.preventDefault();
3129
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
3230
}
3331

34-
function IconBreadcrumbs(props: IconBreadcrumbsProps) {
35-
const { classes } = props;
32+
function IconBreadcrumbs() {
33+
const classes = useStyles();
3634
return (
3735
<Paper elevation={0} className={classes.root}>
3836
<Breadcrumbs aria-label="Breadcrumb">
@@ -58,8 +56,4 @@ function IconBreadcrumbs(props: IconBreadcrumbsProps) {
5856
);
5957
}
6058

61-
IconBreadcrumbs.propTypes = {
62-
classes: PropTypes.object.isRequired,
63-
} as any;
64-
65-
export default withStyles(styles)(IconBreadcrumbs);
59+
export default IconBreadcrumbs;

‎docs/src/pages/demos/breadcrumbs/SimpleBreadcrumbs.js‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
3-
import { withStyles } from '@material-ui/core/styles';
2+
import { makeStyles } from '@material-ui/core/styles';
43
import Paper from '@material-ui/core/Paper';
54
import Typography from '@material-ui/core/Typography';
65
import Breadcrumbs from '@material-ui/core/Breadcrumbs';
76
import Link from '@material-ui/core/Link';
87

9-
const styles = theme => ({
8+
const useStyles = makeStyles(theme => ({
109
root: {
1110
justifyContent: 'center',
1211
flexWrap: 'wrap',
1312
},
1413
paper: {
1514
padding: theme.spacing(1, 2),
1615
},
17-
});
16+
}));
1817

1918
function handleClick(event) {
2019
event.preventDefault();
2120
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
2221
}
2322

24-
function SimpleBreadcrumbs(props) {
25-
const { classes } = props;
23+
function SimpleBreadcrumbs() {
24+
const classes = useStyles();
2625
return (
2726
<div className={classes.root}>
2827
<Paper elevation={0} className={classes.paper}>
@@ -59,8 +58,4 @@ function SimpleBreadcrumbs(props) {
5958
);
6059
}
6160

62-
SimpleBreadcrumbs.propTypes = {
63-
classes: PropTypes.object.isRequired,
64-
};
65-
66-
export default withStyles(styles)(SimpleBreadcrumbs);
61+
export default SimpleBreadcrumbs;

‎docs/src/pages/demos/breadcrumbs/SimpleBreadcrumbs.tsx‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import React from 'react';
2-
import PropTypes from 'prop-types';
3-
import { withStyles, Theme, createStyles, WithStyles } from '@material-ui/core/styles';
2+
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles';
43
import Paper from '@material-ui/core/Paper';
54
import Typography from '@material-ui/core/Typography';
65
import Breadcrumbs from '@material-ui/core/Breadcrumbs';
76
import Link from '@material-ui/core/Link';
87

9-
interface SimpleBreadcrumbsProps extends WithStyles<typeof styles> {}
10-
11-
const styles = (theme: Theme) =>
8+
const useStyles = makeStyles((theme: Theme) =>
129
createStyles({
1310
root: {
1411
justifyContent: 'center',
@@ -17,15 +14,16 @@ const styles = (theme: Theme) =>
1714
paper: {
1815
padding: theme.spacing(1, 2),
1916
},
20-
});
17+
}),
18+
);
2119

2220
function handleClick(event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) {
2321
event.preventDefault();
2422
alert('You clicked a breadcrumb.'); // eslint-disable-line no-alert
2523
}
2624

27-
function SimpleBreadcrumbs(props: SimpleBreadcrumbsProps) {
28-
const { classes } = props;
25+
function SimpleBreadcrumbs() {
26+
const classes = useStyles();
2927
return (
3028
<div className={classes.root}>
3129
<Paper elevation={0} className={classes.paper}>
@@ -62,8 +60,4 @@ function SimpleBreadcrumbs(props: SimpleBreadcrumbsProps) {
6260
);
6361
}
6462

65-
SimpleBreadcrumbs.propTypes = {
66-
classes: PropTypes.object.isRequired,
67-
} as any;
68-
69-
export default withStyles(styles)(SimpleBreadcrumbs);
63+
export default SimpleBreadcrumbs;

‎packages/material-ui-lab/src/Slider/Slider.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ class Slider extends React.Component {
423423
handleRef = ref => {
424424
setRef(this.props.innerRef, ref);
425425

426-
// StrictMode ready
426+
// #StrictMode ready
427427
const nextContainer = ReactDOM.findDOMNode(ref);
428428
const prevContainer = this.container;
429429

‎packages/material-ui-lab/src/Slider/Slider.test.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ describe('<Slider />', () => {
2020

2121
before(() => {
2222
classes = getClasses(<Slider value={0} />);
23-
mount = createMount();
23+
// StrictMode violation: uses ButtonBase
24+
mount = createMount({ strict: false });
2425
});
2526

2627
after(() => {

0 commit comments

Comments
 (0)