@mui/x-charts 7.6.1 → 7.6.2

package/modern/ScatterChart/ScatterPlot.js

@@ -2,10 +2,10 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { Scatter } from './Scatter';
-import { SeriesContext } from '../context/SeriesContextProvider';
 import { CartesianContext } from '../context/CartesianContextProvider';
 import getColor from './getColor';
 import { ZAxisContext } from '../context/ZAxisContextProvider';
+import { useScatterSeries } from '../hooks/useSeries';
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Demos:
@@ -23,7 +23,7 @@ function ScatterPlot(props) {
     slotProps,
     onItemClick
   } = props;
-  const seriesData = React.useContext(SeriesContext).scatter;
+  const seriesData = useScatterSeries();
   const axisData = React.useContext(CartesianContext);
   const {
     zAxis,

package/modern/ScatterChart/formatter.js

@@ -1,4 +1,4 @@
-import defaultizeValueFormatter from '../internals/defaultizeValueFormatter';
+import { defaultizeValueFormatter } from '../internals/defaultizeValueFormatter';
 const formatter = ({
   series,
   seriesOrder

package/modern/ScatterChart/getColor.js

@@ -1,7 +1,7 @@
 export default function getColor(series, xAxis, yAxis, zAxis) {
   const zColorScale = zAxis?.colorScale;
-  const yColorScale = yAxis.colorScale;
-  const xColorScale = xAxis.colorScale;
+  const yColorScale = yAxis?.colorScale;
+  const xColorScale = xAxis?.colorScale;
   if (zColorScale) {
     return dataIndex => {
       if (zAxis?.data?.[dataIndex] !== undefined) {

package/modern/ScatterChart/plugin.js

@@ -0,0 +1,10 @@
+import { getExtremumX, getExtremumY } from './extremums';
+import formatter from './formatter';
+import getColor from './getColor';
+export const plugin = {
+  seriesType: 'scatter',
+  seriesFormatter: formatter,
+  colorProcessor: getColor,
+  xExtremumGetter: getExtremumX,
+  yExtremumGetter: getExtremumY
+};

package/modern/SparkLineChart/SparkLineChart.js

@@ -265,7 +265,7 @@ process.env.NODE_ENV !== "production" ? SparkLineChart.propTypes = {
     labelStyle: PropTypes.object,
     max: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
     min: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
-    position: PropTypes.oneOf(['bottom', 'left', 'right', 'top']),
+    position: PropTypes.oneOf(['bottom', 'top']),
     reverse: PropTypes.bool,
     scaleType: PropTypes.oneOf(['band', 'linear', 'log', 'point', 'pow', 'sqrt', 'time', 'utc']),
     slotProps: PropTypes.object,

package/modern/context/CartesianContextProvider.js

@@ -6,11 +6,11 @@ import { getExtremumX as getScatterExtremumX, getExtremumY as getScatterExtremum
 import { getExtremumX as getLineExtremumX, getExtremumY as getLineExtremumY } from '../LineChart/extremums';
 import { isBandScaleConfig, isPointScaleConfig } from '../models/axis';
 import { getScale } from '../internals/getScale';
-import { SeriesContext } from './SeriesContextProvider';
 import { DEFAULT_X_AXIS_KEY, DEFAULT_Y_AXIS_KEY } from '../constants';
 import { getTickNumber } from '../hooks/useTicks';
 import { useDrawingArea } from '../hooks/useDrawingArea';
 import { getColorScale, getOrdinalColorScale } from '../internals/colorScale';
+import { useSeries } from '../hooks/useSeries';
 import { jsx as _jsx } from "react/jsx-runtime";
 const DEFAULT_CATEGORY_GAP_RATIO = 0.2;
 const DEFAULT_BAR_GAP_RATIO = 0.1;
@@ -42,7 +42,7 @@ function CartesianContextProvider(props) {
     dataset,
     children
   } = props;
-  const formattedSeries = React.useContext(SeriesContext);
+  const formattedSeries = useSeries();
   const drawingArea = useDrawingArea();
   const xAxis = React.useMemo(() => inXAxis?.map(axisConfig => {
     const dataKey = axisConfig.dataKey;

package/modern/context/DrawingProvider.js

@@ -20,7 +20,10 @@ if (process.env.NODE_ENV !== 'production') {
   DrawingContext.displayName = 'DrawingContext';
 }
 export const SvgContext = /*#__PURE__*/React.createContext({
-  current: null
+  isInitialized: false,
+  data: {
+    current: null
+  }
 });
 if (process.env.NODE_ENV !== 'production') {
   SvgContext.displayName = 'SvgContext';
@@ -38,8 +41,12 @@ export function DrawingProvider(props) {
   const value = React.useMemo(() => _extends({
     chartId: chartId ?? ''
   }, drawingArea), [chartId, drawingArea]);
+  const refValue = React.useMemo(() => ({
+    isInitialized: true,
+    data: svgRef
+  }), [svgRef]);
   return /*#__PURE__*/_jsx(SvgContext.Provider, {
-    value: svgRef,
+    value: refValue,
     children: /*#__PURE__*/_jsx(DrawingContext.Provider, {
       value: value,
       children: children

package/modern/context/HighlightedProvider/HighlightedContext.js

@@ -18,11 +18,14 @@ import * as React from 'react';
  */
 
 export const HighlightedContext = /*#__PURE__*/React.createContext({
-  highlightedItem: null,
-  setHighlighted: () => {},
-  clearHighlighted: () => {},
-  isHighlighted: () => false,
-  isFaded: () => false
+  isInitialized: false,
+  data: {
+    highlightedItem: null,
+    setHighlighted: () => {},
+    clearHighlighted: () => {},
+    isHighlighted: () => false,
+    isFaded: () => false
+  }
 });
 if (process.env.NODE_ENV !== 'production') {
   HighlightedContext.displayName = 'HighlightedContext';

package/modern/context/HighlightedProvider/HighlightedProvider.js

@@ -47,18 +47,21 @@ function HighlightedProvider({
   const highlightScope = highlightedItem && highlightedItem.seriesId ? seriesById.get(highlightedItem.seriesId) ?? undefined : undefined;
   const providerValue = React.useMemo(() => {
     return {
-      highlightScope,
-      highlightedItem,
-      setHighlighted: itemData => {
-        setHighlightedItem(itemData);
-        onHighlightChange?.(itemData);
-      },
-      clearHighlighted: () => {
-        setHighlightedItem(null);
-        onHighlightChange?.(null);
-      },
-      isHighlighted: createIsHighlighted(highlightScope, highlightedItem),
-      isFaded: createIsFaded(highlightScope, highlightedItem)
+      isInitialized: true,
+      data: {
+        highlightScope,
+        highlightedItem,
+        setHighlighted: itemData => {
+          setHighlightedItem(itemData);
+          onHighlightChange?.(itemData);
+        },
+        clearHighlighted: () => {
+          setHighlightedItem(null);
+          onHighlightChange?.(null);
+        },
+        isHighlighted: createIsHighlighted(highlightScope, highlightedItem),
+        isFaded: createIsFaded(highlightScope, highlightedItem)
+      }
     };
   }, [highlightedItem, highlightScope, setHighlightedItem, onHighlightChange]);
   return /*#__PURE__*/_jsx(HighlightedContext.Provider, {

package/modern/context/HighlightedProvider/useHighlighted.js

@@ -9,9 +9,12 @@ import { HighlightedContext } from './HighlightedContext';
  * @returns {HighlightedState} the state of the chart
  */
 export function useHighlighted() {
-  const highlighted = React.useContext(HighlightedContext);
-  if (highlighted === undefined) {
+  const {
+    isInitialized,
+    data
+  } = React.useContext(HighlightedContext);
+  if (!isInitialized) {
     throw new Error(['MUI X: Could not find the highlighted ref context.', 'It looks like you rendered your component outside of a ChartsContainer parent component.'].join('\n'));
   }
-  return highlighted;
+  return data;
 }

package/modern/context/HighlightedProvider/useItemHighlighted.js

@@ -1,5 +1,4 @@
-import * as React from 'react';
-import { HighlightedContext } from './HighlightedContext';
+import { useHighlighted } from './useHighlighted';
 /**
  * A hook to check the highlighted state of the item.
  * This function already calculates that an item is not faded if it is highlighted.
@@ -10,10 +9,7 @@ import { HighlightedContext } from './HighlightedContext';
  * @returns {ItemHighlightedState} the state of the item
  */
 export function useItemHighlighted(item) {
-  const highlighted = React.useContext(HighlightedContext);
-  if (highlighted === undefined) {
-    throw new Error(['MUI X: Could not find the highlighted ref context.', 'It looks like you rendered your component outside of a ChartsContainer parent component.'].join('\n'));
-  }
+  const highlighted = useHighlighted();
   if (!item) {
     return {
       isHighlighted: false,

package/modern/context/SeriesContextProvider.js

@@ -1,24 +1,16 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import { useTheme } from '@mui/material/styles';
-import barSeriesFormatter from '../BarChart/formatter';
-import scatterSeriesFormatter from '../ScatterChart/formatter';
-import lineSeriesFormatter from '../LineChart/formatter';
-import pieSeriesFormatter from '../PieChart/formatter';
 import { defaultizeColor } from '../internals/defaultizeColor';
 import { blueberryTwilightPalette } from '../colorPalettes';
 import { jsx as _jsx } from "react/jsx-runtime";
-export const SeriesContext = /*#__PURE__*/React.createContext({});
+export const SeriesContext = /*#__PURE__*/React.createContext({
+  isInitialized: false,
+  data: {}
+});
 if (process.env.NODE_ENV !== 'production') {
   SeriesContext.displayName = 'SeriesContext';
 }
-const seriesTypeFormatter = {
-  bar: barSeriesFormatter,
-  scatter: scatterSeriesFormatter,
-  line: lineSeriesFormatter,
-  pie: pieSeriesFormatter
-};
-
 /**
  * This methods is the interface between what the developer is providing and what components receives
  * To simplify the components behaviors, it groups series by type, such that LinePlots props are not updated if some line data are modified
@@ -27,7 +19,7 @@ const seriesTypeFormatter = {
  * @param colors The color palette used to defaultize series colors
  * @returns An object structuring all the series by type.
  */
-const formatSeries = (series, colors, dataset) => {
+const preprocessSeries = (series, colors, seriesFormatters, dataset) => {
   // Group series by type
   const seriesGroups = {};
   series.forEach((seriesData, seriesIndex) => {
@@ -51,9 +43,10 @@ const formatSeries = (series, colors, dataset) => {
   });
   const formattedSeries = {};
   // Apply formatter on a type group
-  Object.keys(seriesTypeFormatter).forEach(type => {
-    if (seriesGroups[type] !== undefined) {
-      formattedSeries[type] = seriesTypeFormatter[type]?.(seriesGroups[type], dataset) ?? seriesGroups[type];
+  Object.keys(seriesFormatters).forEach(type => {
+    const group = seriesGroups[type];
+    if (group !== undefined) {
+      formattedSeries[type] = seriesFormatters[type]?.(group, dataset) ?? seriesGroups[type];
     }
   });
   return formattedSeries;
@@ -63,10 +56,14 @@ function SeriesContextProvider(props) {
     series,
     dataset,
     colors = blueberryTwilightPalette,
+    seriesFormatters,
     children
   } = props;
   const theme = useTheme();
-  const formattedSeries = React.useMemo(() => formatSeries(series, typeof colors === 'function' ? colors(theme.palette.mode) : colors, dataset), [series, colors, theme.palette.mode, dataset]);
+  const formattedSeries = React.useMemo(() => ({
+    isInitialized: true,
+    data: preprocessSeries(series, typeof colors === 'function' ? colors(theme.palette.mode) : colors, seriesFormatters, dataset)
+  }), [series, colors, theme.palette.mode, seriesFormatters, dataset]);
   return /*#__PURE__*/_jsx(SeriesContext.Provider, {
     value: formattedSeries,
     children: children

package/modern/context/context.types.js

@@ -0,0 +1 @@
+export {};

package/modern/hooks/useInteractionItemProps.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { InteractionContext } from '../context/InteractionProvider';
-import { HighlightedContext } from '../context';
+import { useHighlighted } from '../context';
 export const useInteractionItemProps = skip => {
   const {
     dispatch: dispatchInteraction
@@ -8,7 +8,7 @@ export const useInteractionItemProps = skip => {
   const {
     setHighlighted,
     clearHighlighted
-  } = React.useContext(HighlightedContext);
+  } = useHighlighted();
   if (skip) {
     return () => ({});
   }

package/modern/hooks/useSeries.js

@@ -8,11 +8,14 @@ import { SeriesContext } from '../context/SeriesContextProvider';
  * @returns FormattedSeries series
  */
 export function useSeries() {
-  const series = React.useContext(SeriesContext);
-  if (series === undefined) {
+  const {
+    isInitialized,
+    data
+  } = React.useContext(SeriesContext);
+  if (!isInitialized) {
     throw new Error(['MUI X: Could not find the series ref context.', 'It looks like you rendered your component outside of a ChartsContainer parent component.'].join('\n'));
   }
-  return series;
+  return data;
 }
 
 /**

package/modern/hooks/useSvgRef.js

@@ -1,9 +1,12 @@
 import * as React from 'react';
 import { SvgContext } from '../context/DrawingProvider';
 export function useSvgRef() {
-  const svgRef = React.useContext(SvgContext);
-  if (svgRef === undefined) {
+  const {
+    isInitialized,
+    data
+  } = React.useContext(SvgContext);
+  if (!isInitialized) {
     throw new Error(['MUI X: Could not find the svg ref context.', 'It looks like you rendered your component outside of a ChartsContainer parent component.'].join('\n'));
   }
-  return svgRef;
+  return data;
 }

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-charts v7.6.1
+ * @mui/x-charts v7.6.2
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/internals/configInit.js

@@ -0,0 +1,20 @@
+let instance;
+class CartesianSeriesTypes {
+  constructor() {
+    this.types = new Set();
+    if (instance) {
+      throw new Error('You can only create one instance!');
+    }
+    instance = this.types;
+  }
+  addType(value) {
+    this.types.add(value);
+  }
+  getTypes() {
+    return this.types;
+  }
+}
+export const cartesianSeriesTypes = new CartesianSeriesTypes();
+cartesianSeriesTypes.addType('bar');
+cartesianSeriesTypes.addType('line');
+cartesianSeriesTypes.addType('scatter');

package/modern/internals/defaultizeValueFormatter.js

@@ -1,5 +1,5 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-function defaultizeValueFormatter(series, defaultValueFormatter) {
+export function defaultizeValueFormatter(series, defaultValueFormatter) {
   const defaultizedSeries = {};
   Object.keys(series).forEach(seriesId => {
     defaultizedSeries[seriesId] = _extends({}, series[seriesId], {
@@ -7,5 +7,4 @@ function defaultizeValueFormatter(series, defaultValueFormatter) {
     });
   });
   return defaultizedSeries;
-}
-export default defaultizeValueFormatter;
+}

package/modern/internals/index.js

@@ -0,0 +1 @@
+export * from './configInit';

package/modern/internals/isCartesian.js

@@ -0,0 +1,7 @@
+import { cartesianSeriesTypes } from './configInit';
+export function isCartesianSeriesType(seriesType) {
+  return cartesianSeriesTypes.getTypes().has(seriesType);
+}
+export function isCartesianSeries(series) {
+  return isCartesianSeriesType(series.type);
+}

package/modern/models/index.js

@@ -1,4 +1,5 @@
 export * from './seriesType';
 export * from './layout';
 export * from './stacking';
+export * from './plugin';
 export {};

package/modern/models/plugin.js

@@ -0,0 +1 @@
+export {};

package/modern/models/seriesType/index.js

@@ -1,7 +1,13 @@
+// Series definition
+
+// item identifier
+
 export * from './line';
 export * from './bar';
 export * from './scatter';
 export * from './pie';
+// Helpers
+
 export function isDefaultizedBarSeries(series) {
   return series.type === 'bar';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-charts",
-  "version": "7.6.1",
+  "version": "7.6.2",
   "description": "The community edition of the Charts components (MUI X).",
   "author": "MUI Team",
   "main": "./index.js",