@mui/x-charts 7.2.0 → 7.3.0

package/modern/LineChart/AreaPlot.js

@@ -10,6 +10,7 @@ import { AreaElement } from './AreaElement';
 import { getValueToPositionMapper } from '../hooks/useScale';
 import getCurveFactory from '../internals/getCurve';
 import { DEFAULT_X_AXIS_KEY } from '../constants';
+import { useChartGradient } from '../internals/components/ChartsAxesGradients';
 import { jsx as _jsx } from "react/jsx-runtime";
 const useAggregatedData = () => {
   const seriesData = React.useContext(SeriesContext).line;
@@ -43,6 +44,7 @@ const useAggregatedData = () => {
       const xScale = getValueToPositionMapper(xAxis[xAxisKey].scale);
       const yScale = yAxis[yAxisKey].scale;
       const xData = xAxis[xAxisKey].data;
+      const gradientUsed = yAxis[yAxisKey].colorScale && [yAxisKey, 'y'] || xAxis[xAxisKey].colorScale && [xAxisKey, 'x'] || undefined;
       if (process.env.NODE_ENV !== 'production') {
         if (xData === undefined) {
           throw new Error(`MUI X Charts: ${xAxisKey === DEFAULT_X_AXIS_KEY ? 'The first `xAxis`' : `The x-axis with id "${xAxisKey}"`} should have data property to be able to display a line plot.`);
@@ -60,6 +62,7 @@ const useAggregatedData = () => {
       const d3Data = connectNulls ? formattedData.filter((_, i) => data[i] != null) : formattedData;
       const d = areaPath.curve(curve)(d3Data) || '';
       return _extends({}, series[seriesId], {
+        gradientUsed,
         d,
         seriesId
       });
@@ -86,6 +89,7 @@ function AreaPlot(props) {
       skipAnimation
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
+  const getGradientId = useChartGradient();
   const completedData = useAggregatedData();
   return /*#__PURE__*/_jsx("g", _extends({}, other, {
     children: completedData.reverse().map(({
@@ -93,11 +97,13 @@ function AreaPlot(props) {
       seriesId,
       color,
       highlightScope,
-      area
+      area,
+      gradientUsed
     }) => !!area && /*#__PURE__*/_jsx(AreaElement, {
       id: seriesId,
       d: d,
       color: color,
+      gradientId: gradientUsed && getGradientId(...gradientUsed),
       highlightScope: highlightScope,
       slots: slots,
       slotProps: slotProps,

package/modern/LineChart/LineChart.js

@@ -379,11 +379,26 @@ process.env.NODE_ENV !== "production" ? LineChart.propTypes = {
   width: PropTypes.number,
   /**
    * The configuration of the x-axes.
-   * If not provided, a default axis config is used with id set to `DEFAULT_X_AXIS_KEY`.
+   * If not provided, a default axis config is used.
    */
   xAxis: PropTypes.arrayOf(PropTypes.shape({
     axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     classes: PropTypes.object,
+    colorMap: PropTypes.oneOfType([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
+    }), 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)
+    })]),
     data: PropTypes.array,
     dataKey: PropTypes.string,
     disableLine: PropTypes.bool,
@@ -416,11 +431,26 @@ process.env.NODE_ENV !== "production" ? LineChart.propTypes = {
   })),
   /**
    * The configuration of the y-axes.
-   * If not provided, a default axis config is used with id set to `DEFAULT_Y_AXIS_KEY`.
+   * If not provided, a default axis config is used.
    */
   yAxis: PropTypes.arrayOf(PropTypes.shape({
     axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     classes: PropTypes.object,
+    colorMap: PropTypes.oneOfType([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
+    }), 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)
+    })]),
     data: PropTypes.array,
     dataKey: PropTypes.string,
     disableLine: PropTypes.bool,

package/modern/LineChart/LineElement.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["id", "classes", "color", "highlightScope", "slots", "slotProps", "onClick"];
+const _excluded = ["id", "classes", "color", "gradientId", "highlightScope", "slots", "slotProps", "onClick"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import composeClasses from '@mui/utils/composeClasses';
@@ -42,6 +42,7 @@ function LineElement(props) {
       id,
       classes: innerClasses,
       color,
+      gradientId,
       highlightScope,
       slots,
       slotProps,
@@ -64,6 +65,7 @@ function LineElement(props) {
     id,
     classes: innerClasses,
     color,
+    gradientId,
     isFaded,
     isHighlighted
   };
@@ -92,6 +94,7 @@ process.env.NODE_ENV !== "production" ? LineElement.propTypes = {
   classes: PropTypes.object,
   color: PropTypes.string.isRequired,
   d: PropTypes.string.isRequired,
+  gradientId: PropTypes.string,
   highlightScope: PropTypes.shape({
     faded: PropTypes.oneOf(['global', 'none', 'series']),
     highlighted: PropTypes.oneOf(['item', 'none', 'series'])

package/modern/LineChart/LineHighlightPlot.js

@@ -9,6 +9,7 @@ import { LineHighlightElement } from './LineHighlightElement';
 import { getValueToPositionMapper } from '../hooks/useScale';
 import { InteractionContext } from '../context/InteractionProvider';
 import { DEFAULT_X_AXIS_KEY } from '../constants';
+import getColor from './getColor';
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Demos:
@@ -74,9 +75,11 @@ function LineHighlightPlot(props) {
         }
         const x = xScale(xData[highlightedIndex]);
         const y = yScale(stackedData[highlightedIndex][1]); // This should not be undefined since y should not be a band scale
+
+        const colorGetter = getColor(series[seriesId], xAxis[xAxisKey], yAxis[yAxisKey]);
         return /*#__PURE__*/_jsx(Element, _extends({
           id: seriesId,
-          color: series[seriesId].color,
+          color: colorGetter(highlightedIndex),
           x: x,
           y: y
         }, slotProps?.lineHighlight), `${seriesId}`);

package/modern/LineChart/LinePlot.js

@@ -10,6 +10,7 @@ import { LineElement } from './LineElement';
 import { getValueToPositionMapper } from '../hooks/useScale';
 import getCurveFactory from '../internals/getCurve';
 import { DEFAULT_X_AXIS_KEY } from '../constants';
+import { useChartGradient } from '../internals/components/ChartsAxesGradients';
 import { jsx as _jsx } from "react/jsx-runtime";
 const useAggregatedData = () => {
   const seriesData = React.useContext(SeriesContext).line;
@@ -43,6 +44,7 @@ const useAggregatedData = () => {
       const xScale = getValueToPositionMapper(xAxis[xAxisKey].scale);
       const yScale = yAxis[yAxisKey].scale;
       const xData = xAxis[xAxisKey].data;
+      const gradientUsed = yAxis[yAxisKey].colorScale && [yAxisKey, 'y'] || xAxis[xAxisKey].colorScale && [xAxisKey, 'x'] || undefined;
       if (process.env.NODE_ENV !== 'production') {
         if (xData === undefined) {
           throw new Error(`MUI X Charts: ${xAxisKey === DEFAULT_X_AXIS_KEY ? 'The first `xAxis`' : `The x-axis with id "${xAxisKey}"`} should have data property to be able to display a line plot.`);
@@ -59,6 +61,7 @@ const useAggregatedData = () => {
       const d3Data = connectNulls ? formattedData.filter((_, i) => data[i] != null) : formattedData;
       const d = linePath.curve(getCurveFactory(series[seriesId].curve))(d3Data) || '';
       return _extends({}, series[seriesId], {
+        gradientUsed,
         d,
         seriesId
       });
@@ -84,18 +87,21 @@ function LinePlot(props) {
       onItemClick
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
+  const getGradientId = useChartGradient();
   const completedData = useAggregatedData();
   return /*#__PURE__*/_jsx("g", _extends({}, other, {
     children: completedData.map(({
       d,
       seriesId,
       color,
-      highlightScope
+      highlightScope,
+      gradientUsed
     }) => {
       return /*#__PURE__*/_jsx(LineElement, {
         id: seriesId,
         d: d,
         color: color,
+        gradientId: gradientUsed && getGradientId(...gradientUsed),
         highlightScope: highlightScope,
         skipAnimation: skipAnimation,
         slots: slots,

package/modern/LineChart/MarkPlot.js

@@ -7,9 +7,10 @@ import { SeriesContext } from '../context/SeriesContextProvider';
 import { CartesianContext } from '../context/CartesianContextProvider';
 import { MarkElement } from './MarkElement';
 import { getValueToPositionMapper } from '../hooks/useScale';
+import { useChartId } from '../hooks/useChartId';
 import { DEFAULT_X_AXIS_KEY } from '../constants';
-import { DrawingContext } from '../context/DrawingProvider';
 import { cleanId } from '../internals/utils';
+import getColor from './getColor';
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Demos:
@@ -31,9 +32,7 @@ function MarkPlot(props) {
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const seriesData = React.useContext(SeriesContext).line;
   const axisData = React.useContext(CartesianContext);
-  const {
-    chartId
-  } = React.useContext(DrawingContext);
+  const chartId = useChartId();
   const Mark = slots?.mark ?? MarkElement;
   if (seriesData === undefined) {
     return null;
@@ -87,6 +86,7 @@ function MarkPlot(props) {
         }
         const clipId = cleanId(`${chartId}-${seriesId}-line-clip`); // We assume that if displaying line mark, the line will also be rendered
 
+        const colorGetter = getColor(series[seriesId], xAxis[xAxisKey], yAxis[yAxisKey]);
         return /*#__PURE__*/_jsx("g", {
           clipPath: `url(#${clipId})`,
           children: xData?.map((x, index) => {
@@ -135,7 +135,7 @@ function MarkPlot(props) {
               id: seriesId,
               dataIndex: index,
               shape: "circle",
-              color: series[seriesId].color,
+              color: colorGetter(index),
               x: x,
               y: y // Don't know why TS doesn't get from the filter that y can't be null
               ,

package/modern/LineChart/getColor.js

@@ -0,0 +1,25 @@
+export default function getColor(series, xAxis, yAxis) {
+  const yColorScale = yAxis.colorScale;
+  const xColorScale = xAxis.colorScale;
+  if (yColorScale) {
+    return dataIndex => {
+      const value = series.data[dataIndex];
+      const color = value === null ? series.color : yColorScale(value);
+      if (color === null) {
+        return series.color;
+      }
+      return color;
+    };
+  }
+  if (xColorScale) {
+    return dataIndex => {
+      const value = xAxis.data?.[dataIndex];
+      const color = value === null ? series.color : xColorScale(value);
+      if (color === null) {
+        return series.color;
+      }
+      return color;
+    };
+  }
+  return () => series.color;
+}

package/modern/PieChart/PieChart.js

@@ -335,11 +335,26 @@ process.env.NODE_ENV !== "production" ? PieChart.propTypes = {
   width: PropTypes.number,
   /**
    * The configuration of the x-axes.
-   * If not provided, a default axis config is used with id set to `DEFAULT_X_AXIS_KEY`.
+   * If not provided, a default axis config is used.
    */
   xAxis: PropTypes.arrayOf(PropTypes.shape({
     axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     classes: PropTypes.object,
+    colorMap: PropTypes.oneOfType([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
+    }), 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)
+    })]),
     data: PropTypes.array,
     dataKey: PropTypes.string,
     disableLine: PropTypes.bool,
@@ -372,11 +387,26 @@ process.env.NODE_ENV !== "production" ? PieChart.propTypes = {
   })),
   /**
    * The configuration of the y-axes.
-   * If not provided, a default axis config is used with id set to `DEFAULT_Y_AXIS_KEY`.
+   * If not provided, a default axis config is used.
    */
   yAxis: PropTypes.arrayOf(PropTypes.shape({
     axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     classes: PropTypes.object,
+    colorMap: PropTypes.oneOfType([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
+    }), 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)
+    })]),
     data: PropTypes.array,
     dataKey: PropTypes.string,
     disableLine: PropTypes.bool,

package/modern/PieChart/PiePlot.js

@@ -5,6 +5,7 @@ import { DrawingContext } from '../context/DrawingProvider';
 import { PieArcPlot } from './PieArcPlot';
 import { PieArcLabelPlot } from './PieArcLabelPlot';
 import { getPercentageValue } from '../internals/utils';
+import { getPieCoordinates } from './getPieCoordinates';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 /**
@@ -34,7 +35,6 @@ function PiePlot(props) {
   if (seriesData === undefined) {
     return null;
   }
-  const availableRadius = Math.min(width, height) / 2;
   const {
     series,
     seriesOrder
@@ -53,10 +53,19 @@ function PiePlot(props) {
         faded,
         highlightScope
       } = series[seriesId];
+      const {
+        cx,
+        cy,
+        availableRadius
+      } = getPieCoordinates({
+        cx: cxParam,
+        cy: cyParam
+      }, {
+        width,
+        height
+      });
       const outerRadius = getPercentageValue(outerRadiusParam ?? availableRadius, availableRadius);
       const innerRadius = getPercentageValue(innerRadiusParam ?? 0, availableRadius);
-      const cx = getPercentageValue(cxParam ?? '50%', width);
-      const cy = getPercentageValue(cyParam ?? '50%', height);
       return /*#__PURE__*/_jsx("g", {
         transform: `translate(${left + cx}, ${top + cy})`,
         children: /*#__PURE__*/_jsx(PieArcPlot, {
@@ -89,11 +98,20 @@ function PiePlot(props) {
         cy: cyParam,
         highlightScope
       } = series[seriesId];
+      const {
+        cx,
+        cy,
+        availableRadius
+      } = getPieCoordinates({
+        cx: cxParam,
+        cy: cyParam
+      }, {
+        width,
+        height
+      });
       const outerRadius = getPercentageValue(outerRadiusParam ?? availableRadius, availableRadius);
       const innerRadius = getPercentageValue(innerRadiusParam ?? 0, availableRadius);
       const arcLabelRadius = arcLabelRadiusParam === undefined ? (outerRadius + innerRadius) / 2 : getPercentageValue(arcLabelRadiusParam, availableRadius);
-      const cx = getPercentageValue(cxParam ?? '50%', width);
-      const cy = getPercentageValue(cyParam ?? '50%', height);
       return /*#__PURE__*/_jsx("g", {
         transform: `translate(${left + cx}, ${top + cy})`,
         children: /*#__PURE__*/_jsx(PieArcLabelPlot, {
@@ -107,7 +125,9 @@ function PiePlot(props) {
           skipAnimation: skipAnimation,
           arcLabel: arcLabel,
           arcLabelMinAngle: arcLabelMinAngle,
-          highlightScope: highlightScope
+          highlightScope: highlightScope,
+          slots: slots,
+          slotProps: slotProps
         })
       }, seriesId);
     })]

package/modern/PieChart/formatter.js

@@ -28,8 +28,10 @@ const formatter = params => {
     }, series[seriesId], {
       data: series[seriesId].data.map((item, index) => _extends({}, item, {
         id: item.id ?? `auto-generated-pie-id-${seriesId}-${index}`
-      }, arcs[index])).map(item => _extends({}, item, {
-        formattedValue: series[seriesId].valueFormatter?.(item) ?? item.value.toLocaleString()
+      }, arcs[index])).map((item, index) => _extends({}, item, {
+        formattedValue: series[seriesId].valueFormatter?.(item, {
+          dataIndex: index
+        }) ?? item.value.toLocaleString()
       }))
     });
   });

package/modern/PieChart/getColor.js

@@ -0,0 +1,5 @@
+export default function getColor(series) {
+  return dataIndex => {
+    return series.data[dataIndex].color;
+  };
+}

package/modern/PieChart/getPieCoordinates.js

@@ -0,0 +1,19 @@
+import { getPercentageValue } from '../internals/utils';
+export function getPieCoordinates(series, drawing) {
+  const {
+    height,
+    width
+  } = drawing;
+  const {
+    cx: cxParam,
+    cy: cyParam
+  } = series;
+  const availableRadius = Math.min(width, height) / 2;
+  const cx = getPercentageValue(cxParam ?? '50%', width);
+  const cy = getPercentageValue(cyParam ?? '50%', height);
+  return {
+    cx,
+    cy,
+    availableRadius
+  };
+}

package/modern/PieChart/index.js

@@ -3,4 +3,5 @@ export * from './PiePlot';
 export * from './PieArcPlot';
 export * from './PieArcLabelPlot';
 export * from './PieArc';
-export * from './PieArcLabel';
+export * from './PieArcLabel';
+export * from './getPieCoordinates';

package/modern/ResponsiveChartContainer/ResponsiveChartContainer.js

@@ -106,11 +106,26 @@ process.env.NODE_ENV !== "production" ? ResponsiveChartContainer.propTypes = {
   width: PropTypes.number,
   /**
    * The configuration of the x-axes.
-   * If not provided, a default axis config is used with id set to `DEFAULT_X_AXIS_KEY`.
+   * If not provided, a default axis config is used.
    */
   xAxis: PropTypes.arrayOf(PropTypes.shape({
     axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     classes: PropTypes.object,
+    colorMap: PropTypes.oneOfType([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
+    }), 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)
+    })]),
     data: PropTypes.array,
     dataKey: PropTypes.string,
     disableLine: PropTypes.bool,
@@ -143,11 +158,26 @@ process.env.NODE_ENV !== "production" ? ResponsiveChartContainer.propTypes = {
   })),
   /**
    * The configuration of the y-axes.
-   * If not provided, a default axis config is used with id set to `DEFAULT_Y_AXIS_KEY`.
+   * If not provided, a default axis config is used.
    */
   yAxis: PropTypes.arrayOf(PropTypes.shape({
     axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     classes: PropTypes.object,
+    colorMap: PropTypes.oneOfType([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
+    }), 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)
+    })]),
     data: PropTypes.array,
     dataKey: PropTypes.string,
     disableLine: PropTypes.bool,

package/modern/ScatterChart/Scatter.js

@@ -21,6 +21,7 @@ function Scatter(props) {
     xScale,
     yScale,
     color,
+    colorGetter,
     markerSize,
     onItemClick
   } = props;
@@ -63,19 +64,20 @@ function Scatter(props) {
           isFaded: !isHighlighted && getIsFaded(item, pointCtx, highlightScope),
           interactionProps: getInteractionItemProps(pointCtx),
           id: scatterPoint.id,
-          dataIndex: i
+          dataIndex: i,
+          color: colorGetter ? colorGetter(i) : color
         });
       }
     }
     return temp;
-  }, [xScale, yScale, series.data, series.id, item, highlightScope, getInteractionItemProps]);
+  }, [xScale, yScale, series.data, series.id, item, highlightScope, getInteractionItemProps, color, colorGetter]);
   return /*#__PURE__*/_jsx("g", {
     children: cleanData.map(dataPoint => /*#__PURE__*/_jsx("circle", _extends({
       cx: 0,
       cy: 0,
       r: (dataPoint.isHighlighted ? 1.2 : 1) * markerSize,
       transform: `translate(${dataPoint.x}, ${dataPoint.y})`,
-      fill: color,
+      fill: dataPoint.color,
       opacity: dataPoint.isFaded && 0.3 || 1,
       onClick: onItemClick && (event => onItemClick(event, {
         type: 'scatter',
@@ -92,6 +94,7 @@ process.env.NODE_ENV !== "production" ? Scatter.propTypes = {
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
   color: PropTypes.string.isRequired,
+  colorGetter: PropTypes.func,
   markerSize: PropTypes.number.isRequired,
   /**
    * Callback fired when clicking on a scatter item.

package/modern/ScatterChart/ScatterChart.js

@@ -328,11 +328,26 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
   width: PropTypes.number,
   /**
    * The configuration of the x-axes.
-   * If not provided, a default axis config is used with id set to `DEFAULT_X_AXIS_KEY`.
+   * If not provided, a default axis config is used.
    */
   xAxis: PropTypes.arrayOf(PropTypes.shape({
     axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     classes: PropTypes.object,
+    colorMap: PropTypes.oneOfType([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
+    }), 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)
+    })]),
     data: PropTypes.array,
     dataKey: PropTypes.string,
     disableLine: PropTypes.bool,
@@ -365,11 +380,26 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
   })),
   /**
    * The configuration of the y-axes.
-   * If not provided, a default axis config is used with id set to `DEFAULT_Y_AXIS_KEY`.
+   * If not provided, a default axis config is used.
    */
   yAxis: PropTypes.arrayOf(PropTypes.shape({
     axisId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     classes: PropTypes.object,
+    colorMap: PropTypes.oneOfType([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
+    }), 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)
+    })]),
     data: PropTypes.array,
     dataKey: PropTypes.string,
     disableLine: PropTypes.bool,

package/modern/ScatterChart/ScatterPlot.js

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import { Scatter } from './Scatter';
 import { SeriesContext } from '../context/SeriesContextProvider';
 import { CartesianContext } from '../context/CartesianContextProvider';
+import getColor from './getColor';
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Demos:
@@ -48,12 +49,14 @@ function ScatterPlot(props) {
         markerSize,
         color
       } = series[seriesId];
+      const colorGetter = getColor(series[seriesId], xAxis[xAxisKey ?? defaultXAxisId], yAxis[yAxisKey ?? defaultYAxisId]);
       const xScale = xAxis[xAxisKey ?? defaultXAxisId].scale;
       const yScale = yAxis[yAxisKey ?? defaultYAxisId].scale;
       return /*#__PURE__*/_jsx(ScatterItems, _extends({
         xScale: xScale,
         yScale: yScale,
         color: color,
+        colorGetter: colorGetter,
         markerSize: markerSize ?? 4,
         series: series[seriesId],
         onItemClick: onItemClick

package/modern/ScatterChart/getColor.js

@@ -0,0 +1,25 @@
+export default function getColor(series, xAxis, yAxis) {
+  const yColorScale = yAxis.colorScale;
+  const xColorScale = xAxis.colorScale;
+  if (yColorScale) {
+    return dataIndex => {
+      const value = series.data[dataIndex];
+      const color = value === null ? series.color : yColorScale(value.y);
+      if (color === null) {
+        return series.color;
+      }
+      return color;
+    };
+  }
+  if (xColorScale) {
+    return dataIndex => {
+      const value = series.data[dataIndex];
+      const color = value === null ? series.color : xColorScale(value.x);
+      if (color === null) {
+        return series.color;
+      }
+      return color;
+    };
+  }
+  return () => series.color;
+}