[charts] Fix log scale with null data (#15337)

mui · Nov 8, 2024 · 7c4c924 · 7c4c924
1 parent 1b6c93d
commit 7c4c924
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/packages/x-charts/src/BarChart/extremums.test.ts b/packages/x-charts/src/BarChart/extremums.test.ts
@@ -20,6 +20,7 @@ const buildData = (
             ]
           : [],
         layout,
+        valueFormatter: () => '',
       },
     },
     axis: {

diff --git a/packages/x-charts/src/LineChart/extremums.ts b/packages/x-charts/src/LineChart/extremums.ts
@@ -12,11 +12,15 @@ type GetValues = (d: [number, number]) => [number, number];
 
 function getSeriesExtremums(
   getValues: GetValues,
+  data: (number | null)[],
   stackedData: [number, number][],
   filter?: ExtremumFilter,
 ): [number, number] {
   return stackedData.reduce<[number, number]>(
     (seriesAcc, stackedValue, index) => {
+      if (data[index] === null) {
+        return seriesAcc;
+      }
       const [base, value] = getValues(stackedValue);
       if (
         filter &&
@@ -41,7 +45,7 @@ export const getExtremumY: ExtremumGetter<'line'> = (params) => {
     })
     .reduce(
       (acc, seriesId) => {
-        const { area, stackedData } = series[seriesId];
+        const { area, stackedData, data } = series[seriesId];
         const isArea = area !== undefined;
 
         const filter = getFilters?.({
@@ -57,7 +61,7 @@ export const getExtremumY: ExtremumGetter<'line'> = (params) => {
             ? (d) => d
             : (d) => [d[1], d[1]];
 
-        const seriesExtremums = getSeriesExtremums(getValues, stackedData, filter);
+        const seriesExtremums = getSeriesExtremums(getValues, data, stackedData, filter);
 
         const [seriesMin, seriesMax] = seriesExtremums;
         return [Math.min(seriesMin, acc[0]), Math.max(seriesMax, acc[1])];

diff --git a/packages/x-charts/src/context/PluginProvider/ExtremumGetter.types.ts b/packages/x-charts/src/context/PluginProvider/ExtremumGetter.types.ts
@@ -1,6 +1,6 @@
 import type {
   CartesianChartSeriesType,
-  ChartSeries,
+  ChartSeriesDefaultized,
   ChartSeriesType,
 } from '../../models/seriesType/config';
 import type { AxisConfig, AxisId } from '../../models/axis';
@@ -11,7 +11,7 @@ export type ExtremumGettersConfig<T extends ChartSeriesType = CartesianChartSeri
 };
 
 type ExtremumGetterParams<T extends ChartSeriesType> = {
-  series: Record<SeriesId, ChartSeries<T>>;
+  series: Record<SeriesId, ChartSeriesDefaultized<T>>;
   axis: AxisConfig;
   axisIndex: number;
   isDefaultAxis: boolean;