feat: add animation and update styles

vimeo · Aug 18, 2023 · 3719de9 · 3719de9
1 parent de1e01f
commit 3719de9
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 17 deletions.
diff --git a/src/components/Accordion/Accordion.minors.tsx b/src/components/Accordion/Accordion.minors.tsx
@@ -4,7 +4,7 @@ import {
   Content,
   ChevronUp,
   CircleWarningIcon,
-  Header,
+  HeaderContainer,
   StyledChevronDown,
   Subcopy,
   Title,
@@ -60,14 +60,18 @@ export function Item({
         aria-controls={`accordion-${index}-content`}
         id={`accordion-${index}-trigger`}
       >
-        <Header>
+        <HeaderContainer>
           {hasError && <CircleWarningIcon />}
           {!hasError && icon && icon}
           <TitleContainer>
-            <Title>{title}</Title>
-            {subcopy && <Subcopy>{subcopy}</Subcopy>}
+            <Title size="4">{title}</Title>
+            {subcopy && (
+              <Subcopy size="6" variant="thin">
+                {subcopy}
+              </Subcopy>
+            )}
           </TitleContainer>
-        </Header>
+        </HeaderContainer>
         {isActive ? (
           <ChevronUp width="24" />
         ) : (

diff --git a/src/components/Accordion/Accordion.style.ts b/src/components/Accordion/Accordion.style.ts
@@ -1,8 +1,8 @@
 import { rem } from 'polished';
-import styled, { css } from 'styled-components';
+import styled, { css, keyframes } from 'styled-components';
 
 import { ChevronDown, CircleWarning } from '../../icons';
-import { Paragraph } from '../../typography';
+import { Header } from '../../typography';
 
 import { grayscale } from '../../color';
 import { core } from '../../tokens';
@@ -72,7 +72,7 @@ export const TriggerContainer = styled.button<{
   }
 `;
 
-export const Header = styled.div`
+export const HeaderContainer = styled.div`
   display: flex;
   margin-right: ${rem(10)};
 `;
@@ -83,15 +83,11 @@ export const TitleContainer = styled.div`
   text-align: left;
 `;
 
-export const Title = styled(Paragraph)`
-  font-size: ${rem(16)};
-  font-weight: 700;
-  margin-bottom: 0;
+export const Title = styled(Header)`
+  margin-bottom: ${rem(4)};
 `;
 
-export const Subcopy = styled(Paragraph)`
-  font-size: ${rem(14)};
-  font-weight: 400;
+export const Subcopy = styled(Header)`
   margin-bottom: -${rem(0.2)};
 `;
 
@@ -103,18 +99,56 @@ export const CircleWarningIcon = styled(CircleWarning)`
   }
 `;
 
+const rotateUp = keyframes`
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(-180deg);
+    }
+`;
+
+const rotateDown = keyframes`
+    from {
+        transform: rotate(-180deg);
+    }
+    to {
+        transform: rotate(0deg);
+    }
+`;
+
 export const StyledChevronDown = styled(ChevronDown)`
+  animation: ${rotateDown} 120ms ease-in-out both;
   path {
     fill: ${core.color.text.primary};
   }
 `;
 
 export const ChevronUp = styled(StyledChevronDown)`
-  transform: rotate(180deg);
+  animation: ${rotateUp} 120ms ease-in-out both;
+`;
+
+const fadeAndExpand = keyframes`
+  from {
+    transform: translateY(-50%);
+    opacity: 0;
+  }
+  to {
+    transform: translateY(0);
+    opacity: 1;
+  }
 `;
 
 export const Content = styled.div<{ active: boolean }>`
-  padding: ${rem(0)} ${rem(15)} ${rem(20)};
+  padding: ${rem(0)} ${rem(15)} ${rem(20)} ${rem(20)};
   max-height: ${({ active }) => (active ? '100%' : '0')};
   overflow: hidden;
+  transform: translateY(-50%);
+  opacity: 0;
+  ${({ active }) =>
+    active &&
+    css`
+      animation: ${fadeAndExpand} 150ms ease-in-out both;
+      opacity: 1;
+    `};
 `;