@mui/x-charts 7.8.0 → 7.10.0

package/modern/ScatterChart/Scatter.js

@@ -5,6 +5,7 @@ import { getValueToPositionMapper } from '../hooks/useScale';
 import { useInteractionItemProps } from '../hooks/useInteractionItemProps';
 import { InteractionContext } from '../context/InteractionProvider';
 import { useHighlighted } from '../context';
+import { useDrawingArea } from '../hooks/useDrawingArea';
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * Demos:
@@ -26,6 +27,10 @@ function Scatter(props) {
     markerSize,
     onItemClick
   } = props;
+  const {
+    left,
+    width
+  } = useDrawingArea();
   const {
     useVoronoiInteraction
   } = React.useContext(InteractionContext);
@@ -38,10 +43,7 @@ function Scatter(props) {
   const cleanData = React.useMemo(() => {
     const getXPosition = getValueToPositionMapper(xScale);
     const getYPosition = getValueToPositionMapper(yScale);
-    const xRange = xScale.range();
     const yRange = yScale.range();
-    const minXRange = Math.min(...xRange);
-    const maxXRange = Math.max(...xRange);
     const minYRange = Math.min(...yRange);
     const maxYRange = Math.max(...yRange);
     const temp = [];
@@ -49,7 +51,7 @@ function Scatter(props) {
       const scatterPoint = series.data[i];
       const x = getXPosition(scatterPoint.x);
       const y = getYPosition(scatterPoint.y);
-      const isInRange = x >= minXRange && x <= maxXRange && y >= minYRange && y <= maxYRange;
+      const isInRange = x >= left && x <= left + width && y >= minYRange && y <= maxYRange;
       const pointCtx = {
         type: 'scatter',
         seriesId: series.id,
@@ -74,7 +76,7 @@ function Scatter(props) {
       }
     }
     return temp;
-  }, [xScale, yScale, series.data, series.id, getInteractionItemProps, color, colorGetter, isFaded, isHighlighted]);
+  }, [xScale, yScale, left, width, series.data, series.id, isHighlighted, isFaded, getInteractionItemProps, colorGetter, color]);
   return /*#__PURE__*/_jsx("g", {
     children: cleanData.map(dataPoint => /*#__PURE__*/_jsx("circle", _extends({
       cx: 0,

package/modern/ScatterChart/ScatterChart.js

@@ -339,7 +339,9 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     })]),
     data: PropTypes.array,
     dataKey: PropTypes.string,
-    id: PropTypes.string
+    id: PropTypes.string,
+    max: PropTypes.number,
+    min: PropTypes.number
   }))
 } : void 0;
 export { ScatterChart };

package/modern/context/CartesianProvider/computeValue.js

@@ -10,6 +10,16 @@ const getRange = (drawingArea, axisName, isReverse) => {
   const range = axisName === 'x' ? [drawingArea.left, drawingArea.left + drawingArea.width] : [drawingArea.top + drawingArea.height, drawingArea.top];
   return isReverse ? range.reverse() : range;
 };
+const zoomedScaleRange = (scaleRange, zoomRange) => {
+  const rangeGap = scaleRange[1] - scaleRange[0];
+  const zoomGap = zoomRange[1] - zoomRange[0];
+
+  // If current zoom show the scale between p1 and p2 percents
+  // The range should be extended by adding [0, p1] and [p2, 100] segments
+  const min = scaleRange[0] - zoomRange[0] * rangeGap / zoomGap;
+  const max = scaleRange[1] + (100 - zoomRange[1]) * rangeGap / zoomGap;
+  return [min, max];
+};
 const isDateData = data => data?.[0] instanceof Date;
 function createDateFormatter(axis, range) {
   const timeScale = scaleTime(axis.data, range);
@@ -19,7 +29,7 @@ function createDateFormatter(axis, range) {
 }
 const DEFAULT_CATEGORY_GAP_RATIO = 0.2;
 const DEFAULT_BAR_GAP_RATIO = 0.1;
-export function computeValue(drawingArea, formattedSeries, inAxis, extremumGetters, axisName) {
+export function computeValue(drawingArea, formattedSeries, inAxis, extremumGetters, axisName, zoomRange = [0, 100]) {
   const DEFAULT_AXIS_KEY = axisName === 'x' ? DEFAULT_X_AXIS_KEY : DEFAULT_Y_AXIS_KEY;
   const allAxis = [...(inAxis?.map((axis, index) => _extends({
     id: `defaultized-${axisName}-axis-${index}`
@@ -39,11 +49,12 @@ export function computeValue(drawingArea, formattedSeries, inAxis, extremumGette
       const barGapRatio = axis.barGapRatio ?? DEFAULT_BAR_GAP_RATIO;
       // Reverse range because ordinal scales are presented from top to bottom on y-axis
       const scaleRange = axisName === 'x' ? range : [range[1], range[0]];
+      const zoomedRange = zoomedScaleRange(scaleRange, zoomRange);
       completeAxis[axis.id] = _extends({
         categoryGapRatio,
         barGapRatio
       }, axis, {
-        scale: scaleBand(axis.data, scaleRange).paddingInner(categoryGapRatio).paddingOuter(categoryGapRatio / 2),
+        scale: scaleBand(axis.data, zoomedRange).paddingInner(categoryGapRatio).paddingOuter(categoryGapRatio / 2),
         tickNumber: axis.data.length,
         colorScale: axis.colorMap && (axis.colorMap.type === 'ordinal' ? getOrdinalColorScale(_extends({
           values: axis.data
@@ -56,8 +67,9 @@ export function computeValue(drawingArea, formattedSeries, inAxis, extremumGette
     }
     if (isPointScaleConfig(axis)) {
       const scaleRange = axisName === 'x' ? range : [...range].reverse();
+      const zoomedRange = zoomedScaleRange(scaleRange, zoomRange);
       completeAxis[axis.id] = _extends({}, axis, {
-        scale: scalePoint(axis.data, scaleRange),
+        scale: scalePoint(axis.data, zoomedRange),
         tickNumber: axis.data.length,
         colorScale: axis.colorMap && (axis.colorMap.type === 'ordinal' ? getOrdinalColorScale(_extends({
           values: axis.data
@@ -74,11 +86,15 @@ export function computeValue(drawingArea, formattedSeries, inAxis, extremumGette
     }
     const scaleType = axis.scaleType ?? 'linear';
     const extremums = [axis.min ?? minData, axis.max ?? maxData];
-    const tickNumber = getTickNumber(_extends({}, axis, {
+    const rawTickNumber = getTickNumber(_extends({}, axis, {
       range,
       domain: extremums
     }));
-    const scale = getScale(scaleType, extremums, range).nice(tickNumber);
+    const tickNumber = rawTickNumber / ((zoomRange[1] - zoomRange[0]) / 100);
+    const zoomedRange = zoomedScaleRange(range, zoomRange);
+
+    // TODO: move nice to prop? Disable when there is zoom?
+    const scale = getScale(scaleType, extremums, zoomedRange).nice(rawTickNumber);
     const [minDomain, maxDomain] = scale.domain();
     const domain = [axis.min ?? minDomain, axis.max ?? maxDomain];
     completeAxis[axis.id] = _extends({}, axis, {

package/modern/context/ZAxisContextProvider.js

@@ -37,7 +37,10 @@ function ZAxisContextProvider(props) {
       completedZAxis[axis.id] = _extends({}, axis, {
         colorScale: axis.colorMap && (axis.colorMap.type === 'ordinal' && axis.data ? getOrdinalColorScale(_extends({
           values: axis.data
-        }, axis.colorMap)) : getColorScale(axis.colorMap))
+        }, axis.colorMap)) : getColorScale(axis.colorMap.type === 'continuous' ? _extends({
+          min: axis.min,
+          max: axis.max
+        }, axis.colorMap) : axis.colorMap))
       });
     });
     return {
@@ -83,7 +86,9 @@ process.env.NODE_ENV !== "production" ? ZAxisContextProvider.propTypes = {
     })]),
     data: PropTypes.array,
     dataKey: PropTypes.string,
-    id: PropTypes.string
+    id: PropTypes.string,
+    max: PropTypes.number,
+    min: PropTypes.number
   }))
 } : void 0;
 export { ZAxisContextProvider };

package/modern/hooks/index.js

@@ -1,6 +1,7 @@
 export * from './useDrawingArea';
 export * from './useChartId';
 export * from './useScale';
+export * from './useAxis';
 export * from './useColorScale';
 export * from './useSvgRef';
 export { useSeries as unstable_useSeries, usePieSeries as unstable_usePieSeries, useLineSeries as unstable_useLineSeries, useBarSeries as unstable_useBarSeries, useScatterSeries as unstable_useScatterSeries } from './useSeries';

package/modern/hooks/useAxis.js

@@ -0,0 +1,17 @@
+import { useCartesianContext } from '../context/CartesianProvider';
+export function useXAxis(identifier) {
+  const {
+    xAxis,
+    xAxisIds
+  } = useCartesianContext();
+  const id = typeof identifier === 'string' ? identifier : xAxisIds[identifier ?? 0];
+  return xAxis[id];
+}
+export function useYAxis(identifier) {
+  const {
+    yAxis,
+    yAxisIds
+  } = useCartesianContext();
+  const id = typeof identifier === 'string' ? identifier : yAxisIds[identifier ?? 0];
+  return yAxis[id];
+}

package/modern/hooks/useAxisEvents.js

@@ -98,7 +98,7 @@ export const useAxisEvents = disableAxisListener => {
     };
     const handleMove = event => {
       const target = 'targetTouches' in event ? event.targetTouches[0] : event;
-      const svgPoint = getSVGPoint(svgRef.current, target);
+      const svgPoint = getSVGPoint(element, target);
       mousePosition.current = {
         x: svgPoint.x,
         y: svgPoint.y
@@ -121,15 +121,26 @@ export const useAxisEvents = disableAxisListener => {
         }
       });
     };
-    element.addEventListener('mouseout', handleOut);
-    element.addEventListener('mousemove', handleMove);
-    element.addEventListener('touchend', handleOut);
-    element.addEventListener('touchmove', handleMove);
+    const handleDown = event => {
+      const target = event.currentTarget;
+      if (!target) {
+        return;
+      }
+      if (target.hasPointerCapture(event.pointerId)) {
+        target.releasePointerCapture(event.pointerId);
+      }
+    };
+    element.addEventListener('pointerdown', handleDown);
+    element.addEventListener('pointermove', handleMove);
+    element.addEventListener('pointerout', handleOut);
+    element.addEventListener('pointercancel', handleOut);
+    element.addEventListener('pointerleave', handleOut);
     return () => {
-      element.removeEventListener('mouseout', handleOut);
-      element.removeEventListener('mousemove', handleMove);
-      element.removeEventListener('touchend', handleOut);
-      element.removeEventListener('touchmove', handleMove);
+      element.removeEventListener('pointerdown', handleDown);
+      element.removeEventListener('pointermove', handleMove);
+      element.removeEventListener('pointerout', handleOut);
+      element.removeEventListener('pointercancel', handleOut);
+      element.removeEventListener('pointerleave', handleOut);
     };
   }, [svgRef, dispatch, left, width, top, height, usedYAxis, yAxis, usedXAxis, xAxis, disableAxisListener]);
 };

package/modern/hooks/useInteractionItemProps.js

@@ -13,7 +13,12 @@ export const useInteractionItemProps = skip => {
     return () => ({});
   }
   const getInteractionItemProps = data => {
-    const onMouseEnter = () => {
+    const onPointerDown = event => {
+      if (event.currentTarget.hasPointerCapture(event.pointerId)) {
+        event.currentTarget.releasePointerCapture(event.pointerId);
+      }
+    };
+    const onPointerEnter = () => {
       dispatchInteraction({
         type: 'enterItem',
         data
@@ -23,7 +28,8 @@ export const useInteractionItemProps = skip => {
         dataIndex: data.dataIndex
       });
     };
-    const onMouseLeave = () => {
+    const onPointerLeave = event => {
+      event.currentTarget.releasePointerCapture(event.pointerId);
       dispatchInteraction({
         type: 'leaveItem',
         data
@@ -31,8 +37,9 @@ export const useInteractionItemProps = skip => {
       clearHighlighted();
     };
     return {
-      onMouseEnter,
-      onMouseLeave
+      onPointerEnter,
+      onPointerLeave,
+      onPointerDown
     };
   };
   return getInteractionItemProps;

package/modern/hooks/useScale.js

@@ -1,5 +1,6 @@
-import { useCartesianContext } from '../context/CartesianProvider';
 import { isBandScale } from '../internals/isBandScale';
+import { useXAxis, useYAxis } from './useAxis';
+
 /**
  * For a given scale return a function that map value to their position.
  * Useful when dealing with specific scale such as band.
@@ -13,18 +14,10 @@ export function getValueToPositionMapper(scale) {
   return value => scale(value);
 }
 export function useXScale(identifier) {
-  const {
-    xAxis,
-    xAxisIds
-  } = useCartesianContext();
-  const id = typeof identifier === 'string' ? identifier : xAxisIds[identifier ?? 0];
-  return xAxis[id].scale;
+  const axis = useXAxis(identifier);
+  return axis.scale;
 }
 export function useYScale(identifier) {
-  const {
-    yAxis,
-    yAxisIds
-  } = useCartesianContext();
-  const id = typeof identifier === 'string' ? identifier : yAxisIds[identifier ?? 0];
-  return yAxis[id].scale;
+  const axis = useYAxis(identifier);
+  return axis.scale;
 }

package/modern/index.js

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

package/modern/internals/index.js

@@ -6,6 +6,7 @@ export * from '../ResponsiveChartContainer/ResizableContainer';
 // hooks
 export { useReducedMotion } from '../hooks/useReducedMotion';
 export { useSeries } from '../hooks/useSeries';
+export { useInteractionItemProps } from '../hooks/useInteractionItemProps';
 export { useDrawingArea } from '../hooks/useDrawingArea';
 export { useChartContainerHooks } from '../ChartContainer/useChartContainerHooks';
 export { useScatterChartProps } from '../ScatterChart/useScatterChartProps';
@@ -15,6 +16,7 @@ export { useBarChartProps } from '../BarChart/useBarChartProps';
 // utils
 export * from './defaultizeValueFormatter';
 export * from './configInit';
+export * from './getLabel';
 export * from './getSVGPoint';
 
 // contexts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-charts",
-  "version": "7.8.0",
+  "version": "7.10.0",
   "description": "The community edition of the Charts components (MUI X).",
   "author": "MUI Team",
   "main": "./index.js",
@@ -31,8 +31,8 @@
   "dependencies": {
     "@babel/runtime": "^7.24.7",
     "@mui/base": "^5.0.0-beta.40",
-    "@mui/system": "^5.15.20",
-    "@mui/utils": "^5.15.20",
+    "@mui/system": "^5.16.0",
+    "@mui/utils": "^5.16.0",
     "@react-spring/rafz": "^9.7.3",
     "@react-spring/web": "^9.7.3",
     "clsx": "^2.1.1",

package/themeAugmentation/props.d.ts

@@ -13,6 +13,7 @@ import { LineChartProps } from '../LineChart/LineChart';
 import { ScatterProps } from '../ScatterChart/Scatter';
 import { ScatterChartProps } from '../ScatterChart/ScatterChart';
 import { ChartsXAxisProps, ChartsYAxisProps } from '../models/axis';
+import { ChartSeriesType } from '../models/seriesType/config';
 
 export interface ChartsComponentsPropsList {
   MuiChartsAxis: ChartsAxisProps;
@@ -22,7 +23,7 @@ export interface ChartsComponentsPropsList {
   MuiChartsClipPath: ChartsClipPathProps;
   MuiChartsGrid: ChartsGridProps;
   MuiChartsLegend: ChartsLegendProps;
-  MuiChartsTooltip: ChartsTooltipProps;
+  MuiChartsTooltip: ChartsTooltipProps<ChartSeriesType>;
   MuiChartsSurface: ChartsSurfaceProps;
 
   // BarChart components