@progress/kendo-charts 2.12.2 → 2.12.3-develop.2

package/dist/es/chart/area-chart/area-chart.js

@@ -7,6 +7,8 @@ import SplineAreaSegment from './spline-area-segment';
 
 import { STEP, SMOOTH, ZERO } from '../constants';
 
+import { last } from '../../common';
+
 class AreaChart extends LineChart {
     createSegment(linePoints, currentSeries, seriesIx, prevSegment) {
         const isStacked = this.options.isStacked;
@@ -15,13 +17,8 @@ class AreaChart extends LineChart {
 
         let stackPoints;
         if (isStacked && seriesIx > 0 && prevSegment) {
-            const missingValues = this.seriesMissingValues(currentSeries);
-            if (missingValues !== "gap") {
-                stackPoints = prevSegment.linePoints;
-                previousSegment = prevSegment;
-            } else {
-                stackPoints = this._gapStackPoints(linePoints, seriesIx, style);
-            }
+            stackPoints = this._getStackPoints(linePoints, seriesIx, style);
+            previousSegment = prevSegment;
         }
 
         let pointType;
@@ -49,41 +46,50 @@ class AreaChart extends LineChart {
         }
     }
 
-    _gapStackPoints(linePoints, seriesIx, style) {
+    _getStackPoints(linePoints, seriesIx, style) {
         const seriesPoints = this.seriesPoints;
-        let startIdx = linePoints[0].categoryIx;
-        let length = linePoints.length;
-        if (startIdx < 0) {
-            startIdx = 0;
-            length--;
-        }
-
-        const endIdx = startIdx + length;
+        const startIdx = Math.max(-1, linePoints[0].categoryIx);
+        const endIdx = last(linePoints).categoryIx + 1;
         const pointOffset = this.seriesOptions[0]._outOfRangeMinPoint ? 1 : 0;
         const stackPoints = [];
 
         this._stackPoints = this._stackPoints || [];
         for (let categoryIx = startIdx; categoryIx < endIdx; categoryIx++) {
-            const pointIx = categoryIx + pointOffset;
+            const pointIx = categoryIx;
             let currentSeriesIx = seriesIx;
-            let point;
+            let prevPoint;
+            let crossesSegment = false;
 
             do {
                 currentSeriesIx--;
-                point = seriesPoints[currentSeriesIx][pointIx];
-            } while (currentSeriesIx > 0 && !point);
+                prevPoint = seriesPoints[currentSeriesIx][pointIx + pointOffset];
 
-            if (point) {
-                if (style !== STEP && categoryIx > startIdx && !seriesPoints[currentSeriesIx][pointIx - 1]) {
-                    stackPoints.push(this._previousSegmentPoint(categoryIx, pointIx, pointIx - 1, currentSeriesIx));
+                if (!prevPoint && this.hasSegmentForPoint(currentSeriesIx, categoryIx)) {
+                    crossesSegment = true;
+                    break;
+                }
+            } while (currentSeriesIx > 0 && !prevPoint);
+
+            if (prevPoint) {
+                if (style !== STEP && categoryIx > startIdx) {
+                    const crossesPrevSegment = this.hasSegmentForPoint(currentSeriesIx, pointIx - 1);
+                    if (!crossesPrevSegment) {
+                        // No previous point, close the gap with a point from the previous segment
+                        stackPoints.push(this._previousSegmentPoint(categoryIx, pointIx, pointIx - 1, currentSeriesIx));
+                    }
                 }
 
-                stackPoints.push(point);
+                stackPoints.push(prevPoint);
 
-                if (style !== STEP && categoryIx + 1 < endIdx && !seriesPoints[currentSeriesIx][pointIx + 1]) {
-                    stackPoints.push(this._previousSegmentPoint(categoryIx, pointIx, pointIx + 1, currentSeriesIx));
+                if (style !== STEP && categoryIx + 1 < endIdx) {
+                    const crossesNextSegment = this.hasSegmentForPoint(currentSeriesIx, pointIx + 1);
+                    if (!crossesNextSegment) {
+                        // No next point, close the gap with a point from the previous segment
+                        stackPoints.push(this._previousSegmentPoint(categoryIx, pointIx, pointIx + 1, currentSeriesIx));
+                    }
                 }
-            } else {
+            } else if (!crossesSegment) {
+                // No previous point in the stack and does not cross a segment, add a gap point
                 const gapStackPoint = this._createGapStackPoint(categoryIx);
                 this._stackPoints.push(gapStackPoint);
                 stackPoints.push(gapStackPoint);

package/dist/es/chart/area-chart/spline-area-segment.js

@@ -1,4 +1,3 @@
-import { geometry as geom } from '@progress/kendo-drawing';
 import { CurveProcessor } from '../../core';
 
 import AreaSegment from './area-segment';
@@ -12,20 +11,6 @@ class SplineAreaSegment extends AreaSegment {
         return curveProcessor.process(linePoints);
     }
 
-    createStackSegments() {
-        const strokeSegments = this.strokeSegments();
-        const stackSegments = [];
-        for (let idx = strokeSegments.length - 1; idx >= 0; idx--) {
-            const segment = strokeSegments[idx];
-            stackSegments.push(new geom.Segment(
-                segment.anchor(),
-                segment.controlOut(),
-                segment.controlIn()
-            ));
-        }
-
-        return stackSegments;
-    }
 }
 
-export default SplineAreaSegment;
+export default SplineAreaSegment;

package/dist/es/chart/mixins/line-chart-mixin.js

@@ -49,6 +49,18 @@ const LineChartMixin = {
         segment.parent = this;
     },
 
+    hasSegmentForPoint(seriesIx, pointIx) {
+        return this._segments.some(segment => {
+            if (segment.seriesIx !== seriesIx) {
+                return false;
+            }
+            const points = segment.linePoints;
+            const start = points[0].categoryIx;
+            const end = points[points.length - 1].categoryIx;
+            return pointIx >= start && pointIx <= end;
+        });
+    },
+
     sortPoints: function(points) {
         return points;
     },
@@ -84,4 +96,4 @@ const LineChartMixin = {
     }
 };
 
-export default LineChartMixin;
+export default LineChartMixin;

package/dist/es/core/curve-processor.js

@@ -153,7 +153,6 @@ class CurveProcessor {
     controlPoints(p0, p1, p2) {
         let xField = X;
         let yField = Y;
-        let restrict = false;
         let switchOrientation = false;
         let tangent;
 
@@ -166,8 +165,11 @@ class CurveProcessor {
             };
 
             if (monotonic.x && monotonic.y) {
-                tangent = this.tangent(p0, p2, X, Y);
-                restrict = true;
+                const h0 = p1[xField] - p0[xField];
+                const h1 = p2[xField] - p1[xField];
+                const d0 = (p1[yField] - p0[yField]) / h0;
+                const d1 = (p2[yField] - p1[yField]) / h1;
+                tangent = 3 * (h0 + h1) / ((2 * h1 + h0) / d0 + (h1 + 2 * h0) / d1);
             } else {
                 if (this.invertAxis(p0, p1, p2)) {
                     xField = Y;
@@ -201,34 +203,9 @@ class CurveProcessor {
 
         const firstControlPoint = this.firstControlPoint(tangent, p1, p2, xField, yField);
 
-        if (restrict) {
-            this.restrictControlPoint(p0, p1, secondControlPoint, tangent);
-            this.restrictControlPoint(p1, p2, firstControlPoint, tangent);
-        }
-
         return [ secondControlPoint, firstControlPoint ];
     }
 
-    restrictControlPoint(p1, p2, cp, tangent) {
-        if (p1.y < p2.y) {
-            if (p2.y < cp.y) {
-                cp.x = p1.x + (p2.y - p1.y) / tangent;
-                cp.y = p2.y;
-            } else if (cp.y < p1.y) {
-                cp.x = p2.x - (p2.y - p1.y) / tangent;
-                cp.y = p1.y;
-            }
-        } else {
-            if (cp.y < p2.y) {
-                cp.x = p1.x - (p1.y - p2.y) / tangent;
-                cp.y = p2.y;
-            } else if (p1.y < cp.y) {
-                cp.x = p2.x + (p1.y - p2.y) / tangent;
-                cp.y = p1.y;
-            }
-        }
-    }
-
     tangent(p0, p1, xField, yField) {
         const x = p1[xField] - p0[xField];
         const y = p1[yField] - p0[yField];
@@ -287,4 +264,4 @@ function numberSign(value) {
     return value <= 0 ? -1 : 1;
 }
 
-export default CurveProcessor;
+export default CurveProcessor;

package/dist/es2015/chart/area-chart/area-chart.js

@@ -7,6 +7,8 @@ import SplineAreaSegment from './spline-area-segment';
 
 import { STEP, SMOOTH, ZERO } from '../constants';
 
+import { last } from '../../common';
+
 class AreaChart extends LineChart {
     createSegment(linePoints, currentSeries, seriesIx, prevSegment) {
         const isStacked = this.options.isStacked;
@@ -15,13 +17,8 @@ class AreaChart extends LineChart {
 
         let stackPoints;
         if (isStacked && seriesIx > 0 && prevSegment) {
-            const missingValues = this.seriesMissingValues(currentSeries);
-            if (missingValues !== "gap") {
-                stackPoints = prevSegment.linePoints;
-                previousSegment = prevSegment;
-            } else {
-                stackPoints = this._gapStackPoints(linePoints, seriesIx, style);
-            }
+            stackPoints = this._getStackPoints(linePoints, seriesIx, style);
+            previousSegment = prevSegment;
         }
 
         let pointType;
@@ -49,41 +46,50 @@ class AreaChart extends LineChart {
         }
     }
 
-    _gapStackPoints(linePoints, seriesIx, style) {
+    _getStackPoints(linePoints, seriesIx, style) {
         const seriesPoints = this.seriesPoints;
-        let startIdx = linePoints[0].categoryIx;
-        let length = linePoints.length;
-        if (startIdx < 0) {
-            startIdx = 0;
-            length--;
-        }
-
-        const endIdx = startIdx + length;
+        const startIdx = Math.max(-1, linePoints[0].categoryIx);
+        const endIdx = last(linePoints).categoryIx + 1;
         const pointOffset = this.seriesOptions[0]._outOfRangeMinPoint ? 1 : 0;
         const stackPoints = [];
 
         this._stackPoints = this._stackPoints || [];
         for (let categoryIx = startIdx; categoryIx < endIdx; categoryIx++) {
-            const pointIx = categoryIx + pointOffset;
+            const pointIx = categoryIx;
             let currentSeriesIx = seriesIx;
-            let point;
+            let prevPoint;
+            let crossesSegment = false;
 
             do {
                 currentSeriesIx--;
-                point = seriesPoints[currentSeriesIx][pointIx];
-            } while (currentSeriesIx > 0 && !point);
+                prevPoint = seriesPoints[currentSeriesIx][pointIx + pointOffset];
 
-            if (point) {
-                if (style !== STEP && categoryIx > startIdx && !seriesPoints[currentSeriesIx][pointIx - 1]) {
-                    stackPoints.push(this._previousSegmentPoint(categoryIx, pointIx, pointIx - 1, currentSeriesIx));
+                if (!prevPoint && this.hasSegmentForPoint(currentSeriesIx, categoryIx)) {
+                    crossesSegment = true;
+                    break;
+                }
+            } while (currentSeriesIx > 0 && !prevPoint);
+
+            if (prevPoint) {
+                if (style !== STEP && categoryIx > startIdx) {
+                    const crossesPrevSegment = this.hasSegmentForPoint(currentSeriesIx, pointIx - 1);
+                    if (!crossesPrevSegment) {
+                        // No previous point, close the gap with a point from the previous segment
+                        stackPoints.push(this._previousSegmentPoint(categoryIx, pointIx, pointIx - 1, currentSeriesIx));
+                    }
                 }
 
-                stackPoints.push(point);
+                stackPoints.push(prevPoint);
 
-                if (style !== STEP && categoryIx + 1 < endIdx && !seriesPoints[currentSeriesIx][pointIx + 1]) {
-                    stackPoints.push(this._previousSegmentPoint(categoryIx, pointIx, pointIx + 1, currentSeriesIx));
+                if (style !== STEP && categoryIx + 1 < endIdx) {
+                    const crossesNextSegment = this.hasSegmentForPoint(currentSeriesIx, pointIx + 1);
+                    if (!crossesNextSegment) {
+                        // No next point, close the gap with a point from the previous segment
+                        stackPoints.push(this._previousSegmentPoint(categoryIx, pointIx, pointIx + 1, currentSeriesIx));
+                    }
                 }
-            } else {
+            } else if (!crossesSegment) {
+                // No previous point in the stack and does not cross a segment, add a gap point
                 const gapStackPoint = this._createGapStackPoint(categoryIx);
                 this._stackPoints.push(gapStackPoint);
                 stackPoints.push(gapStackPoint);

package/dist/es2015/chart/area-chart/spline-area-segment.js

@@ -1,4 +1,3 @@
-import { geometry as geom } from '@progress/kendo-drawing';
 import { CurveProcessor } from '../../core';
 
 import AreaSegment from './area-segment';
@@ -12,20 +11,6 @@ class SplineAreaSegment extends AreaSegment {
         return curveProcessor.process(linePoints);
     }
 
-    createStackSegments() {
-        const strokeSegments = this.strokeSegments();
-        const stackSegments = [];
-        for (let idx = strokeSegments.length - 1; idx >= 0; idx--) {
-            const segment = strokeSegments[idx];
-            stackSegments.push(new geom.Segment(
-                segment.anchor(),
-                segment.controlOut(),
-                segment.controlIn()
-            ));
-        }
-
-        return stackSegments;
-    }
 }
 
-export default SplineAreaSegment;
+export default SplineAreaSegment;

package/dist/es2015/chart/mixins/line-chart-mixin.js

@@ -49,6 +49,18 @@ const LineChartMixin = {
         segment.parent = this;
     },
 
+    hasSegmentForPoint(seriesIx, pointIx) {
+        return this._segments.some(segment => {
+            if (segment.seriesIx !== seriesIx) {
+                return false;
+            }
+            const points = segment.linePoints;
+            const start = points[0].categoryIx;
+            const end = points[points.length - 1].categoryIx;
+            return pointIx >= start && pointIx <= end;
+        });
+    },
+
     sortPoints: function(points) {
         return points;
     },
@@ -84,4 +96,4 @@ const LineChartMixin = {
     }
 };
 
-export default LineChartMixin;
+export default LineChartMixin;

package/dist/es2015/core/curve-processor.js

@@ -153,7 +153,6 @@ class CurveProcessor {
     controlPoints(p0, p1, p2) {
         let xField = X;
         let yField = Y;
-        let restrict = false;
         let switchOrientation = false;
         let tangent;
 
@@ -166,8 +165,11 @@ class CurveProcessor {
             };
 
             if (monotonic.x && monotonic.y) {
-                tangent = this.tangent(p0, p2, X, Y);
-                restrict = true;
+                const h0 = p1[xField] - p0[xField];
+                const h1 = p2[xField] - p1[xField];
+                const d0 = (p1[yField] - p0[yField]) / h0;
+                const d1 = (p2[yField] - p1[yField]) / h1;
+                tangent = 3 * (h0 + h1) / ((2 * h1 + h0) / d0 + (h1 + 2 * h0) / d1);
             } else {
                 if (this.invertAxis(p0, p1, p2)) {
                     xField = Y;
@@ -201,34 +203,9 @@ class CurveProcessor {
 
         const firstControlPoint = this.firstControlPoint(tangent, p1, p2, xField, yField);
 
-        if (restrict) {
-            this.restrictControlPoint(p0, p1, secondControlPoint, tangent);
-            this.restrictControlPoint(p1, p2, firstControlPoint, tangent);
-        }
-
         return [ secondControlPoint, firstControlPoint ];
     }
 
-    restrictControlPoint(p1, p2, cp, tangent) {
-        if (p1.y < p2.y) {
-            if (p2.y < cp.y) {
-                cp.x = p1.x + (p2.y - p1.y) / tangent;
-                cp.y = p2.y;
-            } else if (cp.y < p1.y) {
-                cp.x = p2.x - (p2.y - p1.y) / tangent;
-                cp.y = p1.y;
-            }
-        } else {
-            if (cp.y < p2.y) {
-                cp.x = p1.x - (p1.y - p2.y) / tangent;
-                cp.y = p2.y;
-            } else if (p1.y < cp.y) {
-                cp.x = p2.x + (p1.y - p2.y) / tangent;
-                cp.y = p1.y;
-            }
-        }
-    }
-
     tangent(p0, p1, xField, yField) {
         const x = p1[xField] - p0[xField];
         const y = p1[yField] - p0[yField];
@@ -287,4 +264,4 @@ function numberSign(value) {
     return value <= 0 ? -1 : 1;
 }
 
-export default CurveProcessor;
+export default CurveProcessor;