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.

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

Tabs component adapted to the new design system #537

Merged
merged 9 commits into from
Nov 22, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Not released

- Tabs component adapted to the new design system [#537](https://github.com/CartoDB/carto-react/pull/537/)
- Tooltip component adapted to the new design system [#536](https://github.com/CartoDB/carto-react/pull/536/)
- Switch component adapted to the new design system [#534](https://github.com/CartoDB/carto-react/pull/534/)
- Design review of Toggle component [#533](https://github.com/CartoDB/carto-react/pull/533)
Expand Down
3 changes: 3 additions & 0 deletions packages/react-ui/src/theme/sections/components/buttons.js
Original file line number Diff line number Diff line change
Expand Up @@ -387,6 +387,9 @@ export const buttonsOverrides = {

'&:not(:first-of-type)': {
marginLeft: 0
},
'& + .MuiDivider-root': {
height: sizeMedium
}
}
},
Expand Down
73 changes: 37 additions & 36 deletions packages/react-ui/src/theme/sections/components/navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,63 +15,64 @@ export const navigationOverrides = {
// Tabs
MuiTabs: {
defaultProps: {
indicatorColor: 'primary',
textColor: 'primary',
iconPosition: 'start',
TabIndicatorProps: {
classes: {
colorPrimary: 'colorPrimary'
}
}
},
styleOverrides: {
indicator: {
height: 4,
'&.colorPrimary': {
backgroundColor: commonPalette.text.primary
}
},

vertical: {
'& .MuiTabs-indicator': {
width: 4
},
root: ({ ownerState }) => ({
borderBottom: `1px solid ${commonPalette.black[12]}`,

'& .MuiTab-root': {
padding: getSpacing(0, 2),
...(ownerState.variant !== 'fullWidth' && {
display: 'inline-flex'
})
}),

'& .MuiTab-wrapper': {
alignItems: 'flex-start'
}
}
vertical: {
borderBottom: 0
}
}
},

// Tab
MuiTab: {
defaultProps: {
iconPosition: 'start'
},

styleOverrides: {
root: {
padding: getSpacing(0, 1),
marginRight: getSpacing(3),
minWidth: '56px!important',
'&[class*="MuiTab-labelIcon"]': {
flexFlow: 'row',
alignItems: 'center'
minHeight: getSpacing(6),
minWidth: getSpacing(6),
padding: getSpacing(0, 2),
paddingTop: '2px',
borderBottom: '2px solid transparent',
...themeTypography.subtitle2,
color: commonPalette.text.primary,
transition: 'border 300ms cubic-bezier(0.4, 0, 0.2, 1)',

'&:hover': {
borderBottomColor: commonPalette.text.primary
},
'&[class*="MuiTab-labelIcon"] .MuiSvgIcon-root': {
marginRight: getSpacing(1),
marginBottom: 0
}
},
textColorPrimary: {
color: commonPalette.primary.main,
opacity: 1,
'&.Mui-selected': {
color: commonPalette.text.primary
pointerEvents: 'none'
},
'&.Mui-disabled': {
color: commonPalette.action.disabled
'.MuiTabs-vertical &': {
paddingTop: 0,
borderBottom: 0,
paddingLeft: '2px',
borderRight: '2px solid transparent',

'&:hover': {
borderRightColor: commonPalette.text.primary
}
}
},
wrapped: {
maxWidth: '240px'
}
}
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const ToggleRow = ({ label, divider, fullWidth, ...rest }) => {
);
};

const SizesTemplate = (args) => {
const IconTemplate = (args) => {
return (
<Grid container alignItems='center' spacing={4}>
<Grid item>
Expand Down Expand Up @@ -174,6 +174,9 @@ const DividedTemplate = (args) => {
<Grid item>
<ToggleRow divider />
</Grid>
<Grid item>
<ToggleRow divider size='small' />
</Grid>
</Grid>
);
};
Expand Down Expand Up @@ -224,20 +227,20 @@ const BehaviorTemplate = (args) => {

export const Playground = ToggleRow.bind({});

export const Sizes = SizesTemplate.bind({});
export const Icon = IconTemplate.bind({});

export const Text = TextTemplate.bind({});

export const HorizontalGroup = GroupTemplate.bind({});

export const HorizontalTextGroup = GroupTemplate.bind({});
HorizontalTextGroup.args = { label: 'Text' };

export const VerticalGroup = VerticalGroupTemplate.bind({});
VerticalGroup.args = { orientation: 'vertical' };

export const HorizontalGroup = GroupTemplate.bind({});

export const DividedGroup = DividedTemplate.bind({});

export const HorizontalTextGroup = GroupTemplate.bind({});
HorizontalTextGroup.args = { label: 'Text' };

export const MultipleSelectionGroup = GroupTemplate.bind({});
MultipleSelectionGroup.args = { exclusive: false };

Expand Down
11 changes: 5 additions & 6 deletions packages/react-ui/storybook/stories/molecules/Tooltip.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ import React from 'react';
import { Box, Grid, IconButton, Tooltip } from '@mui/material';
import { InfoOutlined } from '@mui/icons-material';
import makeStyles from '@mui/styles/makeStyles';
import Typography from '../../../src/components/atoms/Typography';
import TooltipData from '../../../src/components/organisms/TooltipData';
import { commonPalette } from '../../../src/theme/sections/palette';
import TooltipData from '../../../src/components/organisms/TooltipData';
import Typography from '../../../src/components/atoms/Typography';
import Button from '../../../src/components/atoms/Button';

const options = {
title: 'Molecules/Tooltip',
Expand Down Expand Up @@ -33,7 +34,7 @@ const options = {
url: 'https://www.figma.com/file/nmaoLeo69xBJCHm9nc6lEV/CARTO-Components-1.0?node-id=1534%3A36257'
},
status: {
type: 'readyToReview'
type: 'validated'
}
}
};
Expand Down Expand Up @@ -247,9 +248,7 @@ const TooltipBehaviorTemplate = (args) => {
arrow={false}
title='When followCursor is true, Tooltip should have arrow={false} property too'
>
<IconButton>
<InfoOutlined />
</IconButton>
<Button variant='outlined'>{'Long Button'}</Button>
</Tooltip>
</Box>
</Grid>
Expand Down
Loading