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

Migrate 'Note' component away from makeStyles + cleanup #630

Merged
merged 7 commits into from
Apr 11, 2023
Merged

Migrate 'Note' component away from makeStyles + cleanup #630

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
61bfcca
feat: change makestyles to styled component Note component
jantolg Apr 10, 2023
3866945
feat: change makestyles to styled component Note component
jantolg Apr 10, 2023
c3191c8
fix: remove unnecesary customization
jantolg Apr 10, 2023
915fecd
Merge branch 'master' into feat/migrate-mui5-note-component
VictorVelarde Apr 10, 2023
bb152b6
Merge branch 'master' of github.com:CartoDB/carto-react into feat/mig…
jantolg Apr 11, 2023
ade4ef9
chore: update changelog
jantolg Apr 11, 2023
b370cdc
Merge branch 'feat/migrate-mui5-note-component' of github.com:CartoDB…
jantolg Apr 11, 2023
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
13 changes: 5 additions & 8 deletions packages/react-ui/src/widgets/legend/Note.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
import { Box } from '@mui/material';
import makeStyles from '@mui/styles/makeStyles';
import { styled } from '@mui/material/styles';
import React from 'react';
import Typography from '../../components/atoms/Typography';

const useNoteStyles = makeStyles(() => ({
note: {
fontWeight: 'normal'
}
const FontWeightNormalTypography = styled(Typography)(({ theme }) => ({
fontWeight: 'normal'
}));

export default function Note({ children }) {
const classes = useNoteStyles();

if (!children) {
return null;
Expand All @@ -19,9 +16,9 @@ export default function Note({ children }) {
return (
<Box mt={1} data-testid='note-legend'>
<Typography variant='caption'>Note:</Typography>{' '}
<Typography className={classes.note} variant='caption'>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is no longer necessary, as the caption variant has a regular weight by default.

You can use just <Typography variant='caption' /> and remove the customization.

<FontWeightNormalTypography variant='caption'>
{children}
</Typography>
</FontWeightNormalTypography>
</Box>
);
}