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

[Rating] Fix readOnly + precision combination #19414

Merged
merged 3 commits into from
Jan 30, 2020
Merged

[Rating] Fix readOnly + precision combination #19414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83f204a
created initial changes to rating component to prevent it from duplic…
TommyJackson85 Jan 26, 2020
3710c4b
improve the demos
oliviertassinari Jan 26, 2020
13da7ec
Merge branch 'master' into pr/TommyJackson85/19414
eps1lon Jan 29, 2020
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
20 changes: 19 additions & 1 deletion docs/src/pages/components/rating/HalfRating.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
import React from 'react';
import Rating from '@material-ui/lab/Rating';
import { makeStyles } from '@material-ui/core/styles';

const useStyles = makeStyles(theme => ({
root: {
display: 'flex',
flexDirection: 'column',
'& > * + *': {
marginTop: theme.spacing(1),
},
},
}));

export default function HalfRating() {
return <Rating name="half-rating" defaultValue={2.5} precision={0.5} />;
const classes = useStyles();

return (
<div className={classes.root}>
<Rating name="half-rating" defaultValue={2.5} precision={0.5} />
<Rating name="half-rating-read" defaultValue={2.5} precision={0.5} readOnly />
</div>
);
}
22 changes: 21 additions & 1 deletion docs/src/pages/components/rating/HalfRating.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,26 @@
import React from 'react';
import Rating from '@material-ui/lab/Rating';
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles';

const useStyles = makeStyles((theme: Theme) =>
createStyles({
root: {
display: 'flex',
flexDirection: 'column',
'& > * + *': {
marginTop: theme.spacing(1),
},
},
}),
);

export default function HalfRating() {
return <Rating name="half-rating" defaultValue={2.5} precision={0.5} />;
const classes = useStyles();

return (
<div className={classes.root}>
<Rating name="half-rating" defaultValue={2.5} precision={0.5} />
<Rating name="half-rating-read" defaultValue={2.5} precision={0.5} readOnly />
</div>
);
}
4 changes: 2 additions & 2 deletions docs/src/pages/components/rating/HoverRating.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const labels = {
};

const useStyles = makeStyles({
rating: {
root: {
width: 200,
display: 'flex',
alignItems: 'center',
Expand All @@ -30,7 +30,7 @@ export default function HoverRating() {
const classes = useStyles();

return (
<div className={classes.rating}>
<div className={classes.root}>
<Rating
name="hover-feedback"
value={value}
Expand Down
4 changes: 2 additions & 2 deletions docs/src/pages/components/rating/HoverRating.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const labels: { [index: string]: string } = {
};

const useStyles = makeStyles({
rating: {
root: {
width: 200,
display: 'flex',
alignItems: 'center',
Expand All @@ -30,7 +30,7 @@ export default function HoverRating() {
const classes = useStyles();

return (
<div className={classes.rating}>
<div className={classes.root}>
<Rating
name="hover-feedback"
value={value}
Expand Down
20 changes: 16 additions & 4 deletions docs/src/pages/components/rating/RatingSize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
import React from 'react';
import Box from '@material-ui/core/Box';
import Rating from '@material-ui/lab/Rating';
import { makeStyles } from '@material-ui/core/styles';

const useStyles = makeStyles(theme => ({
root: {
display: 'flex',
flexDirection: 'column',
'& > * + *': {
marginTop: theme.spacing(1),
},
},
}));

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

export default function RatingSize() {
return (
<Box display="flex" flexDirection="column">
<div className={classes.root}>
<Rating name="size-small" defaultValue={2} size="small" />
<Rating name="size-medium" defaultValue={2} />
<Rating name="size-large" defaultValue={2} size="large" />
</Box>
</div>
);
}
22 changes: 18 additions & 4 deletions docs/src/pages/components/rating/RatingSize.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
import React from 'react';
import Box from '@material-ui/core/Box';
import Rating from '@material-ui/lab/Rating';
import { makeStyles, Theme, createStyles } from '@material-ui/core/styles';

const useStyles = makeStyles((theme: Theme) =>
createStyles({
root: {
display: 'flex',
flexDirection: 'column',
'& > * + *': {
marginTop: theme.spacing(1),
},
},
}),
);

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

export default function RatingSize() {
return (
<Box display="flex" flexDirection="column">
<div className={classes.root}>
<Rating name="size-small" defaultValue={2} size="small" />
<Rating name="size-medium" defaultValue={2} />
<Rating name="size-large" defaultValue={2} size="large" />
</Box>
</div>
);
}
6 changes: 5 additions & 1 deletion packages/material-ui-lab/src/Rating/Rating.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,11 @@ const Rating = React.forwardRef(function Rating(props, ref) {
);

if (readOnly) {
return <React.Fragment key={state.value}>{container}</React.Fragment>;
return (
<span key={state.value} {...labelProps}>
{container}
</span>
);
}

return (
Expand Down