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>
2019-11-23 13:41:14 +01:00
parent a0dcf87368
commit 111f0c50e5
105 changed files with 1884 additions and 913 deletions
--- a/src/components/Footer/Footer.test.tsx
+++ b/src/components/Footer/Footer.test.tsx
@@ -1,21 +1,20 @@
 import React from 'react';
-import { mount, ReactWrapper } from 'enzyme';
+
+import { render } from '../../utils/test-react-testing-library';

 import Footer from './Footer';

-jest.mock('../../../package.json', () => ({
-  version: '4.0.0-alpha.3',
-}));
-
 describe('<Footer /> component', () => {
-  let wrapper: ReactWrapper;
-  beforeEach(() => {
+  beforeAll(() => {
    window.VERDACCIO_VERSION = 'v.1.0.0';
-    wrapper = mount(<Footer />);
+  });
+
+  afterAll(() => {
    delete window.VERDACCIO_VERSION;
  });

  test('should load the initial state of Footer component', () => {
-    expect(wrapper.html()).toMatchSnapshot();
+    const { container } = render(<Footer />);
+    expect(container.firstChild).toMatchSnapshot();
  });
 });
--- a/src/components/Footer/snapshots/Footer.test.tsx.snap
+++ b/src/components/Footer/snapshots/Footer.test.tsx.snap
@@ -1,3 +1,274 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`<Footer /> component should load the initial state of Footer component 1`] = `"<div class=\\"css-i0nj2g ezbsl480\\"><div class=\\"css-hzfs9b ezbsl481\\"><div class=\\"css-d8nsp7 ezbsl482\\"> Made with<span class=\\"css-1so4oe0 ezbsl487\\">♥</span>on<span class=\\"css-1ie354y ezbsl484\\"><svg class=\\"ezbsl485 css-151fgib ek145dl0\\"><title>Earth</title><use xlink:href=\\"[object Object]#earth\\"></use></svg><span class=\\"css-8631ip ezbsl486\\"><svg class=\\"ezbsl488 css-1ah96gu ek145dl0\\"><title>Spain</title><use xlink:href=\\"[object Object]#spain\\"></use></svg><svg class=\\"ezbsl488 css-1ah96gu ek145dl0\\"><title>Nicaragua</title><use xlink:href=\\"[object Object]#nicaragua\\"></use></svg><svg class=\\"ezbsl488 css-1ah96gu ek145dl0\\"><title>India</title><use xlink:href=\\"[object Object]#india\\"></use></svg><svg class=\\"ezbsl488 css-1ah96gu ek145dl0\\"><title>Brazil</title><use xlink:href=\\"[object Object]#brazil\\"></use></svg><svg class=\\"ezbsl488 css-1ah96gu ek145dl0\\"><title>China</title><use xlink:href=\\"[object Object]#china\\"></use></svg><svg class=\\"ezbsl488 css-1ah96gu ek145dl0\\"><title>Austria</title><use xlink:href=\\"[object Object]#austria\\"></use></svg></span></span></div><div class=\\"css-1wbzdyy ezbsl483\\">Powered by<span class=\\"ezbsl488 css-ommwhu ek145dl1\\" name=\\"verdaccio\\" title=\\"Verdaccio\\"><img alt=\\"Verdaccio\\" src=\\"[object Object]\\" class=\\"css-1ncdhax ek145dl2\\"></span>/ v.1.0.0</div></div></div>"`;
+exports[`<Footer /> component should load the initial state of Footer component 1`] = `
+.emotion-38 {
+  background: #f9f9f9;
+  border-top: 1px solid #e3e3e3;
+  color: #999999;
+  font-size: 14px;
+  padding: 20px;
+}
+
+.emotion-36 {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  -webkit-box-pack: end;
+  -webkit-justify-content: flex-end;
+  -ms-flex-pack: end;
+  justify-content: flex-end;
+  width: 100%;
+}
+
+@media (min-width:768px) {
+  .emotion-36 {
+    min-width: 400px;
+    max-width: 800px;
+    margin: auto;
+    -webkit-box-pack: justify;
+    -webkit-justify-content: space-between;
+    -ms-flex-pack: justify;
+    justify-content: space-between;
+  }
+}
+
+@media (min-width:1024px) {
+  .emotion-36 {
+    max-width: 1240px;
+  }
+}
+
+.emotion-27 {
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  display: none;
+}
+
+@media (min-width:768px) {
+  .emotion-27 {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+  }
+}
+
+.emotion-0 {
+  color: #e25555;
+  padding: 0 5px;
+}
+
+.emotion-25 {
+  position: relative;
+  height: 18px;
+}
+
+.emotion-25:hover .emotion-24 {
+  visibility: visible;
+}
+
+.emotion-3 {
+  box-sizing: initial;
+  display: inline-block;
+  cursor: default;
+  width: 18px;
+  height: 18px;
+  padding: 0 10px;
+}
+
+.emotion-23 {
+  position: absolute;
+  background: #d3dddd;
+  padding: 1px 4px;
+  border-radius: 3px;
+  height: 20px;
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  visibility: hidden;
+  top: -2px;
+}
+
+.emotion-23:before {
+  content: '';
+  position: absolute;
+  top: 29%;
+  left: -4px;
+  margin-left: -5px;
+  border: 5px solid;
+  border-color: #d3dddd transparent transparent transparent;
+  -webkit-transform: rotate(90deg);
+  -ms-transform: rotate(90deg);
+  transform: rotate(90deg);
+}
+
+.emotion-6 {
+  box-sizing: initial;
+  display: inline-block;
+  cursor: default;
+  width: 18px;
+  height: 18px;
+  padding: 0 5px;
+}
+
+.emotion-34 {
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  display: none;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+
+@media (min-width:768px) {
+  .emotion-34 {
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+  }
+}
+
+.emotion-32 {
+  box-sizing: initial;
+  display: inline-block;
+  cursor: pointer;
+  width: 18px;
+  height: 18px;
+  padding: 0 5px;
+}
+
+.emotion-29 {
+  width: 100%;
+  height: auto;
+}
+
+<div
+  class="emotion-38 emotion-39"
+>
+  <div
+    class="emotion-36 emotion-37"
+  >
+    <div
+      class="emotion-27 emotion-28"
+    >
+       Made with
+      <span
+        class="emotion-0 emotion-1"
+      >
+        ♥
+      </span>
+      on
+      <span
+        class="emotion-25 emotion-26"
+      >
+        <svg
+          class="emotion-2 emotion-3 emotion-4"
+        >
+          <title>
+            Earth
+          </title>
+          <use
+            xlink:href="[object Object]#earth"
+          />
+        </svg>
+        <span
+          class="emotion-23 emotion-24"
+        >
+          <svg
+            class="emotion-5 emotion-6 emotion-4"
+          >
+            <title>
+              Spain
+            </title>
+            <use
+              xlink:href="[object Object]#spain"
+            />
+          </svg>
+          <svg
+            class="emotion-5 emotion-6 emotion-4"
+          >
+            <title>
+              Nicaragua
+            </title>
+            <use
+              xlink:href="[object Object]#nicaragua"
+            />
+          </svg>
+          <svg
+            class="emotion-5 emotion-6 emotion-4"
+          >
+            <title>
+              India
+            </title>
+            <use
+              xlink:href="[object Object]#india"
+            />
+          </svg>
+          <svg
+            class="emotion-5 emotion-6 emotion-4"
+          >
+            <title>
+              Brazil
+            </title>
+            <use
+              xlink:href="[object Object]#brazil"
+            />
+          </svg>
+          <svg
+            class="emotion-5 emotion-6 emotion-4"
+          >
+            <title>
+              China
+            </title>
+            <use
+              xlink:href="[object Object]#china"
+            />
+          </svg>
+          <svg
+            class="emotion-5 emotion-6 emotion-4"
+          >
+            <title>
+              Austria
+            </title>
+            <use
+              xlink:href="[object Object]#austria"
+            />
+          </svg>
+        </span>
+      </span>
+    </div>
+    <div
+      class="emotion-34 emotion-35"
+    >
+      Powered by
+      <span
+        class="emotion-5 emotion-32 emotion-33"
+        title="Verdaccio"
+      >
+        <img
+          alt="Verdaccio"
+          class="emotion-29 emotion-30"
+          src="[object Object]"
+        />
+      </span>
+      / v.1.0.0
+    </div>
+  </div>
+</div>
+`;
--- a/src/components/Footer/styles.ts
+++ b/src/components/Footer/styles.ts
@@ -1,110 +1,88 @@
-import styled, { css } from 'react-emotion';
+import styled from '@emotion/styled';

-import mq from '../../utils/styles/media';
+import { breakpoints } from '../../utils/styles/media';
 import Icon from '../Icon/Icon';
-import colors from '../../utils/styles/colors';
+import { Theme } from '../../design-tokens/theme';

-export const Wrapper = styled('div')({
-  '&&': {
-    background: colors.snow,
-    borderTop: `1px solid ${colors.greyGainsboro}`,
-    color: colors.nobel01,
-    fontSize: '14px',
-    padding: '20px',
+export const Wrapper = styled('div')<{ theme?: Theme }>(props => ({
+  background: props.theme && props.theme.palette.snow,
+  borderTop: `1px solid ${props.theme && props.theme.palette.greyGainsboro}`,
+  color: props.theme && props.theme.palette.nobel01,
+  fontSize: '14px',
+  padding: '20px',
+}));
+
+export const Inner = styled('div')({
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'flex-end',
+  width: '100%',
+  [`@media (min-width: ${breakpoints.medium}px)`]: {
+    minWidth: 400,
+    maxWidth: 800,
+    margin: 'auto',
+    justifyContent: 'space-between',
+  },
+  [`@media (min-width: ${breakpoints.large}px)`]: {
+    maxWidth: 1240,
  },
 });

-export const Inner = styled('div')`
-  && {
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    width: 100%;
-    ${() => {
-      return mq.medium(css`
-        min-width: 400px;
-        max-width: 800px;
-        margin: auto;
-        justify-content: space-between;
-      `);
-    }};
-    ${() => {
-      return mq.large(css`
-        max-width: 1240px;
-      `);
-    }};
-  }
-`;
-
-export const Left = styled('div')`
-  && {
-    align-items: center;
-    display: none;
-    ${() => {
-      return mq.medium(css`
-        display: flex;
-      `);
-    }};
-  }
-`;
-
-export const Right = styled(Left)({
-  '&&': {
+export const Left = styled('div')({
+  alignItems: 'center',
+  display: 'none',
+  [`@media (min-width: ${breakpoints.medium}px)`]: {
    display: 'flex',
  },
 });

-export const ToolTip = styled('span')({
-  '&&': {
-    position: 'relative',
-    height: '18px',
-  },
+export const Right = styled(Left)({
+  display: 'flex',
 });

 export const Earth = styled(Icon)({
-  '&&': {
-    padding: '0 10px',
+  padding: '0 10px',
+});
+
+export const Flags = styled('span')<{ theme?: Theme }>(props => ({
+  position: 'absolute',
+  background: props.theme && props.theme.palette.greyAthens,
+  padding: '1px 4px',
+  borderRadius: 3,
+  height: 20,
+  display: 'inline-flex',
+  alignItems: 'center',
+  visibility: 'hidden',
+  top: -2,
+  ':before': {
+    content: "''",
+    position: 'absolute',
+    top: '29%',
+    left: -4,
+    marginLeft: -5,
+    border: '5px solid',
+    borderColor: `${props.theme && props.theme.palette.greyAthens} transparent transparent transparent`,
+    transform: 'rotate(90deg)',
+  },
+}));
+
+export const ToolTip = styled('span')({
+  position: 'relative',
+  height: '18px',
+  ':hover': {
+    [`${Flags}`]: {
+      visibility: 'visible',
+    },
  },
 });

-export const Flags = styled('span')`
-  && {
-    position: absolute;
-    background: ${colors.greyAthens};
-    padding: 1px 4px;
-    border-radius: 3px;
-    height: 20px;
-    display: inline-flex;
-    align-items: center;
-    visibility: hidden;
-    top: -2px;
-    :before {
-      content: '';
-      position: absolute;
-      top: 29%;
-      left: -4px;
-      margin-left: -5px;
-      border: 5px solid;
-      border-color: ${colors.greyAthens} transparent transparent transparent;
-      transform: rotate(90deg);
-    }
-    ${/* sc-selector */ ToolTip}:hover & {
-      visibility: visible;
-    }
-  }
-`;
-
-export const Love = styled('span')({
-  '&&': {
-    color: colors.love,
-    padding: '0 5px',
-  },
-});
+export const Love = styled('span')<{ theme?: Theme }>(props => ({
+  color: props.theme && props.theme.palette.love,
+  padding: '0 5px',
+}));

 export const Flag = styled(Icon)({
-  '&&': {
-    padding: '0 5px',
-  },
+  padding: '0 5px',
 });

 export const Logo = Flag;