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

package/modern/LineChart/LineHighlightPlot.js

@@ -0,0 +1,91 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["slots", "slotProps"];
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import { SeriesContext } from '../context/SeriesContextProvider';
+import { CartesianContext } from '../context/CartesianContextProvider';
+import { LineHighlightElement } from './LineHighlightElement';
+import { getValueToPositionMapper } from '../hooks/useScale';
+import { InteractionContext } from '../context/InteractionProvider';
+import { jsx as _jsx } from "react/jsx-runtime";
+function LineHighlightPlot(props) {
+  const {
+      slots,
+      slotProps
+    } = props,
+    other = _objectWithoutPropertiesLoose(props, _excluded);
+  const seriesData = React.useContext(SeriesContext).line;
+  const axisData = React.useContext(CartesianContext);
+  const {
+    axis
+  } = React.useContext(InteractionContext);
+  const highlightedIndex = axis.x?.index;
+  if (highlightedIndex === undefined) {
+    return null;
+  }
+  if (seriesData === undefined) {
+    return null;
+  }
+  const {
+    series,
+    stackingGroups
+  } = seriesData;
+  const {
+    xAxis,
+    yAxis,
+    xAxisIds,
+    yAxisIds
+  } = axisData;
+  const defaultXAxisId = xAxisIds[0];
+  const defaultYAxisId = yAxisIds[0];
+  const Element = slots?.lineHighlight ?? LineHighlightElement;
+  return /*#__PURE__*/_jsx("g", _extends({}, other, {
+    children: stackingGroups.flatMap(({
+      ids: groupIds
+    }) => {
+      return groupIds.flatMap(seriesId => {
+        const {
+          xAxisKey = defaultXAxisId,
+          yAxisKey = defaultYAxisId,
+          stackedData,
+          disableHighlight
+        } = series[seriesId];
+        if (disableHighlight) {
+          return null;
+        }
+        const xScale = getValueToPositionMapper(xAxis[xAxisKey].scale);
+        const yScale = yAxis[yAxisKey].scale;
+        const xData = xAxis[xAxisKey].data;
+        if (xData === undefined) {
+          throw new Error(`Axis of id "${xAxisKey}" should have data property to be able to display a line plot.`);
+        }
+        const x = xScale(xData[highlightedIndex]);
+        const y = yScale(stackedData[highlightedIndex][1]);
+        return /*#__PURE__*/_jsx(Element, _extends({
+          id: seriesId,
+          color: series[seriesId].color,
+          x: x,
+          y: y
+        }, slotProps?.lineHighlight), `${seriesId}`);
+      });
+    })
+  }));
+}
+process.env.NODE_ENV !== "production" ? LineHighlightPlot.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * The props used for each component slot.
+   * @default {}
+   */
+  slotProps: PropTypes.object,
+  /**
+   * Overridable component slots.
+   * @default {}
+   */
+  slots: PropTypes.object
+} : void 0;
+export { LineHighlightPlot };

package/modern/LineChart/MarkElement.js

@@ -40,10 +40,7 @@ const MarkElementPath = styled('path', {
   transformOrigin: `${ownerState.x}px ${ownerState.y}px`,
   fill: theme.palette.background.paper,
   stroke: ownerState.color,
-  strokeWidth: 2,
-  '&.MuiMarkElement-highlighted': {
-    fill: ownerState.color
-  }
+  strokeWidth: 2
 }));
 MarkElementPath.propTypes = {
   // ----------------------------- Warning --------------------------------

package/modern/LineChart/MarkPlot.js

@@ -1,4 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["slots", "slotProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { SeriesContext } from '../context/SeriesContextProvider';
@@ -8,9 +10,10 @@ import { getValueToPositionMapper } from '../hooks/useScale';
 import { jsx as _jsx } from "react/jsx-runtime";
 function MarkPlot(props) {
   const {
-    slots,
-    slotProps
-  } = props;
+      slots,
+      slotProps
+    } = props,
+    other = _objectWithoutPropertiesLoose(props, _excluded);
   const seriesData = React.useContext(SeriesContext).line;
   const axisData = React.useContext(CartesianContext);
   const Mark = slots?.mark ?? MarkElement;
@@ -29,7 +32,7 @@ function MarkPlot(props) {
   } = axisData;
   const defaultXAxisId = xAxisIds[0];
   const defaultYAxisId = yAxisIds[0];
-  return /*#__PURE__*/_jsx("g", _extends({}, props, {
+  return /*#__PURE__*/_jsx("g", _extends({}, other, {
     children: stackingGroups.flatMap(({
       ids: groupIds
     }) => {
@@ -37,8 +40,12 @@ function MarkPlot(props) {
         const {
           xAxisKey = defaultXAxisId,
           yAxisKey = defaultYAxisId,
-          stackedData
+          stackedData,
+          showMark = true
         } = series[seriesId];
+        if (showMark === false) {
+          return null;
+        }
         const xScale = getValueToPositionMapper(xAxis[xAxisKey].scale);
         const yScale = yAxis[yAxisKey].scale;
         const xData = xAxis[xAxisKey].data;
@@ -64,21 +71,33 @@ function MarkPlot(props) {
           return {
             x: xScale(x),
             y: yScale(y),
+            position: x,
+            value: y,
             index
           };
         }).filter(isInRange).map(({
           x,
           y,
-          index
-        }) => /*#__PURE__*/_jsx(Mark, _extends({
-          id: seriesId,
-          dataIndex: index,
-          shape: "circle",
-          color: series[seriesId].color,
-          x: x,
-          y: y,
-          highlightScope: series[seriesId].highlightScope
-        }, slotProps?.mark), `${seriesId}-${index}`));
+          index,
+          position,
+          value
+        }) => {
+          return showMark === true || showMark({
+            x,
+            y,
+            index,
+            position,
+            value
+          }) ? /*#__PURE__*/_jsx(Mark, _extends({
+            id: seriesId,
+            dataIndex: index,
+            shape: "circle",
+            color: series[seriesId].color,
+            x: x,
+            y: y,
+            highlightScope: series[seriesId].highlightScope
+          }, slotProps?.mark), `${seriesId}-${index}`) : null;
+        });
       });
     })
   }));

package/modern/LineChart/index.js

@@ -1,7 +1,9 @@
 export { LinePlot } from './LinePlot';
 export { AreaPlot } from './AreaPlot';
 export { MarkPlot } from './MarkPlot';
+export { LineHighlightPlot } from './LineHighlightPlot';
 export { LineChart } from './LineChart';
 export * from './AreaElement';
 export * from './LineElement';
-export * from './MarkElement';
+export * from './MarkElement';
+export * from './LineHighlightElement';

package/modern/PieChart/PieChart.js

@@ -88,7 +88,7 @@ process.env.NODE_ENV !== "production" ? PieChart.propTypes = {
   // ----------------------------------------------------------------------
   axisHighlight: PropTypes.shape({
     x: PropTypes.oneOf(['band', 'line', 'none']),
-    y: PropTypes.oneOf(['line', 'none'])
+    y: PropTypes.oneOf(['band', 'line', 'none'])
   }),
   /**
    * Indicate which axis to display the bottom of the charts.

package/modern/ScatterChart/ScatterChart.js

@@ -70,7 +70,7 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
   // ----------------------------------------------------------------------
   axisHighlight: PropTypes.shape({
     x: PropTypes.oneOf(['band', 'line', 'none']),
-    y: PropTypes.oneOf(['line', 'none'])
+    y: PropTypes.oneOf(['band', 'line', 'none'])
   }),
   /**
    * Indicate which axis to display the bottom of the charts.

package/modern/SparkLineChart/SparkLineChart.js

@@ -1,23 +1,14 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { styled } from '@mui/material/styles';
 import { BarPlot } from '../BarChart';
-import { LinePlot, MarkPlot, AreaPlot, markElementClasses } from '../LineChart';
+import { LinePlot, AreaPlot, LineHighlightPlot } from '../LineChart';
 import { ResponsiveChartContainer } from '../ResponsiveChartContainer';
 import { DEFAULT_X_AXIS_KEY } from '../constants';
 import { ChartsTooltip } from '../ChartsTooltip';
 import { ChartsAxisHighlight } from '../ChartsAxisHighlight';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-const SparkLineMarkPlot = styled(MarkPlot)({
-  [`& .${markElementClasses.root}`]: {
-    display: 'none',
-    [`&.${markElementClasses.highlighted}`]: {
-      display: 'inherit'
-    }
-  }
-});
 const SPARKLINE_DEFAULT_MARGIN = {
   top: 5,
   bottom: 5,
@@ -59,7 +50,8 @@ const SparkLineChart = /*#__PURE__*/React.forwardRef(function SparkLineChart(pro
       valueFormatter
     }, plotType === 'bar' ? {} : {
       area,
-      curve
+      curve,
+      disableHighlight: !showHighlight
     })],
     width: width,
     height: height,
@@ -85,7 +77,10 @@ const SparkLineChart = /*#__PURE__*/React.forwardRef(function SparkLineChart(pro
       }), /*#__PURE__*/_jsx(LinePlot, {
         slots: slots,
         slotProps: slotProps
-      }), showHighlight && /*#__PURE__*/_jsx(SparkLineMarkPlot, {})]
+      }), /*#__PURE__*/_jsx(LineHighlightPlot, {
+        slots: slots,
+        slotProps: slotProps
+      })]
     }), /*#__PURE__*/_jsx(ChartsAxisHighlight, _extends({}, axisHighlight)), showTooltip && /*#__PURE__*/_jsx(ChartsTooltip, _extends({}, tooltip)), children]
   });
 });
@@ -102,7 +97,7 @@ process.env.NODE_ENV !== "production" ? SparkLineChart.propTypes = {
   area: PropTypes.bool,
   axisHighlight: PropTypes.shape({
     x: PropTypes.oneOf(['band', 'line', 'none']),
-    y: PropTypes.oneOf(['line', 'none'])
+    y: PropTypes.oneOf(['band', 'line', 'none'])
   }),
   children: PropTypes.node,
   className: PropTypes.string,

package/modern/context/CartesianContextProvider.js

@@ -150,17 +150,17 @@ function CartesianContextProvider({
       const range = [drawingArea.top + drawingArea.height, drawingArea.top];
       if (isBandScaleConfig(axis)) {
         const categoryGapRatio = axis.categoryGapRatio ?? DEFAULT_CATEGORY_GAP_RATIO;
-        completedXAxis[axis.id] = _extends({
+        completedYAxis[axis.id] = _extends({
           categoryGapRatio,
           barGapRatio: 0
         }, axis, {
-          scale: scaleBand(axis.data, range).paddingInner(categoryGapRatio).paddingOuter(categoryGapRatio / 2),
+          scale: scaleBand(axis.data, [range[1], range[0]]).paddingInner(categoryGapRatio).paddingOuter(categoryGapRatio / 2),
           ticksNumber: axis.data.length
         });
       }
       if (isPointScaleConfig(axis)) {
-        completedXAxis[axis.id] = _extends({}, axis, {
-          scale: scalePoint(axis.data, range),
+        completedYAxis[axis.id] = _extends({}, axis, {
+          scale: scalePoint(axis.data, [range[1], range[0]]),
           ticksNumber: axis.data.length
         });
       }

package/modern/hooks/useAxisEvents.js

@@ -33,66 +33,49 @@ export const useAxisEvents = disableAxisListener => {
     if (element === null || disableAxisListener) {
       return () => {};
     }
-    const getUpdateY = y => {
-      if (usedYAxis === null) {
-        return null;
-      }
-      const {
-        scale: yScale,
-        data: yAxisData
-      } = yAxis[usedYAxis];
-      if (!isBandScale(yScale)) {
-        return {
-          value: yScale.invert(y)
-        };
-      }
-      const dataIndex = Math.floor((y - yScale.range()[0]) / yScale.step());
-      if (dataIndex < 0 || dataIndex >= yAxisData.length) {
-        return null;
-      }
-      return {
-        index: dataIndex,
-        value: yAxisData[dataIndex]
-      };
-    };
-    const getUpdateX = x => {
+    const getUpdate = (axisConfig, mouseValue) => {
       if (usedXAxis === null) {
         return null;
       }
       const {
-        scale: xScale,
-        data: xAxisData
-      } = xAxis[usedXAxis];
-      if (!isBandScale(xScale)) {
-        const value = xScale.invert(x);
-        const closestIndex = xAxisData?.findIndex((v, index) => {
+        scale,
+        data: axisData
+      } = axisConfig;
+      if (!isBandScale(scale)) {
+        const value = scale.invert(mouseValue);
+        if (axisData === undefined) {
+          return {
+            value
+          };
+        }
+        const closestIndex = axisData?.findIndex((v, index) => {
           if (v > value) {
             // @ts-ignore
-            if (index === 0 || Math.abs(value - v) <= Math.abs(value - xAxisData[index - 1])) {
+            if (index === 0 || Math.abs(value - v) <= Math.abs(value - axisData[index - 1])) {
               return true;
             }
           }
           if (v <= value) {
-            if (index === xAxisData.length - 1 ||
+            if (index === axisData.length - 1 ||
             // @ts-ignore
-            Math.abs(value - v) < Math.abs(value - xAxisData[index + 1])) {
+            Math.abs(value - v) < Math.abs(value - axisData[index + 1])) {
               return true;
             }
           }
           return false;
         });
         return {
-          value: closestIndex !== undefined && closestIndex >= 0 ? xAxisData[closestIndex] : value,
+          value: closestIndex !== undefined && closestIndex >= 0 ? axisData[closestIndex] : value,
           index: closestIndex
         };
       }
-      const dataIndex = xScale.bandwidth() === 0 ? Math.floor((x - xScale.range()[0] + xScale.step() / 2) / xScale.step()) : Math.floor((x - xScale.range()[0]) / xScale.step());
-      if (dataIndex < 0 || dataIndex >= xAxisData.length) {
+      const dataIndex = scale.bandwidth() === 0 ? Math.floor((mouseValue - Math.min(...scale.range()) + scale.step() / 2) / scale.step()) : Math.floor((mouseValue - Math.min(...scale.range())) / scale.step());
+      if (dataIndex < 0 || dataIndex >= axisData.length) {
         return null;
       }
       return {
         index: dataIndex,
-        value: xAxisData[dataIndex]
+        value: axisData[dataIndex]
       };
     };
     const handleMouseOut = () => {
@@ -130,8 +113,8 @@ export const useAxisEvents = disableAxisListener => {
         });
         return;
       }
-      const newStateX = getUpdateX(svgPt.x);
-      const newStateY = getUpdateY(svgPt.y);
+      const newStateX = getUpdate(xAxis[usedXAxis], svgPt.x);
+      const newStateY = getUpdate(yAxis[usedYAxis], svgPt.y);
       dispatch({
         type: 'updateAxis',
         data: {

package/modern/hooks/useTicks.js

@@ -25,9 +25,9 @@ function useTicks(options) {
       const domain = scale.domain();
       if (scale.bandwidth() > 0) {
         // scale type = 'band'
-        return [...domain.map((value, index) => ({
+        return [...domain.map(value => ({
           formattedValue: valueFormatter?.(value) ?? value,
-          offset: index === 0 ? scale.range()[0] : scale(value) - (scale.step() - scale.bandwidth()) / 2,
+          offset: scale(value) - (scale.step() - scale.bandwidth()) / 2,
           labelOffset: scale.step() / 2
         })), {
           formattedValue: undefined,

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-charts v6.0.0-alpha.7
+ * @mui/x-charts v6.0.0-alpha.9
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-charts",
-  "version": "6.0.0-alpha.7",
+  "version": "6.0.0-alpha.9",
   "description": "The community edition of the charts components (MUI X).",
   "author": "MUI Team",
   "main": "./index.js",
@@ -27,7 +27,7 @@
     "directory": "packages/x-charts"
   },
   "dependencies": {
-    "@babel/runtime": "^7.22.6",
+    "@babel/runtime": "^7.22.11",
     "clsx": "^2.0.0",
     "d3-color": "^3.1.0",
     "d3-scale": "^4.0.2",
@@ -58,8 +58,8 @@
     },
     "./*": {
       "types": "./*/index.d.ts",
-      "require": "./*",
-      "import": "./esm/*"
+      "require": "./*/index.js",
+      "import": "./esm/*/index.js"
     }
   },
   "setupFiles": [