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

package/ChartContainer/ChartContainer.d.ts

@@ -1,41 +1,24 @@
 import * as React from 'react';
-import { DrawingProviderProps } from '../context/DrawingProvider';
-import { SeriesProviderProps } from '../context/SeriesProvider';
-import { ChartsSurfaceProps } from '../ChartsSurface';
-import { CartesianProviderProps } from '../context/CartesianProvider';
-import { HighlightedProviderProps, ZAxisContextProviderProps } from '../context';
-import { PluginProviderProps } from '../context/PluginProvider';
-import { AxisConfig, ChartsXAxisProps, ChartsYAxisProps, ScaleName } from '../models/axis';
-import { MakeOptional } from '../models/helpers';
-import { AnimationProviderProps } from '../context/AnimationProvider';
-export type ChartContainerProps = Omit<ChartsSurfaceProps & Omit<SeriesProviderProps, 'seriesFormatters'> & Omit<DrawingProviderProps, 'svgRef'> & Pick<CartesianProviderProps, 'dataset'> & ZAxisContextProviderProps & HighlightedProviderProps & PluginProviderProps & AnimationProviderProps, 'children'> & {
+import { ChartDataProviderProps } from '../context/ChartDataProvider';
+export interface ChartContainerProps extends Omit<ChartDataProviderProps, 'width' | 'height'> {
     /**
-     * The configuration of the x-axes.
-     * If not provided, a default axis config is used.
-     * An array of [[AxisConfig]] objects.
+     * The width of the chart in px. If not defined, it takes the width of the parent element.
      */
-    xAxis?: MakeOptional<AxisConfig<ScaleName, any, ChartsXAxisProps>, 'id'>[];
+    width?: number;
     /**
-     * The configuration of the y-axes.
-     * If not provided, a default axis config is used.
-     * An array of [[AxisConfig]] objects.
+     * The height of the chart in px. If not defined, it takes the height of the parent element.
      */
-    yAxis?: MakeOptional<AxisConfig<ScaleName, any, ChartsYAxisProps>, 'id'>[];
-    children?: React.ReactNode;
-};
-declare const ChartContainer: React.ForwardRefExoticComponent<Omit<ChartsSurfaceProps & Omit<SeriesProviderProps, "seriesFormatters"> & Omit<DrawingProviderProps, "svgRef"> & Pick<CartesianProviderProps, "dataset"> & ZAxisContextProviderProps & HighlightedProviderProps & PluginProviderProps & AnimationProviderProps, "children"> & {
+    height?: number;
     /**
-     * The configuration of the x-axes.
-     * If not provided, a default axis config is used.
-     * An array of [[AxisConfig]] objects.
+     * The chart will try to wait for the parent container to resolve its size
+     * before it renders for the first time.
+     *
+     * This can be useful in some scenarios where the chart appear to grow after
+     * the first render, like when used inside a grid.
+     *
+     * @default false
      */
-    xAxis?: MakeOptional<AxisConfig<ScaleName, any, ChartsXAxisProps>, "id">[];
-    /**
-     * The configuration of the y-axes.
-     * If not provided, a default axis config is used.
-     * An array of [[AxisConfig]] objects.
-     */
-    yAxis?: MakeOptional<AxisConfig<ScaleName, any, ChartsYAxisProps>, "id">[];
-    children?: React.ReactNode;
-} & React.RefAttributes<unknown>>;
+    resolveSizeBeforeRender?: boolean;
+}
+declare const ChartContainer: React.ForwardRefExoticComponent<ChartContainerProps & React.RefAttributes<SVGSVGElement>>;
 export { ChartContainer };

package/ChartContainer/ChartContainer.js

@@ -3,47 +3,18 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { DrawingProvider } from "../context/DrawingProvider.js";
-import { SeriesProvider } from "../context/SeriesProvider/index.js";
-import { InteractionProvider } from "../context/InteractionProvider.js";
-import { ChartsSurface } from "../ChartsSurface/index.js";
-import { CartesianProvider } from "../context/CartesianProvider/index.js";
-import { ChartsAxesGradients } from "../internals/components/ChartsAxesGradients/index.js";
-import { HighlightedProvider, ZAxisContextProvider } from "../context/index.js";
-import { PluginProvider } from "../context/PluginProvider/index.js";
+import { ChartDataProvider } from "../context/ChartDataProvider/index.js";
+import { ResizableContainer } from "./ResizableContainer.js";
 import { useChartContainerProps } from "./useChartContainerProps.js";
-import { AnimationProvider } from "../context/AnimationProvider/index.js";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 const ChartContainer = /*#__PURE__*/React.forwardRef(function ChartContainer(props, ref) {
   const {
-    children,
-    drawingProviderProps,
-    seriesProviderProps,
-    cartesianProviderProps,
-    zAxisContextProps,
-    highlightedProviderProps,
-    chartsSurfaceProps,
-    pluginProviderProps,
-    animationProviderProps
+    hasIntrinsicSize,
+    chartDataProviderProps,
+    resizableChartContainerProps
   } = useChartContainerProps(props, ref);
-  return /*#__PURE__*/_jsx(DrawingProvider, _extends({}, drawingProviderProps, {
-    children: /*#__PURE__*/_jsx(PluginProvider, _extends({}, pluginProviderProps, {
-      children: /*#__PURE__*/_jsx(SeriesProvider, _extends({}, seriesProviderProps, {
-        children: /*#__PURE__*/_jsx(CartesianProvider, _extends({}, cartesianProviderProps, {
-          children: /*#__PURE__*/_jsx(ZAxisContextProvider, _extends({}, zAxisContextProps, {
-            children: /*#__PURE__*/_jsx(InteractionProvider, {
-              children: /*#__PURE__*/_jsx(HighlightedProvider, _extends({}, highlightedProviderProps, {
-                children: /*#__PURE__*/_jsxs(ChartsSurface, _extends({}, chartsSurfaceProps, {
-                  children: [/*#__PURE__*/_jsx(ChartsAxesGradients, {}), /*#__PURE__*/_jsx(AnimationProvider, _extends({}, animationProviderProps, {
-                    children: children
-                  }))]
-                }))
-              }))
-            })
-          }))
-        }))
-      }))
-    }))
+  return /*#__PURE__*/_jsx(ResizableContainer, _extends({}, resizableChartContainerProps, {
+    children: hasIntrinsicSize ? /*#__PURE__*/_jsx(ChartDataProvider, _extends({}, chartDataProviderProps)) : null
   }));
 });
 process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
@@ -70,9 +41,9 @@ process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
    */
   disableAxisListener: PropTypes.bool,
   /**
-   * The height of the chart in px.
+   * The height of the chart in px. If not defined, it takes the height of the parent element.
    */
-  height: PropTypes.number.isRequired,
+  height: PropTypes.number,
   /**
    * The item currently highlighted. Turns highlighting into a controlled prop.
    */
@@ -103,6 +74,16 @@ process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
    * If not provided, the container supports line, bar, scatter and pie charts.
    */
   plugins: PropTypes.arrayOf(PropTypes.object),
+  /**
+   * The chart will try to wait for the parent container to resolve its size
+   * before it renders for the first time.
+   *
+   * This can be useful in some scenarios where the chart appear to grow after
+   * the first render, like when used inside a grid.
+   *
+   * @default false
+   */
+  resolveSizeBeforeRender: PropTypes.bool,
   /**
    * The array of series to display.
    * Each type of series has its own specificity.
@@ -123,9 +104,9 @@ process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
     y: PropTypes.number
   }),
   /**
-   * The width of the chart in px.
+   * The width of the chart in px. If not defined, it takes the width of the parent element.
    */
-  width: PropTypes.number.isRequired,
+  width: PropTypes.number,
   /**
    * The configuration of the x-axes.
    * If not provided, a default axis config is used.
@@ -152,6 +133,7 @@ process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
     dataKey: PropTypes.string,
     disableLine: PropTypes.bool,
     disableTicks: PropTypes.bool,
+    domainLimit: PropTypes.oneOfType([PropTypes.oneOf(['nice', 'strict']), PropTypes.func]),
     fill: PropTypes.string,
     hideTooltip: PropTypes.bool,
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
@@ -205,6 +187,7 @@ process.env.NODE_ENV !== "production" ? ChartContainer.propTypes = {
     dataKey: PropTypes.string,
     disableLine: PropTypes.bool,
     disableTicks: PropTypes.bool,
+    domainLimit: PropTypes.oneOfType([PropTypes.oneOf(['nice', 'strict']), PropTypes.func]),
     fill: PropTypes.string,
     hideTooltip: PropTypes.bool,
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),

package/{ResponsiveChartContainer → ChartContainer}/ResizableContainer.d.ts

@@ -1,9 +1,9 @@
-import type { ResponsiveChartContainerProps } from './ResponsiveChartContainer';
+import type { ChartContainerProps } from './ChartContainer';
 /**
  * Wrapping div that take the shape of its parent.
  *
  * @ignore - do not document.
  */
 export declare const ResizableContainer: import("@emotion/styled").StyledComponent<import("@mui/system").MUIStyledCommonProps<import("@mui/material").Theme> & {
-    ownerState: Pick<ResponsiveChartContainerProps, "width" | "height">;
+    ownerState: Pick<ChartContainerProps, "width" | "height">;
 }, Pick<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, keyof import("react").ClassAttributes<HTMLDivElement> | keyof import("react").HTMLAttributes<HTMLDivElement>>, {}>;

package/{ResponsiveChartContainer → ChartContainer}/useChartContainerDimensions.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 export declare const useChartContainerDimensions: (inWidth?: number, inHeight?: number, resolveSizeBeforeRender?: boolean) => {
-    containerRef: React.MutableRefObject<null>;
+    containerRef: React.RefObject<HTMLDivElement>;
     width: number;
     height: number;
 };

package/{ResponsiveChartContainer → ChartContainer}/useChartContainerDimensions.js

@@ -1,9 +1,11 @@
 'use client';
 
+/* eslint-disable react-compiler/react-compiler */
 import * as React from 'react';
 import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
 import ownerWindow from '@mui/utils/ownerWindow';
 export const useChartContainerDimensions = (inWidth, inHeight, resolveSizeBeforeRender) => {
+  const hasInSize = inWidth !== undefined && inHeight !== undefined;
   const stateRef = React.useRef({
     displayError: false,
     initialCompute: true,
@@ -40,7 +42,7 @@ export const useChartContainerDimensions = (inWidth, inHeight, resolveSizeBefore
   // https://github.com/mui/mui-x/issues/13477#issuecomment-2336634785
   useEnhancedEffect(() => {
     // computeRun is used to avoid infinite loops.
-    if (!resolveSizeBeforeRender || !stateRef.current.initialCompute || stateRef.current.computeRun > 20) {
+    if (hasInSize || !resolveSizeBeforeRender || !stateRef.current.initialCompute || stateRef.current.computeRun > 20) {
       return;
     }
     const computedSize = computeSize();
@@ -49,9 +51,9 @@ export const useChartContainerDimensions = (inWidth, inHeight, resolveSizeBefore
     } else if (stateRef.current.initialCompute) {
       stateRef.current.initialCompute = false;
     }
-  }, [width, height, computeSize, resolveSizeBeforeRender]);
+  }, [width, height, computeSize, resolveSizeBeforeRender, hasInSize]);
   useEnhancedEffect(() => {
-    if (inWidth !== undefined && inHeight !== undefined) {
+    if (hasInSize) {
       return () => {};
     }
     computeSize();
@@ -77,7 +79,7 @@ export const useChartContainerDimensions = (inWidth, inHeight, resolveSizeBefore
         observer.unobserve(elementToObserve);
       }
     };
-  }, [computeSize, inHeight, inWidth]);
+  }, [computeSize, hasInSize]);
   if (process.env.NODE_ENV !== 'production') {
     if (stateRef.current.displayError && inWidth === undefined && width === 0) {
       console.error(`MUI X: ChartContainer does not have \`width\` prop, and its container has no \`width\` defined.`);

package/ChartContainer/useChartContainerProps.d.ts

@@ -1,89 +1,14 @@
-import * as React from 'react';
-import type { DrawingProviderProps } from '../context/DrawingProvider';
-import type { CartesianProviderProps } from '../context/CartesianProvider';
-import type { SeriesProviderProps } from '../context/SeriesProvider';
-import type { ZAxisContextProviderProps } from '../context/ZAxisContextProvider';
+import { ChartDataProviderProps } from '../context/ChartDataProvider';
 import type { ChartContainerProps } from './ChartContainer';
-import { HighlightedProviderProps } from '../context';
-import { ChartsSurfaceProps } from '../ChartsSurface';
-import { PluginProviderProps } from '../context/PluginProvider';
-import { AnimationProviderProps } from '../context/AnimationProvider';
-export declare const useChartContainerProps: (props: ChartContainerProps, ref: React.ForwardedRef<unknown>) => {
-    children: React.ReactNode;
-    drawingProviderProps: Omit<DrawingProviderProps, "children">;
-    seriesProviderProps: Omit<SeriesProviderProps, "children">;
-    cartesianProviderProps: Omit<CartesianProviderProps, "children">;
-    zAxisContextProps: Omit<ZAxisContextProviderProps, "children">;
-    highlightedProviderProps: Omit<HighlightedProviderProps, "children">;
-    chartsSurfaceProps: ChartsSurfaceProps & {
-        ref: any;
+export type UseChartContainerPropsReturnValue = {
+    hasIntrinsicSize: boolean;
+    chartDataProviderProps: ChartDataProviderProps;
+    resizableChartContainerProps: {
+        ownerState: {
+            width: ChartContainerProps['width'];
+            height: ChartContainerProps['height'];
+        };
+        ref: React.Ref<HTMLDivElement>;
     };
-    pluginProviderProps: Omit<PluginProviderProps, "children">;
-    animationProviderProps: Omit<AnimationProviderProps, "children">;
-    xAxis: {
-        reverse?: boolean | undefined;
-        fill?: string | undefined;
-        stroke?: string | undefined;
-        data?: any[] | undefined;
-        label?: string | undefined;
-        max?: (number | Date) | undefined;
-        min?: (number | Date) | undefined;
-        valueFormatter?: ((value: any, context: import("../internals").AxisValueFormatterContext) => string) | undefined;
-        dataKey?: string | undefined;
-        sx?: import("@mui/system").SxProps | undefined;
-        classes?: Partial<import("..").ChartsAxisClasses> | undefined;
-        tickMaxStep?: number | undefined;
-        tickMinStep?: number | undefined;
-        tickNumber?: number | undefined;
-        disableLine?: boolean | undefined;
-        disableTicks?: boolean | undefined;
-        tickFontSize?: number | undefined;
-        tickLabelStyle?: import("..").ChartsTextProps["style"];
-        labelStyle?: import("..").ChartsTextProps["style"];
-        tickLabelInterval?: ("auto" | ((value: any, index: number) => boolean)) | undefined;
-        labelFontSize?: number | undefined;
-        tickSize?: number | undefined;
-        slots?: Partial<import("../internals").ChartsAxisSlots> | undefined;
-        slotProps?: Partial<import("../internals").ChartsAxisSlotProps> | undefined;
-        tickInterval?: ("auto" | ((value: any, index: number) => boolean) | any[]) | undefined;
-        tickPlacement?: ("start" | "end" | "middle" | "extremities") | undefined;
-        tickLabelPlacement?: ("middle" | "tick") | undefined;
-        scaleType?: "linear" | "time" | "log" | "band" | "point" | "pow" | "sqrt" | "utc" | undefined;
-        colorMap?: import("../models/colorMapping").ContinuousColorConfig<number | Date> | import("../models/colorMapping").PiecewiseColorConfig<number | Date> | import("../models/colorMapping").OrdinalColorConfig<string | number | Date> | undefined;
-        hideTooltip?: boolean | undefined;
-        id: import("../internals").AxisId;
-    }[];
-    yAxis: {
-        reverse?: boolean | undefined;
-        fill?: string | undefined;
-        stroke?: string | undefined;
-        data?: any[] | undefined;
-        label?: string | undefined;
-        max?: (number | Date) | undefined;
-        min?: (number | Date) | undefined;
-        valueFormatter?: ((value: any, context: import("../internals").AxisValueFormatterContext) => string) | undefined;
-        dataKey?: string | undefined;
-        sx?: import("@mui/system").SxProps | undefined;
-        classes?: Partial<import("..").ChartsAxisClasses> | undefined;
-        tickMaxStep?: number | undefined;
-        tickMinStep?: number | undefined;
-        tickNumber?: number | undefined;
-        disableLine?: boolean | undefined;
-        disableTicks?: boolean | undefined;
-        tickFontSize?: number | undefined;
-        tickLabelStyle?: import("..").ChartsTextProps["style"];
-        labelStyle?: import("..").ChartsTextProps["style"];
-        tickLabelInterval?: ("auto" | ((value: any, index: number) => boolean)) | undefined;
-        labelFontSize?: number | undefined;
-        tickSize?: number | undefined;
-        slots?: Partial<import("../internals").ChartsAxisSlots> | undefined;
-        slotProps?: Partial<import("../internals").ChartsAxisSlotProps> | undefined;
-        tickInterval?: ("auto" | ((value: any, index: number) => boolean) | any[]) | undefined;
-        tickPlacement?: ("start" | "end" | "middle" | "extremities") | undefined;
-        tickLabelPlacement?: ("middle" | "tick") | undefined;
-        scaleType?: "linear" | "time" | "log" | "band" | "point" | "pow" | "sqrt" | "utc" | undefined;
-        colorMap?: import("../models/colorMapping").ContinuousColorConfig<number | Date> | import("../models/colorMapping").PiecewiseColorConfig<number | Date> | import("../models/colorMapping").OrdinalColorConfig<string | number | Date> | undefined;
-        hideTooltip?: boolean | undefined;
-        id: import("../internals").AxisId;
-    }[];
 };
+export declare const useChartContainerProps: (props: ChartContainerProps, ref: React.Ref<SVGSVGElement>) => UseChartContainerPropsReturnValue;

package/ChartContainer/useChartContainerProps.js

@@ -2,85 +2,69 @@
 
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["width", "height", "series", "margin", "xAxis", "yAxis", "zAxis", "colors", "dataset", "sx", "title", "desc", "disableAxisListener", "highlightedItem", "onHighlightChange", "plugins", "children", "skipAnimation"];
-import * as React from 'react';
-import useForkRef from '@mui/utils/useForkRef';
-import { useDefaultizeAxis } from "./useDefaultizeAxis.js";
+const _excluded = ["width", "height", "resolveSizeBeforeRender", "margin", "children", "series", "colors", "dataset", "desc", "disableAxisListener", "highlightedItem", "onHighlightChange", "plugins", "sx", "title", "viewBox", "xAxis", "yAxis", "zAxis", "skipAnimation"];
+import { useChartContainerDimensions } from "./useChartContainerDimensions.js";
 export const useChartContainerProps = (props, ref) => {
   const {
       width,
       height,
-      series,
+      resolveSizeBeforeRender,
       margin,
-      xAxis,
-      yAxis,
-      zAxis,
+      children,
+      series,
       colors,
       dataset,
-      sx,
-      title,
       desc,
       disableAxisListener,
       highlightedItem,
       onHighlightChange,
       plugins,
-      children,
+      sx,
+      title,
+      viewBox,
+      xAxis,
+      yAxis,
+      zAxis,
       skipAnimation
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const svgRef = React.useRef(null);
-  const chartSurfaceRef = useForkRef(ref, svgRef);
-  const [defaultizedXAxis, defaultizedYAxis] = useDefaultizeAxis(xAxis, yAxis, dataset);
-  const drawingProviderProps = {
-    width,
-    height,
+  const {
+    containerRef,
+    width: dWidth,
+    height: dHeight
+  } = useChartContainerDimensions(width, height, resolveSizeBeforeRender);
+  const resizableChartContainerProps = _extends({}, other, {
+    ownerState: {
+      width,
+      height
+    },
+    ref: containerRef
+  });
+  const chartDataProviderProps = {
     margin,
-    svgRef
-  };
-  const animationProviderProps = {
-    skipAnimation
-  };
-  const pluginProviderProps = {
-    plugins
-  };
-  const seriesProviderProps = {
+    children,
     series,
     colors,
-    dataset
-  };
-  const cartesianProviderProps = {
-    xAxis: defaultizedXAxis,
-    yAxis: defaultizedYAxis,
-    dataset
-  };
-  const zAxisContextProps = {
-    zAxis,
-    dataset
-  };
-  const highlightedProviderProps = {
+    dataset,
+    desc,
+    disableAxisListener,
     highlightedItem,
-    onHighlightChange
-  };
-  const chartsSurfaceProps = _extends({}, other, {
-    width,
-    height,
-    ref: chartSurfaceRef,
+    onHighlightChange,
+    plugins,
     sx,
     title,
-    desc,
-    disableAxisListener
-  });
+    viewBox,
+    xAxis,
+    yAxis,
+    zAxis,
+    skipAnimation,
+    width: dWidth,
+    height: dHeight,
+    ref
+  };
   return {
-    children,
-    drawingProviderProps,
-    seriesProviderProps,
-    cartesianProviderProps,
-    zAxisContextProps,
-    highlightedProviderProps,
-    chartsSurfaceProps,
-    pluginProviderProps,
-    animationProviderProps,
-    xAxis: defaultizedXAxis,
-    yAxis: defaultizedYAxis
+    hasIntrinsicSize: Boolean(dWidth && dHeight),
+    chartDataProviderProps,
+    resizableChartContainerProps
   };
 };

package/ChartsLegend/ChartsLegend.js

@@ -11,7 +11,6 @@ import { useThemeProps, useTheme } from '@mui/material/styles';
 import { getSeriesToDisplay } from "./utils.js";
 import { getLegendUtilityClass } from "./chartsLegendClasses.js";
 import { DefaultChartsLegend } from "./DefaultChartsLegend.js";
-import { useDrawingArea } from "../hooks/index.js";
 import { useSeries } from "../hooks/useSeries.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
@@ -50,7 +49,6 @@ function ChartsLegend(inProps) {
   const classes = useUtilityClasses(_extends({}, defaultizedProps, {
     theme
   }));
-  const drawingArea = useDrawingArea();
   const series = useSeries();
   const seriesToDisplay = getSeriesToDisplay(series);
   const ChartLegendRender = slots?.legend ?? DefaultChartsLegend;
@@ -59,7 +57,6 @@ function ChartsLegend(inProps) {
     externalSlotProps: slotProps?.legend,
     additionalProps: _extends({}, other, {
       classes,
-      drawingArea,
       series,
       seriesToDisplay
     }),

package/ChartsLegend/DefaultChartsLegend.d.ts

@@ -1,15 +1,10 @@
 import * as React from 'react';
 import { FormattedSeries } from '../context/SeriesProvider';
 import { LegendPerItemProps } from './LegendPerItem';
-import { DrawingArea } from '../context/DrawingProvider';
 import { SeriesLegendItemContext } from './chartsLegend.types';
 export interface LegendRendererProps extends Omit<LegendPerItemProps, 'itemsToDisplay' | 'onItemClick'> {
     series: FormattedSeries;
     seriesToDisplay: LegendPerItemProps['itemsToDisplay'];
-    /**
-     * @deprecated Use the `useDrawingArea` hook instead.
-     */
-    drawingArea: Omit<DrawingArea, 'isPointInside'>;
     /**
      * Callback fired when a legend item is clicked.
      * @param {React.MouseEvent<SVGRectElement, MouseEvent>} event The click event.

package/ChartsLegend/DefaultChartsLegend.js

@@ -2,7 +2,7 @@
 
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["drawingArea", "seriesToDisplay", "hidden", "onItemClick"];
+const _excluded = ["seriesToDisplay", "hidden", "onItemClick"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { LegendPerItem } from "./LegendPerItem.js";
@@ -43,17 +43,6 @@ process.env.NODE_ENV !== "production" ? DefaultChartsLegend.propTypes = {
    * The default depends on the chart.
    */
   direction: PropTypes.oneOf(['column', 'row']).isRequired,
-  /**
-   * @deprecated Use the `useDrawingArea` hook instead.
-   */
-  drawingArea: PropTypes.shape({
-    bottom: PropTypes.number.isRequired,
-    height: PropTypes.number.isRequired,
-    left: PropTypes.number.isRequired,
-    right: PropTypes.number.isRequired,
-    top: PropTypes.number.isRequired,
-    width: PropTypes.number.isRequired
-  }).isRequired,
   /**
    * Set to true to hide the legend.
    * @default false

package/ChartsLegend/LegendPerItem.d.ts

@@ -1,11 +1,11 @@
 import * as React from 'react';
+import { DefaultizedProps } from '@mui/x-internals/types';
 import { DrawingArea } from '../context/DrawingProvider';
 import { ChartsTextStyle } from '../ChartsText';
 import { CardinalDirections } from '../models/layout';
 import { LegendItemParams } from './chartsLegend.types';
 import { AnchorPosition, Direction, LegendPlacement } from './legend.types';
 import { ChartsLegendClasses } from './chartsLegendClasses';
-import { DefaultizedProps } from '../models/helpers';
 export type ChartsLegendRootOwnerState = {
     position: AnchorPosition;
     direction: Direction;

package/ChartsOnAxisClickHandler/ChartsOnAxisClickHandler.js

@@ -39,8 +39,8 @@ function ChartsOnAxisClickHandler(props) {
       Object.keys(series).filter(seriesType => ['bar', 'line'].includes(seriesType)).forEach(seriesType => {
         series[seriesType]?.seriesOrder.forEach(seriesId => {
           const seriesItem = series[seriesType].series[seriesId];
-          const providedXAxisId = seriesItem.xAxisId ?? seriesItem.xAxisKey;
-          const providedYAxisId = seriesItem.yAxisId ?? seriesItem.yAxisKey;
+          const providedXAxisId = seriesItem.xAxisId;
+          const providedYAxisId = seriesItem.yAxisId;
           const axisKey = isXaxis ? providedXAxisId : providedYAxisId;
           if (axisKey === undefined || axisKey === USED_AXIS_ID) {
             seriesValues[seriesId] = seriesItem.data[dataIndex];

package/ChartsOverlay/ChartsOverlay.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { SxProps, Theme } from '@mui/material/styles';
-import { SlotComponentPropsFromProps } from '../internals/SlotComponentPropsFromProps';
+import { SlotComponentPropsFromProps } from '@mui/x-internals/types';
 export declare function useNoData(): boolean;
 export type CommonOverlayProps = React.SVGAttributes<SVGTextElement> & {
     /**

package/ChartsTooltip/ChartsAxisTooltipContent.js

@@ -40,14 +40,14 @@ function ChartsAxisTooltipContent(props) {
     Object.keys(series).filter(isCartesianSeriesType).forEach(seriesType => {
       series[seriesType].seriesOrder.forEach(seriesId => {
         const item = series[seriesType].series[seriesId];
-        const providedXAxisId = item.xAxisId ?? item.xAxisKey;
-        const providedYAxisId = item.yAxisId ?? item.yAxisKey;
+        const providedXAxisId = item.xAxisId;
+        const providedYAxisId = item.yAxisId;
         const axisKey = isXaxis ? providedXAxisId : providedYAxisId;
         if (axisKey === undefined || axisKey === USED_AXIS_ID) {
           const seriesToAdd = series[seriesType].series[seriesId];
           const xAxisId = providedXAxisId ?? xAxisIds[0];
           const yAxisId = providedYAxisId ?? yAxisIds[0];
-          const zAxisId = seriesToAdd.zAxisId ?? seriesToAdd.zAxisKey ?? zAxisIds[0];
+          const zAxisId = seriesToAdd.zAxisId ?? zAxisIds[0];
           const getColor = colorProcessors[seriesType]?.(seriesToAdd, xAxis[xAxisId], yAxis[yAxisId], zAxisId && zAxis[zAxisId]) ?? (() => '');
           rep.push(_extends({}, seriesToAdd, {
             getColor

package/ChartsTooltip/ChartsItemTooltipContent.js

@@ -30,9 +30,9 @@ function ChartsItemTooltipContent(props) {
     zAxisIds
   } = React.useContext(ZAxisContext);
   const colorProcessors = useColorProcessor();
-  const xAxisId = series.xAxisId ?? series.xAxisKey ?? xAxisIds[0];
-  const yAxisId = series.yAxisId ?? series.yAxisKey ?? yAxisIds[0];
-  const zAxisId = series.zAxisId ?? series.zAxisKey ?? zAxisIds[0];
+  const xAxisId = series.xAxisId ?? xAxisIds[0];
+  const yAxisId = series.yAxisId ?? yAxisIds[0];
+  const zAxisId = series.zAxisId ?? zAxisIds[0];
   const getColor = colorProcessors[series.type]?.(series, xAxisId && xAxis[xAxisId], yAxisId && yAxis[yAxisId], zAxisId && zAxis[zAxisId]) ?? (() => '');
   const Content = content ?? DefaultChartsItemTooltipContent;
   const chartTooltipContentProps = useSlotProps({