fix(bar): fix type errors

plouc · Jul 2, 2021 · 57d50ab · 57d50ab
1 parent cbf1351
commit 57d50ab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/packages/bar/src/BarCanvas.tsx b/packages/bar/src/BarCanvas.tsx
@@ -189,11 +189,17 @@ const InnerBarCanvas = <RawDatum extends BarDatum>({
     const { showTooltipFromEvent, hideTooltip } = useTooltip()
 
     const formatValue = useValueFormatter(valueFormat)
-    const getBorderColor = useInheritedColor<ComputedBarDatum<RawDatum>>(borderColor, theme)
+    const getBorderColor = useInheritedColor<ComputedBarDatumWithValue<RawDatum>>(
+        borderColor,
+        theme
+    )
     const getColor = useOrdinalColorScale(colors, colorBy)
     const getIndex = usePropertyAccessor(indexBy)
     const getLabel = usePropertyAccessor(label)
-    const getLabelColor = useInheritedColor<ComputedBarDatum<RawDatum>>(labelTextColor, theme)
+    const getLabelColor = useInheritedColor<ComputedBarDatumWithValue<RawDatum>>(
+        labelTextColor,
+        theme
+    )
     const getTooltipLabel = usePropertyAccessor(tooltipLabel)
 
     const options = {
@@ -362,11 +368,11 @@ const InnerBarCanvas = <RawDatum extends BarDatum>({
                 barsWithValue.forEach(bar => {
                     renderBar(ctx, {
                         bar,
-                        borderColor: getBorderColor(bar),
+                        borderColor: getBorderColor(bar) as string,
                         borderRadius,
                         borderWidth,
                         label: getLabel(bar.data),
-                        labelColor: getLabelColor(bar),
+                        labelColor: getLabelColor(bar) as string,
                         shouldRenderLabel: shouldRenderLabel(bar),
                     })
                 })

diff --git a/packages/bar/src/types.ts b/packages/bar/src/types.ts
@@ -163,7 +163,10 @@ export interface BarItemProps<RawDatum>
 export type RenderBarProps<RawDatum> = Omit<
     BarItemProps<RawDatum>,
     'isInteractive' | 'style' | 'tooltip'
->
+> & {
+    borderColor: string
+    labelColor: string
+}
 
 export interface BarTooltipProps<RawDatum> extends ComputedDatum<RawDatum> {
     color: string