Make defaultizeValueFormatter types more permissive

mui · Apr 11, 2024 · 11bf5a0 · 11bf5a0
1 parent 0cf2b85
commit 11bf5a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 deletions.
diff --git a/packages/x-charts/src/BarChart/formatter.ts b/packages/x-charts/src/BarChart/formatter.ts
@@ -87,10 +87,7 @@ const formatter: Formatter<'bar'> = (params, dataset) => {
   return {
     seriesOrder,
     stackingGroups,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    series: defaultizeValueFormatter(completedSeries, (v, _) =>
-      v == null ? '' : v.toLocaleString(),
-    ),
+    series: defaultizeValueFormatter(completedSeries, (v) => (v == null ? '' : v.toLocaleString())),
   };
 };
 

diff --git a/packages/x-charts/src/LineChart/formatter.ts b/packages/x-charts/src/LineChart/formatter.ts
@@ -84,10 +84,7 @@ const formatter: Formatter<'line'> = (params, dataset) => {
   return {
     seriesOrder,
     stackingGroups,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    series: defaultizeValueFormatter(completedSeries, (v, _) =>
-      v == null ? '' : v.toLocaleString(),
-    ),
+    series: defaultizeValueFormatter(completedSeries, (v) => (v == null ? '' : v.toLocaleString())),
   };
 };
 

diff --git a/packages/x-charts/src/ScatterChart/formatter.ts b/packages/x-charts/src/ScatterChart/formatter.ts
@@ -3,8 +3,7 @@ import { Formatter } from '../models/seriesType/config';
 
 const formatter: Formatter<'scatter'> = ({ series, seriesOrder }) => {
   return {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    series: defaultizeValueFormatter(series, (v, _) => `(${v.x}, ${v.y})`),
+    series: defaultizeValueFormatter(series, (v) => `(${v.x}, ${v.y})`),
     seriesOrder,
   };
 };

diff --git a/packages/x-charts/src/internals/defaultizeValueFormatter.ts b/packages/x-charts/src/internals/defaultizeValueFormatter.ts
@@ -1,8 +1,8 @@
 import { SeriesId } from '../models/seriesType/common';
 
 function defaultizeValueFormatter<
-  ISeries extends { valueFormatter?: IFormatter },
-  IFormatter extends (v: any, context: any) => string,
+  IFormatter extends (v: any, context?: unknown) => string,
+  ISeries extends { valueFormatter?: Function },
 >(
   series: Record<SeriesId, ISeries>,
   defaultValueFormatter: IFormatter,
@@ -11,7 +11,7 @@ function defaultizeValueFormatter<
   Object.keys(series).forEach((seriesId) => {
     defaultizedSeries[seriesId] = {
       ...series[seriesId],
-      valueFormatter: series[seriesId].valueFormatter ?? defaultValueFormatter,
+      valueFormatter: (series[seriesId].valueFormatter as IFormatter) ?? defaultValueFormatter,
     };
   });
   return defaultizedSeries;