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

package/LineChart/LinePlot.js

@@ -7,14 +7,15 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
 import { line as d3Line } from '@mui/x-charts-vendor/d3-shape';
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
 import { LineElement, lineElementClasses } from "./LineElement.js";
 import { getValueToPositionMapper } from "../hooks/useScale.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/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const LinePlotRoot = styled('g', {
   name: 'MuiAreaPlot',
@@ -27,7 +28,15 @@ const LinePlotRoot = styled('g', {
 });
 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(() => {
@@ -38,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(({
@@ -55,12 +58,15 @@ const useAggregatedData = () => {
           yAxisId = defaultYAxisId,
           stackedData,
           data,
-          connectNulls
+          connectNulls,
+          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.`);
@@ -69,21 +75,51 @@ 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 linePath = d3Line().x(d => xScale(d.x)).defined((_, i) => connectNulls || data[i] != null).y(d => yScale(d.y[1]));
-        const formattedData = xData?.map((x, index) => ({
-          x,
-          y: stackedData[index]
-        })) ?? [];
-        const d3Data = connectNulls ? formattedData.filter((_, i) => data[i] != null) : formattedData;
-        const d = linePath.curve(getCurveFactory(series[seriesId].curve))(d3Data) || '';
+        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 linePath = d3Line().x(d => d.isExtension ? d.x : xPosition(d.x)).defined(d => connectNulls || !d.nullData || !!d.isExtension).y(d => yScale(d.y[1]));
+        const d = linePath.curve(getCurveFactory(curve))(d3Data) || '';
         return _extends({}, series[seriesId], {
-          gradientUsed,
+          gradientId,
           d,
           seriesId
         });
       });
     });
-  }, [seriesData, axisData]);
+  }, [seriesData, xAxisIds, yAxisIds, xAxis, yAxis, getGradientId]);
   return allData;
 };
 
@@ -106,20 +142,19 @@ function LinePlot(props) {
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const skipAnimation = useSkipAnimation(inSkipAnimation);
-  const getGradientId = useChartGradient();
   const completedData = useAggregatedData();
   return /*#__PURE__*/_jsx(LinePlotRoot, _extends({}, other, {
     children: completedData.map(({
       d,
       seriesId,
       color,
-      gradientUsed
+      gradientId
     }) => {
       return /*#__PURE__*/_jsx(LineElement, {
         id: seriesId,
         d: d,
         color: color,
-        gradientId: gradientUsed && getGradientId(...gradientUsed),
+        gradientId: gradientId,
         skipAnimation: skipAnimation,
         slots: slots,
         slotProps: slotProps,

package/LineChart/MarkPlot.d.ts

@@ -24,12 +24,6 @@ export interface MarkPlotProps extends React.SVGAttributes<SVGSVGElement>, Pick<
      * @param {LineItemIdentifier} lineItemIdentifier The line mark item identifier.
      */
     onItemClick?: (event: React.MouseEvent<SVGElement, MouseEvent>, lineItemIdentifier: LineItemIdentifier) => void;
-    /**
-     * If `true` the mark element will only be able to render circle.
-     * Giving fewer customization options, but saving around 40ms per 1.000 marks.
-     * @default false
-     */
-    experimentalRendering?: boolean;
 }
 /**
  * Demos:

package/LineChart/MarkPlot.js

@@ -2,20 +2,20 @@
 
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["slots", "slotProps", "skipAnimation", "onItemClick", "experimentalRendering"];
+const _excluded = ["slots", "slotProps", "skipAnimation", "onItemClick"];
 import PropTypes from 'prop-types';
 import * as React from 'react';
 import { DEFAULT_X_AXIS_KEY } from "../constants/index.js";
 import { useSkipAnimation } from "../context/AnimationProvider/index.js";
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
 import { useChartId } from "../hooks/useChartId.js";
-import { useDrawingArea } from "../hooks/useDrawingArea.js";
 import { getValueToPositionMapper } from "../hooks/useScale.js";
 import { useLineSeries } from "../hooks/useSeries.js";
 import { cleanId } from "../internals/cleanId.js";
 import { CircleMarkElement } from "./CircleMarkElement.js";
 import getColor from "./getColor.js";
 import { MarkElement } from "./MarkElement.js";
+import { useChartContext } from "../context/ChartProvider/index.js";
+import { useXAxes, useYAxes } from "../hooks/index.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Demos:
@@ -32,16 +32,23 @@ function MarkPlot(props) {
       slots,
       slotProps,
       skipAnimation: inSkipAnimation,
-      onItemClick,
-      experimentalRendering
+      onItemClick
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const skipAnimation = useSkipAnimation(inSkipAnimation);
   const seriesData = useLineSeries();
-  const axisData = useCartesianContext();
+  const {
+    xAxis,
+    xAxisIds
+  } = useXAxes();
+  const {
+    yAxis,
+    yAxisIds
+  } = useYAxes();
   const chartId = useChartId();
-  const drawingArea = useDrawingArea();
-  const Mark = slots?.mark ?? (experimentalRendering ? CircleMarkElement : MarkElement);
+  const {
+    instance
+  } = useChartContext();
   if (seriesData === undefined) {
     return null;
   }
@@ -49,12 +56,6 @@ function MarkPlot(props) {
     series,
     stackingGroups
   } = seriesData;
-  const {
-    xAxis,
-    yAxis,
-    xAxisIds,
-    yAxisIds
-  } = axisData;
   const defaultXAxisId = xAxisIds[0];
   const defaultYAxisId = yAxisIds[0];
   return /*#__PURE__*/_jsx("g", _extends({}, other, {
@@ -67,7 +68,8 @@ function MarkPlot(props) {
           yAxisId = defaultYAxisId,
           stackedData,
           data,
-          showMark = true
+          showMark = true,
+          shape = 'circle'
         } = series[seriesId];
         if (showMark === false) {
           return null;
@@ -81,6 +83,7 @@ function MarkPlot(props) {
         const clipId = cleanId(`${chartId}-${seriesId}-line-clip`); // We assume that if displaying line mark, the line will also be rendered
 
         const colorGetter = getColor(series[seriesId], xAxis[xAxisId], yAxis[yAxisId]);
+        const Mark = slots?.mark ?? (shape === 'circle' ? CircleMarkElement : MarkElement);
         return /*#__PURE__*/_jsx("g", {
           clipPath: `url(#${clipId})`,
           children: xData?.map((x, index) => {
@@ -103,7 +106,7 @@ function MarkPlot(props) {
               // Remove missing data point
               return false;
             }
-            if (!drawingArea.isPointInside({
+            if (!instance.isPointInside({
               x,
               y
             })) {
@@ -128,7 +131,7 @@ function MarkPlot(props) {
             return /*#__PURE__*/_jsx(Mark, _extends({
               id: seriesId,
               dataIndex: index,
-              shape: "circle",
+              shape: shape,
               color: colorGetter(index),
               x: x,
               y: y // Don't know why TS doesn't get from the filter that y can't be null
@@ -151,12 +154,6 @@ process.env.NODE_ENV !== "production" ? MarkPlot.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |
   // ----------------------------------------------------------------------
-  /**
-   * If `true` the mark element will only be able to render circle.
-   * Giving fewer customization options, but saving around 40ms per 1.000 marks.
-   * @default false
-   */
-  experimentalRendering: PropTypes.bool,
   /**
    * Callback fired when a line mark item is clicked.
    * @param {React.MouseEvent<SVGPathElement, MouseEvent>} event The event source of the callback.

package/LineChart/extremums.d.ts

@@ -1,3 +1,3 @@
-import { ExtremumGetter } from '../context/PluginProvider/ExtremumGetter.types';
-export declare const getExtremumX: ExtremumGetter<'line'>;
-export declare const getExtremumY: ExtremumGetter<'line'>;
+import { CartesianExtremumGetter } from '../internals/plugins/models/seriesConfig/extremumGetter.types';
+export declare const getExtremumX: CartesianExtremumGetter<'line'>;
+export declare const getExtremumY: CartesianExtremumGetter<'line'>;

package/LineChart/formatter.d.ts

@@ -1,3 +1,3 @@
-import { SeriesFormatter } from '../context/PluginProvider/SeriesFormatter.types';
-declare const formatter: SeriesFormatter<'line'>;
+import { SeriesProcessor } from '../internals/plugins/models';
+declare const formatter: SeriesProcessor<'line'>;
 export default formatter;

package/LineChart/formatter.js

@@ -49,7 +49,9 @@ const formatter = (params, dataset) => {
     .order(stackingOrder).offset(stackingOffset)(d3Dataset);
     ids.forEach((id, index) => {
       const dataKey = series[id].dataKey;
-      completedSeries[id] = _extends({}, series[id], {
+      completedSeries[id] = _extends({
+        labelMarkType: 'line'
+      }, series[id], {
         data: dataKey ? dataset.map(data => {
           const value = data[dataKey];
           if (typeof value !== 'number') {

package/LineChart/getColor.d.ts

@@ -1,3 +1,3 @@
-import { ColorProcessor } from '../context/PluginProvider/ColorProcessor.types';
+import { ColorProcessor } from '../internals/plugins/models';
 declare const getColor: ColorProcessor<'line'>;
 export default getColor;

package/LineChart/legend.d.ts

@@ -1,3 +1,3 @@
-import { LegendGetter } from '../context/PluginProvider';
+import { LegendGetter } from '../internals/plugins/models';
 declare const legendGetter: LegendGetter<'line'>;
 export default legendGetter;

package/LineChart/legend.js

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

package/LineChart/plugin.d.ts

@@ -1,2 +1,2 @@
-import type { ChartsPlugin } from '../context/PluginProvider';
-export declare const plugin: ChartsPlugin<'line'>;
+import { ChartSeriesTypeConfig } from '../internals/plugins/models/seriesConfig';
+export declare const plugin: ChartSeriesTypeConfig<'line'>;

package/LineChart/plugin.js

@@ -1,10 +1,11 @@
 import { getExtremumX, getExtremumY } from "./extremums.js";
 import formatter from "./formatter.js";
 import getColor from "./getColor.js";
+import legendGetter from "./legend.js";
 export const plugin = {
-  seriesType: 'line',
   colorProcessor: getColor,
-  seriesFormatter: formatter,
+  seriesProcessor: formatter,
+  legendGetter,
   xExtremumGetter: getExtremumX,
   yExtremumGetter: getExtremumY
 };

package/LineChart/useLineChartProps.d.ts

@@ -21,7 +21,7 @@ import type { ChartsWrapperProps } from '../internals/components/ChartsWrapper';
  */
 export declare const useLineChartProps: (props: LineChartProps) => {
     chartsWrapperProps: Omit<ChartsWrapperProps, "children">;
-    chartContainerProps: ChartContainerProps;
+    chartContainerProps: Omit<ChartContainerProps<"line">, "plugins">;
     axisClickHandlerProps: ChartsOnAxisClickHandlerProps;
     gridProps: ChartsGridProps;
     clipPathProps: ChartsClipPathProps;

package/LineChart/useLineChartProps.js

@@ -2,7 +2,7 @@
 
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["xAxis", "yAxis", "series", "width", "height", "margin", "colors", "dataset", "sx", "onAxisClick", "onAreaClick", "onLineClick", "onMarkClick", "axisHighlight", "disableLineItemHighlight", "hideLegend", "grid", "topAxis", "leftAxis", "rightAxis", "bottomAxis", "children", "slots", "slotProps", "skipAnimation", "loading", "highlightedItem", "onHighlightChange", "className", "experimentalMarkRendering"];
+const _excluded = ["xAxis", "yAxis", "series", "width", "height", "margin", "colors", "dataset", "sx", "onAxisClick", "onAreaClick", "onLineClick", "onMarkClick", "axisHighlight", "disableLineItemHighlight", "hideLegend", "grid", "topAxis", "leftAxis", "rightAxis", "bottomAxis", "children", "slots", "slotProps", "skipAnimation", "loading", "highlightedItem", "onHighlightChange", "className"];
 import useId from '@mui/utils/useId';
 import { DEFAULT_X_AXIS_KEY } from "../constants/index.js";
 import { calculateMargins } from "../internals/calculateMargins.js";
@@ -44,8 +44,7 @@ export const useLineChartProps = props => {
       loading,
       highlightedItem,
       onHighlightChange,
-      className,
-      experimentalMarkRendering
+      className
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const id = useId();
@@ -106,8 +105,7 @@ export const useLineChartProps = props => {
     slots,
     slotProps,
     onItemClick: onMarkClick,
-    skipAnimation,
-    experimentalRendering: experimentalMarkRendering
+    skipAnimation
   };
   const overlayProps = {
     slots,

package/PieChart/PieArcLabelPlot.js

@@ -7,7 +7,7 @@ const _excluded = ["arcLabel", "arcLabelMinAngle", "arcLabelRadius", "cornerRadi
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useTransition } from '@react-spring/web';
-import { defaultLabelTransitionConfig } from "./dataTransform/transition.js";
+import { getDefaultLabelTransitionConfig } from "./dataTransform/transition.js";
 import { useTransformData } from "./dataTransform/useTransformData.js";
 import { PieArcLabel } from "./PieArcLabel.js";
 import { getLabel } from "../internals/getLabel.js";
@@ -65,7 +65,7 @@ function PieArcLabelPlot(props) {
     faded,
     data
   });
-  const transition = useTransition(transformedData, _extends({}, defaultLabelTransitionConfig, {
+  const transition = useTransition(transformedData, _extends({}, getDefaultLabelTransitionConfig(skipAnimation), {
     immediate: skipAnimation
   }));
   if (data.length === 0) {

package/PieChart/PieArcPlot.js

@@ -7,7 +7,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useTransition } from '@react-spring/web';
 import { PieArc } from "./PieArc.js";
-import { defaultTransitionConfig } from "./dataTransform/transition.js";
+import { getDefaultTransitionConfig } from "./dataTransform/transition.js";
 import { useTransformData } from "./dataTransform/useTransformData.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 function PieArcPlot(props) {
@@ -38,7 +38,7 @@ function PieArcPlot(props) {
     faded,
     data
   });
-  const transition = useTransition(transformedData, _extends({}, defaultTransitionConfig, {
+  const transition = useTransition(transformedData, _extends({}, getDefaultTransitionConfig(skipAnimation), {
     immediate: skipAnimation
   }));
   if (data.length === 0) {

package/PieChart/PieChart.js

@@ -11,7 +11,7 @@ import { ChartsLegend } from "../ChartsLegend/index.js";
 import { PiePlot } from "./PiePlot.js";
 import { ChartsOverlay } from "../ChartsOverlay/index.js";
 import { ChartsSurface } from "../ChartsSurface/index.js";
-import { ChartDataProvider } from "../context/index.js";
+import { ChartDataProvider } from "../ChartDataProvider/index.js";
 import { useChartContainerProps } from "../ChartContainer/useChartContainerProps.js";
 import { ChartsWrapper } from "../internals/components/ChartsWrapper/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -105,6 +105,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.shape({
+    current: PropTypes.object
+  }),
   children: PropTypes.node,
   className: PropTypes.string,
   /**
@@ -138,6 +141,11 @@ process.env.NODE_ENV !== "production" ? PieChart.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,
   /**
    * If `true`, a loading overlay is displayed.
    * @default false
@@ -147,7 +155,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.shape({
     bottom: PropTypes.number,
@@ -186,6 +193,7 @@ process.env.NODE_ENV !== "production" ? PieChart.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,
   /**
    * The width of the chart in px. If not defined, it takes the width of the parent element.

package/PieChart/dataTransform/transition.d.ts

@@ -1,4 +1,4 @@
 import { UseTransitionProps } from '@react-spring/web';
 import { ValueWithHighlight } from './useTransformData';
-export declare const defaultTransitionConfig: UseTransitionProps<ValueWithHighlight>;
-export declare const defaultLabelTransitionConfig: UseTransitionProps<ValueWithHighlight>;
+export declare const getDefaultTransitionConfig: (skipAnimation?: boolean) => UseTransitionProps<ValueWithHighlight>;
+export declare const getDefaultLabelTransitionConfig: (skipAnimation?: boolean) => UseTransitionProps<ValueWithHighlight>;

package/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/PieChart/formatter.d.ts

@@ -1,3 +1,3 @@
-import { SeriesFormatter } from '../context/PluginProvider/SeriesFormatter.types';
-declare const formatter: SeriesFormatter<'pie'>;
+import { SeriesProcessor } from '../internals/plugins/models';
+declare const formatter: SeriesProcessor<'pie'>;
 export default formatter;

package/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/PieChart/getColor.d.ts

@@ -1,3 +1,3 @@
-import { ColorProcessor } from '../context/PluginProvider/ColorProcessor.types';
+import { ColorProcessor } from '../internals/plugins/models';
 declare const getColor: ColorProcessor<'pie'>;
 export default getColor;

package/PieChart/getPieCoordinates.d.ts

@@ -1,6 +1,6 @@
-import { DrawingAreaState } from '../context/DrawingAreaProvider';
+import { ChartDrawingArea } from '../hooks';
 import { DefaultizedPieSeriesType } from '../models/seriesType/pie';
-export declare function getPieCoordinates(series: Pick<DefaultizedPieSeriesType, 'cx' | 'cy'>, drawing: Pick<DrawingAreaState, 'width' | 'height'>): {
+export declare function getPieCoordinates(series: Pick<DefaultizedPieSeriesType, 'cx' | 'cy'>, drawing: Pick<ChartDrawingArea, 'width' | 'height'>): {
     cx: number;
     cy: number;
     availableRadius: number;

package/PieChart/legend.d.ts

@@ -1,3 +1,3 @@
-import { LegendGetter } from '../context/PluginProvider';
+import { LegendGetter } from '../internals/plugins/models';
 declare const legendGetter: LegendGetter<'pie'>;
 export default legendGetter;

package/PieChart/legend.js

@@ -11,7 +11,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/PieChart/plugin.d.ts

@@ -1,2 +1,2 @@
-import type { ChartsPlugin } from '../context/PluginProvider';
-export declare const plugin: ChartsPlugin<'pie'>;
+import { ChartSeriesTypeConfig } from '../internals/plugins/models/seriesConfig';
+export declare const plugin: ChartSeriesTypeConfig<'pie'>;

package/PieChart/plugin.js

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

package/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/ScatterChart/ScatterChart.d.ts

@@ -11,12 +11,11 @@ import { ChartsAxisHighlightProps } from '../ChartsAxisHighlight';
 import { ChartsAxisSlots, ChartsAxisSlotProps } from '../models/axis';
 import { ChartsVoronoiHandlerProps } from '../ChartsVoronoiHandler/ChartsVoronoiHandler';
 import { ChartsGridProps } from '../ChartsGrid';
-import { ZAxisContextProviderProps } from '../context/ZAxisContextProvider';
 export interface ScatterChartSlots extends ChartsAxisSlots, ScatterPlotSlots, ChartsLegendSlots, ChartsOverlaySlots, ChartsTooltipSlots {
 }
 export interface ScatterChartSlotProps extends ChartsAxisSlotProps, ScatterPlotSlotProps, ChartsLegendSlotProps, ChartsOverlaySlotProps, ChartsTooltipSlotProps {
 }
-export interface ScatterChartProps extends Omit<ChartContainerProps, 'series' | 'plugins'>, Omit<ZAxisContextProviderProps, 'children' | 'dataset'>, Omit<ChartsAxisProps, 'slots' | 'slotProps'>, Omit<ChartsOverlayProps, 'slots' | 'slotProps'>, Omit<ChartsVoronoiHandlerProps, 'onItemClick'> {
+export interface ScatterChartProps extends Omit<ChartContainerProps, 'series' | 'plugins'>, Omit<ChartsAxisProps, 'slots' | 'slotProps'>, Omit<ChartsOverlayProps, 'slots' | 'slotProps'>, Omit<ChartsVoronoiHandlerProps, 'onItemClick'> {
     /**
      * The series to display in the scatter chart.
      * An array of [[ScatterSeriesType]] objects.