fix(bar): avoid to redefine react forwardRef type

plouc · Dec 17, 2021 · cd6e3ec · cd6e3ec
1 parent edd3990
commit cd6e3ec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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<T, P = {}>(
-        render: (props: P, ref: React.Ref<T>) => React.ReactElement | null
-    ): (props: P & React.RefAttributes<T>) => React.ReactElement | null
-}
-
 type InnerBarCanvasProps<RawDatum extends BarDatum> = Omit<
     BarCanvasProps<RawDatum>,
     'renderWrapper' | 'theme'

diff --git a/packages/bar/src/ResponsiveBarCanvas.tsx b/packages/bar/src/ResponsiveBarCanvas.tsx
@@ -9,7 +9,12 @@ export const ResponsiveBarCanvas = forwardRef(function ResponsiveBarCanvas<
     return (
         <ResponsiveWrapper>
             {({ width, height }) => (
-                <BarCanvas width={width} height={height} {...props} ref={ref} />
+                <BarCanvas
+                    width={width}
+                    height={height}
+                    {...(props as Omit<BarCanvasProps<BarDatum>, 'height' | 'width'>)}
+                    ref={ref}
+                />
             )}
         </ResponsiveWrapper>
     )