@mui/x-charts-pro 8.5.2 → 8.5.3

package/FunnelChart/labelUtils.d.ts

@@ -1,5 +1,5 @@
-import { FunnelDataPoints, FunnelLabelOptions } from "./funnel.types.js";
-import { PositionGetter } from "./positionGetter.js";
+import { FunnelLabelOptions } from "./funnel.types.js";
+import { Point } from "./curves/index.js";
 /**
  * It tries to keep the label inside the bounds of the section based on the position.
  *
@@ -24,19 +24,11 @@ export declare const alignLabel: ({
 export declare const positionLabel: ({
   position,
   offset,
-  xPosition,
-  yPosition,
   isHorizontal,
-  values,
-  dataIndex,
-  baseScaleData
+  values
 }: Omit<FunnelLabelOptions, "textAnchor" | "dominantBaseline"> & {
-  xPosition: PositionGetter;
-  yPosition: PositionGetter;
   isHorizontal: boolean;
-  values: readonly FunnelDataPoints[];
-  dataIndex: number;
-  baseScaleData: readonly number[];
+  values: readonly Point[];
 }) => {
   x: number;
   y: number;

package/FunnelChart/labelUtils.js

@@ -46,17 +46,21 @@ exports.alignLabel = alignLabel;
 const positionLabel = ({
   position,
   offset,
-  xPosition,
-  yPosition,
   isHorizontal,
-  values,
-  dataIndex,
-  baseScaleData
+  values
 }) => {
   const vertical = position?.vertical ?? 'middle';
   const horizontal = position?.horizontal ?? 'center';
   let x = 0;
   let y = 0;
+
+  // The min/max values are due to the sections possibly being sloped.
+  // Importance of values differs from the horizontal and vertical sections.
+  // Example (vertical):
+  // MaxL         MaxT         MaxR
+  //  \                          /
+  //   \                        /
+  //    MinL      MaxB      MinR
   let minTop = 0;
   let maxTop = 0;
   let minBottom = 0;
@@ -65,56 +69,51 @@ const positionLabel = ({
   let maxLeft = 0;
   let minRight = 0;
   let maxRight = 0;
-  let center = 0;
-  let leftCenter = 0;
-  let rightCenter = 0;
   let middle = 0;
-  let topMiddle = 0;
-  let bottomMiddle = 0;
+  let center = 0;
   const mv = typeof offset === 'number' ? offset : offset?.y ?? 0;
   const mh = typeof offset === 'number' ? offset : offset?.x ?? 0;
-  const stackOffset = values[0].stackOffset;
+
+  // Min ... Max
+  const Ys = values.map(v => v.y).toSorted((a, b) => a - b);
+  const Xs = values.map(v => v.x).toSorted((a, b) => a - b);
+
+  // Visualization of the points in a hierarchical order:
+  //              MaxT
+  //              MinT
+  // MaxL MinL  Cent/Mid  MinR MaxR
+  //              MinB
+  //              MaxB
   if (isHorizontal) {
-    maxTop = yPosition(values[0].y, baseScaleData[dataIndex], stackOffset) - mv;
-    minTop = yPosition(values[1].y, baseScaleData[dataIndex], stackOffset) - mv;
-    minBottom = yPosition(values[2].y, baseScaleData[dataIndex], stackOffset) + mv;
-    maxBottom = yPosition(values[3].y, baseScaleData[dataIndex], stackOffset) + mv;
-    minRight = 0;
-    maxRight = xPosition(Math.min(...values.map(v => v.x)), dataIndex, baseScaleData[dataIndex], stackOffset, true) + mh;
-    minLeft = 0;
-    maxLeft = xPosition(Math.max(...values.map(v => v.x)), dataIndex, baseScaleData[dataIndex], stackOffset) + mh;
-    center = maxRight - (maxRight - maxLeft) / 2;
-    leftCenter = 0;
-    rightCenter = 0;
-    middle = yPosition(0, dataIndex, baseScaleData[dataIndex], stackOffset) - mv;
-    topMiddle = yPosition(values[0].y - (values[0].y - values[1].y) / 2, dataIndex, baseScaleData[dataIndex], stackOffset) - mv;
-    bottomMiddle = yPosition(values[3].y - (values[3].y - values[2].y) / 2, dataIndex, baseScaleData[dataIndex], stackOffset) + mv;
+    maxTop = Ys.at(0) - mv;
+    minTop = Ys.at(1) - mv;
+    minBottom = Ys.at(2) + mv;
+    maxBottom = (Ys.at(3) ?? Ys.at(2)) + mv;
+    maxRight = (Xs.at(3) ?? Xs.at(2)) + mh;
+    // We don't need (minRight/minLeft) for horizontal
+    maxLeft = Xs.at(0) + mh;
+    center = (maxRight + maxLeft) / 2;
+    middle = (maxBottom + maxTop) / 2;
   } else {
-    minTop = 0;
-    maxTop = yPosition(Math.max(...values.map(v => v.y)), dataIndex, baseScaleData[dataIndex], stackOffset) - mv;
-    minBottom = 0;
-    maxBottom = yPosition(Math.min(...values.map(v => v.y)), dataIndex, baseScaleData[dataIndex], stackOffset, true) - mv;
-    maxRight = xPosition(values[0].x, dataIndex, baseScaleData[dataIndex], stackOffset) + mh;
-    minRight = xPosition(values[1].x, dataIndex, baseScaleData[dataIndex], stackOffset) + mh;
-    minLeft = xPosition(values[2].x, dataIndex, baseScaleData[dataIndex], stackOffset) - mh;
-    maxLeft = xPosition(values[3].x, dataIndex, baseScaleData[dataIndex], stackOffset) - mh;
-    center = xPosition(0, dataIndex, baseScaleData[dataIndex], stackOffset) - mh;
-    rightCenter = xPosition(values[0].x - (values[0].x - values[1].x) / 2, dataIndex, baseScaleData[dataIndex], stackOffset) + mh;
-    leftCenter = xPosition(values[3].x - (values[3].x - values[2].x) / 2, dataIndex, baseScaleData[dataIndex], stackOffset) - mh;
-    middle = yPosition(values[0].y - (values[0].y - values[1].y) / 2, dataIndex, baseScaleData[dataIndex], stackOffset);
-    middle = maxTop - (maxTop - maxBottom) / 2;
-    topMiddle = 0;
-    bottomMiddle = 0;
+    maxTop = Ys.at(0) - mv;
+    // We don't need (minTop/minBottom) for vertical
+    maxBottom = (Ys.at(3) ?? Ys.at(2)) - mv;
+    maxRight = (Xs.at(3) ?? Xs.at(2)) + mh;
+    minRight = Xs.at(2) + mh;
+    minLeft = Xs.at(1) - mh;
+    maxLeft = Xs.at(0) - mh;
+    center = (maxRight + maxLeft) / 2;
+    middle = (maxBottom + maxTop) / 2;
   }
   if (isHorizontal) {
     if (horizontal === 'center') {
       x = center;
       if (vertical === 'top') {
-        y = topMiddle;
+        y = (maxTop + minTop) / 2;
       } else if (vertical === 'middle') {
         y = middle;
       } else if (vertical === 'bottom') {
-        y = bottomMiddle;
+        y = (maxBottom + minBottom) / 2;
       }
     } else if (horizontal === 'start') {
       x = maxLeft;
@@ -140,11 +139,11 @@ const positionLabel = ({
     if (vertical === 'middle') {
       y = middle;
       if (horizontal === 'start') {
-        x = leftCenter;
+        x = (maxLeft + minLeft) / 2;
       } else if (horizontal === 'center') {
         x = center;
       } else if (horizontal === 'end') {
-        x = rightCenter;
+        x = (maxRight + minRight) / 2;
       }
     } else if (vertical === 'top') {
       y = maxTop;

package/esm/ChartDataProviderPro/ChartDataProviderPro.js

@@ -11,7 +11,7 @@ import { defaultSlotsMaterial } from "../internals/material/index.js";
 import { DEFAULT_PLUGINS } from "../internals/plugins/allPlugins.js";
 import { useChartDataProviderProProps } from "./useChartDataProviderProProps.js";
 import { jsx as _jsx, jsxs as _jsxs } from "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/esm/ChartZoomSlider/internals/ChartAxisZoomSlider.js

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

package/esm/ChartZoomSlider/internals/ChartAxisZoomSliderActiveTrack.js

@@ -1,6 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import { styled } from '@mui/material/styles';
-import { getSVGPoint, invertScale, selectorChartAxis, selectorChartAxisZoomOptionsLookup, selectorChartDrawingArea, useChartContext, useDrawingArea, useSelector, useStore } from '@mui/x-charts/internals';
+import { getSVGPoint, invertScale, selectorChartAxis, selectorChartAxisZoomOptionsLookup, useChartContext, useDrawingArea, useSelector, useStore } from '@mui/x-charts/internals';
 import * as React from 'react';
 import { rafThrottle } from '@mui/x-internals/rafThrottle';
 import { selectorChartAxisZoomData } from "../../internals/plugins/useChartProZoom/index.js";
@@ -32,7 +32,7 @@ export function ChartAxisZoomSliderActiveTrack({
     svgRef
   } = useChartContext();
   const store = useStore();
-  const axis = useSelector(store, selectorChartAxis, axisId);
+  const axis = useSelector(store, selectorChartAxis, [axisId]);
   const drawingArea = useDrawingArea();
   const activePreviewRectRef = React.useRef(null);
   const [startThumbEl, setStartThumbEl] = React.useState(null);
@@ -48,10 +48,6 @@ export 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 = rafThrottle(event => {
       const element = svgRef.current;
@@ -59,11 +55,10 @@ export function ChartAxisZoomSliderActiveTrack({
         return;
       }
       const point = getSVGPoint(element, event);
-      let pointerZoom = calculateZoomFromPoint(store.getSnapshot(), axisId, point);
+      const pointerZoom = 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);
@@ -87,8 +82,6 @@ export function ChartAxisZoomSliderActiveTrack({
         return;
       }
       prevPointerZoom = pointerDownZoom;
-      pointerZoomMin = pointerDownZoom - axisZoomData.start;
-      pointerZoomMax = 100 - (axisZoomData.end - pointerDownZoom);
       document.addEventListener('pointerup', onPointerUp);
       activePreviewRect.addEventListener('pointermove', onPointerMove);
     };
@@ -129,23 +122,12 @@ export function ChartAxisZoomSliderActiveTrack({
     }
     const point = getSVGPoint(element, event);
     instance.setZoomData(prevZoomData => {
-      const {
-        left,
-        top,
-        width,
-        height
-      } = selectorChartDrawingArea(store.getSnapshot());
       const zoomOptions = 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 = calculateZoomFromPoint(store.getSnapshot(), axisId, point);
+          if (newEnd === null) {
+            return zoom;
           }
           return _extends({}, zoom, {
             end: calculateZoomEnd(newEnd, zoom, zoomOptions)
@@ -163,14 +145,21 @@ export function ChartAxisZoomSliderActiveTrack({
   let startThumbY;
   let endThumbX;
   let endThumbY;
+  const {
+    minStart,
+    maxEnd
+  } = 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 = 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;
@@ -181,13 +170,13 @@ export 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 = 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/esm/ChartZoomSlider/internals/ChartAxisZoomSliderTrack.js

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

package/esm/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/esm/ChartZoomSlider/internals/zoom-utils.js

@@ -1,24 +1,34 @@
-import { selectorChartDrawingArea, selectorChartRawAxis } from '@mui/x-charts/internals';
+import { selectorChartAxisZoomOptionsLookup, selectorChartDrawingArea, selectorChartRawAxis } from '@mui/x-charts/internals';
 export function calculateZoomFromPoint(state, axisId, point) {
+  const axis = selectorChartRawAxis(state, axisId);
+  if (!axis) {
+    return null;
+  }
+  return calculateZoomFromPointImpl(selectorChartDrawingArea(state), axis, selectorChartAxisZoomOptionsLookup(state, axisId), point);
+}
+export function calculateZoomFromPointImpl(drawingArea, axis, zoomOptions, point) {
   const {
     left,
     top,
     height,
     width
-  } = selectorChartDrawingArea(state);
-  const axis = 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/esm/FunnelChart/FunnelPlot.js

@@ -97,21 +97,21 @@ const useAggregatedData = () => {
           min: minPoint,
           max: maxPoint
         });
-        const line = d3Line().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 = d3Line().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 && _extends({}, positionLabel(_extends({}, sectionLabel, {
-            xPosition,
-            yPosition,
             isHorizontal,
-            values,
-            dataIndex,
-            baseScaleData: baseScaleConfig.data ?? []
+            values: bandPoints
           })), alignLabel(sectionLabel ?? {}), {
             value: valueFormatter ? valueFormatter(currentSeries.data[dataIndex], {
               dataIndex
@@ -120,7 +120,7 @@ const useAggregatedData = () => {
         };
       });
     });
-    return result.flat();
+    return result;
   }, [seriesData, xAxis, xAxisIds, yAxis, yAxisIds, gap]);
   return allData;
 };
@@ -131,41 +131,57 @@ function FunnelPlot(props) {
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const data = useAggregatedData();
   return /*#__PURE__*/_jsxs(React.Fragment, {
-    children: [data.map(({
-      d,
-      color,
-      id,
-      seriesId,
-      dataIndex,
-      variant
-    }) => /*#__PURE__*/_createElement(FunnelSection, _extends({}, 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__*/_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__*/_createElement(FunnelSection, _extends({}, 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__*/_jsx(FunnelSectionLabel, _extends({
-        label: label,
-        dataIndex: dataIndex,
-        seriesId: seriesId
-      }, other), id);
+      return /*#__PURE__*/_jsx("g", {
+        "data-series": series[0].seriesId,
+        children: series.map(({
+          id,
+          label,
+          seriesId,
+          dataIndex
+        }) => {
+          if (!label || !label.value) {
+            return null;
+          }
+          return /*#__PURE__*/_jsx(FunnelSectionLabel, _extends({
+            label: label,
+            dataIndex: dataIndex,
+            seriesId: seriesId
+          }, other), id);
+        })
+      }, series[0].seriesId);
     })]
   });
 }

package/esm/FunnelChart/FunnelSection.js

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

package/esm/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/esm/FunnelChart/curves/bump.js

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

package/esm/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/esm/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/esm/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;
 }