refactor: change types (#1132)

reactchartjs · Dec 18, 2022 · dee38b6 · dee38b6
1 parent aa69514
commit dee38b6
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/src/chart.tsx b/src/chart.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useRef, forwardRef } from 'react';
 import { Chart as ChartJS } from 'chart.js';
 import type { ChartType, DefaultDataPoint } from 'chart.js';
 
-import type { ForwardedRef, ChartProps, TypedChartComponent } from './types.js';
+import type { ForwardedRef, ChartProps, BaseChartComponent } from './types.js';
 import {
   reforwardRef,
   cloneData,
@@ -107,6 +107,6 @@ function ChartComponent<
   );
 }
 
-export const Chart: TypedChartComponent = forwardRef(
+export const Chart: BaseChartComponent = forwardRef(
   ChartComponent
-) as TypedChartComponent;
+) as BaseChartComponent;
diff --git a/src/typedCharts.tsx b/src/typedCharts.tsx
@@ -27,7 +27,7 @@ function createTypedChart<T extends ChartType>(
 
   return forwardRef<ChartJSOrUndefined<T>, Omit<ChartProps<T>, 'type'>>(
     (props, ref) => <Chart {...props} ref={ref} type={type} />
-  ) as TypedChartComponent<T, true>;
+  ) as TypedChartComponent<T>;
 }
 
 export const Line = /* #__PURE__ */ createTypedChart('line', LineController);

diff --git a/src/types.ts b/src/types.ts
@@ -73,21 +73,21 @@ export type ChartJSOrUndefined<
   TLabel = unknown
 > = Chart<TType, TData, TLabel> | undefined;
 
-export type TypedChartComponent<
-  TDefaultType extends ChartType = ChartType,
-  TOmitType = false
-> = TOmitType extends true
-  ? <TData = DefaultDataPoint<TDefaultType>, TLabel = unknown>(
-      props: Omit<ChartProps<TDefaultType, TData, TLabel>, 'type'> & {
-        ref?: ForwardedRef<ChartJSOrUndefined<TDefaultType, TData, TLabel>>;
-      }
-    ) => JSX.Element
-  : <
-      TType extends ChartType = ChartType,
-      TData = DefaultDataPoint<TType>,
-      TLabel = unknown
-    >(
-      props: ChartProps<TType, TData, TLabel> & {
-        ref?: ForwardedRef<ChartJSOrUndefined<TType, TData, TLabel>>;
-      }
-    ) => JSX.Element;
+export type BaseChartComponent = <
+  TType extends ChartType = ChartType,
+  TData = DefaultDataPoint<TType>,
+  TLabel = unknown
+>(
+  props: ChartProps<TType, TData, TLabel> & {
+    ref?: ForwardedRef<ChartJSOrUndefined<TType, TData, TLabel>>;
+  }
+) => JSX.Element;
+
+export type TypedChartComponent<TDefaultType extends ChartType> = <
+  TData = DefaultDataPoint<TDefaultType>,
+  TLabel = unknown
+>(
+  props: Omit<ChartProps<TDefaultType, TData, TLabel>, 'type'> & {
+    ref?: ForwardedRef<ChartJSOrUndefined<TDefaultType, TData, TLabel>>;
+  }
+) => JSX.Element;