From cd6e3ec37791393f88519924778602ba9da06065 Mon Sep 17 00:00:00 2001 From: Adrien Gibrat Date: Wed, 6 Oct 2021 10:39:29 +0200 Subject: [PATCH] fix(bar): avoid to redefine react forwardRef type --- packages/bar/src/BarCanvas.tsx | 7 ------- packages/bar/src/ResponsiveBarCanvas.tsx | 7 ++++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/bar/src/BarCanvas.tsx b/packages/bar/src/BarCanvas.tsx index 6204abbc46..fc640e7915 100644 --- a/packages/bar/src/BarCanvas.tsx +++ b/packages/bar/src/BarCanvas.tsx @@ -27,13 +27,6 @@ import { renderLegendToCanvas } from '@nivo/legends' import { useTooltip } from '@nivo/tooltip' import { useBar } from './hooks' -declare module 'react' { - // eslint-disable-next-line @typescript-eslint/ban-types - function forwardRef( - render: (props: P, ref: React.Ref) => React.ReactElement | null - ): (props: P & React.RefAttributes) => React.ReactElement | null -} - type InnerBarCanvasProps = Omit< BarCanvasProps, 'renderWrapper' | 'theme' diff --git a/packages/bar/src/ResponsiveBarCanvas.tsx b/packages/bar/src/ResponsiveBarCanvas.tsx index 3bcffa8d5c..d48e7eb10d 100644 --- a/packages/bar/src/ResponsiveBarCanvas.tsx +++ b/packages/bar/src/ResponsiveBarCanvas.tsx @@ -9,7 +9,12 @@ export const ResponsiveBarCanvas = forwardRef(function ResponsiveBarCanvas< return ( {({ width, height }) => ( - + , 'height' | 'width'>)} + ref={ref} + /> )} )