@mui/x-charts 8.0.0-alpha.6 → 8.0.0-alpha.8

package/modern/PieChart/dataTransform/transition.js

@@ -1,6 +1,6 @@
-export const defaultTransitionConfig = {
+export const getDefaultTransitionConfig = skipAnimation => ({
   keys: item => item.id,
-  from: ({
+  from: skipAnimation ? undefined : ({
     innerRadius,
     outerRadius,
     cornerRadius,
@@ -64,10 +64,10 @@ export const defaultTransitionConfig = {
     friction: 14,
     clamp: true
   }
-};
-export const defaultLabelTransitionConfig = {
+});
+export const getDefaultLabelTransitionConfig = skipAnimation => ({
   keys: item => item.id,
-  from: ({
+  from: skipAnimation ? undefined : ({
     innerRadius,
     outerRadius,
     arcLabelRadius,
@@ -134,4 +134,4 @@ export const defaultLabelTransitionConfig = {
     friction: 14,
     clamp: true
   }
-};
+});

package/modern/PieChart/formatter.js

@@ -25,11 +25,14 @@ const formatter = params => {
   seriesOrder.forEach(seriesId => {
     const arcs = d3Pie().startAngle(2 * Math.PI * (series[seriesId].startAngle ?? 0) / 360).endAngle(2 * Math.PI * (series[seriesId].endAngle ?? 360) / 360).padAngle(2 * Math.PI * (series[seriesId].paddingAngle ?? 0) / 360).sortValues(getSortingComparator(series[seriesId].sortingValues ?? 'none'))(series[seriesId].data.map(piePoint => piePoint.value));
     defaultizedSeries[seriesId] = _extends({
+      labelMarkType: 'circle',
       valueFormatter: item => item.value.toLocaleString()
     }, series[seriesId], {
       data: series[seriesId].data.map((item, index) => _extends({}, item, {
         id: item.id ?? `auto-generated-pie-id-${seriesId}-${index}`
-      }, arcs[index])).map((item, index) => _extends({}, item, {
+      }, arcs[index])).map((item, index) => _extends({
+        labelMarkType: 'circle'
+      }, item, {
         formattedValue: series[seriesId].valueFormatter?.(_extends({}, item, {
           label: getLabel(item.label, 'arc')
         }), {

package/modern/PieChart/legend.js

@@ -11,6 +11,7 @@ const legendGetter = params => {
         return;
       }
       acc.push({
+        markType: series[seriesId].labelMarkType,
         id: item.id,
         seriesId,
         color: item.color,

package/modern/PieChart/plugin.js

@@ -1,7 +1,6 @@
 import formatter from "./formatter.js";
 import getColor from "./getColor.js";
 export const plugin = {
-  seriesType: 'pie',
   colorProcessor: getColor,
-  seriesFormatter: formatter
+  seriesProcessor: formatter
 };

package/modern/ScatterChart/Scatter.js

@@ -8,8 +8,8 @@ import { useInteractionItemProps } from "../hooks/useInteractionItemProps.js";
 import { useStore } from "../internals/store/useStore.js";
 import { useSelector } from "../internals/store/useSelector.js";
 import { useHighlighted } from "../context/index.js";
-import { useDrawingArea } from "../hooks/useDrawingArea.js";
 import { selectorChartsInteractionIsVoronoiEnabled } from "../internals/plugins/featurePlugins/useChartInteraction/index.js";
+import { useChartContext } from "../context/ChartProvider/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Demos:
@@ -31,7 +31,9 @@ function Scatter(props) {
     markerSize,
     onItemClick
   } = props;
-  const drawingArea = useDrawingArea();
+  const {
+    instance
+  } = useChartContext();
   const store = useStore();
   const isVoronoiEnabled = useSelector(store, selectorChartsInteractionIsVoronoiEnabled);
   const skipInteractionHandlers = isVoronoiEnabled || series.disableHover;
@@ -48,7 +50,7 @@ function Scatter(props) {
       const scatterPoint = series.data[i];
       const x = getXPosition(scatterPoint.x);
       const y = getYPosition(scatterPoint.y);
-      const isInRange = drawingArea.isPointInside({
+      const isInRange = instance.isPointInside({
         x,
         y
       });
@@ -76,7 +78,7 @@ function Scatter(props) {
       }
     }
     return temp;
-  }, [xScale, yScale, drawingArea, series.data, series.id, isHighlighted, isFaded, getInteractionItemProps, colorGetter, color]);
+  }, [xScale, yScale, series.data, series.id, isHighlighted, isFaded, getInteractionItemProps, colorGetter, color, instance]);
   return /*#__PURE__*/_jsx("g", {
     children: cleanData.map(dataPoint => /*#__PURE__*/_jsx("circle", _extends({
       cx: 0,

package/modern/ScatterChart/ScatterChart.js

@@ -5,7 +5,6 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useThemeProps } from '@mui/material/styles';
 import { ScatterPlot } from "./ScatterPlot.js";
-import { ChartContainer } from "../ChartContainer/index.js";
 import { ChartsAxis } from "../ChartsAxis/index.js";
 import { ChartsTooltip } from "../ChartsTooltip/index.js";
 import { ChartsLegend } from "../ChartsLegend/index.js";
@@ -13,8 +12,11 @@ import { ChartsOverlay } from "../ChartsOverlay/index.js";
 import { ChartsAxisHighlight } from "../ChartsAxisHighlight/index.js";
 import { ChartsVoronoiHandler } from "../ChartsVoronoiHandler/ChartsVoronoiHandler.js";
 import { ChartsGrid } from "../ChartsGrid/index.js";
-import { ZAxisContextProvider } from "../context/ZAxisContextProvider.js";
 import { useScatterChartProps } from "./useScatterChartProps.js";
+import { useChartContainerProps } from "../ChartContainer/useChartContainerProps.js";
+import { ChartDataProvider } from "../context/index.js";
+import { ChartsSurface } from "../ChartsSurface/index.js";
+import { ChartsWrapper } from "../internals/components/ChartsWrapper/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * Demos:
@@ -32,8 +34,8 @@ const ScatterChart = /*#__PURE__*/React.forwardRef(function ScatterChart(inProps
     name: 'MuiScatterChart'
   });
   const {
+    chartsWrapperProps,
     chartContainerProps,
-    zAxisProps,
     voronoiHandlerProps,
     chartsAxisProps,
     gridProps,
@@ -43,17 +45,21 @@ const ScatterChart = /*#__PURE__*/React.forwardRef(function ScatterChart(inProps
     axisHighlightProps,
     children
   } = useScatterChartProps(props);
+  const {
+    chartDataProviderProps,
+    chartsSurfaceProps
+  } = useChartContainerProps(chartContainerProps, ref);
   const Tooltip = props.slots?.tooltip ?? ChartsTooltip;
-  return /*#__PURE__*/_jsx(ChartContainer, _extends({
-    ref: ref
-  }, chartContainerProps, {
-    children: /*#__PURE__*/_jsxs(ZAxisContextProvider, _extends({}, zAxisProps, {
-      children: [!props.disableVoronoi && /*#__PURE__*/_jsx(ChartsVoronoiHandler, _extends({}, voronoiHandlerProps)), /*#__PURE__*/_jsx(ChartsAxis, _extends({}, chartsAxisProps)), /*#__PURE__*/_jsx(ChartsGrid, _extends({}, gridProps)), /*#__PURE__*/_jsx("g", {
-        "data-drawing-container": true,
-        children: /*#__PURE__*/_jsx(ScatterPlot, _extends({}, scatterPlotProps))
-      }), /*#__PURE__*/_jsx(ChartsOverlay, _extends({}, overlayProps)), !props.hideLegend && /*#__PURE__*/_jsx(ChartsLegend, _extends({}, legendProps)), /*#__PURE__*/_jsx(ChartsAxisHighlight, _extends({}, axisHighlightProps)), !props.loading && /*#__PURE__*/_jsx(Tooltip, _extends({
-        trigger: "item"
-      }, props.slotProps?.tooltip)), children]
+  return /*#__PURE__*/_jsx(ChartDataProvider, _extends({}, chartDataProviderProps, {
+    children: /*#__PURE__*/_jsxs(ChartsWrapper, _extends({}, chartsWrapperProps, {
+      children: [!props.hideLegend && /*#__PURE__*/_jsx(ChartsLegend, _extends({}, legendProps)), /*#__PURE__*/_jsxs(ChartsSurface, _extends({}, chartsSurfaceProps, {
+        children: [!props.disableVoronoi && /*#__PURE__*/_jsx(ChartsVoronoiHandler, _extends({}, voronoiHandlerProps)), /*#__PURE__*/_jsx(ChartsAxis, _extends({}, chartsAxisProps)), /*#__PURE__*/_jsx(ChartsGrid, _extends({}, gridProps)), /*#__PURE__*/_jsx("g", {
+          "data-drawing-container": true,
+          children: /*#__PURE__*/_jsx(ScatterPlot, _extends({}, scatterPlotProps))
+        }), /*#__PURE__*/_jsx(ChartsOverlay, _extends({}, overlayProps)), /*#__PURE__*/_jsx(ChartsAxisHighlight, _extends({}, axisHighlightProps)), !props.loading && /*#__PURE__*/_jsx(Tooltip, _extends({
+          trigger: "item"
+        }, props.slotProps?.tooltip)), children]
+      }))]
     }))
   }));
 });
@@ -62,6 +68,9 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |
   // ----------------------------------------------------------------------
+  apiRef: PropTypes.shape({
+    current: PropTypes.object
+  }),
   /**
    * The configuration of axes highlight.
    * @see See {@link https://mui.com/x/react-charts/highlighting/ highlighting docs} for more details.
@@ -122,6 +131,11 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     dataIndex: PropTypes.number,
     seriesId: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
   }),
+  /**
+   * 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,
   /**
    * Indicate which axis to display the left of the charts.
    * Can be a string (the id of the axis) or an object `ChartsYAxisProps`.
@@ -137,7 +151,6 @@ process.env.NODE_ENV !== "production" ? ScatterChart.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,
@@ -184,6 +197,7 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
    */
   slots: PropTypes.object,
   sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
+  theme: PropTypes.oneOf(['dark', 'light']),
   title: PropTypes.string,
   /**
    * Indicate which axis to display the top of the charts.

package/modern/ScatterChart/ScatterPlot.js

@@ -4,10 +4,10 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { Scatter } from "./Scatter.js";
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
 import getColor from "./getColor.js";
 import { useScatterSeries } from "../hooks/useSeries.js";
-import { useZAxis } from "../hooks/useZAxis.js";
+import { useXAxes, useYAxes } from "../hooks/index.js";
+import { useZAxes } from "../hooks/useZAxis.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Demos:
@@ -26,11 +26,18 @@ function ScatterPlot(props) {
     onItemClick
   } = props;
   const seriesData = useScatterSeries();
-  const axisData = useCartesianContext();
+  const {
+    xAxis,
+    xAxisIds
+  } = useXAxes();
+  const {
+    yAxis,
+    yAxisIds
+  } = useYAxes();
   const {
     zAxis,
     zAxisIds
-  } = useZAxis();
+  } = useZAxes();
   if (seriesData === undefined) {
     return null;
   }
@@ -38,12 +45,6 @@ function ScatterPlot(props) {
     series,
     seriesOrder
   } = seriesData;
-  const {
-    xAxis,
-    yAxis,
-    xAxisIds,
-    yAxisIds
-  } = axisData;
   const defaultXAxisId = xAxisIds[0];
   const defaultYAxisId = yAxisIds[0];
   const defaultZAxisId = zAxisIds[0];

package/modern/ScatterChart/extremums.js

@@ -1,4 +1,6 @@
-const mergeMinMax = (acc, val) => [val[0] === null ? acc[0] : Math.min(acc[0], val[0]), val[1] === null ? acc[1] : Math.max(acc[1], val[1])];
+const mergeMinMax = (acc, val) => {
+  return [val[0] === null ? acc[0] : Math.min(acc[0], val[0]), val[1] === null ? acc[1] : Math.max(acc[1], val[1])];
+};
 export const getExtremumX = params => {
   const {
     series,

package/modern/ScatterChart/formatter.js

@@ -17,7 +17,9 @@ const formatter = ({
         id: d[datasetKeys.id]
       };
     }) ?? [];
-    return [seriesId, _extends({}, seriesData, {
+    return [seriesId, _extends({
+      labelMarkType: 'circle'
+    }, seriesData, {
       data,
       valueFormatter: seriesData.valueFormatter ?? (v => v && `(${v.x}, ${v.y})`)
     })];

package/modern/ScatterChart/legend.js

@@ -10,6 +10,7 @@ const legendGetter = params => {
       return acc;
     }
     acc.push({
+      markType: series[seriesId].labelMarkType,
       id: seriesId,
       seriesId,
       color: series[seriesId].color,

package/modern/ScatterChart/plugin.js

@@ -2,8 +2,7 @@ import { getExtremumX, getExtremumY } from "./extremums.js";
 import formatter from "./formatter.js";
 import getColor from "./getColor.js";
 export const plugin = {
-  seriesType: 'scatter',
-  seriesFormatter: formatter,
+  seriesProcessor: formatter,
   colorProcessor: getColor,
   xExtremumGetter: getExtremumX,
   yExtremumGetter: getExtremumY

package/modern/ScatterChart/useScatterChartProps.js

@@ -3,6 +3,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 const _excluded = ["xAxis", "yAxis", "zAxis", "series", "axisHighlight", "voronoiMaxRadius", "disableVoronoi", "hideLegend", "width", "height", "margin", "colors", "sx", "grid", "topAxis", "leftAxis", "rightAxis", "bottomAxis", "onItemClick", "children", "slots", "slotProps", "loading", "highlightedItem", "onHighlightChange", "className"];
+import { calculateMargins } from "../internals/calculateMargins.js";
+
 /**
  * A helper function that extracts ScatterChartProps from the input props
  * and returns an object with props for the children components of ScatterChart.
@@ -19,6 +21,7 @@ export const useScatterChartProps = props => {
       axisHighlight,
       voronoiMaxRadius,
       disableVoronoi,
+      hideLegend,
       width,
       height,
       margin,
@@ -45,18 +48,20 @@ export const useScatterChartProps = props => {
     }, s)),
     width,
     height,
-    margin,
+    margin: calculateMargins({
+      margin,
+      hideLegend,
+      slotProps,
+      series
+    }),
     colors,
     xAxis,
     yAxis,
-    sx,
+    zAxis,
     highlightedItem,
     onHighlightChange,
     className
   });
-  const zAxisProps = {
-    zAxis
-  };
   const voronoiHandlerProps = {
     voronoiMaxRadius,
     onItemClick: onItemClick
@@ -91,9 +96,14 @@ export const useScatterChartProps = props => {
     y: 'none',
     x: 'none'
   }, axisHighlight);
+  const chartsWrapperProps = {
+    sx,
+    legendPosition: props.slotProps?.legend?.position,
+    legendDirection: props.slotProps?.legend?.direction
+  };
   return {
+    chartsWrapperProps,
     chartContainerProps,
-    zAxisProps,
     voronoiHandlerProps,
     chartsAxisProps,
     gridProps,

package/modern/SparkLineChart/SparkLineChart.js

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 import { BarPlot } from "../BarChart/index.js";
 import { LinePlot, AreaPlot, LineHighlightPlot } from "../LineChart/index.js";
 import { ChartContainer } from "../ChartContainer/index.js";
-import { DEFAULT_X_AXIS_KEY } from "../constants/index.js";
+import { DEFAULT_X_AXIS_KEY, DEFAULT_Y_AXIS_KEY } from "../constants/index.js";
 import { ChartsTooltip } from "../ChartsTooltip/index.js";
 import { ChartsAxisHighlight } from "../ChartsAxisHighlight/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -82,7 +82,7 @@ const SparkLineChart = /*#__PURE__*/React.forwardRef(function SparkLineChart(pro
       hideTooltip: xAxis === undefined
     }, xAxis)],
     yAxis: [_extends({
-      id: DEFAULT_X_AXIS_KEY
+      id: DEFAULT_Y_AXIS_KEY
     }, yAxis)],
     colors: colors,
     sx: sx,
@@ -90,10 +90,7 @@ const SparkLineChart = /*#__PURE__*/React.forwardRef(function SparkLineChart(pro
     children: [plotType === 'bar' && /*#__PURE__*/_jsx(BarPlot, {
       skipAnimation: true,
       slots: slots,
-      slotProps: slotProps,
-      sx: {
-        shapeRendering: 'auto'
-      }
+      slotProps: slotProps
     }), plotType === 'line' && /*#__PURE__*/_jsxs(React.Fragment, {
       children: [/*#__PURE__*/_jsx(AreaPlot, {
         skipAnimation: true,
@@ -115,6 +112,9 @@ process.env.NODE_ENV !== "production" ? SparkLineChart.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |
   // ----------------------------------------------------------------------
+  apiRef: PropTypes.shape({
+    current: PropTypes.object
+  }),
   /**
    * Set to `true` to fill spark line area.
    * Has no effect if plotType='bar'.
@@ -162,6 +162,11 @@ process.env.NODE_ENV !== "production" ? SparkLineChart.propTypes = {
     dataIndex: PropTypes.number,
     seriesId: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
   }),
+  /**
+   * 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 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.
@@ -218,6 +223,7 @@ process.env.NODE_ENV !== "production" ? SparkLineChart.propTypes = {
    */
   slots: PropTypes.object,
   sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
+  theme: PropTypes.oneOf(['dark', 'light']),
   title: PropTypes.string,
   /**
    * Formatter used by the tooltip.

package/modern/constants/index.js

@@ -5,4 +5,5 @@ export const DEFAULT_MARGINS = {
   bottom: 50,
   left: 50,
   right: 50
-};
+};
+export const DEFAULT_LEGEND_FACING_MARGIN = 20;