[charts] Fix scatter dataset with missing data (@alexfauquette) (#15804)

Signed-off-by: Jose C Quintas Jr <juniorquintas@gmail.com> Co-authored-by: Alexandre Fauquette <45398769+alexfauquette@users.noreply.github.com> Co-authored-by: Jose C Quintas Jr <juniorquintas@gmail.com>
mui · Dec 9, 2024 · 9a4e11d · 9a4e11d
1 parent 5abd3ea
commit 9a4e11d
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 6 deletions.
diff --git a/packages/x-charts/src/ScatterChart/ScatterChart.test.tsx b/packages/x-charts/src/ScatterChart/ScatterChart.test.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { createRenderer } from '@mui/internal-test-utils/createRenderer';
+import { expect } from 'chai';
+import { createRenderer, screen } from '@mui/internal-test-utils/createRenderer';
 import { describeConformance } from 'test/utils/describeConformance';
 import { ScatterChart } from '@mui/x-charts/ScatterChart';
 
@@ -38,4 +39,54 @@ describe('<ScatterChart />', () => {
       ],
     }),
   );
+
+  const isJSDOM = /jsdom/.test(window.navigator.userAgent);
+
+  it('should support dataset with missing values', async function test() {
+    if (isJSDOM) {
+      this.skip();
+    }
+
+    // x from 500 to 600
+    // y from 100 to 200
+    const dataset = [
+      {
+        version: 'data-0',
+        a1: 500,
+        a2: 100,
+      },
+      {
+        version: 'data-1',
+        a1: 600,
+        a2: 200,
+      },
+      {
+        version: 'data-2',
+        // Item with missing x-values
+        // a1: 500,
+        a2: 200,
+      },
+      {
+        version: 'data-2',
+        // Item with missing y-values
+        a1: 500,
+        // a2: 200,
+      },
+    ];
+
+    render(
+      <ScatterChart
+        dataset={dataset}
+        series={[{ datasetKeys: { id: 'version', x: 'a1', y: 'a2' }, label: 'Series A' }]}
+        width={500}
+        height={300}
+      />,
+    );
+
+    const labelX = await screen.findByText('100');
+    expect(labelX).toBeVisible();
+
+    const labelY = await screen.findByText('600');
+    expect(labelY).toBeVisible();
+  });
 });
diff --git a/packages/x-charts/src/ScatterChart/extremums.ts b/packages/x-charts/src/ScatterChart/extremums.ts
@@ -6,9 +6,10 @@ import {
 const mergeMinMax = (
   acc: ExtremumGetterResult,
   val: ExtremumGetterResult,
-): ExtremumGetterResult => {
-  return [Math.min(acc[0], val[0]), Math.max(acc[1], val[1])];
-};
+): ExtremumGetterResult => [
+  val[0] === null ? acc[0] : Math.min(acc[0], val[0]),
+  val[1] === null ? acc[1] : Math.max(acc[1], val[1]),
+];
 
 export const getExtremumX: ExtremumGetter<'scatter'> = (params) => {
   const { series, axis, isDefaultAxis, getFilters } = params;

diff --git a/packages/x-charts/src/ScatterChart/formatter.ts b/packages/x-charts/src/ScatterChart/formatter.ts
@@ -23,8 +23,8 @@ const formatter: SeriesFormatter<'scatter'> = ({ series, seriesOrder }, dataset)
         ? (seriesData.data ?? [])
         : (dataset?.map((d) => {
             return {
-              x: d[datasetKeys.x],
-              y: d[datasetKeys.y],
+              x: d[datasetKeys.x] ?? null,
+              y: d[datasetKeys.y] ?? null,
               z: datasetKeys.z && d[datasetKeys.z],
               id: d[datasetKeys.id],
             } as ScatterValueType;