Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import { createSelectorMemoized, createSelector } from '@mui/x-internals/store';
import { ChartRootSelector } from '../../utils/selectors';
import { UseChartSeriesSignature } from './useChartSeries.types';
import { applySeriesLayout, applySeriesProcessors } from './processSeries';
import { applySeriesLayout, applySeriesProcessors, defaultizeSeries } from './processSeries';
import { selectorChartDrawingArea } from '../useChartDimensions/useChartDimensions.selectors';

export const selectorChartSeriesState: ChartRootSelector<UseChartSeriesSignature> = (state) =>
state.series;

export const selectorChartDefaultizedSeries = createSelector(
export const selectorChartDefaultizedSeries = createSelectorMemoized(
selectorChartSeriesState,
(seriesState) => seriesState.defaultizedSeries,
({ colors, series, theme, seriesConfig }) =>
defaultizeSeries({
series,
colors: typeof colors === 'function' ? colors(theme) : colors,
seriesConfig,
}),
);

export const selectorChartSeriesConfig = createSelector(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
'use client';
import * as React from 'react';
import { useEffectAfterFirstRender } from '@mui/x-internals/useEffectAfterFirstRender';
import { ChartPlugin } from '../../models';
import { UseChartSeriesSignature } from './useChartSeries.types';
import { rainbowSurgePalette } from '../../../../colorPalettes';
import { defaultizeSeries } from './processSeries';

export const useChartSeries: ChartPlugin<UseChartSeriesSignature> = ({
params,
Expand All @@ -12,23 +11,12 @@ export const useChartSeries: ChartPlugin<UseChartSeriesSignature> = ({
}) => {
const { series, dataset, theme, colors } = params;

// The effect do not track any value defined synchronously during the 1st render by hooks called after `useChartSeries`
// As a consequence, the state generated by the 1st run of this useEffect will always be equal to the initialization one
const isFirstRender = React.useRef(true);

React.useEffect(() => {
if (isFirstRender.current) {
isFirstRender.current = false;
return;
}

useEffectAfterFirstRender(() => {
store.set('series', {
...store.state.series,
defaultizedSeries: defaultizeSeries({
series,
colors: typeof colors === 'function' ? colors(theme) : colors,
seriesConfig,
}),
series,
colors,
theme,
dataset,
});
}, [colors, dataset, series, theme, seriesConfig, store]);
Expand Down Expand Up @@ -56,11 +44,9 @@ useChartSeries.getInitialState = ({ series = [], colors, theme, dataset }, _, se
return {
series: {
seriesConfig,
defaultizedSeries: defaultizeSeries({
series,
colors: typeof colors === 'function' ? colors(theme) : colors,
seriesConfig,
}),
series,
colors,
theme,
dataset,
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ export type DefaultizedSeriesGroups<TSeriesTypes extends ChartSeriesType = Chart

export interface UseChartSeriesState<T extends ChartSeriesType = ChartSeriesType> {
series: {
defaultizedSeries: DefaultizedSeriesGroups<T>;
series: Readonly<AllSeriesType<T>[]>;
colors: ChartsColorPalette;
theme: 'light' | 'dark';
seriesConfig: ChartSeriesConfig<T>;
dataset?: Readonly<DatasetType>;
};
Expand Down
Loading