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

package/node/PieChart/PieArcPlot.js

@@ -45,7 +45,7 @@ function PieArcPlot(props) {
     faded,
     data
   });
-  const transition = (0, _web.useTransition)(transformedData, (0, _extends2.default)({}, _transition.defaultTransitionConfig, {
+  const transition = (0, _web.useTransition)(transformedData, (0, _extends2.default)({}, (0, _transition.getDefaultTransitionConfig)(skipAnimation), {
     immediate: skipAnimation
   }));
   if (data.length === 0) {

package/node/PieChart/PieChart.js

@@ -112,6 +112,9 @@ process.env.NODE_ENV !== "production" ? PieChart.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |
   // ----------------------------------------------------------------------
+  apiRef: _propTypes.default.shape({
+    current: _propTypes.default.object
+  }),
   children: _propTypes.default.node,
   className: _propTypes.default.string,
   /**
@@ -145,6 +148,11 @@ process.env.NODE_ENV !== "production" ? PieChart.propTypes = {
     dataIndex: _propTypes.default.number,
     seriesId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.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.default.string,
   /**
    * If `true`, a loading overlay is displayed.
    * @default false
@@ -154,7 +162,6 @@ process.env.NODE_ENV !== "production" ? PieChart.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.default.shape({
     bottom: _propTypes.default.number,
@@ -193,6 +200,7 @@ process.env.NODE_ENV !== "production" ? PieChart.propTypes = {
    */
   slots: _propTypes.default.object,
   sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object]),
+  theme: _propTypes.default.oneOf(['dark', 'light']),
   title: _propTypes.default.string,
   /**
    * The width of the chart in px. If not defined, it takes the width of the parent element.

package/node/PieChart/dataTransform/transition.js

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultTransitionConfig = exports.defaultLabelTransitionConfig = void 0;
-const defaultTransitionConfig = exports.defaultTransitionConfig = {
+exports.getDefaultTransitionConfig = exports.getDefaultLabelTransitionConfig = void 0;
+const getDefaultTransitionConfig = skipAnimation => ({
   keys: item => item.id,
-  from: ({
+  from: skipAnimation ? undefined : ({
     innerRadius,
     outerRadius,
     cornerRadius,
@@ -70,10 +70,11 @@ const defaultTransitionConfig = exports.defaultTransitionConfig = {
     friction: 14,
     clamp: true
   }
-};
-const defaultLabelTransitionConfig = exports.defaultLabelTransitionConfig = {
+});
+exports.getDefaultTransitionConfig = getDefaultTransitionConfig;
+const getDefaultLabelTransitionConfig = skipAnimation => ({
   keys: item => item.id,
-  from: ({
+  from: skipAnimation ? undefined : ({
     innerRadius,
     outerRadius,
     arcLabelRadius,
@@ -140,4 +141,5 @@ const defaultLabelTransitionConfig = exports.defaultLabelTransitionConfig = {
     friction: 14,
     clamp: true
   }
-};
+});
+exports.getDefaultLabelTransitionConfig = getDefaultLabelTransitionConfig;

package/node/PieChart/formatter.js

@@ -32,11 +32,14 @@ const formatter = params => {
   seriesOrder.forEach(seriesId => {
     const arcs = (0, _d3Shape.pie)().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] = (0, _extends2.default)({
+      labelMarkType: 'circle',
       valueFormatter: item => item.value.toLocaleString()
     }, series[seriesId], {
       data: series[seriesId].data.map((item, index) => (0, _extends2.default)({}, item, {
         id: item.id ?? `auto-generated-pie-id-${seriesId}-${index}`
-      }, arcs[index])).map((item, index) => (0, _extends2.default)({}, item, {
+      }, arcs[index])).map((item, index) => (0, _extends2.default)({
+        labelMarkType: 'circle'
+      }, item, {
         formattedValue: series[seriesId].valueFormatter?.((0, _extends2.default)({}, item, {
           label: (0, _getLabel.getLabel)(item.label, 'arc')
         }), {

package/node/PieChart/legend.js

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

package/node/PieChart/plugin.js

@@ -8,7 +8,6 @@ exports.plugin = void 0;
 var _formatter = _interopRequireDefault(require("./formatter"));
 var _getColor = _interopRequireDefault(require("./getColor"));
 const plugin = exports.plugin = {
-  seriesType: 'pie',
   colorProcessor: _getColor.default,
-  seriesFormatter: _formatter.default
+  seriesProcessor: _formatter.default
 };

package/node/ScatterChart/Scatter.js

@@ -15,8 +15,8 @@ var _useInteractionItemProps = require("../hooks/useInteractionItemProps");
 var _useStore = require("../internals/store/useStore");
 var _useSelector = require("../internals/store/useSelector");
 var _context = require("../context");
-var _useDrawingArea = require("../hooks/useDrawingArea");
 var _useChartInteraction = require("../internals/plugins/featurePlugins/useChartInteraction");
+var _ChartProvider = require("../context/ChartProvider");
 var _jsxRuntime = require("react/jsx-runtime");
 /**
  * Demos:
@@ -38,7 +38,9 @@ function Scatter(props) {
     markerSize,
     onItemClick
   } = props;
-  const drawingArea = (0, _useDrawingArea.useDrawingArea)();
+  const {
+    instance
+  } = (0, _ChartProvider.useChartContext)();
   const store = (0, _useStore.useStore)();
   const isVoronoiEnabled = (0, _useSelector.useSelector)(store, _useChartInteraction.selectorChartsInteractionIsVoronoiEnabled);
   const skipInteractionHandlers = isVoronoiEnabled || series.disableHover;
@@ -55,7 +57,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
       });
@@ -83,7 +85,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__*/(0, _jsxRuntime.jsx)("g", {
     children: cleanData.map(dataPoint => /*#__PURE__*/(0, _jsxRuntime.jsx)("circle", (0, _extends2.default)({
       cx: 0,

package/node/ScatterChart/ScatterChart.js

@@ -19,7 +19,6 @@ var _ChartsOverlay = require("../ChartsOverlay");
 var _ChartsAxisHighlight = require("../ChartsAxisHighlight");
 var _ChartsVoronoiHandler = require("../ChartsVoronoiHandler/ChartsVoronoiHandler");
 var _ChartsGrid = require("../ChartsGrid");
-var _ZAxisContextProvider = require("../context/ZAxisContextProvider");
 var _useScatterChartProps = require("./useScatterChartProps");
 var _useChartContainerProps = require("../ChartContainer/useChartContainerProps");
 var _context = require("../context");
@@ -44,7 +43,6 @@ const ScatterChart = exports.ScatterChart = /*#__PURE__*/React.forwardRef(functi
   const {
     chartsWrapperProps,
     chartContainerProps,
-    zAxisProps,
     voronoiHandlerProps,
     chartsAxisProps,
     gridProps,
@@ -61,15 +59,13 @@ const ScatterChart = exports.ScatterChart = /*#__PURE__*/React.forwardRef(functi
   const Tooltip = props.slots?.tooltip ?? _ChartsTooltip.ChartsTooltip;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_context.ChartDataProvider, (0, _extends2.default)({}, chartDataProviderProps, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ChartsWrapper.ChartsWrapper, (0, _extends2.default)({}, chartsWrapperProps, {
-      children: [!props.hideLegend && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsLegend.ChartsLegend, (0, _extends2.default)({}, legendProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsSurface.ChartsSurface, (0, _extends2.default)({}, chartsSurfaceProps, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ZAxisContextProvider.ZAxisContextProvider, (0, _extends2.default)({}, zAxisProps, {
-          children: [!props.disableVoronoi && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsVoronoiHandler.ChartsVoronoiHandler, (0, _extends2.default)({}, voronoiHandlerProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsAxis.ChartsAxis, (0, _extends2.default)({}, chartsAxisProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsGrid.ChartsGrid, (0, _extends2.default)({}, gridProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)("g", {
-            "data-drawing-container": true,
-            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ScatterPlot.ScatterPlot, (0, _extends2.default)({}, scatterPlotProps))
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsOverlay.ChartsOverlay, (0, _extends2.default)({}, overlayProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsAxisHighlight.ChartsAxisHighlight, (0, _extends2.default)({}, axisHighlightProps)), !props.loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(Tooltip, (0, _extends2.default)({
-            trigger: "item"
-          }, props.slotProps?.tooltip)), children]
-        }))
+      children: [!props.hideLegend && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsLegend.ChartsLegend, (0, _extends2.default)({}, legendProps)), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ChartsSurface.ChartsSurface, (0, _extends2.default)({}, chartsSurfaceProps, {
+        children: [!props.disableVoronoi && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsVoronoiHandler.ChartsVoronoiHandler, (0, _extends2.default)({}, voronoiHandlerProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsAxis.ChartsAxis, (0, _extends2.default)({}, chartsAxisProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsGrid.ChartsGrid, (0, _extends2.default)({}, gridProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)("g", {
+          "data-drawing-container": true,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ScatterPlot.ScatterPlot, (0, _extends2.default)({}, scatterPlotProps))
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsOverlay.ChartsOverlay, (0, _extends2.default)({}, overlayProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsAxisHighlight.ChartsAxisHighlight, (0, _extends2.default)({}, axisHighlightProps)), !props.loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(Tooltip, (0, _extends2.default)({
+          trigger: "item"
+        }, props.slotProps?.tooltip)), children]
       }))]
     }))
   }));
@@ -79,6 +75,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.default.shape({
+    current: _propTypes.default.object
+  }),
   /**
    * The configuration of axes highlight.
    * @see See {@link https://mui.com/x/react-charts/highlighting/ highlighting docs} for more details.
@@ -139,6 +138,11 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     dataIndex: _propTypes.default.number,
     seriesId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.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.default.string,
   /**
    * Indicate which axis to display the left of the charts.
    * Can be a string (the id of the axis) or an object `ChartsYAxisProps`.
@@ -154,7 +158,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.default.shape({
     bottom: _propTypes.default.number,
@@ -201,6 +204,7 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
    */
   slots: _propTypes.default.object,
   sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object]),
+  theme: _propTypes.default.oneOf(['dark', 'light']),
   title: _propTypes.default.string,
   /**
    * Indicate which axis to display the top of the charts.

package/node/ScatterChart/ScatterPlot.js

@@ -11,9 +11,9 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Scatter = require("./Scatter");
-var _CartesianProvider = require("../context/CartesianProvider");
 var _getColor = _interopRequireDefault(require("./getColor"));
 var _useSeries = require("../hooks/useSeries");
+var _hooks = require("../hooks");
 var _useZAxis = require("../hooks/useZAxis");
 var _jsxRuntime = require("react/jsx-runtime");
 /**
@@ -33,11 +33,18 @@ function ScatterPlot(props) {
     onItemClick
   } = props;
   const seriesData = (0, _useSeries.useScatterSeries)();
-  const axisData = (0, _CartesianProvider.useCartesianContext)();
+  const {
+    xAxis,
+    xAxisIds
+  } = (0, _hooks.useXAxes)();
+  const {
+    yAxis,
+    yAxisIds
+  } = (0, _hooks.useYAxes)();
   const {
     zAxis,
     zAxisIds
-  } = (0, _useZAxis.useZAxis)();
+  } = (0, _useZAxis.useZAxes)();
   if (seriesData === undefined) {
     return null;
   }
@@ -45,12 +52,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/node/ScatterChart/extremums.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getExtremumY = exports.getExtremumX = void 0;
-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])];
+};
 const getExtremumX = params => {
   const {
     series,

package/node/ScatterChart/formatter.js

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

package/node/ScatterChart/legend.js

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

package/node/ScatterChart/plugin.js

@@ -9,8 +9,7 @@ var _extremums = require("./extremums");
 var _formatter = _interopRequireDefault(require("./formatter"));
 var _getColor = _interopRequireDefault(require("./getColor"));
 const plugin = exports.plugin = {
-  seriesType: 'scatter',
-  seriesFormatter: _formatter.default,
+  seriesProcessor: _formatter.default,
   colorProcessor: _getColor.default,
   xExtremumGetter: _extremums.getExtremumX,
   yExtremumGetter: _extremums.getExtremumY

package/node/ScatterChart/useScatterChartProps.js

@@ -62,13 +62,11 @@ const useScatterChartProps = props => {
     colors,
     xAxis,
     yAxis,
+    zAxis,
     highlightedItem,
     onHighlightChange,
     className
   });
-  const zAxisProps = {
-    zAxis
-  };
   const voronoiHandlerProps = {
     voronoiMaxRadius,
     onItemClick: onItemClick
@@ -111,7 +109,6 @@ const useScatterChartProps = props => {
   return {
     chartsWrapperProps,
     chartContainerProps,
-    zAxisProps,
     voronoiHandlerProps,
     chartsAxisProps,
     gridProps,

package/node/SparkLineChart/SparkLineChart.js

@@ -89,7 +89,7 @@ const SparkLineChart = exports.SparkLineChart = /*#__PURE__*/React.forwardRef(fu
       hideTooltip: xAxis === undefined
     }, xAxis)],
     yAxis: [(0, _extends2.default)({
-      id: _constants.DEFAULT_X_AXIS_KEY
+      id: _constants.DEFAULT_Y_AXIS_KEY
     }, yAxis)],
     colors: colors,
     sx: sx,
@@ -119,6 +119,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.default.shape({
+    current: _propTypes.default.object
+  }),
   /**
    * Set to `true` to fill spark line area.
    * Has no effect if plotType='bar'.
@@ -166,6 +169,11 @@ process.env.NODE_ENV !== "production" ? SparkLineChart.propTypes = {
     dataIndex: _propTypes.default.number,
     seriesId: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.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.default.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.
@@ -222,6 +230,7 @@ process.env.NODE_ENV !== "production" ? SparkLineChart.propTypes = {
    */
   slots: _propTypes.default.object,
   sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object]),
+  theme: _propTypes.default.oneOf(['dark', 'light']),
   title: _propTypes.default.string,
   /**
    * Formatter used by the tooltip.