feat: Added Theme and migrate to emotion@10.x 🚀 (#286)

* chore: updated emotion dependency

* feat: introduced theme

* refactor: updated emotion styles

* fix: fixed emotion error

* fix: fixed tests

* chore: add missing types

Co-Authored-By: Thomas Klein <tmkn@users.noreply.github.com>
This commit is contained in:
Priscila Oliveira
2019-11-23 13:41:14 +01:00
committed by Juan Picado @jotadeveloper
parent a0dcf87368
commit 111f0c50e5
105 changed files with 1884 additions and 913 deletions

View File

@@ -1,6 +1,6 @@
import React from 'react';
import { mount } from 'enzyme';
import { mount } from '../../utils/test-enzyme';
import { DetailContextProvider } from '../../pages/Version';
import Developers, { DevelopersType } from './Developers';

View File

@@ -1,22 +1,57 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`test Developers should render the component for contributors with items 1`] = `
.emotion-0 {
font-weight: 700;
margin-bottom: 10px;
text-transform: capitalize;
}
.emotion-12 {
margin: 10px 0 10px 0;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}
.emotion-12 > * {
margin: 5px;
}
.emotion-8 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
}
<Developers
type="contributors"
>
<Styled(Component)
<StyledText
variant="subtitle1"
>
<ForwardRef(Text)
className="css-48zeoi emotion-0"
className="emotion-0 emotion-1"
variant="subtitle1"
>
<WithStyles(ForwardRef(Typography))
className="css-48zeoi emotion-0"
className="emotion-0 emotion-1"
variant="subtitle1"
>
<ForwardRef(Typography)
className="css-48zeoi emotion-0"
className="emotion-0 emotion-1"
classes={
Object {
"alignCenter": "MuiTypography-alignCenter",
@@ -54,23 +89,23 @@ exports[`test Developers should render the component for contributors with items
variant="subtitle1"
>
<h6
className="MuiTypography-root css-48zeoi emotion-0 MuiTypography-subtitle1"
className="MuiTypography-root emotion-0 emotion-1 MuiTypography-subtitle1"
>
contributors
</h6>
</ForwardRef(Typography)>
</WithStyles(ForwardRef(Typography))>
</ForwardRef(Text)>
</Styled(Component)>
<Styled(div)>
</StyledText>
<Content>
<div
className="css-mkcn9c emotion-6"
className="emotion-12 emotion-13"
>
<Styled(span)
<Details
key="dave.methvin@gmail.com"
>
<span
className="css-dvxtzn emotion-4"
className="emotion-8 emotion-9"
>
<AvatarTooltip
email="dave.methvin@gmail.com"
@@ -164,12 +199,12 @@ exports[`test Developers should render the component for contributors with items
</ForwardRef(ToolTip)>
</AvatarTooltip>
</span>
</Styled(span)>
<Styled(span)
</Details>
<Details
key="m.goleb@gmail.com"
>
<span
className="css-dvxtzn emotion-4"
className="emotion-8 emotion-9"
>
<AvatarTooltip
email="m.goleb@gmail.com"
@@ -263,29 +298,64 @@ exports[`test Developers should render the component for contributors with items
</ForwardRef(ToolTip)>
</AvatarTooltip>
</span>
</Styled(span)>
</Details>
</div>
</Styled(div)>
</Content>
</Developers>
`;
exports[`test Developers should render the component for maintainers with items 1`] = `
.emotion-0 {
font-weight: 700;
margin-bottom: 10px;
text-transform: capitalize;
}
.emotion-12 {
margin: 10px 0 10px 0;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-wrap: wrap;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
}
.emotion-12 > * {
margin: 5px;
}
.emotion-8 {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
}
<Developers
type="maintainers"
>
<Styled(Component)
<StyledText
variant="subtitle1"
>
<ForwardRef(Text)
className="css-48zeoi emotion-0"
className="emotion-0 emotion-1"
variant="subtitle1"
>
<WithStyles(ForwardRef(Typography))
className="css-48zeoi emotion-0"
className="emotion-0 emotion-1"
variant="subtitle1"
>
<ForwardRef(Typography)
className="css-48zeoi emotion-0"
className="emotion-0 emotion-1"
classes={
Object {
"alignCenter": "MuiTypography-alignCenter",
@@ -323,23 +393,23 @@ exports[`test Developers should render the component for maintainers with items
variant="subtitle1"
>
<h6
className="MuiTypography-root css-48zeoi emotion-0 MuiTypography-subtitle1"
className="MuiTypography-root emotion-0 emotion-1 MuiTypography-subtitle1"
>
maintainers
</h6>
</ForwardRef(Typography)>
</WithStyles(ForwardRef(Typography))>
</ForwardRef(Text)>
</Styled(Component)>
<Styled(div)>
</StyledText>
<Content>
<div
className="css-mkcn9c emotion-6"
className="emotion-12 emotion-13"
>
<Styled(span)
<Details
key="dave.methvin@gmail.com"
>
<span
className="css-dvxtzn emotion-4"
className="emotion-8 emotion-9"
>
<AvatarTooltip
email="dave.methvin@gmail.com"
@@ -433,12 +503,12 @@ exports[`test Developers should render the component for maintainers with items
</ForwardRef(ToolTip)>
</AvatarTooltip>
</span>
</Styled(span)>
<Styled(span)
</Details>
<Details
key="m.goleb@gmail.com"
>
<span
className="css-dvxtzn emotion-4"
className="emotion-8 emotion-9"
>
<AvatarTooltip
email="m.goleb@gmail.com"
@@ -532,9 +602,9 @@ exports[`test Developers should render the component for maintainers with items
</ForwardRef(ToolTip)>
</AvatarTooltip>
</span>
</Styled(span)>
</Details>
</div>
</Styled(div)>
</Content>
</Developers>
`;

View File

@@ -1,9 +1,9 @@
import styled from 'react-emotion';
import styled from '@emotion/styled';
import colors from '../../utils/styles/colors';
import { fontWeight } from '../../utils/styles/sizes';
import Text from '../../muiComponents/Text';
import FloatingActionButton from '../../muiComponents/FloatingActionButton';
import { Theme } from '../../design-tokens/theme';
export const Details = styled('span')({
display: 'flex',
@@ -26,7 +26,7 @@ export const StyledText = styled(Text)({
textTransform: 'capitalize',
});
export const Fab = styled(FloatingActionButton)({
backgroundColor: colors.primary,
color: colors.white,
});
export const Fab = styled(FloatingActionButton)<{ theme?: Theme }>(props => ({
backgroundColor: props.theme && props.theme.palette.primary.main,
color: props.theme && props.theme.palette.white,
}));