@mui/x-charts-pro 8.5.2 → 8.5.3

package/CHANGELOG.md

@@ -5,6 +5,101 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 8.5.3
+
+_Jun 19, 2025_
+
+We'd like to extend a big thank you to the 10 contributors who made this release possible. Here are some highlights ✨:
+
+- 📚 Documentation improvements
+- 🐞 Bugfixes
+
+Special thanks go out to the community members for their valuable contributions:
+@alisasanib, @arminmeh, @sai6855
+
+The following are all team members who have contributed to this release:
+@alexfauquette, @bernardobelchior, @flaviendelangle, @JCQuintas, @LukasTy, @MBilalShafi, @oliviertassinari
+
+### Data Grid
+
+#### `@mui/x-data-grid@8.5.3`
+
+- [DataGrid] Fix export menu button tooltip being interactive when menu is open (#18327) @bernardobelchior
+- [DataGrid] Fix column menu scroll close (#18065) @alisasanib
+- [DataGrid] Fix page size issue with data source (#18419) @MBilalShafi
+
+#### `@mui/x-data-grid-pro@8.5.3` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-data-grid@8.5.3`, plus:
+
+- [DataGridPro] Ignore missing `rowCount` response when new children are fetched with the data source (#17711) @arminmeh
+
+#### `@mui/x-data-grid-premium@8.5.3` [![premium](https://mui.com/r/x-premium-svg)](https://mui.com/r/x-premium-svg-link 'Premium plan')
+
+Same changes as in `@mui/x-data-grid-pro@8.5.3`.
+
+### Date and Time Pickers
+
+#### `@mui/x-date-pickers@8.5.3`
+
+- [pickers] Add `inputSizeSmall` to classes interface (#18242) @sai6855
+
+#### `@mui/x-date-pickers-pro@8.5.3` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-date-pickers@8.5.3`.
+
+### Charts
+
+#### `@mui/x-charts@8.5.3`
+
+- [charts] Add item class to list item around each series in legend (#18411) @bernardobelchior
+- [charts] Allow `tabIndex` in surface and legend (#18344) @JCQuintas
+- [charts] Explore selector typing (#18362) @alexfauquette
+- [charts] Fix highlight with number ids (#18423) @alexfauquette
+- [charts] Make scatter chart use data attributes (#18048) @alexfauquette
+
+#### `@mui/x-charts-pro@8.5.3` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-charts@8.5.3`, plus:
+
+- [charts-pro] Add data-series to elements of funnel chart (#18067) @JCQuintas
+- [charts-pro] Hide values outside minStart and maxEnd in zoom slider (#18336) @bernardobelchior
+- [charts-pro] Fix `FunnelChart` label positioning with different curves (#18354) @JCQuintas
+
+### Tree View
+
+#### `@mui/x-tree-view@8.5.3`
+
+Internal changes.
+
+#### `@mui/x-tree-view-pro@8.5.3` [![pro](https://mui.com/r/x-pro-svg)](https://mui.com/r/x-pro-svg-link 'Pro plan')
+
+Same changes as in `@mui/x-tree-view@8.5.3`.
+
+### Codemod
+
+#### `@mui/x-codemod@8.5.3`
+
+Internal changes.
+
+### Docs
+
+- [docs] Fix 404 in charts docs (#18440) @alexfauquette
+- [docs][pickers] Fix adapter version resolving when opening demo to edit (#18363) @LukasTy
+
+### Core
+
+- [core] Fix pnpm valelint error (#18420) @oliviertassinari
+
+### Miscellaneous
+
+- [code-infra] Add back a `Playwright` renovate group (#18397) @LukasTy
+- [code-infra] Setup `CODEOWNERS` for charts repositories (#18418) @JCQuintas
+- [code-infra] Strengthen `URL` usage for test config (#18444) @LukasTy
+- [code-infra] Use `vitest` bundled types (#17758) @JCQuintas
+- [infra] Stabilise tests by removing babel and plugins from vitest (#18341) @JCQuintas
+- [infra] Add automated release PR creation script (#18345) @michelengelen
+
 ## 8.5.2
 
 _Jun 12, 2025_
@@ -94,7 +189,7 @@ Same changes as in `@mui/x-tree-view@8.5.2`.
 - [code-infra] Revert `React` to `19.0.0` (#18265) @LukasTy
 - [code-infra] Use `catalog` for reused dependencies (#18302) @LukasTy
 - [infra] Remove unused karma/mocha deps and files (#18340) @JCQuintas
-- [infra] Update github label references to use 'scope' instead of 'component' (#18260) @michelengelen
+- [infra] Update GitHub label references to use 'scope' instead of 'component' (#18260) @michelengelen
 - [infra] Use a single browser server in CI (#18230) @JCQuintas
 
 ## 8.5.1
@@ -189,15 +284,6 @@ Same changes as in `@mui/x-tree-view@8.5.1`.
 
 ### Core
 
-- chore(deps): bump @next/eslint-plugin-next to 15.3.3 (#18155) @renovate[bot]
-- chore(deps): bump @types/lodash to ^4.17.17 (#17990) @renovate[bot]
-- chore(deps): bump babel (#18157) @renovate[bot]
-- chore(deps): bump eslint to ^9.28.0 (#17352) @renovate[bot]
-- chore(deps): bump material ui (#17802) @renovate[bot]
-- chore(deps): bump next to ^15.3.3 (#18159) @renovate[bot]
-- chore(deps): bump ossf/scorecard-action action to v2.4.2 (#18160) @renovate[bot]
-- chore(deps): bump react-router to ^7.6.1 (#18162) @renovate[bot]
-- chore(deps): bump yargs to ^18.0.0 (#18169) @renovate[bot]
 - [code-infra] Different approach to console testing for `processRowUpdate` (#18213) @JCQuintas
 - [code-infra] Fix act warnings in DataGrid/toolbar (#18207) @JCQuintas
 - [code-infra] Remove `istanbul` references (#18194) @JCQuintas
@@ -4641,7 +4727,6 @@ No changes since `@mui/x-charts@7.22.2`.
 - [docs] Add `next` version links (#15423) @LukasTy
 - [docs] Use the `loading` state in the demos (#15538) @cherniavskii
 - [docs] Add data caching to lazy loaded detail panel demo (#15506) @cherniavskii
-
 - [code-infra] Tentative fix for Argos flaky screenshot tests (#15399) @JCQuintas
 - [docs-infra] Transpile `.ts` demo files (#15421) @KenanYusuf
 - [core] Clarify release version bump strategy (#15536) @cherniavskii

package/ChartDataProviderPro/ChartDataProviderPro.js

@@ -18,7 +18,7 @@ var _material = require("../internals/material");
 var _allPlugins = require("../internals/plugins/allPlugins");
 var _useChartDataProviderProProps = require("./useChartDataProviderProProps");
 var _jsxRuntime = require("react/jsx-runtime");
-const releaseInfo = "MTc0OTY3OTIwMDAwMA==";
+const releaseInfo = "MTc1MDI4NDAwMDAwMA==";
 const packageIdentifier = 'x-charts-pro';
 /**
  * Orchestrates the data providers for the chart components and hooks.

package/ChartZoomSlider/internals/ChartAxisZoomSlider.js

@@ -24,7 +24,7 @@ function ChartAxisZoomSlider({
 }) {
   const store = (0, _internals.useStore)();
   const drawingArea = (0, _internals.useDrawingArea)();
-  const zoomData = (0, _internals.useSelector)(store, _useChartProZoom.selectorChartAxisZoomData, axisId);
+  const zoomData = (0, _internals.useSelector)(store, _useChartProZoom.selectorChartAxisZoomData, [axisId]);
   const [showTooltip, setShowTooltip] = React.useState(false);
   const {
     xAxis

package/ChartZoomSlider/internals/ChartAxisZoomSliderActiveTrack.js

@@ -40,7 +40,7 @@ function ChartAxisZoomSliderActiveTrack({
     svgRef
   } = (0, _internals.useChartContext)();
   const store = (0, _internals.useStore)();
-  const axis = (0, _internals.useSelector)(store, _internals.selectorChartAxis, axisId);
+  const axis = (0, _internals.useSelector)(store, _internals.selectorChartAxis, [axisId]);
   const drawingArea = (0, _internals.useDrawingArea)();
   const activePreviewRectRef = React.useRef(null);
   const [startThumbEl, setStartThumbEl] = React.useState(null);
@@ -56,10 +56,6 @@ function ChartAxisZoomSliderActiveTrack({
     if (!activePreviewRect) {
       return;
     }
-
-    /* min and max values of zoom to ensure the pointer anchor in the slider is maintained  */
-    let pointerZoomMin;
-    let pointerZoomMax;
     let prevPointerZoom = 0;
     const onPointerMove = (0, _rafThrottle.rafThrottle)(event => {
       const element = svgRef.current;
@@ -67,11 +63,10 @@ function ChartAxisZoomSliderActiveTrack({
         return;
       }
       const point = (0, _internals.getSVGPoint)(element, event);
-      let pointerZoom = (0, _zoomUtils.calculateZoomFromPoint)(store.getSnapshot(), axisId, point);
+      const pointerZoom = (0, _zoomUtils.calculateZoomFromPoint)(store.getSnapshot(), axisId, point);
       if (pointerZoom === null) {
         return;
       }
-      pointerZoom = Math.max(pointerZoomMin, Math.min(pointerZoomMax, pointerZoom));
       const deltaZoom = pointerZoom - prevPointerZoom;
       prevPointerZoom = pointerZoom;
       instance.moveZoomRange(axisId, deltaZoom);
@@ -95,8 +90,6 @@ function ChartAxisZoomSliderActiveTrack({
         return;
       }
       prevPointerZoom = pointerDownZoom;
-      pointerZoomMin = pointerDownZoom - axisZoomData.start;
-      pointerZoomMax = 100 - (axisZoomData.end - pointerDownZoom);
       document.addEventListener('pointerup', onPointerUp);
       activePreviewRect.addEventListener('pointermove', onPointerMove);
     };
@@ -137,23 +130,12 @@ function ChartAxisZoomSliderActiveTrack({
     }
     const point = (0, _internals.getSVGPoint)(element, event);
     instance.setZoomData(prevZoomData => {
-      const {
-        left,
-        top,
-        width,
-        height
-      } = (0, _internals.selectorChartDrawingArea)(store.getSnapshot());
       const zoomOptions = (0, _internals.selectorChartAxisZoomOptionsLookup)(store.getSnapshot(), axisId);
       return prevZoomData.map(zoom => {
         if (zoom.axisId === axisId) {
-          let newEnd;
-          if (axisDirection === 'x') {
-            newEnd = (point.x - left) / width * 100;
-          } else {
-            newEnd = (top + height - point.y) / height * 100;
-          }
-          if (reverse) {
-            newEnd = 100 - newEnd;
+          const newEnd = (0, _zoomUtils.calculateZoomFromPoint)(store.getSnapshot(), axisId, point);
+          if (newEnd === null) {
+            return zoom;
           }
           return (0, _extends2.default)({}, zoom, {
             end: (0, _zoomUtils.calculateZoomEnd)(newEnd, zoom, zoomOptions)
@@ -171,14 +153,21 @@ function ChartAxisZoomSliderActiveTrack({
   let startThumbY;
   let endThumbX;
   let endThumbY;
+  const {
+    minStart,
+    maxEnd
+  } = (0, _internals.selectorChartAxisZoomOptionsLookup)(store.getSnapshot(), axisId);
+  const range = maxEnd - minStart;
+  const zoomStart = Math.max(minStart, zoomData.start);
+  const zoomEnd = Math.min(zoomData.end, maxEnd);
   if (axisDirection === 'x') {
-    previewX = zoomData.start / 100 * drawingArea.width;
+    previewX = (zoomStart - minStart) / range * drawingArea.width;
     previewY = 0;
-    previewWidth = drawingArea.width * (zoomData.end - zoomData.start) / 100;
+    previewWidth = drawingArea.width * (zoomEnd - zoomStart) / range;
     previewHeight = _constants.ZOOM_SLIDER_ACTIVE_TRACK_SIZE;
-    startThumbX = zoomData.start / 100 * drawingArea.width;
+    startThumbX = (zoomStart - minStart) / range * drawingArea.width;
     startThumbY = 0;
-    endThumbX = zoomData.end / 100 * drawingArea.width;
+    endThumbX = (zoomEnd - minStart) / range * drawingArea.width;
     endThumbY = 0;
     if (reverse) {
       previewX = drawingArea.width - previewX - previewWidth;
@@ -189,13 +178,13 @@ function ChartAxisZoomSliderActiveTrack({
     endThumbX -= previewThumbWidth / 2;
   } else {
     previewX = 0;
-    previewY = drawingArea.height - zoomData.end / 100 * drawingArea.height;
+    previewY = drawingArea.height - (zoomEnd - minStart) / range * drawingArea.height;
     previewWidth = _constants.ZOOM_SLIDER_ACTIVE_TRACK_SIZE;
-    previewHeight = drawingArea.height * (zoomData.end - zoomData.start) / 100;
+    previewHeight = drawingArea.height * (zoomEnd - zoomStart) / range;
     startThumbX = 0;
-    startThumbY = drawingArea.height - zoomData.start / 100 * drawingArea.height;
+    startThumbY = drawingArea.height - (zoomStart - minStart) / range * drawingArea.height;
     endThumbX = 0;
-    endThumbY = drawingArea.height - zoomData.end / 100 * drawingArea.height;
+    endThumbY = drawingArea.height - (zoomEnd - minStart) / range * drawingArea.height;
     if (reverse) {
       previewY = drawingArea.height - previewY - previewHeight;
       startThumbY = drawingArea.height - startThumbY;

package/ChartZoomSlider/internals/ChartAxisZoomSliderTrack.js

@@ -63,17 +63,10 @@ function ChartAxisZoomSliderTrack(_ref) {
       return;
     }
     const pointerDownPoint = (0, _internals.getSVGPoint)(element, event);
-    let zoomFromPointerDown = (0, _zoomUtils.calculateZoomFromPoint)(store.getSnapshot(), axisId, pointerDownPoint);
+    const zoomFromPointerDown = (0, _zoomUtils.calculateZoomFromPoint)(store.getSnapshot(), axisId, pointerDownPoint);
     if (zoomFromPointerDown === null) {
       return;
     }
-    const {
-      minStart,
-      maxEnd
-    } = (0, _internals.selectorChartAxisZoomOptionsLookup)(store.getSnapshot(), axisId);
-
-    // Ensure the zoomFromPointerDown is within the min and max range
-    zoomFromPointerDown = Math.max(Math.min(zoomFromPointerDown, maxEnd), minStart);
     const onPointerMove = (0, _rafThrottle.rafThrottle)(function onPointerMove(pointerMoveEvent) {
       const pointerMovePoint = (0, _internals.getSVGPoint)(element, pointerMoveEvent);
       const zoomFromPointerMove = (0, _zoomUtils.calculateZoomFromPoint)(store.getSnapshot(), axisId, pointerMovePoint);

package/ChartZoomSlider/internals/zoom-utils.d.ts

@@ -1,4 +1,6 @@
-import { AxisId, ChartState, DefaultizedZoomOptions, ZoomData } from '@mui/x-charts/internals';
+import { AxisId, ChartState, DefaultedXAxis, DefaultedYAxis, DefaultizedZoomOptions, ZoomData } from '@mui/x-charts/internals';
+import { ChartDrawingArea } from '@mui/x-charts/hooks';
 export declare function calculateZoomFromPoint(state: ChartState<any>, axisId: AxisId, point: DOMPoint): number | null;
+export declare function calculateZoomFromPointImpl(drawingArea: ChartDrawingArea, axis: Pick<DefaultedXAxis | DefaultedYAxis, 'position' | 'reverse'>, zoomOptions: Pick<DefaultizedZoomOptions, 'minStart' | 'maxEnd'>, point: Pick<DOMPoint, 'x' | 'y'>): number;
 export declare function calculateZoomStart(newStart: number, currentZoom: ZoomData, options: Pick<DefaultizedZoomOptions, 'minStart' | 'minSpan' | 'maxSpan'>): number;
 export declare function calculateZoomEnd(newEnd: number, currentZoom: ZoomData, options: Pick<DefaultizedZoomOptions, 'maxEnd' | 'minSpan' | 'maxSpan'>): number;

package/ChartZoomSlider/internals/zoom-utils.js

@@ -5,28 +5,39 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.calculateZoomEnd = calculateZoomEnd;
 exports.calculateZoomFromPoint = calculateZoomFromPoint;
+exports.calculateZoomFromPointImpl = calculateZoomFromPointImpl;
 exports.calculateZoomStart = calculateZoomStart;
 var _internals = require("@mui/x-charts/internals");
 function calculateZoomFromPoint(state, axisId, point) {
+  const axis = (0, _internals.selectorChartRawAxis)(state, axisId);
+  if (!axis) {
+    return null;
+  }
+  return calculateZoomFromPointImpl((0, _internals.selectorChartDrawingArea)(state), axis, (0, _internals.selectorChartAxisZoomOptionsLookup)(state, axisId), point);
+}
+function calculateZoomFromPointImpl(drawingArea, axis, zoomOptions, point) {
   const {
     left,
     top,
     height,
     width
-  } = (0, _internals.selectorChartDrawingArea)(state);
-  const axis = (0, _internals.selectorChartRawAxis)(state, axisId);
-  if (!axis) {
-    return null;
-  }
+  } = drawingArea;
+  const {
+    minStart,
+    maxEnd
+  } = zoomOptions;
   const axisDirection = axis.position === 'right' || axis.position === 'left' ? 'y' : 'x';
+  const range = maxEnd - minStart;
   let pointerZoom;
   if (axisDirection === 'x') {
-    pointerZoom = (point.x - left) / width * 100;
+    pointerZoom = (point.x - left) / width * range;
   } else {
-    pointerZoom = (top + height - point.y) / height * 100;
+    pointerZoom = (top + height - point.y) / height * range;
   }
   if (axis.reverse) {
-    pointerZoom = 100 - pointerZoom;
+    pointerZoom = maxEnd - pointerZoom;
+  } else {
+    pointerZoom += minStart;
   }
   return pointerZoom;
 }

package/FunnelChart/FunnelPlot.js

@@ -105,21 +105,21 @@ const useAggregatedData = () => {
           min: minPoint,
           max: maxPoint
         });
-        const line = (0, _d3Shape.line)().x(d => xPosition(d.x, dataIndex, baseScaleConfig.data?.[dataIndex], d.stackOffset, d.useBandWidth)).y(d => yPosition(d.y, dataIndex, baseScaleConfig.data?.[dataIndex], d.stackOffset, d.useBandWidth)).curve(curve);
+        const bandPoints = curve({}).processPoints(values.map(v => ({
+          x: xPosition(v.x, dataIndex, baseScaleConfig.data?.[dataIndex], v.stackOffset, v.useBandWidth),
+          y: yPosition(v.y, dataIndex, baseScaleConfig.data?.[dataIndex], v.stackOffset, v.useBandWidth)
+        })));
+        const line = (0, _d3Shape.line)().x(v => v.x).y(v => v.y).curve(curve);
         return {
-          d: line(values),
+          d: line(bandPoints),
           color,
           id,
           seriesId,
           dataIndex,
           variant: currentSeries.variant,
           label: sectionLabel !== false && (0, _extends2.default)({}, (0, _labelUtils.positionLabel)((0, _extends2.default)({}, sectionLabel, {
-            xPosition,
-            yPosition,
             isHorizontal,
-            values,
-            dataIndex,
-            baseScaleData: baseScaleConfig.data ?? []
+            values: bandPoints
           })), (0, _labelUtils.alignLabel)(sectionLabel ?? {}), {
             value: valueFormatter ? valueFormatter(currentSeries.data[dataIndex], {
               dataIndex
@@ -128,7 +128,7 @@ const useAggregatedData = () => {
         };
       });
     });
-    return result.flat();
+    return result;
   }, [seriesData, xAxis, xAxisIds, yAxis, yAxisIds, gap]);
   return allData;
 };
@@ -139,41 +139,57 @@ function FunnelPlot(props) {
     other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const data = useAggregatedData();
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(React.Fragment, {
-    children: [data.map(({
-      d,
-      color,
-      id,
-      seriesId,
-      dataIndex,
-      variant
-    }) => /*#__PURE__*/(0, _react.createElement)(_FunnelSection.FunnelSection, (0, _extends2.default)({}, other, {
-      d: d,
-      color: color,
-      key: id,
-      dataIndex: dataIndex,
-      seriesId: seriesId,
-      variant: variant,
-      onClick: onItemClick && (event => {
-        onItemClick(event, {
-          type: 'funnel',
+    children: [data.map(series => {
+      if (series.length === 0) {
+        return null;
+      }
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)("g", {
+        "data-series": series[0].seriesId,
+        children: series.map(({
+          d,
+          color,
+          id,
           seriesId,
-          dataIndex
-        });
-      })
-    }))), data.map(({
-      id,
-      label,
-      seriesId,
-      dataIndex
-    }) => {
-      if (!label || !label.value) {
+          dataIndex,
+          variant
+        }) => /*#__PURE__*/(0, _react.createElement)(_FunnelSection.FunnelSection, (0, _extends2.default)({}, other, {
+          d: d,
+          color: color,
+          key: id,
+          dataIndex: dataIndex,
+          seriesId: seriesId,
+          variant: variant,
+          onClick: onItemClick && (event => {
+            onItemClick(event, {
+              type: 'funnel',
+              seriesId,
+              dataIndex
+            });
+          })
+        })))
+      }, series[0].seriesId);
+    }), data.map(series => {
+      if (series.length === 0) {
         return null;
       }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FunnelSectionLabel.FunnelSectionLabel, (0, _extends2.default)({
-        label: label,
-        dataIndex: dataIndex,
-        seriesId: seriesId
-      }, other), id);
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)("g", {
+        "data-series": series[0].seriesId,
+        children: series.map(({
+          id,
+          label,
+          seriesId,
+          dataIndex
+        }) => {
+          if (!label || !label.value) {
+            return null;
+          }
+          return /*#__PURE__*/(0, _jsxRuntime.jsx)(_FunnelSectionLabel.FunnelSectionLabel, (0, _extends2.default)({
+            label: label,
+            dataIndex: dataIndex,
+            seriesId: seriesId
+          }, other), id);
+        })
+      }, series[0].seriesId);
     })]
   });
 }

package/FunnelChart/FunnelSection.js

@@ -60,6 +60,8 @@ const FunnelSection = exports.FunnelSection = (0, _internals.consumeSlots)('MuiF
     strokeWidth: isOutlined ? 1.5 : 0,
     cursor: onClick ? 'pointer' : 'unset',
     onClick: onClick,
+    "data-highlighted": isHighlighted || undefined,
+    "data-faded": isFaded || undefined,
     className: (0, _clsx.default)(classes?.root, className, isOutlined ? classes?.outlined : classes?.filled, isHighlighted && classes?.highlighted, isFaded && classes?.faded)
   }, other, {
     ref: ref

package/FunnelChart/curves/bump.d.ts

@@ -1,5 +1,4 @@
-import { CurveGenerator } from '@mui/x-charts-vendor/d3-shape';
-import { CurveOptions } from "./curve.types.js";
+import { FunnelCurveGenerator, CurveOptions, Point } from "./curve.types.js";
 /**
  * This is a custom "bump" curve generator.
  * It draws smooth curves for the 4 provided points,
@@ -8,7 +7,7 @@ import { CurveOptions } from "./curve.types.js";
  * The implementation is based on the d3-shape bump curve generator.
  * https://github.com/d3/d3-shape/blob/a82254af78f08799c71d7ab25df557c4872a3c51/src/curve/bump.js
  */
-export declare class Bump implements CurveGenerator {
+export declare class Bump implements FunnelCurveGenerator {
   private context;
   private isHorizontal;
   private min;
@@ -24,6 +23,7 @@ export declare class Bump implements CurveGenerator {
   areaEnd(): void;
   lineStart(): void;
   lineEnd(): void;
+  processPoints(points: Point[]): Point[];
   point(x: number, y: number): void;
   private drawPath;
   private drawHorizontalPath;

package/FunnelChart/curves/bump.js

@@ -53,6 +53,9 @@ class Bump {
   areaEnd() {}
   lineStart() {}
   lineEnd() {}
+  processPoints(points) {
+    return points;
+  }
   point(x, y) {
     this.points.push({
       x,

package/FunnelChart/curves/curve.types.d.ts

@@ -1,3 +1,4 @@
+import { CurveGenerator } from '@mui/x-charts-vendor/d3-shape';
 export type CurveOptions = {
   /**
    * The gap between each segment.
@@ -44,4 +45,16 @@ export type FunnelPointShape = 'square' | 'sharp';
 export type Point = {
   x: number;
   y: number;
-};
+};
+export interface FunnelCurveGenerator extends CurveGenerator {
+  /**
+   * Processes the points to create a curve based on the provided options.
+   * This does not draw the curve but prepares the points for rendering.
+   *
+   * @param points The points to process.
+   * @param options The options for the curve.
+   * @returns The processed points.
+   */
+  processPoints(points: Point[], xPosition: PositionGetter, yPosition: PositionGetter): Point[];
+}
+export type PositionGetter = (value: number, bandIndex: number, bandIdentifier: string | number, stackOffset?: number, useBand?: boolean) => number;

package/FunnelChart/curves/getFunnelCurve.d.ts

@@ -1,3 +1,8 @@
-import { CurveFactory } from '@mui/x-charts-vendor/d3-shape';
+import type { Path } from '@mui/x-charts-vendor/d3-path';
 import { CurveOptions, FunnelCurveType } from "./curve.types.js";
-export declare const getFunnelCurve: (curve: FunnelCurveType | undefined, options: CurveOptions) => CurveFactory;
+import { Step } from "./step.js";
+import { Linear } from "./linear.js";
+import { Bump } from "./bump.js";
+import { Pyramid } from "./pyramid.js";
+import { StepPyramid } from "./step-pyramid.js";
+export declare const getFunnelCurve: (curve: FunnelCurveType | undefined, options: CurveOptions) => (context: CanvasRenderingContext2D | Path) => Step | Linear | Bump | Pyramid | StepPyramid;

package/FunnelChart/curves/linear.d.ts

@@ -1,5 +1,4 @@
-import { CurveGenerator } from '@mui/x-charts-vendor/d3-shape';
-import { CurveOptions } from "./curve.types.js";
+import { FunnelCurveGenerator, CurveOptions, Point } from "./curve.types.js";
 /**
  * This is a custom "linear" curve generator.
  * It draws straight lines for the 4 provided points,
@@ -8,7 +7,7 @@ import { CurveOptions } from "./curve.types.js";
  * The implementation is based on the d3-shape linear curve generator.
  * https://github.com/d3/d3-shape/blob/a82254af78f08799c71d7ab25df557c4872a3c51/src/curve/linear.js
  */
-export declare class Linear implements CurveGenerator {
+export declare class Linear implements FunnelCurveGenerator {
   private context;
   private position;
   private sections;
@@ -36,5 +35,6 @@ export declare class Linear implements CurveGenerator {
   lineStart(): void;
   lineEnd(): void;
   protected getBorderRadius(): number | number[];
+  processPoints(points: Point[]): Point[];
   point(xIn: number, yIn: number): void;
 }

package/FunnelChart/curves/linear.js

@@ -97,7 +97,7 @@ class Linear {
       }
       // Is smallest section and shaped like a triangle
       if (this.position === this.sections - 1 && this.pointShape === 'sharp') {
-        return [this.borderRadius];
+        return [0, 0, this.borderRadius];
       }
 
       // Is smallest section
@@ -107,19 +107,11 @@ class Linear {
     }
     return 0;
   }
-  point(xIn, yIn) {
-    this.points.push({
-      x: xIn,
-      y: yIn
-    });
-    if (this.points.length < 4) {
-      return;
-    }
-
+  processPoints(points) {
     // Add gaps where they are needed.
-    this.points = this.points.map((point, index) => {
-      const slopeStart = this.points.at(index <= 1 ? 0 : 3);
-      const slopeEnd = this.points.at(index <= 1 ? 1 : 2);
+    const processedPoints = points.map((point, index) => {
+      const slopeStart = points.at(index <= 1 ? 0 : 3);
+      const slopeEnd = points.at(index <= 1 ? 1 : 2);
       if (this.isHorizontal) {
         const yGetter = (0, _utils.lerpY)(slopeStart.x - this.gap, slopeStart.y, slopeEnd.x, slopeEnd.y);
         return {
@@ -141,15 +133,15 @@ class Linear {
       let firstPoint = null;
       let secondPoint = null;
       if (isFirstSection && this.isIncreasing) {
-        firstPoint = this.points[1];
-        secondPoint = this.points[2];
+        firstPoint = processedPoints[1];
+        secondPoint = processedPoints[2];
       }
       if (isLastSection && !this.isIncreasing) {
-        firstPoint = this.points[3];
-        secondPoint = this.points[0];
+        firstPoint = processedPoints[3];
+        secondPoint = processedPoints[0];
       }
       if (firstPoint && secondPoint) {
-        this.points = [
+        return [
         // Sharp point at the start
         this.isHorizontal ? {
           x: this.max.x,
@@ -162,6 +154,19 @@ class Linear {
         firstPoint, secondPoint];
       }
     }
+    return processedPoints;
+  }
+  point(xIn, yIn) {
+    this.points.push({
+      x: xIn,
+      y: yIn
+    });
+    const isLastSection = this.position === this.sections - 1;
+    const isFirstSection = this.position === 0;
+    const isSharpPoint = this.pointShape === 'sharp' && (isLastSection && !this.isIncreasing || isFirstSection && this.isIncreasing);
+    if (this.points.length < (isSharpPoint ? 3 : 4)) {
+      return;
+    }
     (0, _borderRadiusPolygon.borderRadiusPolygon)(this.context, this.points, this.getBorderRadius());
   }
 }