Button typescript (#675)

* Converted to typescript! * Fixed test failing when using json files
equinor · Nov 13, 2020 · e96055b · e96055b
1 parent f37e773
commit e96055b
Show file tree

Hide file tree

Showing 7 changed files with 240 additions and 199 deletions.
diff --git a/libraries/core-react/jest.config.js b/libraries/core-react/jest.config.js
@@ -2,7 +2,7 @@ module.exports = {
   verbose: true,
   setupFilesAfterEnv: ['./rtl.setup.ts'],
   transform: {
-    '.js': 'babel-jest',
+    '.(js)': 'babel-jest',
     '.(ts|tsx)': 'ts-jest',
   },
   testRegex: '(/__tests__/.*|\\.(test|spec))\\.(ts|tsx|js)$',

diff --git a/libraries/core-react/src/Button/Button.jsx b/libraries/core-react/src/Button/Button.jsx
diff --git a/...ies/core-react/src/Button/Button.test.jsx → ...ies/core-react/src/Button/Button.test.tsx b/...ies/core-react/src/Button/Button.test.jsx → ...ies/core-react/src/Button/Button.test.tsx
@@ -5,7 +5,8 @@ import '@testing-library/jest-dom'
 import 'jest-styled-components'
 import styled from 'styled-components'
 import { save } from '@equinor/eds-icons'
-import { Button, Icon } from '..'
+import { Button } from './Button'
+import { Icon } from '../Icon'
 
 Icon.add({ save })
 

diff --git a/...es/core-react/src/Button/Button.tokens.js → ...es/core-react/src/Button/Button.tokens.ts b/...es/core-react/src/Button/Button.tokens.js → ...es/core-react/src/Button/Button.tokens.ts
@@ -1,8 +1,14 @@
-// @ts-nocheck
 import primary from '@equinor/eds-tokens/components/button/buttons-primary.json'
 import secondary from '@equinor/eds-tokens/components/button/buttons-secondary.json'
 import danger from '@equinor/eds-tokens/components/button/buttons-danger.json'
 import disabled from '@equinor/eds-tokens/components/button/buttons-disabled.json'
+import type {
+  Border,
+  Focus,
+  Hover,
+  Spacing,
+  Typography,
+} from '@equinor/eds-tokens'
 
 const colors = {
   primary: {
@@ -35,7 +41,41 @@ const colors = {
   },
 }
 
-export const button = {
+export type Button = {
+  height: string
+  width?: string
+  background: string
+  color: string
+  border: Border
+  typography: Typography
+  spacing?: Partial<Spacing>
+  focus?: Focus
+  hover?: Hover
+  // TODO Remove these once figma-broker is updated with proper types
+  pressedColor?: string
+  clickboundOffset?: number | string
+  clickbound?: string
+}
+
+type Buttons = {
+  [P in keyof typeof colors]: {
+    [P2 in keyof typeof colors[P]]: Button
+  }
+}
+
+export type ButtonGroups =
+  | Buttons['primary']
+  | Buttons['secondary']
+  | Buttons['danger']
+  | Buttons['disabled']
+
+export const button: {
+  colors: Buttons
+  icon_size: {
+    width: string
+    height: string
+  }
+} = {
   colors,
   icon_size: {
     width: '24px',