Skip to content

Commit 599a331

Browse files
authored
[charts] Move seriesConfig to useChartSeriesConfig plugin (mui#21004)
1 parent e06faca commit 599a331

File tree

44 files changed

+191
-135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+191
-135
lines changed

packages/x-charts-premium/src/BarChartPremium/BarChartPremium.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ const BarChartPremium = React.forwardRef(function BarChartPremium(
126126
const Toolbar = props.slots?.toolbar ?? ChartsToolbarPro;
127127

128128
return (
129-
<ChartDataProviderPremium {...chartDataProviderProProps}>
129+
<ChartDataProviderPremium<'bar' | 'rangeBar', BarChartPremiumPluginSignatures>
130+
{...chartDataProviderProProps}
131+
>
130132
<ChartsWrapper {...chartsWrapperProps}>
131133
{showToolbar ? <Toolbar {...props.slotProps?.toolbar} /> : null}
132134
{!props.hideLegend && <ChartsLegend {...legendProps} />}

packages/x-charts-premium/src/BarChartPremium/RangeBar/useRangeBarPlotData.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {
66
type D3Scale,
77
getBandSize,
88
type ScaleName,
9-
selectorChartSeriesConfig,
109
useStore,
1110
} from '@mui/x-charts/internals';
1211
import { type ChartsXAxisProps, type ChartsYAxisProps } from '@mui/x-charts/models';
@@ -23,7 +22,7 @@ export function useRangeBarPlotData(
2322
const seriesData = useRangeBarSeriesContext() ?? { series: {}, seriesOrder: [] };
2423
const defaultXAxisId = useXAxes().xAxisIds[0];
2524
const defaultYAxisId = useYAxes().yAxisIds[0];
26-
const getColor = store.use(selectorChartSeriesConfig).rangeBar.colorProcessor;
25+
const getColor = store.state.seriesConfig.config.rangeBar.colorProcessor;
2726

2827
const { series, seriesOrder } = seriesData;
2928

packages/x-charts-premium/src/ChartContainerPremium/ChartContainerPremium.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const ChartContainerPremium = React.forwardRef(function ChartContainerPremium<
5959
useChartContainerPremiumProps<TSeries, TSignatures>(props, ref);
6060

6161
return (
62-
<ChartDataProviderPremium {...chartDataProviderPremiumProps}>
62+
<ChartDataProviderPremium<TSeries, TSignatures> {...chartDataProviderPremiumProps}>
6363
<ChartsSurface {...chartsSurfaceProps}>{children}</ChartsSurface>
6464
</ChartDataProviderPremium>
6565
);

packages/x-charts-pro/src/BarChartPro/BarChartPro.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ const BarChartPro = React.forwardRef(function BarChartPro(
108108
const Toolbar = props.slots?.toolbar ?? ChartsToolbarPro;
109109

110110
return (
111-
<ChartDataProviderPro {...chartDataProviderProProps}>
111+
<ChartDataProviderPro<'bar', BarChartProPluginSignatures> {...chartDataProviderProProps}>
112112
<ChartsWrapper {...chartsWrapperProps}>
113113
{showToolbar ? <Toolbar {...props.slotProps?.toolbar} /> : null}
114114
{!props.hideLegend && <ChartsLegend {...legendProps} />}

packages/x-charts-pro/src/ChartContainerPro/ChartContainerPro.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const ChartContainerPro = React.forwardRef(function ChartContainerProInner<
5757
>(props, ref);
5858

5959
return (
60-
<ChartDataProviderPro {...chartDataProviderProProps}>
60+
<ChartDataProviderPro<TSeries, TSignatures> {...chartDataProviderProProps}>
6161
<ChartsSurface {...chartsSurfaceProps}>{children}</ChartsSurface>
6262
</ChartDataProviderPro>
6363
);

packages/x-charts-pro/src/FunnelChart/funnelAxisPlugin/useChartFunnelAxis.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { selectorChartXAxis, selectorChartYAxis } from './useChartFunnelAxisRend
1818
export const useChartFunnelAxis: ChartPlugin<UseChartFunnelAxisSignature> = ({
1919
params,
2020
store,
21-
seriesConfig,
2221
svgRef,
2322
instance,
2423
}) => {
@@ -61,7 +60,7 @@ export const useChartFunnelAxis: ChartPlugin<UseChartFunnelAxisSignature> = ({
6160
y: defaultizeYAxis(yAxis, dataset, 0),
6261
},
6362
});
64-
}, [seriesConfig, drawingArea, xAxis, yAxis, dataset, store, gap]);
63+
}, [drawingArea, xAxis, yAxis, dataset, store, gap]);
6564

6665
React.useEffect(() => {
6766
const element = svgRef.current;

packages/x-charts-pro/src/Heatmap/Heatmap.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ export interface HeatmapProps
8888
| 'experimentalFeatures'
8989
| 'highlightedAxis'
9090
| 'onHighlightedAxisChange'
91+
| 'seriesConfig'
9192
| 'onAxisClick'
9293
>,
9394
Omit<ChartsAxisProps, 'slots' | 'slotProps'>,
@@ -330,11 +331,6 @@ Heatmap.propTypes = {
330331
* An array of [[HeatmapSeries]] objects.
331332
*/
332333
series: PropTypes.arrayOf(PropTypes.object).isRequired,
333-
/**
334-
* The configuration helpers used to compute attributes according to the series type.
335-
* @ignore Unstable props for internal usage.
336-
*/
337-
seriesConfig: PropTypes.object,
338334
/**
339335
* If true, shows the default chart toolbar.
340336
* @default false

packages/x-charts-pro/src/LineChartPro/LineChartPro.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const LineChartPro = React.forwardRef(function LineChartPro(
112112
const Toolbar = props.slots?.toolbar ?? ChartsToolbarPro;
113113

114114
return (
115-
<ChartDataProviderPro {...chartDataProviderProProps}>
115+
<ChartDataProviderPro<'line', LineChartProPluginSignatures> {...chartDataProviderProProps}>
116116
<ChartsWrapper {...chartsWrapperProps}>
117117
{showToolbar ? <Toolbar {...props.slotProps?.toolbar} /> : null}
118118
{!props.hideLegend && <ChartsLegend {...legendProps} />}

packages/x-charts-pro/src/ScatterChartPro/ScatterChartPro.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ const ScatterChartPro = React.forwardRef(function ScatterChartPro(
118118
const Toolbar = props.slots?.toolbar ?? ChartsToolbarPro;
119119

120120
return (
121-
<ChartDataProviderPro {...chartDataProviderProProps}>
121+
<ChartDataProviderPro<'scatter', ScatterChartProPluginSignatures>
122+
{...chartDataProviderProProps}
123+
>
122124
<ChartsWrapper {...chartsWrapperProps}>
123125
{showToolbar ? <Toolbar {...props.slotProps?.toolbar} /> : null}
124126
{!props.hideLegend && <ChartsLegend {...legendProps} />}

packages/x-charts/src/ChartDataProvider/ChartDataProvider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export type ChartDataProviderProps<
2828
TSignatures extends readonly ChartAnyPluginSignature[] = AllPluginSignatures<TSeries>,
2929
> = React.PropsWithChildren<
3030
ChartProviderProps<TSeries, TSignatures>['pluginParams'] &
31-
Pick<ChartProviderProps<TSeries, TSignatures>, 'seriesConfig' | 'plugins'>
31+
Pick<ChartProviderProps<TSeries, TSignatures>, 'plugins'>
3232
> &
3333
ChartsLocalizationProviderProps & {
3434
/**

0 commit comments

Comments
 (0)