@mui/x-charts-pro 8.5.0 → 8.5.2

package/esm/FunnelChart/FunnelPlot.js

@@ -1,29 +1,31 @@
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 import _extends from "@babel/runtime/helpers/esm/extends";
-const _excluded = ["onItemClick", "gap"];
+const _excluded = ["onItemClick"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { line as d3Line } from '@mui/x-charts-vendor/d3-shape';
-import { cartesianSeriesTypes } from '@mui/x-charts/internals';
-import { useXAxes, useYAxes } from '@mui/x-charts/hooks';
-import { useTheme } from '@mui/material/styles';
+import { cartesianSeriesTypes, useSelector, useStore, isBandScale } from '@mui/x-charts/internals';
 import { FunnelSection } from "./FunnelSection.js";
 import { alignLabel, positionLabel } from "./labelUtils.js";
 import { useFunnelSeriesContext } from "../hooks/useFunnelSeries.js";
 import { getFunnelCurve } from "./curves/index.js";
+import { FunnelSectionLabel } from "./FunnelSectionLabel.js";
+import { selectorChartXAxis, selectorChartYAxis, selectorFunnelGap } from "./funnelAxisPlugin/useChartFunnelAxisRendering.selectors.js";
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 cartesianSeriesTypes.addType('funnel');
-const useAggregatedData = gap => {
+const useAggregatedData = () => {
   const seriesData = useFunnelSeriesContext();
+  const store = useStore();
   const {
-    xAxis,
-    xAxisIds
-  } = useXAxes();
+    axis: xAxis,
+    axisIds: xAxisIds
+  } = useSelector(store, selectorChartXAxis);
   const {
-    yAxis,
-    yAxisIds
-  } = useYAxes();
+    axis: yAxis,
+    axisIds: yAxisIds
+  } = useSelector(store, selectorChartYAxis);
+  const gap = useSelector(store, selectorFunnelGap);
   const allData = React.useMemo(() => {
     if (seriesData === undefined) {
       return [];
@@ -46,22 +48,28 @@ const useAggregatedData = gap => {
       const bandWidth = (isXAxisBand || isYAxisBand) && baseScaleConfig.scale?.bandwidth() || 0;
       const xScale = xAxis[xAxisId].scale;
       const yScale = yAxis[yAxisId].scale;
-      const xPosition = (value, bandIndex, stackOffset, useBand) => {
-        if (isXAxisBand) {
-          const position = xScale(bandIndex);
+      const xPosition = (value, bandIndex, bandIdentifier, stackOffset, useBand) => {
+        if (isBandScale(xScale)) {
+          const position = xScale(bandIdentifier);
           return useBand ? position + bandWidth : position;
         }
-        return xScale(isHorizontal ? value + (stackOffset || 0) : value);
+        if (isHorizontal) {
+          return xScale(value + (stackOffset || 0)) + bandIndex * gap;
+        }
+        return xScale(value);
       };
-      const yPosition = (value, bandIndex, stackOffset, useBand) => {
-        if (isYAxisBand) {
-          const position = yScale(bandIndex);
+      const yPosition = (value, bandIndex, bandIdentifier, stackOffset, useBand) => {
+        if (isBandScale(yScale)) {
+          const position = yScale(bandIdentifier);
           return useBand ? position + bandWidth : position;
         }
-        return yScale(isHorizontal ? value : value + (stackOffset || 0));
+        if (isHorizontal) {
+          return yScale(value);
+        }
+        return yScale(value + (stackOffset || 0)) + bandIndex * gap;
       };
-      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 allY = currentSeries.dataPoints.flatMap((d, dataIndex) => d.flatMap(v => yPosition(v.y, dataIndex, baseScaleConfig.data?.[dataIndex], v.stackOffset, v.useBandWidth)));
+      const allX = currentSeries.dataPoints.flatMap((d, dataIndex) => d.flatMap(v => xPosition(v.x, dataIndex, baseScaleConfig.data?.[dataIndex], v.stackOffset, v.useBandWidth)));
       const minPoint = {
         x: Math.min(...allX),
         y: Math.min(...allY)
@@ -89,7 +97,7 @@ const useAggregatedData = gap => {
           min: minPoint,
           max: maxPoint
         });
-        const line = d3Line().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);
+        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);
         return {
           d: line(values),
           color,
@@ -118,12 +126,10 @@ const useAggregatedData = gap => {
 };
 function FunnelPlot(props) {
   const {
-      onItemClick,
-      gap
+      onItemClick
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const theme = useTheme();
-  const data = useAggregatedData(gap);
+  const data = useAggregatedData();
   return /*#__PURE__*/_jsxs(React.Fragment, {
     children: [data.map(({
       d,
@@ -148,29 +154,18 @@ function FunnelPlot(props) {
       })
     }))), data.map(({
       id,
-      label
+      label,
+      seriesId,
+      dataIndex
     }) => {
-      if (!label) {
+      if (!label || !label.value) {
         return null;
       }
-      return /*#__PURE__*/_jsx("text", {
-        x: label.x,
-        y: label.y,
-        textAnchor: label.textAnchor,
-        dominantBaseline: label.dominantBaseline,
-        stroke: "none",
-        pointerEvents: "none",
-        fontFamily: theme.typography.body2.fontFamily,
-        fontSize: theme.typography.body2.fontSize,
-        fontSizeAdjust: theme.typography.body2.fontSizeAdjust,
-        fontWeight: theme.typography.body2.fontWeight,
-        letterSpacing: theme.typography.body2.letterSpacing,
-        fontStretch: theme.typography.body2.fontStretch,
-        fontStyle: theme.typography.body2.fontStyle,
-        fontVariant: theme.typography.body2.fontVariant,
-        fill: (theme.vars || theme)?.palette?.text?.primary,
-        children: label.value
-      }, id);
+      return /*#__PURE__*/_jsx(FunnelSectionLabel, _extends({
+        label: label,
+        dataIndex: dataIndex,
+        seriesId: seriesId
+      }, other), id);
     })]
   });
 }
@@ -179,11 +174,6 @@ process.env.NODE_ENV !== "production" ? FunnelPlot.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |
   // ----------------------------------------------------------------------
-  /**
-   * The gap, in pixels, between funnel sections.
-   * @default 0
-   */
-  gap: PropTypes.number,
   /**
    * Callback fired when a funnel item is clicked.
    * @param {React.MouseEvent<SVGElement, MouseEvent>} event The event source of the callback.

package/esm/FunnelChart/FunnelSection.d.ts

@@ -8,7 +8,7 @@ export interface FunnelSectionProps extends Omit<React.SVGProps<SVGPathElement>,
   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>, {}>;
+export declare const FunnelSectionPath: import("@emotion/styled").StyledComponent<import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, React.SVGProps<SVGPathElement>, {}>;
 /**
  * @ignore - internal component.
  */

package/esm/FunnelChart/FunnelSectionLabel.d.ts

@@ -0,0 +1,21 @@
+import * as React from 'react';
+import { SeriesId } from '@mui/x-charts/internals';
+import { FunnelSectionClasses } from "./funnelSectionClasses.js";
+export interface FunnelSectionLabelConfig {
+  x: number;
+  y: number;
+  value: string | null;
+  textAnchor?: React.SVGProps<SVGTextElement>['textAnchor'];
+  dominantBaseline?: React.SVGProps<SVGTextElement>['dominantBaseline'];
+}
+export interface FunnelSectionLabelProps extends Omit<React.SVGProps<SVGTextElement>, 'ref' | 'id'> {
+  classes?: Partial<FunnelSectionClasses>;
+  label: FunnelSectionLabelConfig;
+  seriesId: SeriesId;
+  dataIndex: number;
+}
+/**
+ * @ignore - internal component.
+ */
+declare const FunnelSectionLabel: React.ForwardRefExoticComponent<FunnelSectionLabelProps & React.RefAttributes<{}>>;
+export { FunnelSectionLabel };

package/esm/FunnelChart/FunnelSectionLabel.js

@@ -0,0 +1,46 @@
+'use client';
+
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["classes", "color", "onClick", "className", "label", "seriesId", "dataIndex"];
+import * as React from 'react';
+import { useTheme } from '@mui/material/styles';
+import { consumeSlots } from '@mui/x-charts/internals';
+import { useLabelUtilityClasses } from "./funnelSectionClasses.js";
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * @ignore - internal component.
+ */
+const FunnelSectionLabel = consumeSlots('MuiFunnelSectionLabel', 'funnelSectionLabel', {
+  classesResolver: useLabelUtilityClasses
+}, /*#__PURE__*/React.forwardRef(function FunnelSectionLabel(props, ref) {
+  const {
+      classes,
+      label
+    } = props,
+    other = _objectWithoutPropertiesLoose(props, _excluded);
+  const theme = useTheme();
+  return /*#__PURE__*/_jsx("text", _extends({
+    stroke: "none",
+    pointerEvents: "none",
+    fontFamily: theme.typography.body2.fontFamily,
+    fontSize: theme.typography.body2.fontSize,
+    fontSizeAdjust: theme.typography.body2.fontSizeAdjust,
+    fontWeight: theme.typography.body2.fontWeight,
+    letterSpacing: theme.typography.body2.letterSpacing,
+    fontStretch: theme.typography.body2.fontStretch,
+    fontStyle: theme.typography.body2.fontStyle,
+    fontVariant: theme.typography.body2.fontVariant,
+    fill: (theme.vars || theme)?.palette?.text?.primary,
+    className: classes?.label,
+    x: label.x,
+    y: label.y,
+    textAnchor: label.textAnchor ?? 'middle',
+    dominantBaseline: label.dominantBaseline ?? 'central'
+  }, other, {
+    ref: ref,
+    children: label.value
+  }));
+}));
+if (process.env.NODE_ENV !== "production") FunnelSectionLabel.displayName = "FunnelSectionLabel";
+export { FunnelSectionLabel };

package/esm/FunnelChart/categoryAxis.types.d.ts

@@ -1,6 +1,7 @@
 import { AxisConfig, ScaleName } from '@mui/x-charts/models';
 import { MakeOptional } from '@mui/x-internals/types';
-export type CategoryAxis<S extends ScaleName = ScaleName> = S extends ScaleName ? {
+export type FunnelScaleName = Exclude<ScaleName, 'point'>;
+export type CategoryAxis<S extends FunnelScaleName = FunnelScaleName> = S extends FunnelScaleName ? {
   /**
    * The categories to be displayed on the axis.
    * The order of the categories is the order in which they are displayed.

package/esm/FunnelChart/curves/bump.d.ts

@@ -10,18 +10,22 @@ import { CurveOptions } from "./curve.types.js";
  */
 export declare class Bump implements CurveGenerator {
   private context;
-  private x;
-  private y;
-  private currentPoint;
   private isHorizontal;
-  private gap;
+  private min;
+  private max;
+  private points;
   constructor(context: CanvasRenderingContext2D, {
     isHorizontal,
-    gap
+    min,
+    max,
+    isIncreasing
   }: CurveOptions);
   areaStart(): void;
   areaEnd(): void;
   lineStart(): void;
   lineEnd(): void;
   point(x: number, y: number): void;
+  private drawPath;
+  private drawHorizontalPath;
+  private drawVerticalPath;
 }

package/esm/FunnelChart/curves/bump.js

@@ -11,64 +11,93 @@
 export class Bump {
   constructor(context, {
     isHorizontal,
-    gap
+    min,
+    max,
+    isIncreasing
   }) {
     this.context = void 0;
-    this.x = NaN;
-    this.y = NaN;
-    this.currentPoint = 0;
     this.isHorizontal = false;
-    this.gap = 0;
+    this.min = {
+      x: 0,
+      y: 0
+    };
+    this.max = {
+      x: 0,
+      y: 0
+    };
+    this.points = [];
     this.context = context;
     this.isHorizontal = isHorizontal ?? false;
-    this.gap = (gap ?? 0) / 2;
+    this.min = min ?? {
+      x: 0,
+      y: 0
+    };
+    this.max = max ?? {
+      x: 0,
+      y: 0
+    };
+    if (isIncreasing) {
+      const currentMin = this.min;
+      const currentMax = this.max;
+      this.min = currentMax;
+      this.max = currentMin;
+    }
   }
   areaStart() {}
   areaEnd() {}
   lineStart() {}
   lineEnd() {}
   point(x, y) {
-    x = +x;
-    y = +y;
-
-    // 0 is the top-left corner.
-    if (this.isHorizontal) {
-      if (this.currentPoint === 0) {
-        this.context.moveTo(x + this.gap, y);
-        this.context.lineTo(x + this.gap, y);
-      } else if (this.currentPoint === 1) {
-        this.context.bezierCurveTo((this.x + x) / 2, this.y, (this.x + x) / 2, y, x - this.gap, y);
-      } else if (this.currentPoint === 2) {
-        this.context.lineTo(x - this.gap, y);
-      } 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;
+    this.points.push({
+      x,
+      y
+    });
+    if (this.points.length < 4) {
       return;
     }
 
-    // 0 is the top-right corner.
-    if (this.currentPoint === 0) {
-      // X from Y
-      this.context.moveTo(x, y + this.gap);
-      this.context.lineTo(x, y + this.gap);
-    } else if (this.currentPoint === 1) {
-      this.context.bezierCurveTo(this.x, (this.y + y) / 2, x, (this.y + y) / 2, x, y - this.gap);
-    } else if (this.currentPoint === 2) {
-      this.context.lineTo(x, y - this.gap);
+    // Draw the path using bezier curves
+    this.drawPath();
+  }
+  drawPath() {
+    if (this.isHorizontal) {
+      this.drawHorizontalPath();
     } 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.drawVerticalPath();
     }
-    this.currentPoint += 1;
-    this.x = x;
-    this.y = y;
+  }
+  drawHorizontalPath() {
+    const [p0, p1, p2, p3] = this.points;
+
+    // 0 is the top-left corner
+    this.context.moveTo(p0.x, p0.y);
+    this.context.lineTo(p0.x, p0.y);
+
+    // Bezier curve to point 1
+    this.context.bezierCurveTo((p0.x + p1.x) / 2, p0.y, (p0.x + p1.x) / 2, p1.y, p1.x, p1.y);
+
+    // Line to point 2
+    this.context.lineTo(p2.x, p2.y);
+
+    // Bezier curve back to point 3
+    this.context.bezierCurveTo((p2.x + p3.x) / 2, p2.y, (p2.x + p3.x) / 2, p3.y, p3.x, p3.y);
+    this.context.closePath();
+  }
+  drawVerticalPath() {
+    const [p0, p1, p2, p3] = this.points;
+
+    // 0 is the top-right corner
+    this.context.moveTo(p0.x, p0.y);
+    this.context.lineTo(p0.x, p0.y);
+
+    // Bezier curve to point 1
+    this.context.bezierCurveTo(p0.x, (p0.y + p1.y) / 2, p1.x, (p0.y + p1.y) / 2, p1.x, p1.y);
+
+    // Line to point 2
+    this.context.lineTo(p2.x, p2.y);
+
+    // Bezier curve back to point 3
+    this.context.bezierCurveTo(p2.x, (p2.y + p3.y) / 2, p3.x, (p2.y + p3.y) / 2, p3.x, p3.y);
+    this.context.closePath();
   }
 }

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

@@ -34,8 +34,13 @@ export type CurveOptions = {
    * The maximum point for all the segments.
    */
   max?: Point;
+  /**
+   * The shape of the point of the funnel for the curves that support it.
+   */
+  pointShape?: FunnelPointShape;
 };
-export type FunnelCurveType = 'linear' | 'step' | 'bump' | 'pyramid' | 'step-pyramid';
+export type FunnelCurveType = 'linear' | 'linear-sharp' | 'step' | 'bump' | 'pyramid' | 'step-pyramid';
+export type FunnelPointShape = 'square' | 'sharp';
 export type Point = {
   x: number;
   y: number;

package/esm/FunnelChart/curves/getFunnelCurve.js

@@ -19,5 +19,8 @@ const curveConstructor = curve => {
   return Linear;
 };
 export const getFunnelCurve = (curve, options) => {
+  if (curve === 'linear-sharp') {
+    options.pointShape = 'sharp';
+  }
   return context => new (curveConstructor(curve))(context, options);
 };

package/esm/FunnelChart/curves/linear.d.ts

@@ -3,7 +3,7 @@ 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.
+ * with the option to properly handling the border radius.
  *
  * The implementation is based on the d3-shape linear curve generator.
  * https://github.com/d3/d3-shape/blob/a82254af78f08799c71d7ab25df557c4872a3c51/src/curve/linear.js
@@ -13,15 +13,23 @@ export declare class Linear implements CurveGenerator {
   private position;
   private sections;
   private isHorizontal;
+  private isIncreasing;
   private gap;
   private borderRadius;
+  private min;
+  private max;
   private points;
+  private pointShape;
   constructor(context: CanvasRenderingContext2D, {
     isHorizontal,
     gap,
     position,
     sections,
-    borderRadius
+    borderRadius,
+    min,
+    max,
+    isIncreasing,
+    pointShape
   }: CurveOptions);
   areaStart(): void;
   areaEnd(): void;

package/esm/FunnelChart/curves/linear.js

@@ -6,7 +6,7 @@ import { lerpX, lerpY } from "./utils.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.
+ * with the option to properly handling the border radius.
  *
  * The implementation is based on the d3-shape linear curve generator.
  * https://github.com/d3/d3-shape/blob/a82254af78f08799c71d7ab25df557c4872a3c51/src/curve/linear.js
@@ -17,21 +17,51 @@ export class Linear {
     gap,
     position,
     sections,
-    borderRadius
+    borderRadius,
+    min,
+    max,
+    isIncreasing,
+    pointShape
   }) {
     this.context = void 0;
     this.position = 0;
     this.sections = 0;
     this.isHorizontal = false;
+    this.isIncreasing = false;
     this.gap = 0;
     this.borderRadius = 0;
+    this.min = {
+      x: 0,
+      y: 0
+    };
+    this.max = {
+      x: 0,
+      y: 0
+    };
     this.points = [];
+    this.pointShape = 'square';
     this.context = context;
     this.isHorizontal = isHorizontal ?? false;
-    this.gap = (gap ?? 0) / 2;
+    this.gap = gap ?? 0;
     this.position = position ?? 0;
     this.sections = sections ?? 1;
     this.borderRadius = borderRadius ?? 0;
+    this.isIncreasing = isIncreasing ?? false;
+    this.min = min ?? {
+      x: 0,
+      y: 0
+    };
+    this.max = max ?? {
+      x: 0,
+      y: 0
+    };
+    this.pointShape = pointShape ?? 'square';
+    if (isIncreasing) {
+      const currentMin = this.min;
+      const currentMax = this.max;
+      this.min = currentMax;
+      this.max = currentMin;
+    }
   }
   areaStart() {}
   areaEnd() {}
@@ -41,11 +71,34 @@ export class Linear {
     if (this.gap > 0) {
       return this.borderRadius;
     }
-    if (this.position === 0) {
-      return [0, 0, this.borderRadius, this.borderRadius];
+    if (this.isIncreasing) {
+      // Is largest section
+      if (this.position === this.sections - 1) {
+        return [this.borderRadius, this.borderRadius];
+      }
+      // Is smallest section and shaped like a triangle
+      if (this.position === 0 && this.pointShape === 'sharp') {
+        return [0, 0, this.borderRadius];
+      }
+      // Is smallest section
+      if (this.position === 0) {
+        return [0, 0, this.borderRadius, this.borderRadius];
+      }
     }
-    if (this.position === this.sections - 1) {
-      return [this.borderRadius, this.borderRadius];
+    if (!this.isIncreasing) {
+      // Is largest section
+      if (this.position === 0) {
+        return [0, 0, this.borderRadius, this.borderRadius];
+      }
+      // Is smallest section and shaped like a triangle
+      if (this.position === this.sections - 1 && this.pointShape === 'sharp') {
+        return [this.borderRadius];
+      }
+
+      // Is smallest section
+      if (this.position === this.sections - 1) {
+        return [this.borderRadius, this.borderRadius];
+      }
     }
     return 0;
   }
@@ -60,23 +113,50 @@ export class Linear {
 
     // 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);
+      const slopeStart = this.points.at(index <= 1 ? 0 : 3);
+      const slopeEnd = this.points.at(index <= 1 ? 1 : 2);
       if (this.isHorizontal) {
-        const yGetter = 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);
+        const yGetter = lerpY(slopeStart.x - this.gap, slopeStart.y, slopeEnd.x, slopeEnd.y);
         return {
-          x: xGap,
-          y: yGetter(xGap)
+          x: point.x,
+          y: yGetter(point.x)
         };
       }
-      const xGetter = 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);
+      const xGetter = lerpX(slopeStart.x, slopeStart.y - this.gap, slopeEnd.x, slopeEnd.y);
       return {
-        x: xGetter(yGap),
-        y: yGap
+        x: xGetter(point.y),
+        y: point.y
       };
     });
+    if (this.pointShape === 'sharp') {
+      // In the last section, to form a triangle we need 3 points instead of 4
+      // Else the algorithm will break.
+      const isLastSection = this.position === this.sections - 1;
+      const isFirstSection = this.position === 0;
+      let firstPoint = null;
+      let secondPoint = null;
+      if (isFirstSection && this.isIncreasing) {
+        firstPoint = this.points[1];
+        secondPoint = this.points[2];
+      }
+      if (isLastSection && !this.isIncreasing) {
+        firstPoint = this.points[3];
+        secondPoint = this.points[0];
+      }
+      if (firstPoint && secondPoint) {
+        this.points = [
+        // Sharp point at the start
+        this.isHorizontal ? {
+          x: this.max.x,
+          y: (this.max.y + this.min.y) / 2
+        } : {
+          x: (this.max.x + this.min.x) / 2,
+          y: this.max.y
+        },
+        // Then other points
+        firstPoint, secondPoint];
+      }
+    }
     borderRadiusPolygon(this.context, this.points, this.getBorderRadius());
   }
 }