@mui/x-charts 7.0.0-beta.0 → 7.0.0-beta.1

package/modern/LineChart/formatter.js

@@ -69,7 +69,7 @@ const formatter = (params, dataset) => {
   return {
     seriesOrder,
     stackingGroups,
-    series: defaultizeValueFormatter(completedSeries, v => v === null ? '' : v.toLocaleString())
+    series: defaultizeValueFormatter(completedSeries, v => v == null ? '' : v.toLocaleString())
   };
 };
 export default formatter;

package/modern/LineChart/index.js

@@ -4,6 +4,8 @@ export * from './AreaPlot';
 export * from './MarkPlot';
 export * from './LineHighlightPlot';
 export * from './AreaElement';
+export * from './AnimatedArea';
 export * from './LineElement';
+export * from './AnimatedLine';
 export * from './MarkElement';
 export * from './LineHighlightElement';

package/modern/PieChart/PieArcLabelPlot.js

@@ -173,7 +173,7 @@ process.env.NODE_ENV !== "production" ? PieArcLabelPlot.propTypes = {
    */
   paddingAngle: PropTypes.number,
   /**
-   * If `true`, animations are skiped.
+   * If `true`, animations are skipped.
    * @default false
    */
   skipAnimation: PropTypes.bool,

package/modern/PieChart/PieArcPlot.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["slots", "slotProps", "innerRadius", "outerRadius", "cornerRadius", "paddingAngle", "id", "highlightScope", "highlighted", "faded", "data", "onClick", "skipAnimation"],
+const _excluded = ["slots", "slotProps", "innerRadius", "outerRadius", "cornerRadius", "paddingAngle", "id", "highlightScope", "highlighted", "faded", "data", "onItemClick", "skipAnimation"],
   _excluded2 = ["startAngle", "endAngle", "paddingAngle", "innerRadius", "arcLabelRadius", "outerRadius", "cornerRadius"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
@@ -24,7 +24,7 @@ function PieArcPlot(props) {
         additionalRadius: -5
       },
       data,
-      onClick,
+      onItemClick,
       skipAnimation
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
@@ -71,8 +71,8 @@ function PieArcPlot(props) {
         highlightScope: highlightScope,
         isFaded: item.isFaded,
         isHighlighted: item.isHighlighted,
-        onClick: onClick && (event => {
-          onClick(event, {
+        onClick: onItemClick && (event => {
+          onItemClick(event, {
             type: 'pie',
             seriesId: id,
             dataIndex: index
@@ -149,7 +149,7 @@ process.env.NODE_ENV !== "production" ? PieArcPlot.propTypes = {
    * @param {PieItemIdentifier} pieItemIdentifier The pie item identifier.
    * @param {DefaultizedPieValueType} item The pie item.
    */
-  onClick: PropTypes.func,
+  onItemClick: PropTypes.func,
   /**
    * The radius between circle center and the end of the arc.
    */
@@ -160,7 +160,7 @@ process.env.NODE_ENV !== "production" ? PieArcPlot.propTypes = {
    */
   paddingAngle: PropTypes.number,
   /**
-   * If `true`, animations are skiped.
+   * If `true`, animations are skipped.
    * @default false
    */
   skipAnimation: PropTypes.bool,

package/modern/PieChart/PieChart.js

@@ -59,7 +59,7 @@ function PieChart(props) {
     children,
     slots,
     slotProps,
-    onClick
+    onItemClick
   } = props;
   const margin = _extends({}, defaultMargin, marginProps);
   return /*#__PURE__*/_jsxs(ResponsiveChartContainer, {
@@ -88,7 +88,7 @@ function PieChart(props) {
     }), /*#__PURE__*/_jsx(PiePlot, {
       slots: slots,
       slotProps: slotProps,
-      onClick: onClick,
+      onItemClick: onItemClick,
       skipAnimation: skipAnimation
     }), /*#__PURE__*/_jsx(ChartsLegend, _extends({}, legend, {
       slots: slots,
@@ -208,7 +208,7 @@ process.env.NODE_ENV !== "production" ? PieChart.propTypes = {
     right: PropTypes.number,
     top: PropTypes.number
   }),
-  onClick: PropTypes.func,
+  onItemClick: PropTypes.func,
   /**
    * Indicate which axis to display the right of the charts.
    * Can be a string (the id of the axis) or an object `ChartsYAxisProps`.
@@ -238,7 +238,7 @@ process.env.NODE_ENV !== "production" ? PieChart.propTypes = {
   }), PropTypes.string]),
   series: PropTypes.arrayOf(PropTypes.object).isRequired,
   /**
-   * If `true`, animations are skiped.
+   * If `true`, animations are skipped.
    * @default false
    */
   skipAnimation: PropTypes.bool,

package/modern/PieChart/PiePlot.js

@@ -22,7 +22,7 @@ function PiePlot(props) {
     skipAnimation,
     slots,
     slotProps,
-    onClick
+    onItemClick
   } = props;
   const seriesData = React.useContext(SeriesContext).pie;
   const {
@@ -70,7 +70,7 @@ function PiePlot(props) {
           highlightScope: highlightScope,
           highlighted: highlighted,
           faded: faded,
-          onClick: onClick,
+          onItemClick: onItemClick,
           slots: slots,
           slotProps: slotProps
         })
@@ -124,9 +124,9 @@ process.env.NODE_ENV !== "production" ? PiePlot.propTypes = {
    * @param {PieItemIdentifier} pieItemIdentifier The pie item identifier.
    * @param {DefaultizedPieValueType} item The pie item.
    */
-  onClick: PropTypes.func,
+  onItemClick: PropTypes.func,
   /**
-   * If `true`, animations are skiped.
+   * If `true`, animations are skipped.
    * @default false
    */
   skipAnimation: PropTypes.bool,

package/modern/ScatterChart/Scatter.js

@@ -21,7 +21,8 @@ function Scatter(props) {
     xScale,
     yScale,
     color,
-    markerSize
+    markerSize,
+    onItemClick
   } = props;
   const highlightScope = React.useMemo(() => _extends({
     highlighted: 'item',
@@ -61,7 +62,8 @@ function Scatter(props) {
           isHighlighted,
           isFaded: !isHighlighted && getIsFaded(item, pointCtx, highlightScope),
           interactionProps: getInteractionItemProps(pointCtx),
-          id: scatterPoint.id
+          id: scatterPoint.id,
+          dataIndex: i
         });
       }
     }
@@ -74,7 +76,13 @@ function Scatter(props) {
       r: (dataPoint.isHighlighted ? 1.2 : 1) * markerSize,
       transform: `translate(${dataPoint.x}, ${dataPoint.y})`,
       fill: color,
-      opacity: dataPoint.isFaded && 0.3 || 1
+      opacity: dataPoint.isFaded && 0.3 || 1,
+      onClick: onItemClick && (event => onItemClick(event, {
+        type: 'scatter',
+        seriesId: series.id,
+        dataIndex: dataPoint.dataIndex
+      })),
+      cursor: onItemClick ? 'pointer' : 'unset'
     }, dataPoint.interactionProps), dataPoint.id))
   });
 }
@@ -85,6 +93,12 @@ process.env.NODE_ENV !== "production" ? Scatter.propTypes = {
   // ----------------------------------------------------------------------
   color: PropTypes.string.isRequired,
   markerSize: PropTypes.number.isRequired,
+  /**
+   * Callback fired when clicking on a scatter item.
+   * @param {MouseEvent} event Mouse event recorded on the `<svg/>` element.
+   * @param {ScatterItemIdentifier} scatterItemIdentifier The scatter item identifier.
+   */
+  onItemClick: PropTypes.func,
   series: PropTypes.object.isRequired,
   xScale: PropTypes.func.isRequired,
   yScale: PropTypes.func.isRequired

package/modern/ScatterChart/ScatterChart.js

@@ -39,6 +39,7 @@ const ScatterChart = /*#__PURE__*/React.forwardRef(function ScatterChart(props,
     leftAxis,
     rightAxis,
     bottomAxis,
+    onItemClick,
     children,
     slots,
     slotProps
@@ -56,7 +57,8 @@ const ScatterChart = /*#__PURE__*/React.forwardRef(function ScatterChart(props,
     yAxis: yAxis,
     sx: sx,
     children: [!disableVoronoi && /*#__PURE__*/_jsx(ChartsVoronoiHandler, {
-      voronoiMaxRadius: voronoiMaxRadius
+      voronoiMaxRadius: voronoiMaxRadius,
+      onItemClick: onItemClick
     }), /*#__PURE__*/_jsx(ChartsAxis, {
       topAxis: topAxis,
       leftAxis: leftAxis,
@@ -66,7 +68,8 @@ const ScatterChart = /*#__PURE__*/React.forwardRef(function ScatterChart(props,
       slotProps: slotProps
     }), /*#__PURE__*/_jsx(ScatterPlot, {
       slots: slots,
-      slotProps: slotProps
+      slotProps: slotProps,
+      onItemClick: disableVoronoi ? onItemClick : undefined
     }), /*#__PURE__*/_jsx(ChartsLegend, _extends({}, legend, {
       slots: slots,
       slotProps: slotProps
@@ -195,6 +198,12 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     right: PropTypes.number,
     top: PropTypes.number
   }),
+  /**
+   * Callback fired when clicking on a scatter item.
+   * @param {MouseEvent} event The mouse event recorded on the `<svg/>` element if using Voronoi cells. Or the Mouse event from the scatter element, when `disableVoronoi=true`.
+   * @param {ScatterItemIdentifier} scatterItemIdentifier The scatter item identifier.
+   */
+  onItemClick: PropTypes.func,
   /**
    * Indicate which axis to display the right of the charts.
    * Can be a string (the id of the axis) or an object `ChartsYAxisProps`.

package/modern/ScatterChart/ScatterPlot.js

@@ -18,7 +18,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 function ScatterPlot(props) {
   const {
     slots,
-    slotProps
+    slotProps,
+    onItemClick
   } = props;
   const seriesData = React.useContext(SeriesContext).scatter;
   const axisData = React.useContext(CartesianContext);
@@ -54,7 +55,8 @@ function ScatterPlot(props) {
         yScale: yScale,
         color: color,
         markerSize: markerSize ?? 4,
-        series: series[seriesId]
+        series: series[seriesId],
+        onItemClick: onItemClick
       }, slotProps?.scatter), id);
     })
   });
@@ -64,6 +66,12 @@ process.env.NODE_ENV !== "production" ? ScatterPlot.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
+  /**
+   * Callback fired when clicking on a scatter item.
+   * @param {MouseEvent} event Mouse event recorded on the `<svg/>` element.
+   * @param {ScatterItemIdentifier} scatterItemIdentifier The scatter item identifier.
+   */
+  onItemClick: PropTypes.func,
   /**
    * The props used for each component slot.
    * @default {}

package/modern/SparkLineChart/SparkLineChart.js

@@ -86,9 +86,11 @@ const SparkLineChart = /*#__PURE__*/React.forwardRef(function SparkLineChart(pro
       }
     }), plotType === 'line' && /*#__PURE__*/_jsxs(React.Fragment, {
       children: [/*#__PURE__*/_jsx(AreaPlot, {
+        skipAnimation: true,
         slots: slots,
         slotProps: slotProps
       }), /*#__PURE__*/_jsx(LinePlot, {
+        skipAnimation: true,
         slots: slots,
         slotProps: slotProps
       }), /*#__PURE__*/_jsx(LineHighlightPlot, {

package/modern/context/DrawingProvider.js

@@ -1,5 +1,7 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import useId from '@mui/utils/useId';
 import useChartDimensions from '../hooks/useChartDimensions';
 
 /**
@@ -12,7 +14,8 @@ export const DrawingContext = /*#__PURE__*/React.createContext({
   bottom: 0,
   right: 0,
   height: 300,
-  width: 400
+  width: 400,
+  chartId: ''
 });
 export const SVGContext = /*#__PURE__*/React.createContext({
   current: null
@@ -32,10 +35,14 @@ function DrawingProvider(props) {
     children
   } = props;
   const drawingArea = useChartDimensions(width, height, margin);
+  const chartId = useId();
+  const value = React.useMemo(() => _extends({
+    chartId: chartId ?? ''
+  }, drawingArea), [chartId, drawingArea]);
   return /*#__PURE__*/_jsx(SVGContext.Provider, {
     value: svgRef,
     children: /*#__PURE__*/_jsx(DrawingContext.Provider, {
-      value: drawingArea,
+      value: value,
       children: children
     })
   });

package/modern/hooks/useDrawingArea.js

@@ -5,12 +5,16 @@ export function useDrawingArea() {
     left,
     top,
     width,
-    height
+    height,
+    bottom,
+    right
   } = React.useContext(DrawingContext);
   return React.useMemo(() => ({
     left,
     top,
     width,
-    height
-  }), [height, left, top, width]);
+    height,
+    bottom,
+    right
+  }), [height, left, top, width, bottom, right]);
 }

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-charts v7.0.0-beta.0
+ * @mui/x-charts v7.0.0-beta.1
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the
@@ -20,6 +20,7 @@ export * from './ChartsTooltip';
 export * from './ChartsLegend';
 export * from './ChartsAxisHighlight';
 export * from './ChartsVoronoiHandler';
+export * from './ChartsOnAxisClickHandler';
 export * from './BarChart';
 export * from './LineChart';
 export * from './PieChart';

package/modern/internals/geometry.js

@@ -14,7 +14,7 @@ export function getMinXTranslation(width, height, angle = 0) {
   if (process.env.NODE_ENV !== 'production') {
     if (!warnedOnce && angle > 90 && angle < -90) {
       warnedOnce = true;
-      console.warn([`MUI X: It seems you applied an angle larger than 90° or smaller than -90° to an axis text.`, `This could cause some text overlapping.`, `If you encounter a use case where it's needed, please open an issue.`].join('\n'));
+      console.warn([`MUI X Charts: It seems you applied an angle larger than 90° or smaller than -90° to an axis text.`, `This could cause some text overlapping.`, `If you encounter a use case where it's needed, please open an issue.`].join('\n'));
     }
   }
   const standardAngle = Math.min(Math.abs(angle) % 180, Math.abs(Math.abs(angle) % 180 - 180) % 180); // Map from R to [0, 90]

package/modern/internals/useAnimatedPath.js

@@ -0,0 +1,29 @@
+import * as React from 'react';
+import { interpolateString } from 'd3-interpolate';
+import { useSpring, to } from '@react-spring/web';
+function usePrevious(value) {
+  const ref = React.useRef(null);
+  React.useEffect(() => {
+    ref.current = value;
+  }, [value]);
+  return ref.current;
+}
+
+// Taken from Nivo
+export const useAnimatedPath = (path, skipAnimation) => {
+  const previousPath = usePrevious(path);
+  const interpolator = React.useMemo(() => previousPath ? interpolateString(previousPath, path) : () => path, [previousPath, path]);
+  const {
+    value
+  } = useSpring({
+    from: {
+      value: 0
+    },
+    to: {
+      value: 1
+    },
+    reset: true,
+    immediate: skipAnimation
+  });
+  return to([value], interpolator);
+};

package/modern/internals/utils.js

@@ -42,4 +42,11 @@ export function getPercentageValue(value, refValue) {
     }
   }
   throw Error(`MUI-Charts: Received an unknown value "${value}". It should be a number, or a string with a percentage value.`);
+}
+
+/**
+ * Remove spaces to have viable ids
+ */
+export function cleanId(id) {
+  return id.replace(' ', '_');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-charts",
-  "version": "7.0.0-beta.0",
+  "version": "7.0.0-beta.1",
   "description": "The community edition of the charts components (MUI X).",
   "author": "MUI Team",
   "main": "./index.js",
@@ -28,15 +28,16 @@
     "directory": "packages/x-charts"
   },
   "dependencies": {
-    "@babel/runtime": "^7.23.8",
-    "@mui/base": "^5.0.0-beta.33",
-    "@mui/system": "^5.15.6",
-    "@mui/utils": "^5.15.6",
+    "@babel/runtime": "^7.23.9",
+    "@mui/base": "^5.0.0-beta.34",
+    "@mui/system": "^5.15.7",
+    "@mui/utils": "^5.15.7",
     "@react-spring/rafz": "^9.7.3",
     "@react-spring/web": "^9.7.3",
     "clsx": "^2.1.0",
     "d3-color": "^3.1.0",
     "d3-delaunay": "^6.0.4",
+    "d3-interpolate": "^3.0.1",
     "d3-scale": "^4.0.2",
     "d3-shape": "^3.2.0",
     "prop-types": "^15.8.1"