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

[core] Update charts folder structure #16471

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion packages/x-charts/src/BarChart/BarPlot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { styled } from '@mui/material/styles';
import { BarElement, barElementClasses, BarElementSlotProps, BarElementSlots } from './BarElement';
import { AxisDefaultized } from '../models/axis';
import { BarItemIdentifier } from '../models';
import getColor from './getColor';
import getColor from './seriesConfig/getColor';
import { useChartId, useDrawingArea, useXAxes, useYAxes } from '../hooks';
import { AnimationData, CompletedBarData, MaskData } from './types';
import { BarClipPath } from './BarClipPath';
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/BarChart/extremums.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import { getExtremumX } from './extremums';
import { getExtremumX } from './seriesConfig/extremums';
import { CartesianExtremumGetter } from '../internals/plugins/models';

const buildData = (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CartesianExtremumGetter } from '../internals/plugins/models/seriesConfig/extremumGetter.types';
import { CartesianExtremumGetter } from '../../internals/plugins/models/seriesConfig/extremumGetter.types';

const createResult = (data: any, direction: 'x' | 'y') => {
if (direction === 'x') {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ColorProcessor } from '../internals/plugins/models';
import { ColorProcessor } from '../../internals/plugins/models';

const getColor: ColorProcessor<'bar'> = (series, xAxis, yAxis) => {
const verticalLayout = series.layout === 'vertical';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { ChartSeriesTypeConfig } from '../internals/plugins/models/seriesConfig';
import { ChartSeriesTypeConfig } from '../../internals/plugins/models/seriesConfig';
import { getExtremumX, getExtremumY } from './extremums';
import formatter from './formatter';
import seriesProcessor from './seriesProcessor';
import legendGetter from './legend';
import getColor from './getColor';
import tooltipGetter from './tooltip';

export const plugin: ChartSeriesTypeConfig<'bar'> = {
seriesProcessor: formatter,
export const seriesConfig: ChartSeriesTypeConfig<'bar'> = {
seriesProcessor,
colorProcessor: getColor,
legendGetter,
tooltipGetter,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { LegendItemParams } from '../ChartsLegend';
import { getLabel } from '../internals/getLabel';
import { LegendGetter } from '../internals/plugins/models';
import type { LegendItemParams } from '../../ChartsLegend';
import { getLabel } from '../../internals/getLabel';
import { LegendGetter } from '../../internals/plugins/models';

const legendGetter: LegendGetter<'bar'> = (params) => {
const { seriesOrder, series } = params;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { stack as d3Stack } from '@mui/x-charts-vendor/d3-shape';
import { warnOnce } from '@mui/x-internals/warning';
import { DefaultizedProps } from '@mui/x-internals/types';
import { getStackingGroups } from '../internals/stackSeries';
import { ChartSeries, DatasetElementType, DatasetType } from '../models/seriesType/config';
import { defaultizeValueFormatter } from '../internals/defaultizeValueFormatter';
import { SeriesId } from '../models/seriesType/common';
import { SeriesProcessor } from '../internals/plugins/models';
import { getStackingGroups } from '../../internals/stackSeries';
import { ChartSeries, DatasetElementType, DatasetType } from '../../models/seriesType/config';
import { defaultizeValueFormatter } from '../../internals/defaultizeValueFormatter';
import { SeriesId } from '../../models/seriesType/common';
import { SeriesProcessor } from '../../internals/plugins/models';

type BarDataset = DatasetType<number | null>;

const formatter: SeriesProcessor<'bar'> = (params, dataset) => {
const seriesProcessor: SeriesProcessor<'bar'> = (params, dataset) => {
const { seriesOrder, series } = params;
const stackingGroups = getStackingGroups(params);

Expand Down Expand Up @@ -88,4 +88,4 @@ const formatter: SeriesProcessor<'bar'> = (params, dataset) => {
};
};

export default formatter;
export default seriesProcessor;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLabel } from '../internals/getLabel';
import type { TooltipGetter } from '../internals/plugins/models';
import { getLabel } from '../../internals/getLabel';
import type { TooltipGetter } from '../../internals/plugins/models';

const tooltipGetter: TooltipGetter<'bar'> = (params) => {
const { series, getColor, identifier } = params;
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/LineChart/LineHighlightPlot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useSelector } from '../internals/store/useSelector';
import { LineHighlightElement, LineHighlightElementProps } from './LineHighlightElement';
import { getValueToPositionMapper } from '../hooks/useScale';
import { DEFAULT_X_AXIS_KEY } from '../constants';
import getColor from './getColor';
import getColor from './seriesConfig/getColor';
import { useLineSeries } from '../hooks/useSeries';
import { useChartContext } from '../context/ChartProvider';
import { selectorChartsInteractionXAxis } from '../internals/plugins/featurePlugins/useChartInteraction';
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/LineChart/MarkPlot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useLineSeries } from '../hooks/useSeries';
import { cleanId } from '../internals/cleanId';
import { LineItemIdentifier } from '../models/seriesType/line';
import { CircleMarkElement } from './CircleMarkElement';
import getColor from './getColor';
import getColor from './seriesConfig/getColor';
import { MarkElement, MarkElementProps } from './MarkElement';
import { useChartContext } from '../context/ChartProvider';
import { useXAxes, useYAxes } from '../hooks';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
CartesianExtremumFilter,
CartesianExtremumGetter,
} from '../internals/plugins/models/seriesConfig/extremumGetter.types';
} from '../../internals/plugins/models/seriesConfig/extremumGetter.types';

export const getExtremumX: CartesianExtremumGetter<'line'> = (params) => {
const { axis } = params;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ColorProcessor } from '../internals/plugins/models';
import { ColorProcessor } from '../../internals/plugins/models';

const getColor: ColorProcessor<'line'> = (series, xAxis, yAxis) => {
const yColorScale = yAxis?.colorScale;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { ChartSeriesTypeConfig } from '../internals/plugins/models/seriesConfig';
import { ChartSeriesTypeConfig } from '../../internals/plugins/models/seriesConfig';
import { getExtremumX, getExtremumY } from './extremums';
import formatter from './formatter';
import seriesProcessor from './seriesProcessor';
import getColor from './getColor';
import legendGetter from './legend';
import tooltipGetter from './tooltip';

export const plugin: ChartSeriesTypeConfig<'scatter'> = {
seriesProcessor: formatter,
export const seriesConfig: ChartSeriesTypeConfig<'line'> = {
colorProcessor: getColor,
seriesProcessor,
legendGetter,
tooltipGetter,
xExtremumGetter: getExtremumX,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { LegendItemParams } from '../ChartsLegend';
import { getLabel } from '../internals/getLabel';
import { LegendGetter } from '../internals/plugins/models';
import type { LegendItemParams } from '../../ChartsLegend';
import { getLabel } from '../../internals/getLabel';
import { LegendGetter } from '../../internals/plugins/models';

const legendGetter: LegendGetter<'line'> = (params) => {
const { seriesOrder, series } = params;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { expect } from 'chai';
import lineFormatter from './formatter';
import { SeriesProcessorParams } from '../internals/plugins/models';
import lineProcessor from './seriesProcessor';
import { SeriesProcessorParams } from '../../internals/plugins/models';

const seriesOrder = ['id1'];
const seriesDataset: SeriesProcessorParams<'line'>['series'] = {
Expand All @@ -19,12 +19,12 @@ const dataSet = [{ k: 1 }, { k: 2 }, { k: 3 }];
describe('LineChart - formatter', () => {
describe('data from dataset', () => {
it('should get data from the dataset', () => {
const { series } = lineFormatter({ seriesOrder, series: seriesDataset }, dataSet);
const { series } = lineProcessor({ seriesOrder, series: seriesDataset }, dataSet);
expect(series.id1.data).to.deep.equal([1, 2, 3]);
});

it('should support missing values', () => {
const { series } = lineFormatter({ seriesOrder, series: seriesDataset }, [
const { series } = lineProcessor({ seriesOrder, series: seriesDataset }, [
{ k: 1 },
{ k: null },
{ k: 2 },
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { stack as d3Stack } from '@mui/x-charts-vendor/d3-shape';
import { warnOnce } from '@mui/x-internals/warning';
import { DefaultizedProps } from '@mui/x-internals/types';
import { getStackingGroups } from '../internals/stackSeries';
import { ChartSeries, DatasetElementType, DatasetType } from '../models/seriesType/config';
import { defaultizeValueFormatter } from '../internals/defaultizeValueFormatter';
import { SeriesId } from '../models/seriesType/common';
import { SeriesProcessor } from '../internals/plugins/models';
import { getStackingGroups } from '../../internals/stackSeries';
import { ChartSeries, DatasetElementType, DatasetType } from '../../models/seriesType/config';
import { defaultizeValueFormatter } from '../../internals/defaultizeValueFormatter';
import { SeriesId } from '../../models/seriesType/common';
import { SeriesProcessor } from '../../internals/plugins/models';

// For now it's a copy past of bar charts formatter, but maybe will diverge later
const formatter: SeriesProcessor<'line'> = (params, dataset) => {
const seriesProcessor: SeriesProcessor<'line'> = (params, dataset) => {
const { seriesOrder, series } = params;
const stackingGroups = getStackingGroups({ ...params, defaultStrategy: { stackOffset: 'none' } });

Expand Down Expand Up @@ -85,4 +85,4 @@ const formatter: SeriesProcessor<'line'> = (params, dataset) => {
};
};

export default formatter;
export default seriesProcessor;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLabel } from '../internals/getLabel';
import type { TooltipGetter } from '../internals/plugins/models';
import { getLabel } from '../../internals/getLabel';
import type { TooltipGetter } from '../../internals/plugins/models';

const tooltipGetter: TooltipGetter<'line'> = (params) => {
const { series, getColor, identifier } = params;
Expand Down
12 changes: 0 additions & 12 deletions packages/x-charts/src/PieChart/plugin.ts

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ColorProcessor } from '../internals/plugins/models';
import { ColorProcessor } from '../../internals/plugins/models';

const getColor: ColorProcessor<'pie'> = (series) => {
return (dataIndex: number) => {
Expand Down
12 changes: 12 additions & 0 deletions packages/x-charts/src/PieChart/seriesConfig/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { ChartSeriesTypeConfig } from '../../internals/plugins/models/seriesConfig';
import seriesProcessor from './seriesProcessor';
import getColor from './getColor';
import legendGetter from './legend';
import tooltipGetter from './tooltip';

export const seriesConfig: ChartSeriesTypeConfig<'pie'> = {
colorProcessor: getColor,
seriesProcessor,
legendGetter,
tooltipGetter,
};
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { LegendItemParams } from '../ChartsLegend';
import { getLabel } from '../internals/getLabel';
import { LegendGetter } from '../internals/plugins/models';
import type { LegendItemParams } from '../../ChartsLegend';
import { getLabel } from '../../internals/getLabel';
import { LegendGetter } from '../../internals/plugins/models';

const legendGetter: LegendGetter<'pie'> = (params) => {
const { seriesOrder, series } = params;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { pie as d3Pie } from '@mui/x-charts-vendor/d3-shape';
import { ChartSeriesDefaultized } from '../models/seriesType/config';
import { ChartsPieSorting, PieValueType } from '../models/seriesType/pie';
import { SeriesId } from '../models/seriesType/common';
import { getLabel } from '../internals/getLabel';
import { SeriesProcessor } from '../internals/plugins/models';
import { ChartSeriesDefaultized } from '../../models/seriesType/config';
import { ChartsPieSorting, PieValueType } from '../../models/seriesType/pie';
import { SeriesId } from '../../models/seriesType/common';
import { getLabel } from '../../internals/getLabel';
import { SeriesProcessor } from '../../internals/plugins/models';

const getSortingComparator = (comparator: ChartsPieSorting = 'none') => {
if (typeof comparator === 'function') {
Expand All @@ -21,7 +21,7 @@ const getSortingComparator = (comparator: ChartsPieSorting = 'none') => {
}
};

const formatter: SeriesProcessor<'pie'> = (params) => {
const seriesProcessor: SeriesProcessor<'pie'> = (params) => {
const { seriesOrder, series } = params;

const defaultizedSeries: Record<SeriesId, ChartSeriesDefaultized<'pie'>> = {};
Expand Down Expand Up @@ -61,4 +61,4 @@ const formatter: SeriesProcessor<'pie'> = (params) => {
};
};

export default formatter;
export default seriesProcessor;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLabel } from '../internals/getLabel';
import type { TooltipGetter } from '../internals/plugins/models';
import { getLabel } from '../../internals/getLabel';
import type { TooltipGetter } from '../../internals/plugins/models';

const tooltipGetter: TooltipGetter<'pie'> = (params) => {
const { series, getColor, identifier } = params;
Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/src/ScatterChart/ScatterPlot.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import { Scatter, ScatterProps } from './Scatter';
import getColor from './getColor';
import getColor from './seriesConfig/getColor';
import { useScatterSeries } from '../hooks/useSeries';
import { useXAxes, useYAxes } from '../hooks';
import { useZAxes } from '../hooks/useZAxis';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
CartesianExtremumGetter,
CartesianExtremumGetterResult,
} from '../internals/plugins/models/seriesConfig/extremumGetter.types';
} from '../../internals/plugins/models/seriesConfig/extremumGetter.types';

const mergeMinMax = (
acc: CartesianExtremumGetterResult,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ColorProcessor } from '../internals/plugins/models';
import { ColorProcessor } from '../../internals/plugins/models';

const getColor: ColorProcessor<'scatter'> = (series, xAxis, yAxis, zAxis) => {
const zColorScale = zAxis?.colorScale;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { ChartSeriesTypeConfig } from '../internals/plugins/models/seriesConfig';
import { ChartSeriesTypeConfig } from '../../internals/plugins/models/seriesConfig';
import { getExtremumX, getExtremumY } from './extremums';
import formatter from './formatter';
import seriesProcessor from './seriesProcessor';
import getColor from './getColor';
import legendGetter from './legend';
import tooltipGetter from './tooltip';

export const plugin: ChartSeriesTypeConfig<'line'> = {
export const seriesConfig: ChartSeriesTypeConfig<'scatter'> = {
seriesProcessor,
colorProcessor: getColor,
seriesProcessor: formatter,
legendGetter,
tooltipGetter,
xExtremumGetter: getExtremumX,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { LegendItemParams } from '../ChartsLegend';
import { getLabel } from '../internals/getLabel';
import { LegendGetter } from '../internals/plugins/models';
import type { LegendItemParams } from '../../ChartsLegend';
import { getLabel } from '../../internals/getLabel';
import { LegendGetter } from '../../internals/plugins/models';

const legendGetter: LegendGetter<'scatter'> = (params) => {
const { seriesOrder, series } = params;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { ScatterValueType } from '../models';
import { SeriesProcessor } from '../internals/plugins/models';
import { ScatterValueType } from '../../models';
import { SeriesProcessor } from '../../internals/plugins/models';

const formatter: SeriesProcessor<'scatter'> = ({ series, seriesOrder }, dataset) => {
const seriesProcessor: SeriesProcessor<'scatter'> = ({ series, seriesOrder }, dataset) => {
const completeSeries = Object.fromEntries(
Object.entries(series).map(([seriesId, seriesData]) => {
const datasetKeys = seriesData?.datasetKeys;
Expand Down Expand Up @@ -48,4 +48,4 @@ const formatter: SeriesProcessor<'scatter'> = ({ series, seriesOrder }, dataset)
};
};

export default formatter;
export default seriesProcessor;
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getLabel } from '../internals/getLabel';
import type { TooltipGetter } from '../internals/plugins/models';
import { getLabel } from '../../internals/getLabel';
import type { TooltipGetter } from '../../internals/plugins/models';

const tooltipGetter: TooltipGetter<'scatter'> = (params) => {
const { series, getColor, identifier } = params;
Expand Down
16 changes: 8 additions & 8 deletions packages/x-charts/src/context/ChartProvider/ChartProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ import { useChartCartesianAxis } from '../../internals/plugins/featurePlugins/us
import { useChartInteraction } from '../../internals/plugins/featurePlugins/useChartInteraction';
import { useChartZAxis } from '../../internals/plugins/featurePlugins/useChartZAxis';
import { useChartHighlight } from '../../internals/plugins/featurePlugins/useChartHighlight/useChartHighlight';
import { plugin as barPlugin } from '../../BarChart/plugin';
import { plugin as scatterPlugin } from '../../ScatterChart/plugin';
import { plugin as linePlugin } from '../../LineChart/plugin';
import { plugin as piePlugin } from '../../PieChart/plugin';
import { seriesConfig as barSeriesConfig } from '../../BarChart/seriesConfig';
import { seriesConfig as scatterSeriesConfig } from '../../ScatterChart/seriesConfig';
import { seriesConfig as lineSeriesConfig } from '../../LineChart/seriesConfig';
import { seriesConfig as pieSeriesConfig } from '../../PieChart/seriesConfig';
import { ChartSeriesType } from '../../models/seriesType/config';

export const defaultSeriesConfig: ChartSeriesConfig<'bar' | 'scatter' | 'line' | 'pie'> = {
bar: barPlugin,
scatter: scatterPlugin,
line: linePlugin,
pie: piePlugin,
bar: barSeriesConfig,
scatter: scatterSeriesConfig,
line: lineSeriesConfig,
pie: pieSeriesConfig,
};

// For consistency with the v7, the cartesian axes are set by default.
Expand Down