@mui/x-charts 8.0.0-alpha.0 → 8.0.0-alpha.10

package/modern/ChartsYAxis/ChartsYAxis.js

@@ -9,7 +9,6 @@ import useSlotProps from '@mui/utils/useSlotProps';
 import composeClasses from '@mui/utils/composeClasses';
 import { useThemeProps, useTheme, styled } from '@mui/material/styles';
 import { useRtl } from '@mui/system/RtlProvider';
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
 import { useTicks } from "../hooks/useTicks.js";
 import { useDrawingArea } from "../hooks/useDrawingArea.js";
 import { AxisRoot } from "../internals/components/AxisSharedComponents.js";
@@ -17,6 +16,8 @@ import { ChartsText } from "../ChartsText/index.js";
 import { getAxisUtilityClass } from "../ChartsAxis/axisClasses.js";
 import { isInfinity } from "../internals/isInfinity.js";
 import { isBandScale } from "../internals/isBandScale.js";
+import { useChartContext } from "../context/ChartProvider/index.js";
+import { useYAxes } from "../hooks/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
@@ -42,8 +43,6 @@ const defaultProps = {
   position: 'left',
   disableLine: false,
   disableTicks: false,
-  tickFontSize: 12,
-  labelFontSize: 14,
   tickSize: 6
 };
 
@@ -60,7 +59,7 @@ function ChartsYAxis(inProps) {
   const {
     yAxisIds,
     yAxis
-  } = useCartesianContext();
+  } = useYAxes();
   const _yAxis = yAxis[inProps.axisId ?? yAxisIds[0]],
     {
       scale: yScale,
@@ -76,9 +75,7 @@ function ChartsYAxis(inProps) {
     position,
     disableLine,
     disableTicks,
-    tickFontSize,
     label,
-    labelFontSize,
     labelStyle,
     tickLabelStyle,
     tickSize: tickSizeProp,
@@ -96,12 +93,14 @@ function ChartsYAxis(inProps) {
   const classes = useUtilityClasses(_extends({}, defaultizedProps, {
     theme
   }));
+  const {
+    instance
+  } = useChartContext();
   const {
     left,
     top,
     width,
-    height,
-    isPointInside
+    height
   } = useDrawingArea();
   const tickSize = disableTicks ? 4 : tickSizeProp;
   const yTicks = useTicks({
@@ -113,6 +112,7 @@ function ChartsYAxis(inProps) {
     tickInterval
   });
   const positionSign = position === 'right' ? 1 : -1;
+  const tickFontSize = typeof tickLabelStyle?.fontSize === 'number' ? tickLabelStyle.fontSize : 12;
   const labelRefPoint = {
     x: positionSign * (tickFontSize + tickSize + 10),
     y: top + height / 2
@@ -140,7 +140,7 @@ function ChartsYAxis(inProps) {
     externalSlotProps: slotProps?.axisLabel,
     additionalProps: {
       style: _extends({
-        fontSize: labelFontSize,
+        fontSize: 14,
         angle: positionSign * 90,
         textAnchor: 'middle',
         dominantBaseline: 'auto'
@@ -181,7 +181,7 @@ function ChartsYAxis(inProps) {
       const xTickLabel = positionSign * (tickSize + 2);
       const yTickLabel = labelOffset;
       const skipLabel = typeof tickLabelInterval === 'function' && !tickLabelInterval?.(value, index);
-      const showLabel = isPointInside({
+      const showLabel = instance.isPointInside({
         x: -1,
         y: offset
       }, {
@@ -243,12 +243,6 @@ process.env.NODE_ENV !== "production" ? ChartsYAxis.propTypes = {
    * The label of the axis.
    */
   label: PropTypes.string,
-  /**
-   * The font size of the axis label.
-   * @default 14
-   * @deprecated Consider using `labelStyle.fontSize` instead.
-   */
-  labelFontSize: PropTypes.number,
   /**
    * The style applied to the axis label.
    */
@@ -273,12 +267,6 @@ process.env.NODE_ENV !== "production" ? ChartsYAxis.propTypes = {
    */
   stroke: PropTypes.string,
   sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-  /**
-   * The font size of the axis ticks text.
-   * @default 12
-   * @deprecated Consider using `tickLabelStyle.fontSize` instead.
-   */
-  tickFontSize: PropTypes.number,
   /**
    * Defines which ticks are displayed.
    * Its value can be:

package/modern/Gauge/Gauge.js

@@ -88,6 +88,11 @@ process.env.NODE_ENV !== "production" ? Gauge.propTypes = {
    * The height of the chart in px. If not defined, it takes the height of the parent element.
    */
   height: PropTypes.number,
+  /**
+   * This prop is used to help implement the accessibility logic.
+   * If you don't provide this prop. It falls back to a randomly generated id.
+   */
+  id: PropTypes.string,
   /**
    * The radius between circle center and the beginning of the arc.
    * Can be a number (in px) or a string with a percentage such as '50%'.
@@ -99,7 +104,6 @@ process.env.NODE_ENV !== "production" ? Gauge.propTypes = {
    * The margin between the SVG and the drawing area.
    * It's used for leaving some space for extra information such as the x- and y-axis or legend.
    * Accepts an object with the optional properties: `top`, `bottom`, `left`, and `right`.
-   * @default object Depends on the charts type.
    */
   margin: PropTypes.shape({
     bottom: PropTypes.number,
@@ -137,12 +141,6 @@ process.env.NODE_ENV !== "production" ? Gauge.propTypes = {
    * @default 0
    */
   valueMin: PropTypes.number,
-  viewBox: PropTypes.shape({
-    height: PropTypes.number,
-    width: PropTypes.number,
-    x: PropTypes.number,
-    y: PropTypes.number
-  }),
   /**
    * The width of the chart in px. If not defined, it takes the width of the parent element.
    */

package/modern/Gauge/GaugeContainer.js

@@ -6,32 +6,13 @@ const _excluded = ["width", "height", "margin", "title", "desc", "value", "value
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
-import useForkRef from '@mui/utils/useForkRef';
-import { useChartContainerDimensions } from "../ChartContainer/useChartContainerDimensions.js";
 import { ChartsSurface } from "../ChartsSurface/index.js";
-import { DrawingProvider } from "../context/DrawingProvider.js";
 import { GaugeProvider } from "./GaugeProvider.js";
+import { ChartProvider } from "../context/ChartProvider/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-const ResizableContainer = styled('div', {
-  name: 'MuiGauge',
-  slot: 'Container'
-})(({
-  ownerState,
+const GStyled = styled('g')(({
   theme
 }) => ({
-  width: ownerState.width ?? '100%',
-  height: ownerState.height ?? '100%',
-  display: 'flex',
-  position: 'relative',
-  flexGrow: 1,
-  flexDirection: 'column',
-  alignItems: 'center',
-  justifyContent: 'center',
-  overflow: 'hidden',
-  '&>svg': {
-    width: '100%',
-    height: '100%'
-  },
   '& text': {
     fill: (theme.vars || theme).palette.text.primary
   }
@@ -56,58 +37,45 @@ const GaugeContainer = /*#__PURE__*/React.forwardRef(function GaugeContainer(pro
       children
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const {
-    containerRef,
-    width,
-    height
-  } = useChartContainerDimensions(inWidth, inHeight);
-  const svgRef = React.useRef(null);
-  const chartSurfaceRef = useForkRef(ref, svgRef);
-  return /*#__PURE__*/_jsx(ResizableContainer, _extends({
-    ref: containerRef,
-    ownerState: {
+  return /*#__PURE__*/_jsx(ChartProvider, {
+    pluginParams: {
       width: inWidth,
-      height: inHeight
-    },
-    role: "meter",
-    "aria-valuenow": value === null ? undefined : value,
-    "aria-valuemin": valueMin,
-    "aria-valuemax": valueMax
-  }, other, {
-    children: width && height ? /*#__PURE__*/_jsx(DrawingProvider, {
-      width: width,
-      height: height,
+      height: inHeight,
       margin: _extends({
         left: 10,
         right: 10,
         top: 10,
         bottom: 10
-      }, margin),
-      svgRef: svgRef,
-      children: /*#__PURE__*/_jsx(GaugeProvider, {
-        value: value,
-        valueMin: valueMin,
-        valueMax: valueMax,
-        startAngle: startAngle,
-        endAngle: endAngle,
-        outerRadius: outerRadius,
-        innerRadius: innerRadius,
-        cornerRadius: cornerRadius,
-        cx: cx,
-        cy: cy,
-        children: /*#__PURE__*/_jsx(ChartsSurface, {
-          width: width,
-          height: height,
-          ref: chartSurfaceRef,
-          title: title,
-          desc: desc,
-          disableAxisListener: true,
+      }, margin)
+    },
+    plugins: [],
+    children: /*#__PURE__*/_jsx(GaugeProvider, {
+      value: value,
+      valueMin: valueMin,
+      valueMax: valueMax,
+      startAngle: startAngle,
+      endAngle: endAngle,
+      outerRadius: outerRadius,
+      innerRadius: innerRadius,
+      cornerRadius: cornerRadius,
+      cx: cx,
+      cy: cy,
+      children: /*#__PURE__*/_jsx(ChartsSurface, _extends({
+        title: title,
+        desc: desc,
+        role: "meter",
+        "aria-valuenow": value === null ? undefined : value,
+        "aria-valuemin": valueMin,
+        "aria-valuemax": valueMax
+      }, other, {
+        ref: ref,
+        children: /*#__PURE__*/_jsx(GStyled, {
           "aria-hidden": "true",
           children: children
         })
-      })
-    }) : null
-  }));
+      }))
+    })
+  });
 });
 process.env.NODE_ENV !== "production" ? GaugeContainer.propTypes = {
   // ----------------------------- Warning --------------------------------
@@ -150,6 +118,11 @@ process.env.NODE_ENV !== "production" ? GaugeContainer.propTypes = {
    * The height of the chart in px. If not defined, it takes the height of the parent element.
    */
   height: PropTypes.number,
+  /**
+   * This prop is used to help implement the accessibility logic.
+   * If you don't provide this prop. It falls back to a randomly generated id.
+   */
+  id: PropTypes.string,
   /**
    * The radius between circle center and the beginning of the arc.
    * Can be a number (in px) or a string with a percentage such as '50%'.
@@ -161,7 +134,6 @@ process.env.NODE_ENV !== "production" ? GaugeContainer.propTypes = {
    * The margin between the SVG and the drawing area.
    * It's used for leaving some space for extra information such as the x- and y-axis or legend.
    * Accepts an object with the optional properties: `top`, `bottom`, `left`, and `right`.
-   * @default object Depends on the charts type.
    */
   margin: PropTypes.shape({
     bottom: PropTypes.number,
@@ -198,12 +170,6 @@ process.env.NODE_ENV !== "production" ? GaugeContainer.propTypes = {
    * @default 0
    */
   valueMin: PropTypes.number,
-  viewBox: PropTypes.shape({
-    height: PropTypes.number,
-    width: PropTypes.number,
-    x: PropTypes.number,
-    y: PropTypes.number
-  }),
   /**
    * The width of the chart in px. If not defined, it takes the width of the parent element.
    */

package/modern/Gauge/GaugeProvider.js

@@ -1,4 +1,6 @@
 // @ignore - do not document.
+'use client';
+
 import * as React from 'react';
 import { getPercentageValue } from "../internals/getPercentageValue.js";
 import { getArcRatios, getAvailableRadius } from "./utils.js";

package/modern/LineChart/AnimatedArea.js

@@ -5,24 +5,10 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 const _excluded = ["d", "skipAnimation", "ownerState"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { styled } from '@mui/material/styles';
 import { animated, useTransition } from '@react-spring/web';
-import { color as d3Color } from '@mui/x-charts-vendor/d3-color';
 import { useStringInterpolator } from "../internals/useStringInterpolator.js";
 import { AppearingMask } from "./AppearingMask.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-export const AreaElementPath = styled(animated.path, {
-  name: 'MuiAreaElement',
-  slot: 'Root',
-  overridesResolver: (_, styles) => styles.root
-})(({
-  ownerState
-}) => ({
-  stroke: 'none',
-  fill: ownerState.gradientId && `url(#${ownerState.gradientId})` || ownerState.isHighlighted && d3Color(ownerState.color).brighter(1).formatHex() || d3Color(ownerState.color).brighter(0.5).formatHex(),
-  transition: 'opacity 0.2s ease-in, fill 0.2s ease-in',
-  opacity: ownerState.isFaded ? 0.3 : 1
-}));
 /**
  * Demos:
  *
@@ -42,7 +28,7 @@ function AnimatedArea(props) {
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const stringInterpolator = useStringInterpolator(d);
   const transitionChange = useTransition([stringInterpolator], {
-    from: {
+    from: skipAnimation ? undefined : {
       value: 0
     },
     to: {
@@ -57,10 +43,16 @@ function AnimatedArea(props) {
   return /*#__PURE__*/_jsx(AppearingMask, {
     skipAnimation: skipAnimation,
     id: `${ownerState.id}-area-clip`,
-    children: transitionChange((style, interpolator) => /*#__PURE__*/_jsx(AreaElementPath, _extends({}, other, {
-      ownerState: ownerState,
-      d: style.value.to(interpolator)
-    })))
+    children: transitionChange((style, interpolator) => /*#__PURE__*/_jsx(animated.path, _extends({
+      // @ts-expect-error
+      d: style.value.to(interpolator),
+      fill: ownerState.gradientId ? `url(#${ownerState.gradientId})` : ownerState.color,
+      filter:
+      // eslint-disable-next-line no-nested-ternary
+      ownerState.isHighlighted ? 'brightness(140%)' : ownerState.gradientId ? undefined : 'brightness(120%)',
+      opacity: ownerState.isFaded ? 0.3 : 1,
+      stroke: "none"
+    }, other)))
   });
 }
 process.env.NODE_ENV !== "production" ? AnimatedArea.propTypes = {

package/modern/LineChart/AnimatedLine.js

@@ -6,25 +6,9 @@ const _excluded = ["d", "skipAnimation", "ownerState"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { animated, useTransition } from '@react-spring/web';
-import { color as d3Color } from '@mui/x-charts-vendor/d3-color';
-import { styled } from '@mui/material/styles';
 import { useStringInterpolator } from "../internals/useStringInterpolator.js";
 import { AppearingMask } from "./AppearingMask.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-export const LineElementPath = styled(animated.path, {
-  name: 'MuiLineElement',
-  slot: 'Root',
-  overridesResolver: (_, styles) => styles.root
-})(({
-  ownerState
-}) => ({
-  strokeWidth: 2,
-  strokeLinejoin: 'round',
-  fill: 'none',
-  stroke: ownerState.gradientId && `url(#${ownerState.gradientId})` || ownerState.isHighlighted && d3Color(ownerState.color).brighter(0.5).formatHex() || ownerState.color,
-  transition: 'opacity 0.2s ease-in, stroke 0.2s ease-in',
-  opacity: ownerState.isFaded ? 0.3 : 1
-}));
 /**
  * Demos:
  *
@@ -44,7 +28,7 @@ function AnimatedLine(props) {
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const stringInterpolator = useStringInterpolator(d);
   const transitionChange = useTransition([stringInterpolator], {
-    from: {
+    from: skipAnimation ? undefined : {
       value: 0
     },
     to: {
@@ -59,10 +43,16 @@ function AnimatedLine(props) {
   return /*#__PURE__*/_jsx(AppearingMask, {
     skipAnimation: skipAnimation,
     id: `${ownerState.id}-line-clip`,
-    children: transitionChange((style, interpolator) => /*#__PURE__*/_jsx(LineElementPath, _extends({}, other, {
-      ownerState: ownerState,
-      d: style.value.to(interpolator)
-    })))
+    children: transitionChange((style, interpolator) => /*#__PURE__*/_jsx(animated.path, _extends({
+      // @ts-expect-error
+      d: style.value.to(interpolator),
+      stroke: ownerState.gradientId ? `url(#${ownerState.gradientId})` : ownerState.color,
+      strokeWidth: 2,
+      strokeLinejoin: "round",
+      fill: "none",
+      filter: ownerState.isHighlighted ? 'brightness(120%)' : undefined,
+      opacity: ownerState.isFaded ? 0.3 : 1
+    }, other)))
   });
 }
 process.env.NODE_ENV !== "production" ? AnimatedLine.propTypes = {

package/modern/LineChart/AppearingMask.js

@@ -12,7 +12,7 @@ export function AppearingMask(props) {
   const drawingArea = useDrawingArea();
   const chartId = useChartId();
   const transitionAppear = useTransition([drawingArea], {
-    from: v => ({
+    from: props.skipAnimation ? undefined : v => ({
       animatedWidth: v.left
     }),
     enter: v => ({
@@ -29,6 +29,7 @@ export function AppearingMask(props) {
     children: [/*#__PURE__*/_jsx("clipPath", {
       id: clipId,
       children: transitionAppear(style => /*#__PURE__*/_jsx(animated.rect, {
+        // @ts-expect-error
         x: 0,
         y: 0,
         width: style.animatedWidth,

package/modern/LineChart/AreaElement.js

@@ -10,8 +10,8 @@ import useSlotProps from '@mui/utils/useSlotProps';
 import generateUtilityClass from '@mui/utils/generateUtilityClass';
 import generateUtilityClasses from '@mui/utils/generateUtilityClasses';
 import { useInteractionItemProps } from "../hooks/useInteractionItemProps.js";
+import { useItemHighlighted } from "../hooks/useItemHighlighted.js";
 import { AnimatedArea } from "./AnimatedArea.js";
-import { useItemHighlighted } from "../context/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function getAreaElementUtilityClass(slot) {
   return generateUtilityClass('MuiAreaElement', slot);

package/modern/LineChart/AreaPlot.js

@@ -5,19 +5,38 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 const _excluded = ["slots", "slotProps", "onItemClick", "skipAnimation"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { styled } from '@mui/material/styles';
 import { area as d3Area } from '@mui/x-charts-vendor/d3-shape';
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
-import { AreaElement } from "./AreaElement.js";
+import { AreaElement, areaElementClasses } from "./AreaElement.js";
 import { getValueToPositionMapper } from "../hooks/useScale.js";
-import getCurveFactory from "../internals/getCurve.js";
+import { getCurveFactory } from "../internals/getCurve.js";
+import { isBandScale } from "../internals/isBandScale.js";
 import { DEFAULT_X_AXIS_KEY } from "../constants/index.js";
-import { useChartGradient } from "../internals/components/ChartsAxesGradients/index.js";
 import { useLineSeries } from "../hooks/useSeries.js";
 import { useSkipAnimation } from "../context/AnimationProvider/index.js";
+import { useChartGradientIdBuilder } from "../hooks/useChartGradientId.js";
+import { useXAxes, useYAxes } from "../hooks/useAxis.js";
 import { jsx as _jsx } from "react/jsx-runtime";
+const AreaPlotRoot = styled('g', {
+  name: 'MuiAreaPlot',
+  slot: 'Root',
+  overridesResolver: (_, styles) => styles.root
+})({
+  [`& .${areaElementClasses.root}`]: {
+    transition: 'opacity 0.2s ease-in, fill 0.2s ease-in'
+  }
+});
 const useAggregatedData = () => {
   const seriesData = useLineSeries();
-  const axisData = useCartesianContext();
+  const {
+    xAxis,
+    xAxisIds
+  } = useXAxes();
+  const {
+    yAxis,
+    yAxisIds
+  } = useYAxes();
+  const getGradientId = useChartGradientIdBuilder();
 
   // This memo prevents odd line chart behavior when hydrating.
   const allData = React.useMemo(() => {
@@ -28,12 +47,6 @@ const useAggregatedData = () => {
       series,
       stackingGroups
     } = seriesData;
-    const {
-      xAxis,
-      yAxis,
-      xAxisIds,
-      yAxisIds
-    } = axisData;
     const defaultXAxisId = xAxisIds[0];
     const defaultYAxisId = yAxisIds[0];
     return stackingGroups.flatMap(({
@@ -47,12 +60,15 @@ const useAggregatedData = () => {
           stackedData,
           data,
           connectNulls,
-          baseline
+          baseline,
+          curve,
+          strictStepCurve
         } = series[seriesId];
-        const xScale = getValueToPositionMapper(xAxis[xAxisId].scale);
+        const xScale = xAxis[xAxisId].scale;
+        const xPosition = getValueToPositionMapper(xScale);
         const yScale = yAxis[yAxisId].scale;
         const xData = xAxis[xAxisId].data;
-        const gradientUsed = yAxis[yAxisId].colorScale && [yAxisId, 'y'] || xAxis[xAxisId].colorScale && [xAxisId, 'x'] || undefined;
+        const gradientId = yAxis[yAxisId].colorScale && getGradientId(yAxisId) || xAxis[xAxisId].colorScale && getGradientId(xAxisId) || undefined;
         if (process.env.NODE_ENV !== 'production') {
           if (xData === undefined) {
             throw new Error(`MUI X: ${xAxisId === DEFAULT_X_AXIS_KEY ? 'The first `xAxis`' : `The x-axis with id "${xAxisId}"`} should have data property to be able to display a line plot.`);
@@ -61,7 +77,42 @@ const useAggregatedData = () => {
             throw new Error(`MUI X: The data length of the x axis (${xData.length} items) is lower than the length of series (${stackedData.length} items).`);
           }
         }
-        const areaPath = d3Area().x(d => xScale(d.x)).defined((_, i) => connectNulls || data[i] != null).y0(d => {
+        const shouldExpand = curve?.includes('step') && !strictStepCurve && isBandScale(xScale);
+        const formattedData = xData?.flatMap((x, index) => {
+          const nullData = data[index] == null;
+          if (shouldExpand) {
+            const rep = [{
+              x,
+              y: stackedData[index],
+              nullData,
+              isExtension: false
+            }];
+            if (!nullData && (index === 0 || data[index - 1] == null)) {
+              rep.unshift({
+                x: (xScale(x) ?? 0) - (xScale.step() - xScale.bandwidth()) / 2,
+                y: stackedData[index],
+                nullData,
+                isExtension: true
+              });
+            }
+            if (!nullData && (index === data.length - 1 || data[index + 1] == null)) {
+              rep.push({
+                x: (xScale(x) ?? 0) + (xScale.step() + xScale.bandwidth()) / 2,
+                y: stackedData[index],
+                nullData,
+                isExtension: true
+              });
+            }
+            return rep;
+          }
+          return {
+            x,
+            y: stackedData[index],
+            nullData
+          };
+        }) ?? [];
+        const d3Data = connectNulls ? formattedData.filter(d => !d.nullData) : formattedData;
+        const areaPath = d3Area().x(d => d.isExtension ? d.x : xPosition(d.x)).defined(d => connectNulls || !d.nullData || !!d.isExtension).y0(d => {
           if (typeof baseline === 'number') {
             return yScale(baseline);
           }
@@ -77,21 +128,15 @@ const useAggregatedData = () => {
           }
           return value;
         }).y1(d => d.y && yScale(d.y[1]));
-        const curve = getCurveFactory(series[seriesId].curve);
-        const formattedData = xData?.map((x, index) => ({
-          x,
-          y: stackedData[index]
-        })) ?? [];
-        const d3Data = connectNulls ? formattedData.filter((_, i) => data[i] != null) : formattedData;
-        const d = areaPath.curve(curve)(d3Data) || '';
+        const d = areaPath.curve(getCurveFactory(curve))(d3Data) || '';
         return _extends({}, series[seriesId], {
-          gradientUsed,
+          gradientId,
           d,
           seriesId
         });
       });
     });
-  }, [seriesData, axisData]);
+  }, [seriesData, xAxisIds, yAxisIds, xAxis, yAxis, getGradientId]);
   return allData;
 };
 
@@ -115,20 +160,19 @@ function AreaPlot(props) {
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const skipAnimation = useSkipAnimation(inSkipAnimation);
-  const getGradientId = useChartGradient();
   const completedData = useAggregatedData();
-  return /*#__PURE__*/_jsx("g", _extends({}, other, {
+  return /*#__PURE__*/_jsx(AreaPlotRoot, _extends({}, other, {
     children: completedData.map(({
       d,
       seriesId,
       color,
       area,
-      gradientUsed
+      gradientId
     }) => !!area && /*#__PURE__*/_jsx(AreaElement, {
       id: seriesId,
       d: d,
       color: color,
-      gradientId: gradientUsed && getGradientId(...gradientUsed),
+      gradientId: gradientId,
       slots: slots,
       slotProps: slotProps,
       onClick: onItemClick && (event => onItemClick(event, {

package/modern/LineChart/CircleMarkElement.js

@@ -2,16 +2,17 @@
 
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["x", "y", "id", "classes", "color", "dataIndex", "onClick", "skipAnimation", "shape"];
+const _excluded = ["x", "y", "id", "classes", "color", "dataIndex", "onClick", "skipAnimation"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useTheme } from '@mui/material/styles';
-import { warnOnce } from '@mui/x-internals/warning';
 import { animated, useSpring } from '@react-spring/web';
-import { InteractionContext } from "../context/InteractionProvider.js";
 import { useInteractionItemProps } from "../hooks/useInteractionItemProps.js";
-import { useItemHighlighted } from "../context/index.js";
+import { useItemHighlighted } from "../hooks/useItemHighlighted.js";
 import { useUtilityClasses } from "./markElementClasses.js";
+import { useSelector } from "../internals/store/useSelector.js";
+import { selectorChartsInteractionXAxis } from "../internals/plugins/featurePlugins/useChartInteraction/index.js";
+import { useStore } from "../internals/store/useStore.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * The line mark element that only render circle for performance improvement.
@@ -34,13 +35,9 @@ function CircleMarkElement(props) {
       color,
       dataIndex,
       onClick,
-      skipAnimation,
-      shape
+      skipAnimation
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  if (shape !== 'circle') {
-    warnOnce([`MUI X: The mark element of your line chart have shape "${shape}" which is not supported when using \`experimentalRendering=true\`.`, 'Only "circle" are supported with `experimentalRendering`.'].join('\n'), 'error');
-  }
   const theme = useTheme();
   const getInteractionItemProps = useInteractionItemProps();
   const {
@@ -49,9 +46,8 @@ function CircleMarkElement(props) {
   } = useItemHighlighted({
     seriesId: id
   });
-  const {
-    axis
-  } = React.useContext(InteractionContext);
+  const store = useStore();
+  const xAxisIdentifier = useSelector(store, selectorChartsInteractionXAxis);
   const position = useSpring({
     to: {
       x,
@@ -62,12 +58,13 @@ function CircleMarkElement(props) {
   const ownerState = {
     id,
     classes: innerClasses,
-    isHighlighted: axis.x?.index === dataIndex || isHighlighted,
+    isHighlighted: xAxisIdentifier?.index === dataIndex || isHighlighted,
     isFaded,
     color
   };
   const classes = useUtilityClasses(ownerState);
   return /*#__PURE__*/_jsx(animated.circle, _extends({}, other, {
+    // @ts-expect-error
     cx: position.x,
     cy: position.y,
     r: 5,