@mui/x-charts 7.6.1 → 7.7.0

package/modern/ChartContainer/ChartContainer.js

@@ -4,11 +4,13 @@ import useForkRef from '@mui/utils/useForkRef';
 import { DrawingProvider } from '../context/DrawingProvider';
 import { SeriesContextProvider } from '../context/SeriesContextProvider';
 import { InteractionProvider } from '../context/InteractionProvider';
+import { ColorProvider } from '../context/ColorProvider';
 import { useReducedMotion } from '../hooks/useReducedMotion';
 import { ChartsSurface } from '../ChartsSurface';
 import { CartesianContextProvider } from '../context/CartesianContextProvider';
 import { ChartsAxesGradients } from '../internals/components/ChartsAxesGradients';
-import { HighlightedProvider } from '../context';
+import { HighlightedProvider, ZAxisContextProvider } from '../context';
+import { usePluginsMerge } from './usePluginsMerge';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const ChartContainer = /*#__PURE__*/React.forwardRef(function ChartContainer(props, ref) {
   const {
@@ -18,6 +20,7 @@ const ChartContainer = /*#__PURE__*/React.forwardRef(function ChartContainer(pro
     margin,
     xAxis,
     yAxis,
+    zAxis,
     colors,
     dataset,
     sx,
@@ -26,10 +29,17 @@ const ChartContainer = /*#__PURE__*/React.forwardRef(function ChartContainer(pro
     disableAxisListener,
     highlightedItem,
     onHighlightChange,
+    plugins,
     children
   } = props;
   const svgRef = React.useRef(null);
   const handleRef = useForkRef(ref, svgRef);
+  const {
+    xExtremumGetters,
+    yExtremumGetters,
+    seriesFormatters,
+    colorProcessors
+  } = usePluginsMerge(plugins);
   useReducedMotion(); // a11y reduce motion (see: https://react-spring.dev/docs/utilities/use-reduced-motion)
 
   return /*#__PURE__*/_jsx(DrawingProvider, {
@@ -37,27 +47,37 @@ const ChartContainer = /*#__PURE__*/React.forwardRef(function ChartContainer(pro
     height: height,
     margin: margin,
     svgRef: svgRef,
-    children: /*#__PURE__*/_jsx(SeriesContextProvider, {
-      series: series,
-      colors: colors,
-      dataset: dataset,
-      children: /*#__PURE__*/_jsx(CartesianContextProvider, {
-        xAxis: xAxis,
-        yAxis: yAxis,
+    children: /*#__PURE__*/_jsx(ColorProvider, {
+      colorProcessors: colorProcessors,
+      children: /*#__PURE__*/_jsx(SeriesContextProvider, {
+        series: series,
+        colors: colors,
         dataset: dataset,
-        children: /*#__PURE__*/_jsx(InteractionProvider, {
-          children: /*#__PURE__*/_jsx(HighlightedProvider, {
-            highlightedItem: highlightedItem,
-            onHighlightChange: onHighlightChange,
-            children: /*#__PURE__*/_jsxs(ChartsSurface, {
-              width: width,
-              height: height,
-              ref: handleRef,
-              sx: sx,
-              title: title,
-              desc: desc,
-              disableAxisListener: disableAxisListener,
-              children: [/*#__PURE__*/_jsx(ChartsAxesGradients, {}), children]
+        seriesFormatters: seriesFormatters,
+        children: /*#__PURE__*/_jsx(CartesianContextProvider, {
+          xAxis: xAxis,
+          yAxis: yAxis,
+          dataset: dataset,
+          xExtremumGetters: xExtremumGetters,
+          yExtremumGetters: yExtremumGetters,
+          children: /*#__PURE__*/_jsx(ZAxisContextProvider, {
+            zAxis: zAxis,
+            dataset: dataset,
+            children: /*#__PURE__*/_jsx(InteractionProvider, {
+              children: /*#__PURE__*/_jsx(HighlightedProvider, {
+                highlightedItem: highlightedItem,
+                onHighlightChange: onHighlightChange,
+                children: /*#__PURE__*/_jsxs(ChartsSurface, {
+                  width: width,
+                  height: height,
+                  ref: handleRef,
+                  sx: sx,
+                  title: title,
+                  desc: desc,
+                  disableAxisListener: disableAxisListener,
+                  children: [/*#__PURE__*/_jsx(ChartsAxesGradients, {}), children]
+                })
+              })
             })
           })
         })
@@ -117,6 +137,11 @@ process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
    * @param {HighlightItemData | null} highlightedItem  The newly highlighted item.
    */
   onHighlightChange: PropTypes.func,
+  /**
+   * An array of plugins defining how to preprocess data.
+   * If not provided, the container supports line, bar, scatter and pie charts.
+   */
+  plugins: PropTypes.arrayOf(PropTypes.object),
   /**
    * The array of series to display.
    * Each type of series has its own specificity.
@@ -170,7 +195,7 @@ process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
     labelStyle: PropTypes.object,
     max: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
     min: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
-    position: PropTypes.oneOf(['bottom', 'left', 'right', 'top']),
+    position: PropTypes.oneOf(['bottom', 'top']),
     reverse: PropTypes.bool,
     scaleType: PropTypes.oneOf(['band', 'linear', 'log', 'point', 'pow', 'sqrt', 'time', 'utc']),
     slotProps: PropTypes.object,
@@ -223,7 +248,7 @@ process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
     labelStyle: PropTypes.object,
     max: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
     min: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
-    position: PropTypes.oneOf(['bottom', 'left', 'right', 'top']),
+    position: PropTypes.oneOf(['left', 'right']),
     reverse: PropTypes.bool,
     scaleType: PropTypes.oneOf(['band', 'linear', 'log', 'point', 'pow', 'sqrt', 'time', 'utc']),
     slotProps: PropTypes.object,
@@ -240,6 +265,29 @@ process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
     tickPlacement: PropTypes.oneOf(['end', 'extremities', 'middle', 'start']),
     tickSize: PropTypes.number,
     valueFormatter: PropTypes.func
+  })),
+  /**
+   * The configuration of the z-axes.
+   */
+  zAxis: PropTypes.arrayOf(PropTypes.shape({
+    colorMap: PropTypes.oneOfType([PropTypes.shape({
+      colors: PropTypes.arrayOf(PropTypes.string).isRequired,
+      type: PropTypes.oneOf(['ordinal']).isRequired,
+      unknownColor: PropTypes.string,
+      values: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number, PropTypes.string]).isRequired)
+    }), PropTypes.shape({
+      color: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.string.isRequired), PropTypes.func]).isRequired,
+      max: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
+      min: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
+      type: PropTypes.oneOf(['continuous']).isRequired
+    }), PropTypes.shape({
+      colors: PropTypes.arrayOf(PropTypes.string).isRequired,
+      thresholds: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]).isRequired).isRequired,
+      type: PropTypes.oneOf(['piecewise']).isRequired
+    })]),
+    data: PropTypes.array,
+    dataKey: PropTypes.string,
+    id: PropTypes.string
   }))
 } : void 0;
 export { ChartContainer };

package/modern/ChartContainer/defaultPlugins.js

@@ -0,0 +1,5 @@
+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';
+export const defaultPlugins = [barPlugin, scatterPlugin, linePlugin, piePlugin];

package/modern/ChartContainer/usePluginsMerge.js

@@ -0,0 +1,31 @@
+import * as React from 'react';
+import { defaultPlugins } from './defaultPlugins';
+export function usePluginsMerge(plugins) {
+  const defaultizedPlugins = plugins ?? defaultPlugins;
+  return React.useMemo(() => {
+    const seriesFormatters = {};
+    const colorProcessors = {};
+    const xExtremumGetters = {};
+    const yExtremumGetters = {};
+    for (let i = 0; i < defaultizedPlugins.length; i += 1) {
+      const plugin = defaultizedPlugins[i];
+
+      // To remove those any we will need to solve this union discrimination issue:
+      // https://www.typescriptlang.org/play/?#code/FDAuE8AcFMAIDkCuBbARtATgYQPYDsAzASwHNYBeWAb2FlgGsi8ATALlgHI8V0MOBuWrBwwMAQ1A4M7ABQAPdtzSYAlBQB8sJb0EBfEBBiwAyqAxMSuQqQrUhjFuw4BnMxYFCRmCVNkLYruZ4JGrkmoEWeiAAxviuWqhWxCTsSMrY+Mm2VAxMbLAARNqYBQA0wqI+0rByGrAATLAAVDWw+rF48YFJpOymQZaZNpQ5DvkFEcFlFd6S1bVhsAAG9S0AJFRyukttMXGgsB3JzrYA2niJQyTl3VcAugZQcADylXPOALJikJAW2ULFDAAflSPEwPRIpw4XnEcw4d1KQkmJBBJjcwQhUJhVXhiN0gmAHXi2LmXx+FnYr1mUk+31+wWy+JABCksBkABtoAcjjYcARDldnGoaCA6AB6MWwADqUnoJxw9FgRH5AHc4L9ooroGJogALQ5iZxwPJEABuRGYiDE7PASJVRFAerZPJIADoxsKhHRooa4FwwXxWF66DNYVIyfTIS73Xk7rZoySpIIQyHUBhtfRkyGfUbOMiOEGU3RExgIxZTtGxnHKAm3kng8xoAQxIh2aBC0W0xms-pvftqLkWOUS2141chBLYABJDimuB4HBKxtiWBiVA4RAHXU4FWwSSwTkHAAqxlgiBYmFcYhYAusbrGq5vtepGFX6YPTHo0GYnjrpbp5ZVrYJZ6EAA
+      seriesFormatters[plugin.seriesType] = plugin.seriesFormatter;
+      colorProcessors[plugin.seriesType] = plugin.colorProcessor;
+      if (plugin.xExtremumGetter) {
+        xExtremumGetters[plugin.seriesType] = plugin.xExtremumGetter;
+      }
+      if (plugin.yExtremumGetter) {
+        yExtremumGetters[plugin.seriesType] = plugin.yExtremumGetter;
+      }
+    }
+    return {
+      seriesFormatters,
+      colorProcessors,
+      xExtremumGetters,
+      yExtremumGetters
+    };
+  }, [defaultizedPlugins]);
+}

package/modern/ChartsLegend/ChartsLegend.js

@@ -5,10 +5,10 @@ import { useSlotProps } from '@mui/base/utils';
 import { unstable_composeClasses as composeClasses } from '@mui/utils';
 import { useThemeProps, useTheme } from '@mui/material/styles';
 import { getSeriesToDisplay } from './utils';
-import { SeriesContext } from '../context/SeriesContextProvider';
 import { getLegendUtilityClass } from './chartsLegendClasses';
 import { DefaultChartsLegend } from './DefaultChartsLegend';
 import { useDrawingArea } from '../hooks';
+import { useSeries } from '../hooks/useSeries';
 import { jsx as _jsx } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
@@ -47,7 +47,7 @@ function ChartsLegend(inProps) {
     theme
   }));
   const drawingArea = useDrawingArea();
-  const series = React.useContext(SeriesContext);
+  const series = useSeries();
   const seriesToDisplay = getSeriesToDisplay(series);
   const ChartLegendRender = slots?.legend ?? DefaultChartsLegend;
   const chartLegendRenderProps = useSlotProps({

package/modern/ChartsLegend/utils.js

@@ -9,5 +9,8 @@ const legendGetter = {
   pie: getPieLegend
 };
 export function getSeriesToDisplay(series) {
-  return Object.keys(series).flatMap(seriesType => legendGetter[seriesType](series[seriesType]));
+  return Object.keys(series).flatMap(seriesType => {
+    const getter = legendGetter[seriesType];
+    return getter === undefined ? [] : getter(series[seriesType]);
+  });
 }

package/modern/ChartsOnAxisClickHandler/ChartsOnAxisClickHandler.js

@@ -1,16 +1,16 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { SvgContext } from '../context/DrawingProvider';
 import { InteractionContext } from '../context/InteractionProvider';
 import { CartesianContext } from '../context/CartesianContextProvider';
-import { SeriesContext } from '../context/SeriesContextProvider';
+import { useSeries } from '../hooks/useSeries';
+import { useSvgRef } from '../hooks';
 import { jsx as _jsx } from "react/jsx-runtime";
 function ChartsOnAxisClickHandler(props) {
   const {
     onAxisClick
   } = props;
-  const svgRef = React.useContext(SvgContext);
-  const series = React.useContext(SeriesContext);
+  const svgRef = useSvgRef();
+  const series = useSeries();
   const {
     axis
   } = React.useContext(InteractionContext);

package/modern/ChartsReferenceLine/ChartsXReferenceLine.js

@@ -5,6 +5,7 @@ import { useDrawingArea, useXScale } from '../hooks';
 import { ReferenceLineRoot } from './common';
 import { ChartsText } from '../ChartsText';
 import { getReferenceLineUtilityClass } from './chartsReferenceLineClasses';
+import { buildWarning } from '../internals/warning';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const getTextParams = ({
   top,
@@ -46,7 +47,7 @@ export function getXReferenceLineClasses(classes) {
     label: ['label']
   }, getReferenceLineUtilityClass, classes);
 }
-let warnedOnce = false;
+const valueError = buildWarning((value, id) => `MUI X Charts: the value ${value} does not exist in the data of x axis with id ${id}.`, 'error');
 function ChartsXReferenceLine(props) {
   const {
     x,
@@ -66,10 +67,7 @@ function ChartsXReferenceLine(props) {
   const xPosition = xAxisScale(x);
   if (xPosition === undefined) {
     if (process.env.NODE_ENV !== 'production') {
-      if (!warnedOnce) {
-        warnedOnce = true;
-        console.error(`MUI X Charts: the value ${x} does not exist in the data of x axis with id ${axisId}.`);
-      }
+      valueError(x, axisId);
     }
     return null;
   }

package/modern/ChartsReferenceLine/ChartsYReferenceLine.js

@@ -5,6 +5,7 @@ import { useDrawingArea, useYScale } from '../hooks';
 import { ReferenceLineRoot } from './common';
 import { ChartsText } from '../ChartsText';
 import { getReferenceLineUtilityClass } from './chartsReferenceLineClasses';
+import { buildWarning } from '../internals/warning';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const getTextParams = ({
   left,
@@ -39,7 +40,6 @@ const getTextParams = ({
       };
   }
 };
-let warnedOnce = false;
 export function getYReferenceLineClasses(classes) {
   return composeClasses({
     root: ['root', 'horizontal'],
@@ -47,6 +47,7 @@ export function getYReferenceLineClasses(classes) {
     label: ['label']
   }, getReferenceLineUtilityClass, classes);
 }
+const valueError = buildWarning((value, id) => `MUI X Charts: the value ${value} does not exist in the data of y axis with id ${id}.`, 'error');
 function ChartsYReferenceLine(props) {
   const {
     y,
@@ -66,10 +67,7 @@ function ChartsYReferenceLine(props) {
   const yPosition = yAxisScale(y);
   if (yPosition === undefined) {
     if (process.env.NODE_ENV !== 'production') {
-      if (!warnedOnce) {
-        warnedOnce = true;
-        console.error(`MUI X Charts: the value ${y} does not exist in the data of y axis with id ${axisId}.`);
-      }
+      valueError(y, axisId);
     }
     return null;
   }

package/modern/ChartsText/ChartsText.js

@@ -49,10 +49,8 @@ function ChartsText(props) {
   if (angle) {
     transforms.push(`rotate(${angle}, ${x}, ${y})`);
   }
-  if (transforms.length) {
-    textProps.transform = transforms.join(' ');
-  }
   return /*#__PURE__*/_jsx("text", _extends({}, textProps, {
+    transform: transforms.length > 0 ? transforms.join(' ') : undefined,
     x: x,
     y: y,
     textAnchor: textAnchor,

package/modern/ChartsTooltip/ChartsAxisTooltipContent.js

@@ -2,12 +2,12 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useSlotProps } from '@mui/base/utils';
-import { SeriesContext } from '../context/SeriesContextProvider';
 import { CartesianContext } from '../context/CartesianContextProvider';
 import { DefaultChartsAxisTooltipContent } from './DefaultChartsAxisTooltipContent';
-import { isCartesianSeriesType } from './utils';
-import colorGetter from '../internals/colorGetter';
 import { ZAxisContext } from '../context/ZAxisContextProvider';
+import { useColorProcessor } from '../hooks/useColor';
+import { isCartesianSeriesType } from '../internals/isCartesian';
+import { useSeries } from '../hooks/useSeries';
 import { jsx as _jsx } from "react/jsx-runtime";
 function ChartsAxisTooltipContent(props) {
   const {
@@ -30,7 +30,8 @@ function ChartsAxisTooltipContent(props) {
     zAxisIds,
     zAxis
   } = React.useContext(ZAxisContext);
-  const series = React.useContext(SeriesContext);
+  const series = useSeries();
+  const colorProcessors = useColorProcessor();
   const USED_AXIS_ID = isXaxis ? xAxisIds[0] : yAxisIds[0];
   const relevantSeries = React.useMemo(() => {
     const rep = [];
@@ -40,15 +41,8 @@ function ChartsAxisTooltipContent(props) {
         const axisKey = isXaxis ? item.xAxisKey : item.yAxisKey;
         if (axisKey === undefined || axisKey === USED_AXIS_ID) {
           const seriesToAdd = series[seriesType].series[seriesId];
-          let getColor;
-          switch (seriesToAdd.type) {
-            case 'scatter':
-              getColor = colorGetter(seriesToAdd, xAxis[seriesToAdd.xAxisKey ?? xAxisIds[0]], yAxis[seriesToAdd.yAxisKey ?? yAxisIds[0]], zAxis[seriesToAdd.zAxisKey ?? zAxisIds[0]]);
-              break;
-            default:
-              getColor = colorGetter(seriesToAdd, xAxis[seriesToAdd.xAxisKey ?? xAxisIds[0]], yAxis[seriesToAdd.yAxisKey ?? yAxisIds[0]]);
-              break;
-          }
+          const zAxisKey = seriesToAdd.zAxisKey ?? zAxisIds[0];
+          const getColor = colorProcessors[seriesType]?.(seriesToAdd, xAxis[seriesToAdd.xAxisKey ?? xAxisIds[0]], yAxis[seriesToAdd.yAxisKey ?? yAxisIds[0]], zAxisKey && zAxis[zAxisKey]) ?? (() => '');
           rep.push(_extends({}, seriesToAdd, {
             getColor
           }));
@@ -56,7 +50,7 @@ function ChartsAxisTooltipContent(props) {
       });
     });
     return rep;
-  }, [USED_AXIS_ID, isXaxis, series, xAxis, xAxisIds, yAxis, yAxisIds, zAxis, zAxisIds]);
+  }, [USED_AXIS_ID, colorProcessors, isXaxis, series, xAxis, xAxisIds, yAxis, yAxisIds, zAxis, zAxisIds]);
   const relevantAxis = React.useMemo(() => {
     return isXaxis ? xAxis[USED_AXIS_ID] : yAxis[USED_AXIS_ID];
   }, [USED_AXIS_ID, isXaxis, xAxis, yAxis]);

package/modern/ChartsTooltip/ChartsItemTooltipContent.js

@@ -2,11 +2,11 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useSlotProps } from '@mui/base/utils';
-import { SeriesContext } from '../context/SeriesContextProvider';
 import { DefaultChartsItemTooltipContent } from './DefaultChartsItemTooltipContent';
 import { CartesianContext } from '../context/CartesianContextProvider';
-import colorGetter from '../internals/colorGetter';
 import { ZAxisContext } from '../context/ZAxisContextProvider';
+import { useColorProcessor } from '../hooks/useColor';
+import { useSeries } from '../hooks/useSeries';
 import { jsx as _jsx } from "react/jsx-runtime";
 function ChartsItemTooltipContent(props) {
   const {
@@ -16,7 +16,7 @@ function ChartsItemTooltipContent(props) {
     classes,
     contentProps
   } = props;
-  const series = React.useContext(SeriesContext)[itemData.type].series[itemData.seriesId];
+  const series = useSeries()[itemData.type].series[itemData.seriesId];
   const {
     xAxis,
     yAxis,
@@ -27,21 +27,11 @@ function ChartsItemTooltipContent(props) {
     zAxis,
     zAxisIds
   } = React.useContext(ZAxisContext);
-  const defaultXAxisId = xAxisIds[0];
-  const defaultYAxisId = yAxisIds[0];
-  const defaultZAxisId = zAxisIds[0];
-  let getColor;
-  switch (series.type) {
-    case 'pie':
-      getColor = colorGetter(series);
-      break;
-    case 'scatter':
-      getColor = colorGetter(series, xAxis[series.xAxisKey ?? defaultXAxisId], yAxis[series.yAxisKey ?? defaultYAxisId], zAxis[series.zAxisKey ?? defaultZAxisId]);
-      break;
-    default:
-      getColor = colorGetter(series, xAxis[series.xAxisKey ?? defaultXAxisId], yAxis[series.yAxisKey ?? defaultYAxisId]);
-      break;
-  }
+  const colorProcessors = useColorProcessor();
+  const xAxisKey = series.xAxisKey ?? xAxisIds[0];
+  const yAxisKey = series.yAxisKey ?? yAxisIds[0];
+  const zAxisKey = series.zAxisKey ?? zAxisIds[0];
+  const getColor = colorProcessors[series.type]?.(series, xAxisKey && xAxis[xAxisKey], yAxisKey && yAxis[yAxisKey], zAxisKey && zAxis[zAxisKey]) ?? (() => '');
   const Content = content ?? DefaultChartsItemTooltipContent;
   const chartTooltipContentProps = useSlotProps({
     elementType: Content,

package/modern/ChartsTooltip/DefaultChartsAxisTooltipContent.js

@@ -3,8 +3,9 @@ import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import Typography from '@mui/material/Typography';
 import { ChartsTooltipCell, ChartsTooltipPaper, ChartsTooltipTable, ChartsTooltipMark, ChartsTooltipRow } from './ChartsTooltipTable';
-import { isCartesianSeries, utcFormatter } from './utils';
+import { utcFormatter } from './utils';
 import { getLabel } from '../internals/getLabel';
+import { isCartesianSeries } from '../internals/isCartesian';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function DefaultChartsAxisTooltipContent(props) {
   const {
@@ -37,7 +38,6 @@ function DefaultChartsAxisTooltipContent(props) {
         })
       }), /*#__PURE__*/_jsx("tbody", {
         children: series.filter(isCartesianSeries).map(({
-          color,
           id,
           label,
           valueFormatter,
@@ -52,12 +52,13 @@ function DefaultChartsAxisTooltipContent(props) {
             return null;
           }
           const formattedLabel = getLabel(label, 'tooltip');
+          const color = getColor(dataIndex);
           return /*#__PURE__*/_jsxs(ChartsTooltipRow, {
             className: classes.row,
             children: [/*#__PURE__*/_jsx(ChartsTooltipCell, {
               className: clsx(classes.markCell, classes.cell),
-              children: /*#__PURE__*/_jsx(ChartsTooltipMark, {
-                color: getColor(dataIndex) ?? color,
+              children: color && /*#__PURE__*/_jsx(ChartsTooltipMark, {
+                color: color,
                 className: classes.mark
               })
             }), /*#__PURE__*/_jsx(ChartsTooltipCell, {

package/modern/ChartsTooltip/DefaultChartsItemTooltipContent.js

@@ -23,7 +23,7 @@ function DefaultChartsItemTooltipContent(props) {
     color: getColor(itemData.dataIndex),
     displayedLabel: getLabel(series.data[itemData.dataIndex].label, 'tooltip')
   } : {
-    color: getColor(itemData.dataIndex) ?? series.color,
+    color: getColor(itemData.dataIndex),
     displayedLabel: getLabel(series.label, 'tooltip')
   };
   const value = series.type === 'pie' ? _extends({}, series.data[itemData.dataIndex], {

package/modern/ChartsTooltip/utils.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { SvgContext } from '../context/DrawingProvider';
+import { useSvgRef } from '../hooks';
 export function generateVirtualElement(mousePosition) {
   if (mousePosition === null) {
     return {
@@ -44,7 +44,7 @@ export function generateVirtualElement(mousePosition) {
   };
 }
 export function useMouseTracker() {
-  const svgRef = React.useContext(SvgContext);
+  const svgRef = useSvgRef();
 
   // Use a ref to avoid rerendering on every mousemove event.
   const [mousePosition, setMousePosition] = React.useState(null);
@@ -84,12 +84,6 @@ export function getTooltipHasData(trigger, displayedData) {
   const hasAxisYData = displayedData.y !== null;
   return hasAxisXData || hasAxisYData;
 }
-export function isCartesianSeriesType(seriesType) {
-  return ['bar', 'line', 'scatter'].includes(seriesType);
-}
-export function isCartesianSeries(series) {
-  return isCartesianSeriesType(series.type);
-}
 export function utcFormatter(v) {
   if (v instanceof Date) {
     return v.toUTCString();

package/modern/ChartsVoronoiHandler/ChartsVoronoiHandler.js

@@ -4,11 +4,11 @@ import { Delaunay } from 'd3-delaunay';
 import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
 import { InteractionContext } from '../context/InteractionProvider';
 import { CartesianContext } from '../context/CartesianContextProvider';
-import { SeriesContext } from '../context/SeriesContextProvider';
 import { getValueToPositionMapper } from '../hooks/useScale';
 import { getSVGPoint } from '../internals/utils';
 import { useDrawingArea, useSvgRef } from '../hooks';
 import { useHighlighted } from '../context';
+import { useScatterSeries } from '../hooks/useSeries';
 import { jsx as _jsx } from "react/jsx-runtime";
 function ChartsVoronoiHandler(props) {
   const {
@@ -34,7 +34,7 @@ function ChartsVoronoiHandler(props) {
   const {
     series,
     seriesOrder
-  } = React.useContext(SeriesContext).scatter ?? {};
+  } = useScatterSeries() ?? {};
   const voronoiRef = React.useRef({});
   const delauneyRef = React.useRef(undefined);
   const {

package/modern/ChartsXAxis/ChartsXAxis.js

@@ -104,27 +104,23 @@ const defaultProps = {
  * - [ChartsXAxis API](https://mui.com/x/api/charts/charts-x-axis/)
  */
 function ChartsXAxis(inProps) {
-  const props = useThemeProps({
-    props: _extends({}, defaultProps, inProps),
-    name: 'MuiChartsXAxis'
-  });
   const {
-    xAxisIds
+    xAxisIds,
+    xAxis
   } = React.useContext(CartesianContext);
-  const _React$useContext = React.useContext(CartesianContext),
-    _ref = props.axisId ?? xAxisIds[0],
+  const _xAxis = xAxis[inProps.axisId ?? xAxisIds[0]],
     {
-      xAxis: {
-        [_ref]: {
-          scale: xScale,
-          tickNumber,
-          reverse
-        }
-      }
-    } = _React$useContext,
-    settings = _objectWithoutPropertiesLoose(_React$useContext.xAxis[_ref], _excluded);
+      scale: xScale,
+      tickNumber,
+      reverse
+    } = _xAxis,
+    settings = _objectWithoutPropertiesLoose(_xAxis, _excluded);
   const isMounted = useMounted();
-  const defaultizedProps = _extends({}, defaultProps, settings, props);
+  const themedProps = useThemeProps({
+    props: _extends({}, settings, inProps),
+    name: 'MuiChartsXAxis'
+  });
+  const defaultizedProps = _extends({}, defaultProps, themedProps);
   const {
     position,
     disableLine,
@@ -314,10 +310,12 @@ process.env.NODE_ENV !== "production" ? ChartsXAxis.propTypes = {
    */
   tickFontSize: PropTypes.number,
   /**
-   * Defines which ticks are displayed. Its value can be:
+   * Defines which ticks are displayed.
+   * Its value can be:
    * - 'auto' In such case the ticks are computed based on axis scale and other parameters.
-   * - a filtering function of the form `(value, index) => boolean` which is available only if the axis has a data property.
+   * - a filtering function of the form `(value, index) => boolean` which is available only if the axis has "point" scale.
    * - an array containing the values where ticks should be displayed.
+   * @see See {@link https://mui.com/x/react-charts/axis/#fixed-tick-positions}
    * @default 'auto'
    */
   tickInterval: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.array, PropTypes.func]),

package/modern/ChartsYAxis/ChartsYAxis.js

@@ -1,5 +1,5 @@
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 const _excluded = ["scale", "tickNumber"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
@@ -47,25 +47,21 @@ const defaultProps = {
  * - [ChartsYAxis API](https://mui.com/x/api/charts/charts-y-axis/)
  */
 function ChartsYAxis(inProps) {
-  const props = useThemeProps({
-    props: _extends({}, defaultProps, inProps),
-    name: 'MuiChartsYAxis'
-  });
   const {
-    yAxisIds
+    yAxisIds,
+    yAxis
   } = React.useContext(CartesianContext);
-  const _React$useContext = React.useContext(CartesianContext),
-    _ref = props.axisId ?? yAxisIds[0],
+  const _yAxis = yAxis[inProps.axisId ?? yAxisIds[0]],
     {
-      yAxis: {
-        [_ref]: {
-          scale: yScale,
-          tickNumber
-        }
-      }
-    } = _React$useContext,
-    settings = _objectWithoutPropertiesLoose(_React$useContext.yAxis[_ref], _excluded);
-  const defaultizedProps = _extends({}, defaultProps, settings, props);
+      scale: yScale,
+      tickNumber
+    } = _yAxis,
+    settings = _objectWithoutPropertiesLoose(_yAxis, _excluded);
+  const themedProps = useThemeProps({
+    props: _extends({}, settings, inProps),
+    name: 'MuiChartsYAxis'
+  });
+  const defaultizedProps = _extends({}, defaultProps, themedProps);
   const {
     position,
     disableLine,
@@ -250,10 +246,12 @@ process.env.NODE_ENV !== "production" ? ChartsYAxis.propTypes = {
    */
   tickFontSize: PropTypes.number,
   /**
-   * Defines which ticks are displayed. Its value can be:
+   * Defines which ticks are displayed.
+   * Its value can be:
    * - 'auto' In such case the ticks are computed based on axis scale and other parameters.
-   * - a filtering function of the form `(value, index) => boolean` which is available only if the axis has a data property.
+   * - a filtering function of the form `(value, index) => boolean` which is available only if the axis has "point" scale.
    * - an array containing the values where ticks should be displayed.
+   * @see See {@link https://mui.com/x/react-charts/axis/#fixed-tick-positions}
    * @default 'auto'
    */
   tickInterval: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.array, PropTypes.func]),