Merge pull request #989 from primer/cb/ts-grid

Migrate Grid to TypeScript
primer · Jan 27, 2021 · 3f464ed · 3f464ed · vercel · Jan 27, 2021
2 parents 6857161 + 34ff488
commit 3f464ed
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.changeset/tricky-gifts-bake.md b/.changeset/tricky-gifts-bake.md
@@ -0,0 +1,5 @@
+---
+"@primer/components": patch
+---
+
+Migrate `Grid` to TypeScript
diff --git a/src/Grid.js → src/Grid.tsx b/src/Grid.js → src/Grid.tsx
@@ -1,9 +1,10 @@
 import styled from 'styled-components'
-import {GRID} from './constants'
-import theme from './theme'
 import Box from './Box'
+import {GRID, SystemGridProps} from './constants'
+import theme from './theme'
+import {ComponentProps} from './utils/types'
 
-const Grid = styled(Box)`
+const Grid = styled(Box)<SystemGridProps>`
   ${GRID};
 `
 
@@ -17,4 +18,5 @@ Grid.propTypes = {
   ...GRID.propTypes
 }
 
+export type GridProps = ComponentProps<typeof Grid>
 export default Grid
diff --git a/src/__tests__/Grid.js → src/__tests__/Grid.tsx b/src/__tests__/Grid.js → src/__tests__/Grid.tsx
diff --git a/src/__tests__/__snapshots__/Grid.js.snap → src/__tests__/__snapshots__/Grid.tsx.snap b/src/__tests__/__snapshots__/Grid.js.snap → src/__tests__/__snapshots__/Grid.tsx.snap