Skip to content

Commit 1ba3a9f

Browse files
Address feedback
1 parent a7b4223 commit 1ba3a9f

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

packages/x-charts/src/RadarChart/RadarSeriesPlot/RadarSeriesMarks.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { useItemHighlightedGetter } from '../../hooks/useItemHighlightedGetter';
77
import { RadarSeriesPlotClasses, useUtilityClasses } from './radarSeriesPlotClasses';
88
import { SeriesId } from '../../models/seriesType/common';
99
import { HighlightItemData } from '../../internals/plugins/featurePlugins/useChartHighlight';
10-
import { getSeriesColorFn } from '../../internals/getSeriesColorFn';
1110

1211
interface GetCirclePropsParams {
1312
seriesId: SeriesId;
@@ -47,14 +46,11 @@ function RadarSeriesMarks(props: RadarSeriesMarksProps) {
4746

4847
return (
4948
<React.Fragment>
50-
{seriesCoordinates?.map((series) => {
51-
if (series.hideMark) {
49+
{seriesCoordinates?.map(({ seriesId: id, points, hideMark, fillArea }) => {
50+
if (hideMark) {
5251
return null;
5352
}
5453

55-
const { seriesId: id, points, fillArea } = series;
56-
const getColor = getSeriesColorFn(series);
57-
5854
return (
5955
<g key={id}>
6056
{points.map((point, index) => (
@@ -63,7 +59,7 @@ function RadarSeriesMarks(props: RadarSeriesMarksProps) {
6359
{...getCircleProps({
6460
seriesId: id,
6561
point,
66-
color: getColor({ value: point.value, dataIndex: point.dataIndex }),
62+
color: point.color,
6763
fillArea,
6864
isFaded,
6965
isHighlighted,

packages/x-charts/src/RadarChart/RadarSeriesPlot/RadarSeriesPlot.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { useUtilityClasses } from './radarSeriesPlotClasses';
77
import { getPathProps } from './RadarSeriesArea';
88
import { getCircleProps } from './RadarSeriesMarks';
99
import { useRadarRotationIndex } from './useRadarRotationIndex';
10-
import { getSeriesColorFn } from '../../internals/getSeriesColorFn';
1110

1211
function RadarSeriesPlot(props: RadarSeriesPlotProps) {
1312
const { seriesId: inSeriesId, classes: inClasses, onAreaClick, onMarkClick } = props;
@@ -21,10 +20,7 @@ function RadarSeriesPlot(props: RadarSeriesPlotProps) {
2120

2221
return (
2322
<g className={classes.root}>
24-
{seriesCoordinates?.map((series, seriesIndex) => {
25-
const { seriesId, points, color, hideMark, fillArea } = series;
26-
const getColor = getSeriesColorFn(series);
27-
23+
{seriesCoordinates?.map(({ seriesId, points, color, hideMark, fillArea }, seriesIndex) => {
2824
return (
2925
<g key={seriesId}>
3026
{
@@ -57,7 +53,7 @@ function RadarSeriesPlot(props: RadarSeriesPlotProps) {
5753
{...getCircleProps({
5854
seriesId,
5955
point,
60-
color: getColor({ value: point.value, dataIndex: point.dataIndex }),
56+
color: point.color,
6157
fillArea,
6258
isFaded,
6359
isHighlighted,

packages/x-charts/src/RadarChart/RadarSeriesPlot/useRadarSeriesData.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { useItemHighlightedGetter } from '../../hooks/useItemHighlightedGetter';
55
import { SeriesId } from '../../models/seriesType/common';
66
import { UseChartPolarAxisSignature } from '../../internals/plugins/featurePlugins/useChartPolarAxis';
77
import { useChartContext } from '../../context/ChartProvider/useChartContext';
8+
import { getSeriesColorFn } from '../../internals/getSeriesColorFn';
89

910
/**
1011
* This hook provides all the data needed to display radar series.
@@ -28,6 +29,7 @@ export function useRadarSeriesData(querySeriesId?: SeriesId) {
2829
const seriesId = series.id;
2930
const isSeriesHighlighted = isItemHighlighted({ seriesId });
3031
const isSeriesFaded = !isSeriesHighlighted && isItemFaded({ seriesId });
32+
const getColor = getSeriesColorFn(series);
3133

3234
return {
3335
...series,
@@ -48,6 +50,7 @@ export function useRadarSeriesData(querySeriesId?: SeriesId) {
4850
isItemFaded: faded,
4951
dataIndex,
5052
value,
53+
color: getColor({ value, dataIndex }),
5154
};
5255
}),
5356
};

0 commit comments

Comments
 (0)