Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 6 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 65 additions & 1 deletion packages/x-charts/src/ScatterChart/ScatterChart.test.tsx
Original file line number Diff line number Diff line change
@@ -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';

Expand Down Expand Up @@ -38,4 +39,67 @@ describe('<ScatterChart />', () => {
],
}),
);

const isJSDOM = /jsdom/.test(window.navigator.userAgent);

const config = {
JCQuintas marked this conversation as resolved.
Show resolved Hide resolved
dataset: [
{ id: 1, x: 0, y: 10 },
{ id: 2, x: 10, y: 10 },
{ id: 3, x: 10, y: 0 },
{ id: 4, x: 0, y: 0 },
{ id: 5, x: 5, y: 5 },
],
margin: { top: 0, left: 0, bottom: 0, right: 0 },
width: 100,
height: 100,
};

JCQuintas marked this conversation as resolved.
Show resolved Hide resolved
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();
});
});
7 changes: 4 additions & 3 deletions packages/x-charts/src/ScatterChart/extremums.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions packages/x-charts/src/ScatterChart/formatter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading