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.

Sign up for GitHub

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

Jump to bottom

Fix Chip tests #705

Merged
merged 4 commits into from
Oct 20, 2020
Merged

Fix Chip tests #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4537585
Typescript conversion of Chips completed and working.
joelmheim Oct 10, 2020
0023820
Fixed some comments and typings in tests.
joelmheim Oct 19, 2020
cc42cb0
Merge branch 'typescript' of github.com:equinor/design-system into is…
joelmheim Oct 19, 2020
9e924d5
Fixed Chip tests. No longer allowing imports from index.{js|jsx|ts|ts…
joelmheim Oct 19, 2020
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
5 changes: 3 additions & 2 deletions libraries/core-react/src/Chip/Chip.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import '@testing-library/jest-dom'
import 'jest-styled-components'
import styled from 'styled-components'
import { add } from '@equinor/eds-icons'
import { Chip } from '.'
import { Avatar, Icon } from '..'
import { Chip } from './Chip'
import { Avatar } from '../Avatar'
import { Icon } from '../Icon'
import { chip as tokens } from './Chip.tokens'

Icon.add({ add })
Expand Down
2 changes: 1 addition & 1 deletion libraries/core-react/src/Chip/Icon.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled, { css } from 'styled-components'
import { close } from '@equinor/eds-icons'
import { Icon as Icon_ } from '..'
import { Icon as Icon_ } from '../Icon'
import { chip as tokens } from './Chip.tokens'

Icon_.add({ close })
Expand Down