Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Migrate Text to TypeScript #979

Merged
merged 6 commits into from
Jan 27, 2021
Merged

Migrate Text to TypeScript #979

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23edffc
Text.js → Text.tsx
colebemis Jan 22, 2021
73d7e76
Remove React import
colebemis Jan 22, 2021
7128403
Create cool-snakes-bathe.md
colebemis Jan 22, 2021
654e821
Merge branch 'main' into cb/ts-text
colebemis Jan 25, 2021
48d1db3
Merge branch 'main' into cb/ts-text
colebemis Jan 26, 2021
40d7c47
Merge branch 'main' into cb/ts-text
smockle Jan 27, 2021
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: 5 additions & 0 deletions .changeset/cool-snakes-bathe.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/components": patch
---

Migrate `Text` to TypeScript
9 changes: 5 additions & 4 deletions src/Text.js → src/Text.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import styled from 'styled-components'
import PropTypes from 'prop-types'
import styled from 'styled-components'
import {COMMON, SystemCommonProps, SystemTypographyProps, TYPOGRAPHY} from './constants'
import sx, {SxProp} from './sx'
import theme from './theme'
import {TYPOGRAPHY, COMMON} from './constants'
import sx from './sx'

const Text = styled.span`
const Text = styled.span<SystemTypographyProps & SystemCommonProps & SxProp>`
${TYPOGRAPHY};
${COMMON};
${sx};
Expand All @@ -21,4 +21,5 @@ Text.propTypes = {
theme: PropTypes.object
}

export type TextProps = React.ComponentProps<typeof Text>
export default Text
0 src/__tests__/Text.js → src/__tests__/Text.tsx
View file
Open in desktop
File renamed without changes.
0 src/__tests__/__snapshots__/Text.js.snap → src/__tests__/__snapshots__/Text.tsx.snap
View file
Open in desktop
File renamed without changes.