@amcharts/amcharts5 5.14.3 → 5.15.0

package/.internal/charts/xy/series/XYSeries.js

@@ -12,35 +12,21 @@ import * as $utils from "../../../core/util/Utils";
  * @ignore
  */
 function min(left, right) {
-    if (left == null) {
+    if (left == null)
         return right;
-    }
-    else if (right == null) {
-        return left;
-    }
-    else if (right < left) {
-        return right;
-    }
-    else {
+    if (right == null)
         return left;
-    }
+    return (right < left) ? right : left;
 }
 /**
  * @ignore
  */
 function max(left, right) {
-    if (left == null) {
+    if (left == null)
         return right;
-    }
-    else if (right == null) {
-        return left;
-    }
-    else if (right > left) {
-        return right;
-    }
-    else {
+    if (right == null)
         return left;
-    }
+    return (left > right) ? left : right;
 }
 /**
  * A base class for all XY chart series.
@@ -140,6 +126,18 @@ export class XYSeries extends Series {
             writable: true,
             value: 0
         });
+        Object.defineProperty(this, "_xRenderer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "_yRenderer", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "_bullets", {
             enumerable: true,
             configurable: true,
@@ -494,12 +492,12 @@ export class XYSeries extends Series {
             let endIndex = this.endIndex();
             let count = endIndex - startIndex;
             if (xAxis == baseAxis) {
-                if (xAxis.get("renderer").axisLength() / count < minBulletDistance / 5) {
+                if (this._xRenderer.axisLength() / count < minBulletDistance / 5) {
                     return false;
                 }
             }
             else if (yAxis == baseAxis) {
-                if (yAxis.get("renderer").axisLength() / count < minBulletDistance / 5) {
+                if (this._yRenderer.axisLength() / count < minBulletDistance / 5) {
                     return false;
                 }
             }
@@ -585,6 +583,8 @@ export class XYSeries extends Series {
     }
     _prepareChildren() {
         super._prepareChildren();
+        this._xRenderer = this.get("xAxis").get("renderer");
+        this._yRenderer = this.get("yAxis").get("renderer");
         this._bullets = {};
         if (this.isDirty("valueYShow") || this.isDirty("valueXShow") || this.isDirty("openValueYShow") || this.isDirty("openValueXShow") || this.isDirty("lowValueYShow") || this.isDirty("lowValueXShow") || this.isDirty("highValueYShow") || this.isDirty("highValueXShow")) {
             this._updateFields();
@@ -1066,7 +1066,7 @@ export class XYSeries extends Series {
                         }
                         if (realField) {
                             positionY = yAxis.getDataItemPositionY(dataItem, realField, 0, this.get("vcy", 1), exactLocationY);
-                            point = yAxis.get("renderer").positionToPoint(positionY);
+                            point = this._yRenderer.positionToPoint(positionY);
                             y = point.y;
                             x = left + w * locationX;
                         }
@@ -1086,7 +1086,7 @@ export class XYSeries extends Series {
                         }
                         if (realField) {
                             positionX = xAxis.getDataItemPositionX(dataItem, realField, 0, this.get("vcx", 1), exactLocationX);
-                            point = xAxis.get("renderer").positionToPoint(positionX);
+                            point = this._xRenderer.positionToPoint(positionX);
                             x = point.x;
                             y = bottom - h * locationY;
                         }
@@ -1492,20 +1492,20 @@ export class XYSeries extends Series {
      * @ignore
      */
     getPoint(positionX, positionY) {
-        let x = this.get("xAxis").get("renderer").positionToCoordinate(positionX);
-        let y = this.get("yAxis").get("renderer").positionToCoordinate(positionY);
+        let x = this._xRenderer.positionToCoordinate(positionX);
+        let y = this._yRenderer.positionToCoordinate(positionY);
         // if coordinate is super big, canvas fails to draw line, capping to some big number (won't make any visual difference)
         let max = 999999999;
         if (y < -max) {
             y = -max;
         }
-        if (y > max) {
+        else if (y > max) {
             y = max;
         }
         if (x < -max) {
             x = -max;
         }
-        if (x > max) {
+        else if (x > max) {
             x = max;
         }
         return { x: x, y: y };