fine-tuning on @nivo/bar imports and types

plouc · May 17, 2022 · b07d3c9 · b07d3c9
1 parent 7930c71
commit b07d3c9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/bar/src/Bar.tsx b/packages/bar/src/Bar.tsx
@@ -19,7 +19,7 @@ import {
     useMotionConfig,
 } from '@nivo/core'
 import { Fragment, ReactNode, createElement, useMemo } from 'react'
-import { defaultProps, svgDefaultProps } from './props'
+import { svgDefaultProps } from './props'
 import { useTransition } from '@react-spring/web'
 import { useBar } from './hooks'
 
@@ -61,10 +61,10 @@ const InnerBar = <RawDatum extends BarDatum>({
     layers = svgDefaultProps.layers as BarLayer<RawDatum>[],
     barComponent = svgDefaultProps.barComponent,
 
-    enableLabel = defaultProps.enableLabel,
+    enableLabel = svgDefaultProps.enableLabel,
     label,
-    labelSkipWidth = defaultProps.labelSkipWidth,
-    labelSkipHeight = defaultProps.labelSkipHeight,
+    labelSkipWidth = svgDefaultProps.labelSkipWidth,
+    labelSkipHeight = svgDefaultProps.labelSkipHeight,
     labelTextColor,
 
     markers = svgDefaultProps.markers,

diff --git a/packages/bar/src/types.ts b/packages/bar/src/types.ts
@@ -118,6 +118,8 @@ interface BarCustomLayerBaseProps<RawDatum>
 
     isFocusable: boolean
 
+    getTooltipLabel: (datum: ComputedDatum<RawDatum>) => string | number
+
     xScale: AnyScale
     yScale: AnyScale
 }