feat(bullet): init package migration to typescript

Close #1224
plouc · Nov 9, 2020 · d07378a · d07378a
1 parent df211c0
commit d07378a
Show file tree

Hide file tree

Showing 22 changed files with 521 additions and 552 deletions.
diff --git a/packages/bullet/package.json b/packages/bullet/package.json
@@ -16,25 +16,30 @@
   ],
   "main": "./dist/nivo-bullet.cjs.js",
   "module": "./dist/nivo-bullet.es.js",
+  "typings": "./dist/types/index.d.ts",
   "files": [
     "README.md",
     "LICENSE.md",
-    "index.d.ts",
     "dist/"
   ],
   "dependencies": {
     "@nivo/axes": "0.64.0",
     "@nivo/colors": "0.64.0",
-    "@nivo/core": "0.64.0",
     "@nivo/legends": "0.64.0",
     "@nivo/tooltip": "0.64.0",
     "d3-scale": "^3.0.0",
     "lodash": "^4.17.11",
     "react-motion": "^0.5.2",
     "recompose": "^0.30.0"
   },
+  "devDependencies": {
+    "@nivo/core": "*",
+    "@types/d3-scale": "^3.2.1",
+    "@types/react-motion": "^0.0.29",
+    "@types/recompose": "^0.30.7"
+  },
   "peerDependencies": {
-    "prop-types": ">= 15.5.10 < 16.0.0",
+    "@nivo/core": "^0.64.0",
     "react": ">= 16.8.4 < 17.0.0"
   },
   "publishConfig": {

diff --git a/packages/bullet/src/Bullet.js → packages/bullet/src/Bullet.tsx b/packages/bullet/src/Bullet.js → packages/bullet/src/Bullet.tsx
@@ -1,21 +1,16 @@
-/*
- * This file is part of the nivo project.
- *
- * Copyright 2016-present, Raphaël Benitte.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
 import React, { Component } from 'react'
 import { scaleLinear } from 'd3-scale'
+// @ts-ignore
 import setDisplayName from 'recompose/setDisplayName'
+// @ts-ignore
 import { Container, SvgWrapper } from '@nivo/core'
-import { BulletPropTypes } from './props'
+import { defaultProps } from './props'
+import { BulletSvgProps, TooltipHandlers } from './types'
 import enhance from './enhance'
 import BulletItem from './BulletItem'
 
-export class Bullet extends Component {
-    static propTypes = BulletPropTypes
+export class Bullet extends Component<BulletSvgProps> {
+    static displayName = 'Bullet'
 
     render() {
         const {
@@ -61,9 +56,9 @@ export class Bullet extends Component {
             onMarkerClick,
 
             role,
-        } = this.props
+        } = { height: 0, width: 0, ...defaultProps, ...this.props }
 
-        let itemHeight
+        let itemHeight: number
         if (layout === 'horizontal') {
             itemHeight = (height - spacing * (data.length - 1)) / data.length
         } else {
@@ -73,7 +68,7 @@ export class Bullet extends Component {
         const markerHeight = itemHeight * markerSize
 
         const enhancedData = data.map(d => {
-            const all = [...d.ranges, ...d.measures, ...d.markers]
+            const all = [...d.ranges, ...d.measures, ...(d.markers ?? [])]
 
             const max = Math.max(...all)
 
@@ -101,7 +96,7 @@ export class Bullet extends Component {
                 motionStiffness={motionStiffness}
                 motionDamping={motionDamping}
             >
-                {({ showTooltip, hideTooltip }) => (
+                {({ showTooltip, hideTooltip }: TooltipHandlers<unknown>) => (
                     <SvgWrapper
                         width={outerWidth}
                         height={outerHeight}
@@ -151,6 +146,4 @@ export class Bullet extends Component {
     }
 }
 
-Bullet.displayName = 'Bullet'
-
 export default setDisplayName(Bullet.displayName)(enhance(Bullet))