revisions to Flash and Flash tests

primer · Mar 4, 2021 · bfee3cc · bfee3cc
1 parent 8c37126
commit bfee3cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/src/Flash.tsx b/src/Flash.tsx
@@ -3,14 +3,6 @@ import {variant} from 'styled-system'
 import {COMMON, get, SystemCommonProps} from './constants'
 import sx, {SxProp} from './sx'
 
-const variantAliases = {
-  default: 'info',
-  info: 'info',
-  warning: 'warn',
-  danger: 'error',
-  success: 'success'
-}
-
 const variants = variant({
   variants: {
     default: {
@@ -68,7 +60,6 @@ const Flash = styled.div<
   }
 
   svg {
-    color: ${props => get(`colors.alert.${variantAliases[props.variant || 'default']}.icon`)(props.theme)};
     margin-right: ${get('space.2')};
   }
 

diff --git a/src/__tests__/Flash.tsx b/src/__tests__/Flash.tsx
@@ -1,8 +1,7 @@
 import React from 'react'
 import {Flash} from '..'
 import {COMMON} from '../constants'
-import theme, {colors} from '../theme'
-import {default as primitives} from '@primer/primitives'
+import theme from '../theme'
 import {render, behavesAsComponent, checkExports} from '../utils/testing'
 import {render as HTMLRender, cleanup} from '@testing-library/react'
 import {axe, toHaveNoViolations} from 'jest-axe'
@@ -32,16 +31,16 @@ describe('Flash', () => {
   it('respects the "variant" prop', () => {
     expect(render(<Flash variant="warning" theme={theme} />)).toHaveStyleRule(
       'background-color',
-      primitives.colors.light.alert.warn.bg
+      theme.colors.alert.warn.bg
     )
     expect(render(<Flash variant="danger" theme={theme} />)).toHaveStyleRule(
       'background-color',
-      primitives.colors.light.alert.error.bg
+      theme.colors.alert.error.bg
     )
     expect(render(<Flash variant="success" theme={theme} />)).toHaveStyleRule(
       'background-color',
-      primitives.colors.light.alert.success.bg
+      theme.colors.alert.success.bg
     )
-    expect(render(<Flash theme={theme} />)).toHaveStyleRule('background-color', primitives.colors.light.alert.info.bg)
+    expect(render(<Flash theme={theme} />)).toHaveStyleRule('background-color', theme.colors.alert.info.bg)
   })
 })
diff --git a/src/__tests__/__snapshots__/Flash.tsx.snap b/src/__tests__/__snapshots__/Flash.tsx.snap
@@ -19,10 +19,13 @@ exports[`Flash renders consistently 1`] = `
 }
 
 .c0 svg {
-  color: rgba(4,66,137,0.6);
   margin-right: 8px;
 }
 
+.c0 svg {
+  color: rgba(4,66,137,0.6);
+}
+
 <div
   className="c0"
 />