@mui/x-charts-pro 8.2.0 → 8.3.0

package/FunnelChart/FunnelChart.js

@@ -15,7 +15,6 @@ var _ChartsOverlay = require("@mui/x-charts/ChartsOverlay");
 var _ChartsTooltip = require("@mui/x-charts/ChartsTooltip");
 var _internals = require("@mui/x-charts/internals");
 var _ChartsLegend = require("@mui/x-charts/ChartsLegend");
-var _ChartsClipPath = require("@mui/x-charts/ChartsClipPath");
 var _ChartsSurface = require("@mui/x-charts/ChartsSurface");
 var _ChartsAxisHighlight = require("@mui/x-charts/ChartsAxisHighlight");
 var _ChartsAxis = require("@mui/x-charts/ChartsAxis");
@@ -38,9 +37,7 @@ const FunnelChart = exports.FunnelChart = /*#__PURE__*/React.forwardRef(function
     funnelPlotProps,
     overlayProps,
     legendProps,
-    clipPathGroupProps,
     chartsAxisProps,
-    clipPathProps,
     chartsWrapperProps,
     axisHighlightProps,
     children
@@ -54,11 +51,9 @@ const FunnelChart = exports.FunnelChart = /*#__PURE__*/React.forwardRef(function
     seriesConfig: seriesConfig,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_internals.ChartsWrapper, (0, _extends2.default)({}, chartsWrapperProps, {
       children: [!themedProps.hideLegend && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsLegend.ChartsLegend, (0, _extends2.default)({}, legendProps)), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ChartsSurface.ChartsSurface, (0, _extends2.default)({}, chartsSurfaceProps, {
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("g", (0, _extends2.default)({}, clipPathGroupProps, {
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_FunnelPlot.FunnelPlot, (0, _extends2.default)({}, funnelPlotProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsOverlay.ChartsOverlay, (0, _extends2.default)({}, overlayProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsAxisHighlight.ChartsAxisHighlight, (0, _extends2.default)({}, axisHighlightProps))]
-        })), !themedProps.loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(Tooltip, (0, _extends2.default)({}, themedProps.slotProps?.tooltip, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_FunnelPlot.FunnelPlot, (0, _extends2.default)({}, funnelPlotProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsOverlay.ChartsOverlay, (0, _extends2.default)({}, overlayProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsAxisHighlight.ChartsAxisHighlight, (0, _extends2.default)({}, axisHighlightProps)), !themedProps.loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(Tooltip, (0, _extends2.default)({}, themedProps.slotProps?.tooltip, {
           trigger: "item"
-        })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsAxis.ChartsAxis, (0, _extends2.default)({}, chartsAxisProps)), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsClipPath.ChartsClipPath, (0, _extends2.default)({}, clipPathProps)), children]
+        })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_ChartsAxis.ChartsAxis, (0, _extends2.default)({}, chartsAxisProps)), children]
       }))]
     }))
   }));

package/FunnelChart/FunnelPlot.js

@@ -54,7 +54,6 @@ const useAggregatedData = gap => {
       const bandWidth = (isXAxisBand || isYAxisBand) && baseScaleConfig.scale?.bandwidth() || 0;
       const xScale = xAxis[xAxisId].scale;
       const yScale = yAxis[yAxisId].scale;
-      const curve = (0, _curves.getFunnelCurve)(currentSeries.curve, isHorizontal, gap);
       const xPosition = (value, bandIndex, stackOffset, useBand) => {
         if (isXAxisBand) {
           const position = xScale(bandIndex);
@@ -69,7 +68,17 @@ const useAggregatedData = gap => {
         }
         return yScale(isHorizontal ? value : value + (stackOffset || 0));
       };
-      return currentSeries.dataPoints.map((values, dataIndex) => {
+      const allY = currentSeries.dataPoints.flatMap((d, dataIndex) => d.flatMap(v => yPosition(v.y, baseScaleConfig.data?.[dataIndex], v.stackOffset, v.useBandWidth)));
+      const allX = currentSeries.dataPoints.flatMap((d, dataIndex) => d.flatMap(v => xPosition(v.x, baseScaleConfig.data?.[dataIndex], v.stackOffset, v.useBandWidth)));
+      const minPoint = {
+        x: Math.min(...allX),
+        y: Math.min(...allY)
+      };
+      const maxPoint = {
+        x: Math.max(...allX),
+        y: Math.max(...allY)
+      };
+      return currentSeries.dataPoints.flatMap((values, dataIndex) => {
         const color = currentSeries.data[dataIndex].color;
         const id = `${seriesId}-${dataIndex}`;
         const sectionLabel = typeof currentSeries.sectionLabel === 'function' ? currentSeries.sectionLabel({
@@ -77,6 +86,15 @@ const useAggregatedData = gap => {
           seriesId,
           value: currentSeries.data[dataIndex].value
         }) : currentSeries.sectionLabel;
+        const curve = (0, _curves.getFunnelCurve)(currentSeries.curve, {
+          isHorizontal,
+          gap,
+          position: dataIndex,
+          sections: currentSeries.dataPoints.length,
+          borderRadius: currentSeries.borderRadius,
+          min: minPoint,
+          max: maxPoint
+        });
         const line = (0, _d3Shape.line)().x(d => xPosition(d.x, baseScaleConfig.data?.[dataIndex], d.stackOffset, d.useBandWidth)).y(d => yPosition(d.y, baseScaleConfig.data?.[dataIndex], d.stackOffset, d.useBandWidth)).curve(curve);
         return {
           d: line(values),
@@ -84,6 +102,7 @@ const useAggregatedData = gap => {
           id,
           seriesId,
           dataIndex,
+          variant: currentSeries.variant,
           label: sectionLabel !== false && (0, _extends2.default)({}, (0, _labelUtils.positionLabel)((0, _extends2.default)({}, sectionLabel, {
             xPosition,
             yPosition,
@@ -117,13 +136,15 @@ function FunnelPlot(props) {
       color,
       id,
       seriesId,
-      dataIndex
+      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',

package/FunnelChart/FunnelSection.d.ts

@@ -6,6 +6,7 @@ export interface FunnelSectionProps extends Omit<React.SVGProps<SVGPathElement>,
   dataIndex: number;
   color: string;
   classes?: Partial<FunnelSectionClasses>;
+  variant?: 'filled' | 'outlined';
 }
 export declare const FunnelSectionPath: import("@emotion/styled").StyledComponent<import("@mui/system").MUIStyledCommonProps<import("@mui/material").Theme>, React.SVGProps<SVGPathElement>, {}>;
 /**

package/FunnelChart/FunnelSection.js

@@ -16,9 +16,9 @@ var _hooks = require("@mui/x-charts/hooks");
 var _clsx = _interopRequireDefault(require("clsx"));
 var _funnelSectionClasses = require("./funnelSectionClasses");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["seriesId", "dataIndex", "classes", "color", "onClick", "className"];
+const _excluded = ["seriesId", "dataIndex", "classes", "color", "onClick", "className", "variant"];
 const FunnelSectionPath = exports.FunnelSectionPath = (0, _styles.styled)('path')(() => ({
-  transition: 'opacity 0.2s ease-in, fill 0.2s ease-in'
+  transition: 'opacity 0.2s ease-in, fill 0.2s ease-in, fill-opacity 0.2s ease-in, filter 0.2s ease-in'
 }));
 
 /**
@@ -33,7 +33,8 @@ const FunnelSection = exports.FunnelSection = (0, _internals.consumeSlots)('MuiF
       classes,
       color,
       onClick,
-      className
+      className,
+      variant = 'filled'
     } = props,
     other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const interactionProps = (0, _internals.useInteractionItemProps)({
@@ -48,14 +49,18 @@ const FunnelSection = exports.FunnelSection = (0, _internals.consumeSlots)('MuiF
     seriesId,
     dataIndex
   });
+  const isOutlined = variant === 'outlined';
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(FunnelSectionPath, (0, _extends2.default)({}, interactionProps, {
-    filter: isHighlighted ? 'brightness(120%)' : undefined,
-    opacity: isFaded ? 0.3 : 1,
+    filter: isHighlighted && !isOutlined ? 'brightness(120%)' : undefined,
+    opacity: isFaded && !isOutlined ? 0.3 : 1,
     fill: color,
-    stroke: "none",
+    stroke: isOutlined ? color : 'none',
+    fillOpacity: isOutlined && !isHighlighted ? 0.4 : 1,
+    strokeOpacity: 1,
+    strokeWidth: isOutlined ? 1.5 : 0,
     cursor: onClick ? 'pointer' : 'unset',
     onClick: onClick,
-    className: (0, _clsx.default)(classes?.root, className, isHighlighted && classes?.highlighted, isFaded && classes?.faded)
+    className: (0, _clsx.default)(classes?.root, className, isOutlined ? classes?.outlined : classes?.filled, isHighlighted && classes?.highlighted, isFaded && classes?.faded)
   }, other, {
     ref: ref
   }));

package/FunnelChart/curves/borderRadiusPolygon.d.ts

@@ -0,0 +1,8 @@
+import { Point } from "./curve.types.js";
+/**
+ * Draws a polygon with rounded corners
+ * @param {CanvasRenderingContext2D} ctx The canvas context
+ * @param {Array} points A list of `{x, y}` points
+ * @param {number} radius how much to round the corners
+ */
+export declare function borderRadiusPolygon(ctx: CanvasRenderingContext2D, points: Point[], radius: number | number[]): void;

package/FunnelChart/curves/borderRadiusPolygon.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.borderRadiusPolygon = borderRadiusPolygon;
+const distance = (p1, p2) => Math.sqrt((p1.x - p2.x) ** 2 + (p1.y - p2.y) ** 2);
+const lerp = (a, b, x) => a + (b - a) * x;
+const lerp2D = (p1, p2, t) => ({
+  x: lerp(p1.x, p2.x, t),
+  y: lerp(p1.y, p2.y, t)
+});
+
+/**
+ * Draws a polygon with rounded corners
+ * @param {CanvasRenderingContext2D} ctx The canvas context
+ * @param {Array} points A list of `{x, y}` points
+ * @param {number} radius how much to round the corners
+ */
+function borderRadiusPolygon(ctx, points, radius) {
+  const numPoints = points.length;
+  radius = Array.isArray(radius) ? radius : Array(numPoints).fill(radius);
+  const corners = [];
+  for (let i = 0; i < numPoints; i += 1) {
+    const lastPoint = points[i];
+    const thisPoint = points[(i + 1) % numPoints];
+    const nextPoint = points[(i + 2) % numPoints];
+    const lastEdgeLength = distance(lastPoint, thisPoint);
+    const lastOffsetDistance = Math.min(lastEdgeLength / 2, radius[i] ?? 0);
+    const start = lerp2D(thisPoint, lastPoint, lastOffsetDistance / lastEdgeLength);
+    const nextEdgeLength = distance(nextPoint, thisPoint);
+    const nextOffsetDistance = Math.min(nextEdgeLength / 2, radius[i] ?? 0);
+    const end = lerp2D(thisPoint, nextPoint, nextOffsetDistance / nextEdgeLength);
+    corners.push([start, thisPoint, end]);
+  }
+  ctx.moveTo(corners[0][0].x, corners[0][0].y);
+  for (const [start, ctrl, end] of corners) {
+    ctx.lineTo(start.x, start.y);
+    ctx.quadraticCurveTo(ctrl.x, ctrl.y, end.x, end.y);
+  }
+  ctx.closePath();
+}

package/FunnelChart/curves/bump.d.ts

@@ -1,21 +1,24 @@
 import { CurveGenerator } from '@mui/x-charts-vendor/d3-shape';
+import { CurveOptions } from "./curve.types.js";
 /**
  * This is a custom "bump" curve generator.
+ * It draws smooth curves for the 4 provided points,
+ * with the option to add a gap between sections while also properly handling the border radius.
  *
- * It takes into account the gap between the points and draws a smooth curve between them.
- *
- * It is based on the d3-shape bump curve generator.
+ * 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 {
   private context;
-  private line;
   private x;
   private y;
   private currentPoint;
   private isHorizontal;
   private gap;
-  constructor(context: CanvasRenderingContext2D, isHorizontal: boolean, gap?: number);
+  constructor(context: CanvasRenderingContext2D, {
+    isHorizontal,
+    gap
+  }: CurveOptions);
   areaStart(): void;
   areaEnd(): void;
   lineStart(): void;

package/FunnelChart/curves/bump.js

@@ -4,42 +4,35 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Bump = void 0;
+/* eslint-disable class-methods-use-this */
+
 /**
  * This is a custom "bump" curve generator.
+ * It draws smooth curves for the 4 provided points,
+ * with the option to add a gap between sections while also properly handling the border radius.
  *
- * It takes into account the gap between the points and draws a smooth curve between them.
- *
- * It is based on the d3-shape bump curve generator.
+ * The implementation is based on the d3-shape bump curve generator.
  * https://github.com/d3/d3-shape/blob/a82254af78f08799c71d7ab25df557c4872a3c51/src/curve/bump.js
  */
 class Bump {
-  constructor(context, isHorizontal, gap = 0) {
+  constructor(context, {
+    isHorizontal,
+    gap
+  }) {
     this.context = void 0;
-    this.line = NaN;
     this.x = NaN;
     this.y = NaN;
     this.currentPoint = 0;
     this.isHorizontal = false;
     this.gap = 0;
     this.context = context;
-    this.isHorizontal = isHorizontal;
-    this.gap = gap / 2;
-  }
-  areaStart() {
-    this.line = 0;
-  }
-  areaEnd() {
-    this.line = NaN;
-  }
-  lineStart() {
-    this.currentPoint = 0;
-  }
-  lineEnd() {
-    if (this.line || this.line !== 0 && this.currentPoint === 1) {
-      this.context.closePath();
-    }
-    this.line = 1 - this.line;
+    this.isHorizontal = isHorizontal ?? false;
+    this.gap = (gap ?? 0) / 2;
   }
+  areaStart() {}
+  areaEnd() {}
+  lineStart() {}
+  lineEnd() {}
   point(x, y) {
     x = +x;
     y = +y;
@@ -56,6 +49,9 @@ class Bump {
       } else {
         this.context.bezierCurveTo((this.x + x) / 2, this.y, (this.x + x) / 2, y, x + this.gap, y);
       }
+      if (this.currentPoint === 3) {
+        this.context.closePath();
+      }
       this.currentPoint += 1;
       this.x = x;
       this.y = y;
@@ -74,6 +70,9 @@ class Bump {
     } else {
       this.context.bezierCurveTo(this.x, (this.y + y) / 2, x, (this.y + y) / 2, x, y + this.gap);
     }
+    if (this.currentPoint === 3) {
+      this.context.closePath();
+    }
     this.currentPoint += 1;
     this.x = x;
     this.y = y;

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

@@ -1,8 +1,38 @@
-export type FunnelCurveOptions = {
+export type CurveOptions = {
   /**
-   * The gap between the funnel segments.
+   * The gap between each segment.
    * @default 0
    */
   gap?: number;
+  /**
+   * Indicates if the main axis of the visualization.
+   */
+  isHorizontal?: boolean;
+  /**
+   * The order position of the segment.
+   */
+  position?: number;
+  /**
+   * The total number of segments that will be drawn.
+   * @default 1
+   */
+  sections?: number;
+  /**
+   * The border radius of the segments.
+   * @default 0
+   */
+  borderRadius?: number;
+  /**
+   * The minimum point for all the segments.
+   */
+  min?: Point;
+  /**
+   * The maximum point for all the segments.
+   */
+  max?: Point;
 };
-export type FunnelCurveType = 'linear' | 'step' | 'bump';
+export type FunnelCurveType = 'linear' | 'step' | 'bump' | 'pyramid' | 'step-pyramid';
+export type Point = {
+  x: number;
+  y: number;
+};

package/FunnelChart/curves/getFunnelCurve.d.ts

@@ -1,3 +1,3 @@
 import { CurveFactory } from '@mui/x-charts-vendor/d3-shape';
-import { FunnelCurveType } from "./curve.types.js";
-export declare const getFunnelCurve: (curve: FunnelCurveType | undefined, isHorizontal: boolean, gap?: number) => CurveFactory;
+import { CurveOptions, FunnelCurveType } from "./curve.types.js";
+export declare const getFunnelCurve: (curve: FunnelCurveType | undefined, options: CurveOptions) => CurveFactory;

package/FunnelChart/curves/getFunnelCurve.js

@@ -4,19 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getFunnelCurve = void 0;
-var _funnelStep = require("./funnelStep");
+var _step = require("./step");
 var _linear = require("./linear");
 var _bump = require("./bump");
+var _pyramid = require("./pyramid");
+var _stepPyramid = require("./step-pyramid");
 const curveConstructor = curve => {
   if (curve === 'step') {
-    return _funnelStep.FunnelStep;
+    return _step.Step;
   }
   if (curve === 'bump') {
     return _bump.Bump;
   }
+  if (curve === 'pyramid') {
+    return _pyramid.Pyramid;
+  }
+  if (curve === 'step-pyramid') {
+    return _stepPyramid.StepPyramid;
+  }
   return _linear.Linear;
 };
-const getFunnelCurve = (curve, isHorizontal, gap = 0) => {
-  return context => new (curveConstructor(curve))(context, isHorizontal, gap);
+const getFunnelCurve = (curve, options) => {
+  return context => new (curveConstructor(curve))(context, options);
 };
 exports.getFunnelCurve = getFunnelCurve;

package/FunnelChart/curves/linear.d.ts

@@ -1,24 +1,32 @@
 import { CurveGenerator } from '@mui/x-charts-vendor/d3-shape';
+import { CurveOptions } from "./curve.types.js";
 /**
  * This is a custom "linear" curve generator.
+ * It draws straight lines for the 4 provided points,
+ * with the option to add a gap between sections while also properly handling the border radius.
  *
- * It takes into account the gap between the points and draws a smooth curve between them.
- *
- * It is based on the d3-shape linear curve generator.
+ * 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 {
   private context;
-  private line;
-  private x;
-  private y;
-  private currentPoint;
+  private position;
+  private sections;
   private isHorizontal;
   private gap;
-  constructor(context: CanvasRenderingContext2D, isHorizontal: boolean, gap?: number);
+  private borderRadius;
+  private points;
+  constructor(context: CanvasRenderingContext2D, {
+    isHorizontal,
+    gap,
+    position,
+    sections,
+    borderRadius
+  }: CurveOptions);
   areaStart(): void;
   areaEnd(): void;
   lineStart(): void;
   lineEnd(): void;
-  point(x: number, y: number): void;
+  protected getBorderRadius(): number | number[];
+  point(xIn: number, yIn: number): void;
 }

package/FunnelChart/curves/linear.js

@@ -4,110 +4,85 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Linear = void 0;
-// From point1 to point2, get the x value from y
-const xFromY = (x1, y1, x2, y2) => y => {
-  if (y1 === y2) {
-    return x1;
-  }
-  const result = (x2 - x1) * (y - y1) / (y2 - y1) + x1;
-  return Number.isNaN(result) ? 0 : result;
-};
-
-// From point1 to point2, get the y value from x
-const yFromX = (x1, y1, x2, y2) => x => {
-  if (x1 === x2) {
-    return y1;
-  }
-  const result = (y2 - y1) * (x - x1) / (x2 - x1) + y1;
-  return Number.isNaN(result) ? 0 : result;
-};
+var _borderRadiusPolygon = require("./borderRadiusPolygon");
+var _utils = require("./utils");
+/* eslint-disable class-methods-use-this */
 
 /**
  * This is a custom "linear" curve generator.
+ * It draws straight lines for the 4 provided points,
+ * with the option to add a gap between sections while also properly handling the border radius.
  *
- * It takes into account the gap between the points and draws a smooth curve between them.
- *
- * It is based on the d3-shape linear curve generator.
+ * The implementation is based on the d3-shape linear curve generator.
  * https://github.com/d3/d3-shape/blob/a82254af78f08799c71d7ab25df557c4872a3c51/src/curve/linear.js
  */
 class Linear {
-  constructor(context, isHorizontal, gap = 0) {
+  constructor(context, {
+    isHorizontal,
+    gap,
+    position,
+    sections,
+    borderRadius
+  }) {
     this.context = void 0;
-    this.line = NaN;
-    this.x = NaN;
-    this.y = NaN;
-    this.currentPoint = 0;
+    this.position = 0;
+    this.sections = 0;
     this.isHorizontal = false;
     this.gap = 0;
+    this.borderRadius = 0;
+    this.points = [];
     this.context = context;
-    this.isHorizontal = isHorizontal;
-    this.gap = gap / 2;
+    this.isHorizontal = isHorizontal ?? false;
+    this.gap = (gap ?? 0) / 2;
+    this.position = position ?? 0;
+    this.sections = sections ?? 1;
+    this.borderRadius = borderRadius ?? 0;
   }
-  areaStart() {
-    this.line = 0;
-  }
-  areaEnd() {
-    this.line = NaN;
-  }
-  lineStart() {
-    this.currentPoint = 0;
-  }
-  lineEnd() {
-    if (this.line || this.line !== 0 && this.currentPoint === 1) {
-      this.context.closePath();
+  areaStart() {}
+  areaEnd() {}
+  lineStart() {}
+  lineEnd() {}
+  getBorderRadius() {
+    if (this.gap > 0) {
+      return this.borderRadius;
+    }
+    if (this.position === 0) {
+      return [0, 0, this.borderRadius, this.borderRadius];
     }
-    this.line = 1 - this.line;
+    if (this.position === this.sections - 1) {
+      return [this.borderRadius, this.borderRadius];
+    }
+    return 0;
   }
-  point(x, y) {
-    x = +x;
-    y = +y;
-
-    // We draw the lines only at currentPoint 1 & 3 because we need
-    // The data of a pair of points to draw the lines.
-    // Hence currentPoint 1 draws a line from point 0 to point 1 and point 1 to point 2.
-    // currentPoint 3 draws a line from point 2 to point 3 and point 3 to point 0.
-
-    if (this.isHorizontal) {
-      const yGetter = yFromX(this.x, this.y, x, y);
-      let xGap = 0;
-
-      // 0 is the top-left corner.
-      if (this.currentPoint === 1) {
-        xGap = this.x + this.gap;
-        this.context.moveTo(xGap, yGetter(xGap));
-        this.context.lineTo(xGap, yGetter(xGap));
-        xGap = x - this.gap;
-        this.context.lineTo(xGap, yGetter(xGap));
-      } else if (this.currentPoint === 3) {
-        xGap = this.x - this.gap;
-        this.context.lineTo(xGap, yGetter(xGap));
-        xGap = x + this.gap;
-        this.context.lineTo(xGap, yGetter(xGap));
-      }
+  point(xIn, yIn) {
+    this.points.push({
+      x: xIn,
+      y: yIn
+    });
+    if (this.points.length < 4) {
+      return;
     }
-    if (!this.isHorizontal) {
-      const xGetter = xFromY(this.x, this.y, x, y);
-      let yGap = 0;
 
-      // 0 is the top-right corner.
-      if (this.currentPoint === 1) {
-        yGap = this.y + this.gap;
-        this.context.moveTo(xGetter(yGap), yGap);
-        this.context.lineTo(xGetter(yGap), yGap);
-        yGap = y - this.gap;
-        this.context.lineTo(xGetter(yGap), yGap);
-      } else if (this.currentPoint === 3) {
-        yGap = this.y - this.gap;
-        this.context.lineTo(xGetter(yGap), yGap);
-        yGap = y + this.gap;
-        this.context.lineTo(xGetter(yGap), yGap);
+    // Add gaps where they are needed.
+    this.points = this.points.map((point, index) => {
+      const slopeStart = this.points.at(index <= 1 ? 0 : 2);
+      const slopeEnd = this.points.at(index <= 1 ? 1 : 3);
+      if (this.isHorizontal) {
+        const yGetter = (0, _utils.lerpY)(slopeStart.x - this.gap, slopeStart.y, slopeEnd.x - this.gap, slopeEnd.y);
+        const xGap = point.x + (index === 0 || index === 3 ? this.gap : -this.gap);
+        return {
+          x: xGap,
+          y: yGetter(xGap)
+        };
       }
-    }
-
-    // Increment the values
-    this.currentPoint += 1;
-    this.x = x;
-    this.y = y;
+      const xGetter = (0, _utils.lerpX)(slopeStart.x, slopeStart.y - this.gap, slopeEnd.x, slopeEnd.y - this.gap);
+      const yGap = point.y + (index === 0 || index === 3 ? this.gap : -this.gap);
+      return {
+        x: xGetter(yGap),
+        y: yGap
+      };
+    });
+    (0, _borderRadiusPolygon.borderRadiusPolygon)(this.context, this.points, this.getBorderRadius());
   }
 }
 exports.Linear = Linear;

package/FunnelChart/curves/pyramid.d.ts

@@ -0,0 +1,34 @@
+import { CurveGenerator } from '@mui/x-charts-vendor/d3-shape';
+import { CurveOptions } from "./curve.types.js";
+/**
+ * This is a custom "pyramid" curve generator.
+ * It draws straight lines for the 4 provided points. The slopes are calculated
+ * based on the min and max values of the x and y axes.
+ * with the option to add a gap between sections while also properly handling the border radius.
+ */
+export declare class Pyramid implements CurveGenerator {
+  private context;
+  private position;
+  private sections;
+  private isHorizontal;
+  private gap;
+  private borderRadius;
+  private min;
+  private max;
+  private points;
+  constructor(context: CanvasRenderingContext2D, {
+    isHorizontal,
+    gap,
+    position,
+    sections,
+    borderRadius,
+    min,
+    max
+  }: CurveOptions);
+  areaStart(): void;
+  areaEnd(): void;
+  lineStart(): void;
+  lineEnd(): void;
+  protected getBorderRadius(): number | number[];
+  point(xIn: number, yIn: number): void;
+}