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

package/PieChart/dataTransform/useTransformData.js

@@ -2,7 +2,7 @@
 
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import { useHighlighted } from "../../context/index.js";
+import { useItemHighlightedGetter } from "../../hooks/useItemHighlightedGetter.js";
 export function useTransformData(series) {
   const {
     id: seriesId,
@@ -18,7 +18,7 @@ export function useTransformData(series) {
   const {
     isFaded: isItemFaded,
     isHighlighted: isItemHighlighted
-  } = useHighlighted();
+  } = useItemHighlightedGetter();
   const dataWithHighlight = React.useMemo(() => data.map((item, itemIndex) => {
     const currentItem = {
       seriesId,
@@ -35,6 +35,7 @@ export function useTransformData(series) {
     const cornerRadius = attributesOverride.cornerRadius ?? baseCornerRadius;
     const arcLabelRadius = attributesOverride.arcLabelRadius ?? baseArcLabelRadius ?? (innerRadius + outerRadius) / 2;
     return _extends({}, item, attributesOverride, {
+      dataIndex: itemIndex,
       isFaded,
       isHighlighted,
       paddingAngle,

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

@@ -5,17 +5,18 @@ const legendGetter = params => {
     series
   } = params;
   return seriesOrder.reduce((acc, seriesId) => {
-    series[seriesId].data.forEach(item => {
+    series[seriesId].data.forEach((item, dataIndex) => {
       const formattedLabel = getLabel(item.label, 'legend');
       if (formattedLabel === undefined) {
         return;
       }
       acc.push({
-        id: item.id,
+        markType: item.labelMarkType ?? series[seriesId].labelMarkType,
+        id: item.id ?? dataIndex,
         seriesId,
         color: item.color,
         label: formattedLabel,
-        itemId: item.id
+        itemId: item.id ?? dataIndex
       });
     });
     return acc;

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,10 @@
 import formatter from "./formatter.js";
 import getColor from "./getColor.js";
+import legendGetter from "./legend.js";
+import tooltipGetter from "./tooltip.js";
 export const plugin = {
-  seriesType: 'pie',
   colorProcessor: getColor,
-  seriesFormatter: formatter
+  seriesProcessor: formatter,
+  legendGetter,
+  tooltipGetter
 };

package/PieChart/tooltip.d.ts

@@ -0,0 +1,3 @@
+import type { TooltipGetter } from '../internals/plugins/models';
+declare const tooltipGetter: TooltipGetter<'pie'>;
+export default tooltipGetter;

package/PieChart/tooltip.js

@@ -0,0 +1,29 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import { getLabel } from "../internals/getLabel.js";
+const tooltipGetter = params => {
+  const {
+    series,
+    getColor,
+    identifier
+  } = params;
+  if (!identifier || identifier.dataIndex === undefined) {
+    return null;
+  }
+  const point = series.data[identifier.dataIndex];
+  const label = getLabel(point.label, 'tooltip');
+  const value = _extends({}, point, {
+    label
+  });
+  const formattedValue = series.valueFormatter(value, {
+    dataIndex: identifier.dataIndex
+  });
+  return {
+    identifier,
+    color: getColor(identifier.dataIndex),
+    label,
+    value,
+    formattedValue,
+    markType: point.labelMarkType ?? series.labelMarkType
+  };
+};
+export default tooltipGetter;

package/README.md

@@ -1,7 +1,7 @@
 # MUI X Charts
 
 This package is the community edition of the chart components.
-It's part of [MUI X](https://mui.com/x/), an open-core extension of MUI Core, with advanced components.
+It's part of [MUI X](https://mui.com/x/), an open-core extension of our Core libraries, with advanced components.
 
 ## Installation
 

package/ScatterChart/Scatter.js

@@ -5,11 +5,11 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { getValueToPositionMapper } from "../hooks/useScale.js";
 import { useInteractionItemProps } from "../hooks/useInteractionItemProps.js";
-import { useStore } from "../internals/useStore.js";
-import { useSelector } from "../internals/useSelector.js";
-import { useHighlighted } from "../context/index.js";
-import { useDrawingArea } from "../hooks/useDrawingArea.js";
-import { selectorChartsInteractionIsVoronoiEnabled } from "../context/InteractionSelectors.js";
+import { useStore } from "../internals/store/useStore.js";
+import { useSelector } from "../internals/store/useSelector.js";
+import { useItemHighlightedGetter } from "../hooks/useItemHighlightedGetter.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;
@@ -39,7 +41,7 @@ function Scatter(props) {
   const {
     isFaded,
     isHighlighted
-  } = useHighlighted();
+  } = useItemHighlightedGetter();
   const cleanData = React.useMemo(() => {
     const getXPosition = getValueToPositionMapper(xScale);
     const getYPosition = getValueToPositionMapper(yScale);
@@ -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,
@@ -91,7 +93,7 @@ function Scatter(props) {
         dataIndex: dataPoint.dataIndex
       })),
       cursor: onItemClick ? 'pointer' : 'unset'
-    }, dataPoint.interactionProps), dataPoint.id))
+    }, dataPoint.interactionProps), dataPoint.id ?? dataPoint.dataIndex))
   });
 }
 process.env.NODE_ENV !== "production" ? Scatter.propTypes = {

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.

package/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 "../ChartDataProvider/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.
@@ -116,12 +125,18 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
    */
   hideLegend: PropTypes.bool,
   /**
-   * The item currently highlighted. Turns highlighting into a controlled prop.
+   * The highlighted item.
+   * Used when the highlight is controlled.
    */
   highlightedItem: PropTypes.shape({
     dataIndex: PropTypes.number,
-    seriesId: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
+    seriesId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired
   }),
+  /**
+   * 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 +152,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 +198,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.
@@ -231,7 +246,6 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     hideTooltip: PropTypes.bool,
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     label: PropTypes.string,
-    labelFontSize: PropTypes.number,
     labelStyle: PropTypes.object,
     max: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
     min: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
@@ -242,7 +256,6 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     slots: PropTypes.object,
     stroke: PropTypes.string,
     sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-    tickFontSize: PropTypes.number,
     tickInterval: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.array, PropTypes.func]),
     tickLabelInterval: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.func]),
     tickLabelPlacement: PropTypes.oneOf(['middle', 'tick']),
@@ -285,7 +298,6 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     hideTooltip: PropTypes.bool,
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     label: PropTypes.string,
-    labelFontSize: PropTypes.number,
     labelStyle: PropTypes.object,
     max: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
     min: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
@@ -296,7 +308,6 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     slots: PropTypes.object,
     stroke: PropTypes.string,
     sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-    tickFontSize: PropTypes.number,
     tickInterval: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.array, PropTypes.func]),
     tickLabelInterval: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.func]),
     tickLabelPlacement: PropTypes.oneOf(['middle', 'tick']),

package/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 { ZAxisContext } from "../context/ZAxisContextProvider.js";
 import { useScatterSeries } from "../hooks/useSeries.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
-  } = React.useContext(ZAxisContext);
+  } = 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/ScatterChart/extremums.d.ts

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

package/ScatterChart/extremums.js

@@ -1,5 +1,5 @@
 const mergeMinMax = (acc, val) => {
-  return [Math.min(acc[0], val[0]), Math.max(acc[1], val[1])];
+  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 {

package/ScatterChart/formatter.d.ts

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

package/ScatterChart/formatter.js

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

package/ScatterChart/getColor.d.ts

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

package/ScatterChart/legend.d.ts

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

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

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

package/ScatterChart/plugin.js

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

package/ScatterChart/tooltip.d.ts

@@ -0,0 +1,3 @@
+import type { TooltipGetter } from '../internals/plugins/models';
+declare const tooltipGetter: TooltipGetter<'scatter'>;
+export default tooltipGetter;

package/ScatterChart/tooltip.js

@@ -0,0 +1,25 @@
+import { getLabel } from "../internals/getLabel.js";
+const tooltipGetter = params => {
+  const {
+    series,
+    getColor,
+    identifier
+  } = params;
+  if (!identifier || identifier.dataIndex === undefined) {
+    return null;
+  }
+  const label = getLabel(series.label, 'tooltip');
+  const value = series.data[identifier.dataIndex];
+  const formattedValue = series.valueFormatter(value, {
+    dataIndex: identifier.dataIndex
+  });
+  return {
+    identifier,
+    color: getColor(identifier.dataIndex),
+    label,
+    value,
+    formattedValue,
+    markType: series.labelMarkType
+  };
+};
+export default tooltipGetter;

package/ScatterChart/useScatterChartProps.d.ts

@@ -1,13 +1,13 @@
 import { ChartsAxisProps } from '../ChartsAxis';
 import { ChartsAxisHighlightProps } from '../ChartsAxisHighlight';
 import { ChartsGridProps } from '../ChartsGrid';
-import { ChartsLegendProps } from '../ChartsLegend';
+import { ChartsLegendSlotExtension } from '../ChartsLegend';
 import { ChartsOverlayProps } from '../ChartsOverlay';
 import type { ChartsVoronoiHandlerProps } from '../ChartsVoronoiHandler';
 import { ChartContainerProps } from '../ChartContainer';
-import { ZAxisContextProviderProps } from '../context';
 import type { ScatterChartProps } from './ScatterChart';
 import type { ScatterPlotProps } from './ScatterPlot';
+import type { ChartsWrapperProps } from '../internals/components/ChartsWrapper';
 /**
  * A helper function that extracts ScatterChartProps from the input props
  * and returns an object with props for the children components of ScatterChart.
@@ -16,14 +16,14 @@ import type { ScatterPlotProps } from './ScatterPlot';
  * @returns An object with props for the children components of ScatterChart
  */
 export declare const useScatterChartProps: (props: ScatterChartProps) => {
-    chartContainerProps: ChartContainerProps;
-    zAxisProps: Omit<ZAxisContextProviderProps, "children">;
+    chartsWrapperProps: Omit<ChartsWrapperProps, "children">;
+    chartContainerProps: Omit<ChartContainerProps<"scatter">, "plugins">;
     voronoiHandlerProps: ChartsVoronoiHandlerProps;
     chartsAxisProps: ChartsAxisProps;
     gridProps: ChartsGridProps;
     scatterPlotProps: ScatterPlotProps;
     overlayProps: ChartsOverlayProps;
-    legendProps: ChartsLegendProps;
+    legendProps: ChartsLegendSlotExtension;
     axisHighlightProps: ChartsAxisHighlightProps;
     children: import("react").ReactNode;
 };

package/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,