igniteui-webcomponents-charts 5.0.0-beta.3 → 5.0.1

package/esm5/lib/ScatterBase_combined.js

@@ -63,49 +63,49 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ScatterBase, _super);
     function ScatterBase() {
         var _this = _super.call(this) || this;
-        _this.yn = null;
-        _this.y6 = null;
+        _this.yo = null;
         _this.y7 = null;
-        _this.acb = null;
+        _this.y8 = null;
         _this.acc = null;
-        _this.yw = 1;
-        _this.yd = null;
+        _this.acd = null;
+        _this.yx = 1;
         _this.ye = null;
-        _this.yt = null;
-        _this.yv = null;
-        _this.yr = null;
+        _this.yf = null;
+        _this.yu = null;
+        _this.yw = null;
+        _this.ys = null;
+        _this.zd = false;
         _this.zc = false;
-        _this.zb = false;
-        _this.y4 = null;
         _this.y5 = null;
+        _this.y6 = null;
         _this.assigningScatterStyle = null;
         _this.assigningScatterMarkerStyle = null;
-        _this.y0 = null;
-        _this.yu = null;
-        _this.yq = null;
-        _this.za = true;
-        _this.zp = 0;
+        _this.y1 = null;
+        _this.yv = null;
+        _this.yr = null;
+        _this.zb = true;
         _this.zq = 0;
         _this.zr = 0;
         _this.zs = 0;
-        _this.yx = _this.yy();
-        _this.y0 = new ScatterSeriesRenderManager();
-        _this.yu = new ScatterFrame();
+        _this.zt = 0;
+        _this.yy = _this.yz();
+        _this.y1 = new ScatterSeriesRenderManager();
+        _this.yv = new ScatterFrame();
+        _this.acd = Rect.empty;
         _this.acc = Rect.empty;
-        _this.acb = Rect.empty;
         return _this;
     }
     ScatterBase.prototype.cq = function () {
         return new ScatterBaseView(this);
     };
-    ScatterBase.prototype.oz = function () {
-        _super.prototype.oz.call(this);
+    ScatterBase.prototype.o0 = function () {
+        _super.prototype.o0.call(this);
         this.xAxis = null;
         this.yAxis = null;
     };
-    ScatterBase.prototype.qw = function (a) {
-        _super.prototype.qw.call(this, a);
-        this.yo = a;
+    ScatterBase.prototype.qx = function (a) {
+        _super.prototype.qx.call(this, a);
+        this.yp = a;
     };
     ScatterBase.prototype.get_fu = function () {
         return true;
@@ -114,36 +114,36 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return [this.xAxis, this.yAxis];
     };
     ScatterBase.prototype.ko = function (a, b) {
-        var c = this.na(b);
+        var c = this.nb(b);
         if (c == ScatterBase.$$p[12]) {
-            return this.kp(a, b, this.aak);
+            return this.kp(a, b, this.aal);
         }
         if (c == ScatterBase.$$p[16]) {
-            return this.kp(a, b, this.aas);
+            return this.kp(a, b, this.aat);
         }
         if (c == ScatterBase.$$p[1]) {
-            return this.kp(a, b, this.z4);
+            return this.kp(a, b, this.z5);
         }
         if (c == ScatterBase.$$p[2]) {
-            return this.kp(a, b, this.z6);
+            return this.kp(a, b, this.z7);
         }
         return null;
     };
-    ScatterBase.prototype.ma = function (a) {
-        var b = this.na(a);
+    ScatterBase.prototype.mb = function (a) {
+        var b = this.nb(a);
         if (b == ScatterBase.$$p[12]) {
-            return this.aak;
+            return this.aal;
         }
         if (b == ScatterBase.$$p[16]) {
-            return this.aas;
+            return this.aat;
         }
         if (b == ScatterBase.$$p[1]) {
-            return this.z4;
+            return this.z5;
         }
         if (b == ScatterBase.$$p[2]) {
-            return this.z6;
+            return this.z7;
         }
-        return _super.prototype.ma.call(this, a);
+        return _super.prototype.mb.call(this, a);
     };
     ScatterBase.prototype.d9 = function (a, b, c, d) {
         var _this = this;
@@ -151,27 +151,27 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return false;
         }
         var e = this.xAxis;
-        var f = new ScalerParams(1, this.c9.vl, this.wk, e.ch);
+        var f = new ScalerParams(1, this.c9.vl, this.wl, e.ch);
         f.c = this.getEffectiveViewport1(this.ct);
         var g = this.yAxis;
-        var h = new ScalerParams(1, this.c9.vl, this.wk, g.ch);
+        var h = new ScalerParams(1, this.c9.vl, this.wl, g.ch);
         h.c = this.getEffectiveViewport1(this.ct);
         a.clear();
-        this.wx.cj(function (i) {
+        this.wy.cj(function (i) {
             if (i._visibility == 0) {
                 var j = new SeriesPointOfInterest();
                 var k = i.n;
                 var l = i.o;
-                if (k < _this.wk.left || k > _this.wk.right || l < _this.wk.top || l > _this.wk.bottom) {
+                if (k < _this.wl.left || k > _this.wl.right || l < _this.wl.top || l > _this.wl.bottom) {
                     return;
                 }
                 j.d = e.en(k, f);
                 j.e = g.en(l, h);
                 j.b = i.content;
-                j.g = _this.u9;
+                j.g = _this.va;
                 j.c = i.ak;
                 if (_this.g7) {
-                    j.g = _this.vg(i.ak);
+                    j.g = _this.vh(i.ak);
                 }
                 a.add(j);
             }
@@ -180,7 +180,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBase.prototype.b0 = function () {
         if (this.b1 == 0) {
-            if (this.z0 <= 2000) {
+            if (this.z1 <= 2000) {
                 return 1;
             }
             else {
@@ -191,54 +191,54 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return _super.prototype.b0.call(this);
         }
     };
-    ScatterBase.prototype.wi = function (a) {
-        if (!this.hasMarkers || !this.w7()) {
+    ScatterBase.prototype.wj = function (a) {
+        if (!this.hasMarkers || !this.w8()) {
             return Rect.empty;
         }
-        var b = this.wx.b1(this.v0(a));
+        var b = this.wy.b1(this.v1(a));
         if (b != null) {
-            return this.wx.cu(b);
+            return this.wy.cu(b);
         }
         return Rect.empty;
     };
     ScatterBase.prototype.gu = function (a, b) {
-        if (this.w8(a, b)) {
+        if (this.w9(a, b)) {
             return true;
         }
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "y8", {
+    Object.defineProperty(ScatterBase.prototype, "y9", {
         get: function () {
-            return this.y6;
+            return this.y7;
         },
         set: function (a) {
-            if (this.y6 != a) {
-                var b = this.y8;
-                this.y6 = a;
-                this.raisePropertyChanged("XColumn", b, this.y8);
+            if (this.y7 != a) {
+                var b = this.y9;
+                this.y7 = a;
+                this.raisePropertyChanged("XColumn", b, this.y9);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ScatterBase.prototype, "y9", {
+    Object.defineProperty(ScatterBase.prototype, "za", {
         get: function () {
-            return this.y7;
+            return this.y8;
         },
         set: function (a) {
-            if (this.y7 != a) {
-                var b = this.y9;
-                this.y7 = a;
-                this.raisePropertyChanged("YColumn", b, this.y9);
+            if (this.y8 != a) {
+                var b = this.za;
+                this.y8 = a;
+                this.raisePropertyChanged("YColumn", b, this.za);
             }
         },
         enumerable: false,
         configurable: true
     });
     ScatterBase.prototype.f9 = function () {
-        return this.highlightedItemsSource != null || (this.z4 != null && this.z6 != null);
+        return this.highlightedItemsSource != null || (this.z5 != null && this.z7 != null);
     };
-    ScatterBase.prototype.zn = function () {
+    ScatterBase.prototype.zo = function () {
         return false;
     };
     ScatterBase.prototype.hr = function () {
@@ -252,7 +252,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.aaz));
+            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.aa0));
             a.add(b);
         }
         {
@@ -264,10 +264,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aay));
+            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aaz));
             a.add(c);
         }
-        if (this.zn()) {
+        if (this.zo()) {
             var d = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -284,7 +284,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             })());
             a.add(d);
         }
-        if (!this.zn()) {
+        if (!this.zo()) {
             var e = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -294,10 +294,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.ru));
+            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.rv));
             a.add(e);
         }
-        if (!this.zn()) {
+        if (!this.zo()) {
             var f = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -307,31 +307,31 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.ru));
+            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.rv));
             a.add(f);
         }
         return a;
     };
-    ScatterBase.prototype.aay = function (a, b) {
-        if (this.z4 != null) {
-            b.value = this.z4;
+    ScatterBase.prototype.aaz = function (a, b) {
+        if (this.z5 != null) {
+            b.value = this.z5;
             return;
         }
-        b.value = this.aak;
+        b.value = this.aal;
     };
-    ScatterBase.prototype.aaz = function (a, b) {
-        if (this.z6 != null) {
-            b.value = this.z6;
+    ScatterBase.prototype.aa0 = function (a, b) {
+        if (this.z7 != null) {
+            b.value = this.z7;
             return;
         }
-        b.value = this.aas;
+        b.value = this.aat;
     };
-    Object.defineProperty(ScatterBase.prototype, "ab8", {
+    Object.defineProperty(ScatterBase.prototype, "ab9", {
         get: function () {
-            return this.c(ScatterBase.abj);
+            return this.c(ScatterBase.abk);
         },
         set: function (a) {
-            this.h(ScatterBase.abj, a);
+            this.h(ScatterBase.abk, a);
         },
         enumerable: false,
         configurable: true
@@ -350,8 +350,8 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.p5 = function () {
-        _super.prototype.p5.call(this);
+    ScatterBase.prototype.p6 = function () {
+        _super.prototype.p6.call(this);
         if (this.xAxis != null) {
             this.xAxis.h9(false);
         }
@@ -359,32 +359,32 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             this.yAxis.h9(false);
         }
     };
-    ScatterBase.prototype.q4 = function (a, b, c, d) {
-        _super.prototype.q4.call(this, a, b, c, d);
-        if (this.yo.c2.g$b(a, b, c, d)) {
-            this.rm(false);
-            this.qg();
+    ScatterBase.prototype.q5 = function (a, b, c, d) {
+        _super.prototype.q5.call(this, a, b, c, d);
+        if (this.yp.c2.g$b(a, b, c, d)) {
+            this.rn(false);
+            this.qh();
         }
         switch (b) {
             case ScatterBase.$$p[10]:
             case ScatterBase.$$p[14]:
             case ScatterBase.$$p[11]:
             case ScatterBase.$$p[15]:
-                this.qa();
+                this.qb();
                 break;
             case "FastItemsSource":
                 if (typeCast(IFastItemsSource_$type, c) != null) {
-                    c.deregisterColumn(this.y8);
                     c.deregisterColumn(this.y9);
-                    this.y8 = null;
+                    c.deregisterColumn(this.za);
                     this.y9 = null;
+                    this.za = null;
                 }
                 if (typeCast(IFastItemsSource_$type, d) != null) {
-                    this.y8 = this.di(this.aak);
-                    this.y9 = this.di(this.aas);
+                    this.y9 = this.di(this.aal);
+                    this.za = this.di(this.aat);
                 }
                 if ((this.yAxis != null && !this.yAxis.c1()) || (this.xAxis != null && !this.xAxis.c1())) {
-                    this.rm(this.ge && c != null);
+                    this.rn(this.ge && c != null);
                 }
                 break;
             case ScatterBase.$$p[9]:
@@ -395,9 +395,9 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     d.ct(this);
                 }
                 if ((this.xAxis != null && !this.xAxis.c1()) || (d == null && c != null)) {
-                    this.rm(false);
+                    this.rn(false);
                 }
-                this.qg();
+                this.qh();
                 break;
             case ScatterBase.$$p[13]:
                 if (c != null) {
@@ -407,134 +407,134 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     d.ct(this);
                 }
                 if ((this.yAxis != null && !this.yAxis.c1()) || (d == null && c != null)) {
-                    this.rm(false);
+                    this.rn(false);
                 }
-                this.qg();
+                this.qh();
                 break;
             case ScatterBase.$$p[12]:
                 if (this.dl != null) {
-                    this.dl.deregisterColumn(this.y8);
-                    this.y8 = this.di(this.aak);
+                    this.dl.deregisterColumn(this.y9);
+                    this.y9 = this.di(this.aal);
                 }
                 break;
             case "XColumn":
-                this.yo.c2.g$i();
+                this.yp.c2.g$i();
                 if (this.xAxis != null && !this.xAxis.c1()) {
-                    this.rm(this.ge && this.d5);
+                    this.rn(this.ge && this.d5);
                 }
                 break;
             case ScatterBase.$$p[16]:
                 if (this.dl != null) {
-                    this.dl.deregisterColumn(this.y9);
-                    this.y9 = this.di(this.aas);
+                    this.dl.deregisterColumn(this.za);
+                    this.za = this.di(this.aat);
                 }
                 break;
             case "YColumn":
-                this.yo.c2.g$i();
+                this.yp.c2.g$i();
                 if (this.yAxis != null && !this.yAxis.c1()) {
-                    this.rm(this.ge && this.d5);
+                    this.rn(this.ge && this.d5);
                 }
                 break;
             case ScatterBase.$$p[7]:
-                this.rm(false);
-                this.qg();
+                this.rn(false);
+                this.qh();
                 break;
             case ScatterBase.$$p[8]:
-                this.rm(false);
-                this.qg();
+                this.rn(false);
+                this.qh();
                 break;
             case "TransitionProgress":
-                this.yv.c(this.jo, this.yt, this.yr);
-                this.aau();
+                this.yw.c(this.jo, this.yu, this.ys);
+                this.aav();
                 try {
                     if (this.d3(this.ct)) {
                         return;
                     }
                     if ((Math.round(this.jo * 100000) / 100000) == 1) {
-                        this.abg(this.yr, this.yo);
+                        this.abh(this.ys, this.yp);
                     }
                     else {
-                        this.abg(this.yv, this.yo);
+                        this.abh(this.yw, this.yp);
                     }
                     if (this.c9 != null) {
                         this.c9.qa(this);
                     }
                 }
                 finally {
-                    this.abh();
+                    this.abi();
                 }
                 break;
             case "TrendLineBrush":
-                this.ra(b);
+                this.rb(b);
                 break;
             case ScatterBase.$$p[0]:
-                if (this.yp != null) {
-                    this.yp.r = this;
+                if (this.yq != null) {
+                    this.yq.r = this;
                 }
-                this.rm(false);
-                this.qg();
+                this.rn(false);
+                this.qh();
                 break;
             case "TrendLineType":
-                this.qg();
+                this.qh();
                 break;
             case ScatterBase.$$p[4]:
-                this.zc = this.zk();
-                this.rm(false);
+                this.zd = this.zl();
+                this.rn(false);
                 break;
             case ScatterBase.$$p[3]:
-                this.zb = this.zj();
-                this.rm(false);
+                this.zc = this.zk();
+                this.rn(false);
                 break;
             case ScatterBase.$$p[5]:
-                this.yx = this.yy();
+                this.yy = this.yz();
                 break;
         }
     };
+    ScatterBase.prototype.zl = function () {
+        return this.zh;
+    };
     ScatterBase.prototype.zk = function () {
         return this.zg;
     };
-    ScatterBase.prototype.zj = function () {
-        return this.zf;
-    };
-    ScatterBase.prototype.ze = function (a) {
+    ScatterBase.prototype.zf = function (a) {
         if (typeCast(NumericYAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.zd = function (a) {
+    ScatterBase.prototype.ze = function (a) {
         if (typeCast(NumericXAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.abh = function () {
-        this.acb = Rect.empty;
+    ScatterBase.prototype.abi = function () {
         this.acc = Rect.empty;
+        this.acd = Rect.empty;
     };
-    ScatterBase.prototype.aau = function () {
-        var a = this.getViewInfo(this.acb, this.acc);
-        this.acb = a.p0;
-        this.acc = a.p1;
+    ScatterBase.prototype.aav = function () {
+        var a = this.getViewInfo(this.acc, this.acd);
+        this.acc = a.p0;
+        this.acd = a.p1;
     };
-    ScatterBase.prototype.zi = function (a, b) {
+    ScatterBase.prototype.zj = function (a, b) {
         if (b != 3) {
             return true;
         }
         if (a == null) {
             return true;
         }
-        if (this.aak == a || this.aas == a) {
+        if (this.aal == a || this.aat == a) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.o8 = function (a, b, c, d) {
+    ScatterBase.prototype.o9 = function (a, b, c, d) {
         var e = false;
-        if (!this.zi(d, a)) {
+        if (!this.zj(d, a)) {
             return;
         }
-        this.yo.c2.g$e(a, b, c, d);
+        this.yp.c2.g$e(a, b, c, d);
         if (this.xAxis != null && !this.xAxis.c1()) {
             e = true;
         }
@@ -542,29 +542,29 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             e = true;
         }
         if (a == 0 || a == 2 || a == 3 || a == 4) {
-            this.za = true;
+            this.zb = true;
         }
         else if (a == 1) {
             for (var f = b; f < b + c; f++) {
-                this.zp += this.y8.item(f);
                 this.zq += this.y9.item(f);
+                this.zr += this.za.item(f);
             }
-            this.zr = this.zp / this.y8.count;
             this.zs = this.zq / this.y9.count;
+            this.zt = this.zr / this.za.count;
         }
         if (e) {
-            this.rm(true);
+            this.rn(true);
         }
     };
-    ScatterBase.prototype.aa8 = function (a) {
-        this.aa9(a, null);
+    ScatterBase.prototype.aa9 = function (a) {
+        this.aba(a, null);
     };
-    ScatterBase.prototype.aa9 = function (a, b) {
+    ScatterBase.prototype.aba = function (a, b) {
         var e_1, _a, e_2, _b;
-        var c = this.y8 != null ? this.y8.count : 0;
-        var d = this.y9 != null ? this.y9.count : 0;
+        var c = this.y9 != null ? this.y9.count : 0;
+        var d = this.za != null ? this.za.count : 0;
         var e = Math.min(c, d);
-        if (e <= this.z0) {
+        if (e <= this.z1) {
             a.m.clear();
             var f = new List$1(OwnedPoint.$, 0);
             try {
@@ -630,12 +630,12 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     ScatterBase.prototype.ax = function (a) {
-        if (a != null && a == this.xAxis && this.y8 != null) {
-            return new AxisRange(this.y8.minimum, this.y8.maximum);
-        }
-        if (a != null && a == this.yAxis && this.y9 != null) {
+        if (a != null && a == this.xAxis && this.y9 != null) {
             return new AxisRange(this.y9.minimum, this.y9.maximum);
         }
+        if (a != null && a == this.yAxis && this.za != null) {
+            return new AxisRange(this.za.minimum, this.za.maximum);
+        }
         return null;
     };
     ScatterBase.prototype.kl = function (a) {
@@ -645,62 +645,62 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return null;
     };
-    Object.defineProperty(ScatterBase.prototype, "yx", {
+    Object.defineProperty(ScatterBase.prototype, "yy", {
         get: function () {
-            return this.yw;
+            return this.yx;
         },
         set: function (a) {
-            var b = this.yw;
-            this.yw = a;
-            if (b != this.yw) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.yw));
+            var b = this.yx;
+            this.yx = a;
+            if (b != this.yx) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.yx));
             }
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.yy = function () {
-        if (this.yz != 0) {
-            return this.yz;
+    ScatterBase.prototype.yz = function () {
+        if (this.y0 != 0) {
+            return this.y0;
         }
-        return this.zh ? 4 : 1;
+        return this.zi ? 4 : 1;
     };
     ScatterBase.prototype.j1 = function (a) {
         var b = truncate(Math.round(this.ip(a)));
         return b;
     };
     ScatterBase.prototype.ip = function (a) {
-        switch (this.yx) {
-            case 1: return this.zw(a);
-            case 3: return this.zx(a);
-            case 2: return this.zu(a);
-            case 4: return this.zv(a);
-            case 5: return this.zt(a);
+        switch (this.yy) {
+            case 1: return this.zx(a);
+            case 3: return this.zy(a);
+            case 2: return this.zv(a);
+            case 4: return this.zw(a);
+            case 5: return this.zu(a);
         }
         return -1;
     };
-    ScatterBase.prototype.zv = function (a) {
-        return this.zy(a, false);
+    ScatterBase.prototype.zw = function (a) {
+        return this.zz(a, false);
     };
-    ScatterBase.prototype.zu = function (a) {
-        var b = this.v0(a);
+    ScatterBase.prototype.zv = function (a) {
+        var b = this.v1(a);
         var c = b.x;
         var d = b.y;
-        if (this.dl == null || this.xAxis == null || this.yAxis == null || this.y8 == null || this.y9 == null) {
+        if (this.dl == null || this.xAxis == null || this.yAxis == null || this.y9 == null || this.za == null) {
             return -1;
         }
-        if (this.dl.count > this.zz) {
+        if (this.dl.count > this.z0) {
             return -1;
         }
-        this.aax();
-        var e = this.yd;
-        var f = this.ye;
+        this.aay();
+        var e = this.ye;
+        var f = this.yf;
         if (e == null || f == null) {
             return -1;
         }
         var g = 1.7976931348623157E+308;
         var h = -1;
-        for (var i = 0; i < this.y8.count; i++) {
+        for (var i = 0; i < this.y9.count; i++) {
             var j = e[i];
             var k = f[i];
             var l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -711,66 +711,66 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h;
     };
-    ScatterBase.prototype.aax = function () {
+    ScatterBase.prototype.aay = function () {
         var _this = this;
         var a = this.ct.by;
         var b = this.ct.bx;
         var c = this.getEffectiveViewport();
-        if (this.yn == null) {
+        if (this.yo == null) {
             return;
         }
-        var d = new ScalerParams(0, a, b, this.yn.d, c);
+        var d = new ScalerParams(0, a, b, this.yo.d, c);
         var e = ((function () {
-            var $ret = new ScalerParams(0, a, b, _this.yn.e, c);
+            var $ret = new ScalerParams(0, a, b, _this.yo.e, c);
             $ret.b = _this.iw();
             return $ret;
         })());
-        if (this.yd == null || this.ye == null) {
-            var f = arrayShallowClone(this.y8.asArray());
-            var g = arrayShallowClone(this.y9.asArray());
+        if (this.ye == null || this.yf == null) {
+            var f = arrayShallowClone(this.y9.asArray());
+            var g = arrayShallowClone(this.za.asArray());
             this.xAxis.ho(boxArray$1(f), 0, f.length, d);
             this.yAxis.ho(boxArray$1(g), 0, g.length, e);
-            this.yd = f;
-            this.ye = g;
+            this.ye = f;
+            this.yf = g;
         }
     };
-    ScatterBase.prototype.get_zh = function () {
+    ScatterBase.prototype.get_zi = function () {
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "zh", {
+    Object.defineProperty(ScatterBase.prototype, "zi", {
         get: function () {
-            return this.get_zh();
+            return this.get_zi();
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.zy = function (a, b) {
-        if (!this.zh) {
+    ScatterBase.prototype.zz = function (a, b) {
+        if (!this.zi) {
             return -1;
         }
         var c = { $type: Point_$type, x: 0, y: 0 };
         var d = true;
-        var e = this.ys();
+        var e = this.yt();
         if (e == null) {
             return -1;
         }
         if (e.m == null) {
             return -1;
         }
-        if (this.dl == null || this.dl.count > this.zz) {
+        if (this.dl == null || this.dl.count > this.z0) {
             return -1;
         }
-        this.aax();
-        var f = this.yd;
-        var g = this.ye;
+        this.aay();
+        var f = this.ye;
+        var g = this.yf;
         if (f == null || g == null) {
             return -1;
         }
-        var h = this.v0(a);
+        var h = this.v1(a);
         var i = 1.7976931348623157E+308;
         var j = -1;
-        for (var k = 0; k < this.yd.length; k++) {
-            var l = { $type: Point_$type, x: this.yd[k], y: this.ye[k] };
+        for (var k = 0; k < this.ye.length; k++) {
+            var l = { $type: Point_$type, x: this.ye[k], y: this.yf[k] };
             if (k > 0) {
                 if (!b || e.j.containsKey(this.dl.item(k)) || e.j.containsKey(this.dl.item(k - 1))) {
                     var m = GeometryUtil.g(h, c, l);
@@ -783,8 +783,8 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             c = l;
         }
         if (j >= 0) {
-            var n = { $type: Point_$type, x: this.yd[j], y: this.ye[j] };
-            var o = { $type: Point_$type, x: this.yd[j - 1], y: this.ye[j - 1] };
+            var n = { $type: Point_$type, x: this.ye[j], y: this.yf[j] };
+            var o = { $type: Point_$type, x: this.ye[j - 1], y: this.yf[j - 1] };
             if (!b || (e.j.containsKey(this.dl.item(j)) && e.j.containsKey(this.dl.item(j - 1)))) {
                 var p = GeometryUtil.l(h, o, n);
                 return (j - 1) + p;
@@ -798,25 +798,25 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.zx = function (a) {
-        return this.zy(a, true);
+    ScatterBase.prototype.zy = function (a) {
+        return this.zz(a, true);
     };
-    ScatterBase.prototype.zt = function (a) {
+    ScatterBase.prototype.zu = function (a) {
         var _this = this;
-        var b = this.v0(a);
+        var b = this.v1(a);
         var c = b.x;
         var d = b.y;
-        if (this.yo.c3.e > this.zz) {
+        if (this.yp.c3.e > this.z0) {
             return -1;
         }
         var e = -1;
-        this.wx.ck(function (f) {
-            var g = _this.yo.cu(f);
+        this.wy.ck(function (f) {
+            var g = _this.yp.cu(f);
             var h = g.left;
             var i = g.top;
             var j = g.width;
             var k = g.height;
-            if (_this.w4) {
+            if (_this.w5) {
                 var l = h + j / 2;
                 var m = i + k / 2;
                 var n = (j / 2) * (j / 2);
@@ -837,19 +837,19 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         });
         return e;
     };
-    ScatterBase.prototype.zw = function (a) {
+    ScatterBase.prototype.zx = function (a) {
         var _this = this;
         var b = null;
         var c = 1.7976931348623157E+308;
-        var d = this.v0(a);
+        var d = this.v1(a);
         var e = d.x;
         var f = d.y;
-        if (this.yo.c3.e > this.zz) {
+        if (this.yp.c3.e > this.z0) {
             return -1;
         }
-        this.yo.da(function (g) {
+        this.yp.da(function (g) {
             if (g._visibility == 0) {
-                var h = _this.yo.cu(g);
+                var h = _this.yp.cu(g);
                 var i = h.left + h.width / 2;
                 var j = h.top + h.height / 2;
                 var k = (e - i) * (e - i) + (f - j) * (f - j);
@@ -864,9 +864,9 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.v5 = function (a, b, c) {
+    ScatterBase.prototype.v6 = function (a, b, c) {
         var _this = this;
-        if (this.xAxis == null || this.yAxis == null || this.y8 == null || this.y9 == null) {
+        if (this.xAxis == null || this.yAxis == null || this.y9 == null || this.za == null) {
             return { $type: Point_$type, x: NaN, y: NaN };
         }
         var d = this.ct.by;
@@ -898,15 +898,15 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 j = this.dl.count - 1;
             }
             if (k == j) {
-                var l = this.xAxis.ek(this.y8.item(j), g);
-                var m = this.yAxis.ek(this.y9.item(j), h);
+                var l = this.xAxis.ek(this.y9.item(j), g);
+                var m = this.yAxis.ek(this.za.item(j), h);
                 return { $type: Point_$type, x: l, y: m };
             }
             var n = i - Math.floor(i);
-            var o = this.xAxis.ek(this.y8.item(j), g);
-            var p = this.yAxis.ek(this.y9.item(j), h);
-            var q = this.xAxis.ek(this.y8.item(k), g);
-            var r = this.yAxis.ek(this.y9.item(k), h);
+            var o = this.xAxis.ek(this.y9.item(j), g);
+            var p = this.yAxis.ek(this.za.item(j), h);
+            var q = this.xAxis.ek(this.y9.item(k), g);
+            var r = this.yAxis.ek(this.za.item(k), h);
             var s = q - o;
             var t = r - p;
             return { $type: Point_$type, x: o + s * n, y: p + t * n };
@@ -916,8 +916,8 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             if (u == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            var v = this.xAxis.ek(this.y8.item(u), g);
-            var w = this.yAxis.ek(this.y9.item(u), h);
+            var v = this.xAxis.ek(this.y9.item(u), g);
+            var w = this.yAxis.ek(this.za.item(u), h);
             return { $type: Point_$type, x: v, y: w };
         }
     };
@@ -927,7 +927,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         b = b.copy();
         var c = this.c9 != null ? this.c9.v0 : Rect.empty;
         var d = new Rect(0, 0, 0, 1, 1);
-        var e = this.we(this.ct);
+        var e = this.wf(this.ct);
         var f = new ScalerParams(0, d, d, this.xAxis.ch, e);
         var g = ((function () {
             var $ret = new ScalerParams(0, d, d, _this.yAxis.ch, e);
@@ -935,8 +935,8 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return $ret;
         })());
         var h = !b.isEmpty && !c.isEmpty && this.dl != null ? this.dl.indexOf(a) : -1;
-        var i = this.xAxis != null && this.y8 != null && h < this.y8.count ? this.xAxis.ek(this.y8.item(h), f) : NaN;
-        var j = this.yAxis != null && this.y9 != null && h < this.y9.count ? this.yAxis.ek(this.y9.item(h), g) : NaN;
+        var i = this.xAxis != null && this.y9 != null && h < this.y9.count ? this.xAxis.ek(this.y9.item(h), f) : NaN;
+        var j = this.yAxis != null && this.za != null && h < this.za.count ? this.yAxis.ek(this.za.item(h), g) : NaN;
         if (!isNaN_(i)) {
             if (i < b.left + 0.1 * b.width) {
                 i = i + 0.4 * b.width;
@@ -962,23 +962,23 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h >= 0;
     };
-    ScatterBase.prototype.sj = function (a, b) {
-        this.rm(false);
-    };
     ScatterBase.prototype.sk = function (a, b) {
-        this.rm(false);
+        this.rn(false);
+    };
+    ScatterBase.prototype.sl = function (a, b) {
+        this.rn(false);
     };
-    ScatterBase.prototype.ys = function () {
-        var a = this.yr;
+    ScatterBase.prototype.yt = function () {
+        var a = this.ys;
         if (this.d1()) {
             if (this.da.g) {
                 this.da.t();
             }
-            a = this.yv;
+            a = this.yw;
         }
         return a;
     };
-    ScatterBase.prototype.aav = function (a, b, c, d, e) {
+    ScatterBase.prototype.aaw = function (a, b, c, d, e) {
         var _this = this;
         b.g = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
         var f = this.getEffectiveViewport1(a);
@@ -986,12 +986,12 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var h;
         var i;
         var j = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.yn.d, f);
+            var $ret = new ScalerParams(0, d, e, _this.yo.d, f);
             $ret.c = _this.getEffectiveViewport1(a);
             return $ret;
         })());
         var k = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.yn.e, f);
+            var $ret = new ScalerParams(0, d, e, _this.yo.e, f);
             $ret.c = _this.getEffectiveViewport1(a);
             $ret.b = _this.iw();
             return $ret;
@@ -1006,9 +1006,9 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         var _loop_1 = function (o) {
-            h = this_1.y8.item(o);
-            i = this_1.y9.item(o);
-            var p = { $type: Point_$type, x: this_1.yn.a.ek(h, j), y: this_1.yn.b.ek(i, k) };
+            h = this_1.y9.item(o);
+            i = this_1.za.item(o);
+            var p = { $type: Point_$type, x: this_1.yo.a.ek(h, j), y: this_1.yo.b.ek(i, k) };
             if (l) {
                 if (p.x < e.left || p.x > e.right) {
                     if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -1036,17 +1036,17 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             _loop_1(o);
         }
     };
-    ScatterBase.prototype.aa5 = function (a, b) {
+    ScatterBase.prototype.aa6 = function (a, b) {
         var _this = this;
-        this.yd = null;
         this.ye = null;
+        this.yf = null;
         a.j.clear();
         a.n.clear();
         a.h.clear();
         a.l.clear();
         a.i.clear();
         a.k.clear();
-        var c = Math.min(this.y8 != null ? this.y8.count : 0, this.y9 != null ? this.y9.count : 0);
+        var c = Math.min(this.y9 != null ? this.y9.count : 0, this.za != null ? this.za.count : 0);
         var d = b.by;
         var e = b.bx;
         var f = this.getEffectiveViewport1(b);
@@ -1061,7 +1061,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         if (c < 1) {
             return;
         }
-        this.yn = ((function () {
+        this.yo = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
@@ -1071,21 +1071,21 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return $ret;
         })());
         var i = b;
-        if (c <= this.z0) {
-            this.aav(i, a, c, d, e);
+        if (c <= this.z1) {
+            this.aaw(i, a, c, d, e);
         }
-        if (this.w7()) {
-            b.c0.l(a.j, this.z0, d, e, this.ib);
+        if (this.w8()) {
+            b.c0.l(a.j, this.z1, d, e, this.ib);
         }
         var j = ((function () {
             var $ret = new Clipper(0, e, false);
             $ret.i = a.n;
             return $ret;
         })());
-        var k = this.wc(b);
+        var k = this.wd(b);
         var l = this.xAxis.en(k.left, g);
         var m = this.xAxis.en(k.right, g);
-        b.c2.h(a.n, this.trendLineType, this.y8, this.y9, this.trendLinePeriod, function (n) { return _this.xAxis.ek(n, g); }, function (n) { return _this.yAxis.ek(n, h); }, ((function () {
+        b.c2.h(a.n, this.trendLineType, this.y9, this.za, this.trendLinePeriod, function (n) { return _this.xAxis.ek(n, g); }, function (n) { return _this.yAxis.ek(n, h); }, ((function () {
             var $ret = new TrendResolutionParams();
             $ret.d = _this.ib;
             $ret.i = e;
@@ -1093,25 +1093,25 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.j = d;
             return $ret;
         })()), j, l, m);
-        this.aa3(a, b);
+        this.aa4(a, b);
     };
-    ScatterBase.prototype.o2 = function (a, b) {
-        _super.prototype.o2.call(this, a, b);
+    ScatterBase.prototype.o3 = function (a, b) {
+        _super.prototype.o3.call(this, a, b);
         var c = b;
         c.c9(a);
     };
     ScatterBase.prototype.get_fc = function () {
         return true;
     };
-    ScatterBase.prototype.y2 = function (a, b, c) {
+    ScatterBase.prototype.y3 = function (a, b, c) {
         return null;
     };
-    ScatterBase.prototype.y3 = function (a, b, c) {
+    ScatterBase.prototype.y4 = function (a, b, c) {
         if (this.dl == null) {
             return null;
         }
-        var d = this.ys();
-        var e = this.yo.b1(this.v0(b));
+        var d = this.yt();
+        var e = this.yp.b1(this.v1(b));
         var f = -1;
         if (e == null) {
             if (a != null) {
@@ -1138,11 +1138,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return g;
     };
-    ScatterBase.prototype.wm = function (a, b) {
-        if (this.wz != 1 && this.wz != 13) {
-            var c = this.wx.cv();
-            var d = (c.width / 2) + (this.xa / 2);
-            var e = (c.height / 2) + (this.xa / 2);
+    ScatterBase.prototype.wn = function (a, b) {
+        if (this.w0 != 1 && this.w0 != 13) {
+            var c = this.wy.cv();
+            var d = (c.width / 2) + (this.xb / 2);
+            var e = (c.height / 2) + (this.xb / 2);
             var f = d;
             var g = d;
             var h = e;
@@ -1163,7 +1163,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Thickness(1, 0, 0, 0, 0);
     };
-    ScatterBase.prototype.y1 = function (a, b, c) {
+    ScatterBase.prototype.y2 = function (a, b, c) {
         var d = new HighlightingInfo();
         d.i = this;
         d.g = 0;
@@ -1176,40 +1176,40 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBase.prototype.de = function (a, b, c) {
         if (this.eb && this.fx(this.bv) && !c) {
-            var d = this.y2(a, b, this.y4);
-            this.y4 = d;
+            var d = this.y3(a, b, this.y5);
+            this.y5 = d;
             return d;
         }
         else {
-            var e = this.y1(a, b, this.y4);
-            this.y4 = e;
+            var e = this.y2(a, b, this.y5);
+            this.y5 = e;
             return e;
         }
     };
     ScatterBase.prototype.df = function (a, b, c) {
         if (this.fx(this.bv) && !c) {
-            var d = this.y3(a, b, this.y5);
-            this.y5 = d;
+            var d = this.y4(a, b, this.y6);
+            this.y6 = d;
             return d;
         }
         else {
-            var e = this.y1(a, b, this.y5);
+            var e = this.y2(a, b, this.y6);
             e.d = true;
-            this.y5 = e;
+            this.y6 = e;
             return e;
         }
     };
-    ScatterBase.prototype.zm = function () {
-        return (this.assigningScatterStyle != null && this.zc) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
+    ScatterBase.prototype.zn = function () {
+        return (this.assigningScatterStyle != null && this.zd) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
     };
-    ScatterBase.prototype.zl = function () {
-        return (this.assigningScatterMarkerStyle != null && this.zb) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
+    ScatterBase.prototype.zm = function () {
+        return (this.assigningScatterMarkerStyle != null && this.zc) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
     };
-    ScatterBase.prototype.abg = function (a, b) {
+    ScatterBase.prototype.abh = function (a, b) {
         var _this = this;
-        this.qs();
+        this.qt();
         var c = b.bx;
-        this.yn = ((function () {
+        this.yo = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
@@ -1217,10 +1217,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.e = _this.yAxis.ch;
             return $ret;
         })());
-        if (this.w7()) {
-            b.c0.j(a.j, this.w9);
-            if (this.zl()) {
-                this.aaw(b, a);
+        if (this.w8()) {
+            b.c0.j(a.j, this.xa);
+            if (this.zm()) {
+                this.aax(b, a);
             }
         }
         b.cr();
@@ -1230,13 +1230,13 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return $ret;
         })());
         b.c2.g$h(a.n, d);
-        this.abd(a, b);
-    };
-    ScatterBase.prototype.yg = function (a, b) {
-        return this.yh(a, b);
+        this.abe(a, b);
     };
     ScatterBase.prototype.yh = function (a, b) {
-        if (b < a || a < 0 || a > this.y8.count || b < 0 || b > this.y8.count) {
+        return this.yi(a, b);
+    };
+    ScatterBase.prototype.yi = function (a, b) {
+        if (b < a || a < 0 || a > this.y9.count || b < 0 || b > this.y9.count) {
             return null;
         }
         var c = new Array((b - a) + 1);
@@ -1246,15 +1246,15 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ScatterBase.prototype.aaw = function (a, b) {
+    ScatterBase.prototype.aax = function (a, b) {
         var _this = this;
         a.b7 = true;
-        this.y0.ay(this, this.zl(), runOn(this, this.yg));
-        var c = this.y0.d;
+        this.y1.ay(this, this.zm(), runOn(this, this.yh));
+        var c = this.y1.d;
         var d = c != null;
         var e = this.getEffectiveViewport1(a);
         var f = this.dl == null ? 0 : this.dl.count;
-        this.yo.cj(function (g) {
+        this.yp.cj(function (g) {
             if (g._visibility == 0) {
                 var h = g.ak;
                 var i = g.content;
@@ -1263,19 +1263,19 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     g.content = i;
                 }
                 if (d) {
-                    _this.aa0(h, f, a.q);
+                    _this.aa1(h, f, a.q);
                 }
-                _this.y0.ac(g, i);
+                _this.y1.ac(g, i);
             }
         });
     };
-    ScatterBase.prototype.aa1 = function (a, b, c) {
+    ScatterBase.prototype.aa2 = function (a, b, c) {
         var d = this.bv != 1;
         var e = this.cn != 1;
         var f = this.cm != 1;
-        this.y0.a0(this.y0.b, a, b, false);
-        this.y0.ab(this.h9);
-        var g = this.y0.ax;
+        this.y1.a0(this.y1.b, a, b, false);
+        this.y1.ab(this.h9);
+        var g = this.y1.ax;
         var h = null;
         var i = null;
         var j = null;
@@ -1293,16 +1293,16 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             g.b = h;
         }
         g.h = c;
-        this.abb(g);
-        this.y0.z(this, h, i, j, c, d, e, f, a < 0);
+        this.abc(g);
+        this.y1.z(this, h, i, j, c, d, e, f, a < 0);
     };
-    ScatterBase.prototype.aa0 = function (a, b, c) {
+    ScatterBase.prototype.aa1 = function (a, b, c) {
         var d = this.bv != 1;
         var e = this.cn != 1;
         var f = this.cm != 1;
-        this.y0.a0(this.y0.d, a, b, true);
-        this.y0.aa(this.h9);
-        var g = this.y0.aw;
+        this.y1.a0(this.y1.d, a, b, true);
+        this.y1.aa(this.h9);
+        var g = this.y1.aw;
         var h = null;
         var i = null;
         var j = null;
@@ -1335,27 +1335,27 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             g.d = i;
         }
         g.h = c;
-        this.aba(g);
-        this.y0.y(this, h, i, j, c, d, e, f, g.v, this.c9.dj.totalHighWaterMark, g.x, this.c9.dk.totalHighWaterMark, g.t, this.c9.di.totalHighWaterMark);
+        this.abb(g);
+        this.y1.y(this, h, i, j, c, d, e, f, g.v, this.c9.dj.totalHighWaterMark, g.x, this.c9.dk.totalHighWaterMark, g.t, this.c9.di.totalHighWaterMark);
     };
-    ScatterBase.prototype.abb = function (a) {
-        if (this.assigningScatterStyle != null && this.zc) {
+    ScatterBase.prototype.abc = function (a) {
+        if (this.assigningScatterStyle != null && this.zd) {
             this.assigningScatterStyle(this, a);
         }
     };
-    ScatterBase.prototype.aba = function (a) {
-        if (this.assigningScatterMarkerStyle != null && this.zb) {
+    ScatterBase.prototype.abb = function (a) {
+        if (this.assigningScatterMarkerStyle != null && this.zc) {
             this.assigningScatterMarkerStyle(this, a);
         }
     };
-    ScatterBase.prototype.aa3 = function (a, b) {
+    ScatterBase.prototype.aa4 = function (a, b) {
         var e_3, _a;
         var c = new ErrorBarsHelper(this, b);
-        if (this.yp == null) {
+        if (this.yq == null) {
             return;
         }
-        var d = this.yp.u;
-        var e = this.yp.v;
+        var d = this.yq.u;
+        var e = this.yq.v;
         var f = 0;
         var g = 0;
         var h = 0;
@@ -1367,35 +1367,35 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            var l = this.aa6(k, c, d, h, i, true);
+                            var l = this.aa7(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            var m = this.aa4(k, c, d, h, i, true);
+                            var m = this.aa5(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            var n = this.aa2(k, c, d, j, h, i, true);
+                            var n = this.aa3(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            var o = this.aa7(c, d, f, h, i, true);
+                            var o = this.aa8(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            var p = this.aa4(k, c, d, h, i, true);
+                            var p = this.aa5(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     var q = new OwnedPoint();
-                    q.c = c.l(d, this.yn.a, k.c, f);
+                    q.c = c.l(d, this.yo.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1403,35 +1403,35 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            var r = this.aa6(k, c, e, h, i, false);
+                            var r = this.aa7(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            var s = this.aa4(k, c, e, h, i, false);
+                            var s = this.aa5(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            var t = this.aa2(k, c, e, j, h, i, false);
+                            var t = this.aa3(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            var u = this.aa7(c, e, g, h, i, false);
+                            var u = this.aa8(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            var v = this.aa4(k, c, e, h, i, false);
+                            var v = this.aa5(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     var w = new OwnedPoint();
-                    w.c = c.m(e, this.yn.b, k.c, g);
+                    w.c = c.m(e, this.yo.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
@@ -1452,18 +1452,18 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.aa6 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.aa7 = function (a, b, c, d, e, f) {
         if (f) {
             var g = void 0;
             var h = void 0, i = void 0;
-            i = this.yn.a;
-            if (this.yp.s == 0) {
+            i = this.yo.a;
+            if (this.yq.s == 0) {
                 g = a.c.x;
-                h = this.yn.a;
+                h = this.yo.a;
             }
             else {
                 g = a.c.y;
-                h = this.yn.b;
+                h = this.yo.b;
             }
             var j = b.f(g, c, h, i, d, e);
             d = j.p4;
@@ -1472,14 +1472,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         else {
             var k = void 0;
             var l = void 0, m = void 0;
-            m = this.yn.b;
-            if (this.yp.t == 0) {
+            m = this.yo.b;
+            if (this.yq.t == 0) {
                 k = a.c.x;
-                l = this.yn.a;
+                l = this.yo.a;
             }
             else {
                 k = a.c.y;
-                l = this.yn.b;
+                l = this.yo.b;
             }
             var n = b.f(k, c, l, m, d, e);
             d = n.p4;
@@ -1490,14 +1490,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.aa4 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.aa5 = function (a, b, c, d, e, f) {
         if (f) {
-            var g = b.j(a.c.x, c, this.yn.a, d, e);
+            var g = b.j(a.c.x, c, this.yo.a, d, e);
             d = g.p3;
             e = g.p4;
         }
         else {
-            var h = b.j(a.c.y, c, this.yn.b, d, e);
+            var h = b.j(a.c.y, c, this.yo.b, d, e);
             d = h.p3;
             e = h.p4;
         }
@@ -1506,18 +1506,18 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.aa2 = function (a, b, c, d, e, f, g) {
+    ScatterBase.prototype.aa3 = function (a, b, c, d, e, f, g) {
         var h = c.getItemColumn();
         var i = this.dl.indexOf(d);
         if (h != null && i < h.count) {
             var j = h.item(i);
             if (g) {
-                var k = b.h(a.c.x, j, this.yn.a, e, f);
+                var k = b.h(a.c.x, j, this.yo.a, e, f);
                 e = k.p3;
                 f = k.p4;
             }
             else {
-                var l = b.h(a.c.y, j, this.yn.b, e, f);
+                var l = b.h(a.c.y, j, this.yo.b, e, f);
                 e = l.p3;
                 f = l.p4;
             }
@@ -1531,16 +1531,16 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p5: f
         };
     };
-    ScatterBase.prototype.aa7 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.aa8 = function (a, b, c, d, e, f) {
         var g = a.i(b, c);
         c = g.p1;
         if (f) {
-            var h = a.k(c, b, this.yn.a, d, e);
+            var h = a.k(c, b, this.yo.a, d, e);
             d = h.p3;
             e = h.p4;
         }
         else {
-            var i = a.k(c, b, this.yn.b, d, e);
+            var i = a.k(c, b, this.yo.b, d, e);
             d = i.p3;
             e = i.p4;
         }
@@ -1550,20 +1550,20 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.abd = function (a, b) {
-        if (!b.o() || this.yp == null) {
+    ScatterBase.prototype.abe = function (a, b) {
+        if (!b.o() || this.yq == null) {
             b.db();
             return;
         }
-        this.abe(a, b);
         this.abf(a, b);
+        this.abg(a, b);
     };
-    ScatterBase.prototype.abe = function (a, b) {
+    ScatterBase.prototype.abf = function (a, b) {
         var e_4, _a;
         b.c7();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.yp.u;
+        var e = this.yq.u;
         try {
             for (var _b = __values(fromEnum(a.j.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1572,10 +1572,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     var h = a.i.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         var i = a.h.item(f).c;
-                        if (this.yp.o == 1 || this.yp.o == 2) {
+                        if (this.yq.o == 1 || this.yq.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.yp.o == 1 || this.yp.o == 3) {
+                        if (this.yq.o == 1 || this.yq.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1597,12 +1597,12 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         b.dc(d);
     };
-    ScatterBase.prototype.abf = function (a, b) {
+    ScatterBase.prototype.abg = function (a, b) {
         var e_5, _a;
         b.c8();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.yp.v;
+        var e = this.yq.v;
         try {
             for (var _b = __values(fromEnum(a.j.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1611,10 +1611,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     var h = a.k.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         var i = a.l.item(f).c;
-                        if (this.yp.p == 1 || this.yp.p == 2) {
+                        if (this.yq.p == 1 || this.yq.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.yp.p == 1 || this.yp.p == 3) {
+                        if (this.yq.p == 1 || this.yq.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
@@ -1637,15 +1637,15 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBase.prototype.hc = function (a, b, c) {
         var d = true;
-        if (!_super.prototype.hc.call(this, a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.y8 == null || this.y9 == null || this.y8.count == 0 || this.y9.count == 0 || this.dl == null || this.dl.count != this.y8.count || this.dl.count != this.y9.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.ly == this.xAxis.lx || this.yAxis.ly == this.yAxis.lx) {
+        if (!_super.prototype.hc.call(this, a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.y9 == null || this.za == null || this.y9.count == 0 || this.za.count == 0 || this.dl == null || this.dl.count != this.y9.count || this.dl.count != this.za.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.ly == this.xAxis.lx || this.yAxis.ly == this.yAxis.lx) {
             d = false;
         }
         return d;
     };
     ScatterBase.prototype.getViewInfo = function (a, b) {
-        if (!this.acb.isEmpty && !this.acc.isEmpty) {
-            a = this.acb;
-            b = this.acc;
+        if (!this.acc.isEmpty && !this.acd.isEmpty) {
+            a = this.acc;
+            b = this.acd;
             return {
                 p0: a,
                 p1: b
@@ -1658,52 +1658,52 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p1: b
         };
     };
-    ScatterBase.prototype.rn = function (a) {
-        _super.prototype.rn.call(this, a);
-        this.aau();
+    ScatterBase.prototype.ro = function (a) {
+        _super.prototype.ro.call(this, a);
+        this.aav();
         try {
             if (this.d3(this.ct)) {
                 return;
             }
-            if (this.dl != null && this.dl.count > this.z0) {
+            if (this.dl != null && this.dl.count > this.z1) {
                 a = false;
             }
             if (this.gd(a) && !this.gp) {
-                var b = this.yt;
+                var b = this.yu;
                 if (this.d1()) {
                     if (this.da.g) {
                         this.da.t();
                     }
-                    this.yt = this.yv;
-                    this.yv = b;
+                    this.yu = this.yw;
+                    this.yw = b;
                 }
                 else {
-                    this.yt = this.yr;
-                    this.yr = b;
+                    this.yu = this.ys;
+                    this.ys = b;
                 }
-                this.aa5(this.yr, this.yo);
-                this.r0();
+                this.aa6(this.ys, this.yp);
+                this.r1();
             }
             else {
                 if (!this.gp) {
-                    this.aa5(this.yr, this.yo);
+                    this.aa6(this.ys, this.yp);
                 }
-                this.abg(this.yr, this.yo);
+                this.abh(this.ys, this.yp);
             }
         }
         finally {
-            this.abh();
+            this.abi();
         }
     };
-    ScatterBase.prototype.sa = function () {
-        _super.prototype.sa.call(this);
+    ScatterBase.prototype.sb = function () {
+        _super.prototype.sb.call(this);
         if (this.index < 0) {
             return;
         }
-        this.yo.df();
+        this.yp.df();
     };
-    ScatterBase.prototype.ro = function (a, b) {
-        _super.prototype.ro.call(this, a, b);
+    ScatterBase.prototype.rp = function (a, b) {
+        _super.prototype.rp.call(this, a, b);
         if (!this.gy) {
             this.ct.a4(b);
             return;
@@ -1714,28 +1714,28 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         var c = typeCast(ScatterBaseView.$, this.cs);
         if (!this.gq) {
-            this.yu = new ScatterFrame();
-            this.aa5(this.yu, c);
+            this.yv = new ScatterFrame();
+            this.aa6(this.yv, c);
         }
         this.gq = false;
-        this.abg(this.yu, c);
+        this.abh(this.yv, c);
         this.gy = false;
     };
-    ScatterBase.prototype.rl = function (a, b, c, d, e) {
-        _super.prototype.rl.call(this, a, b, c, d, e);
+    ScatterBase.prototype.rm = function (a, b, c, d, e) {
+        _super.prototype.rm.call(this, a, b, c, d, e);
         var f = this.a9.a$j.item(d);
         var g = f;
         f.a3(c);
         if (this.d3(g)) {
             return;
         }
-        if (this.yq == null) {
-            this.yq = new ScatterFrame();
+        if (this.yr == null) {
+            this.yr = new ScatterFrame();
         }
-        this.aa5(this.yq, g);
-        this.abg(this.yq, g);
+        this.aa6(this.yr, g);
+        this.abh(this.yr, g);
     };
-    ScatterBase.prototype.abc = function (a, b) {
+    ScatterBase.prototype.abd = function (a, b) {
         var e_6, _a, e_7, _b;
         var c = new List$1(Base.$, 0);
         try {
@@ -1779,11 +1779,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.yf = function (a, b, c, d, e) {
+    ScatterBase.prototype.yg = function (a, b, c, d, e) {
         var _this = this;
-        if (c == null || c.length != this.yn.c.count) {
-            c = new Array(this.yn.c.count);
-            for (var f = 0; f < this.yn.c.count; f++) {
+        if (c == null || c.length != this.yo.c.count) {
+            c = new Array(this.yo.c.count);
+            for (var f = 0; f < this.yo.c.count; f++) {
                 c[f] = PointUtil.create();
             }
         }
@@ -1799,28 +1799,28 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.b = _this.iw();
             return $ret;
         })());
-        var j = this.wc(a);
-        var k = this.yn.a.en(j.left, h);
-        var l = this.yn.a.en(j.right, h);
-        var m = this.yn.b.en(j.bottom, i);
-        var n = this.yn.b.en(j.top, i);
-        if (this.yn.d) {
+        var j = this.wd(a);
+        var k = this.yo.a.en(j.left, h);
+        var l = this.yo.a.en(j.right, h);
+        var m = this.yo.b.en(j.bottom, i);
+        var n = this.yo.b.en(j.top, i);
+        if (this.yo.d) {
             var o = k;
             k = l;
             l = o;
         }
-        if (this.yn.e) {
+        if (this.yo.e) {
             var p = m;
             m = n;
             n = p;
         }
-        var q = this.yn;
+        var q = this.yo;
         var r = q.a;
         var s = q.b;
         var t;
         var u;
-        var v = this.y8;
-        var w = this.y9;
+        var v = this.y9;
+        var w = this.za;
         var x = false;
         var y = 0;
         var z = 0;
@@ -1834,11 +1834,12 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 z -= ab;
             }
         }
-        for (var ac = 0; ac < this.yn.c.count; ac++) {
+        for (var ac = 0; ac < this.yo.c.count; ac++) {
             t = v.item(ac);
             u = w.item(ac);
+            var ad = 1E-10;
             if (x) {
-                if (t >= k && t <= l && u >= m && u <= n) {
+                if (t >= k - ad && t <= l + ad && u >= m - ad && u <= n + ad) {
                     c[ac].x = r.ek(t, h);
                     c[ac].y = s.ek(u, i);
                 }
@@ -1854,7 +1855,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
             else {
-                if (t >= k && t <= l && u >= m && u <= n) {
+                if (t >= k - ad && t <= l + ad && u >= m - ad && u <= n + ad) {
                     c[ac].x = r.ek(t, h);
                     c[ac].y = s.ek(u, i);
                 }
@@ -1866,7 +1867,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ScatterBase.prototype.zo = function (a, b) {
+    ScatterBase.prototype.zp = function (a, b) {
         var e_8, _a;
         if (b == null) {
             b = new List$1(Number_$type, 2, a.e);
@@ -1897,12 +1898,12 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    ScatterBase.prototype.pu = function (a) {
-        _super.prototype.pu.call(this, a);
-        this.bb.exportTrendlineData(this, a, this.yo.c2.g$j);
+    ScatterBase.prototype.pv = function (a) {
+        _super.prototype.pv.call(this, a);
+        this.bb.exportTrendlineData(this, a, this.yp.c2.g$j);
     };
     ScatterBase.prototype.iw = function () {
-        return Series.ix(this.y9, null);
+        return Series.ix(this.za, null);
     };
     ScatterBase.prototype.getDataLegendSeriesContextAt = function (a, b) {
         var c = { $type: Point_$type, x: a, y: b };
@@ -1913,16 +1914,16 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         g.l = e;
         g.a = 13;
         g.q = "X";
-        g.r = this.aak != null ? this.aak : "X";
-        g.s = this.aag != null ? this.aag : "X:";
-        g.t = this.aai != null ? this.aai : "";
+        g.r = this.aal != null ? this.aal : "X";
+        g.s = this.aah != null ? this.aah : "X:";
+        g.t = this.aaj != null ? this.aaj : "";
         var h = new DataLegendSeriesValueInfo();
         h.l = f;
         h.a = 14;
         h.q = "Y";
-        h.r = this.aas != null ? this.aas : "Y";
-        h.s = this.aao != null ? this.aao : "Y:";
-        h.t = this.aaq != null ? this.aaq : "";
+        h.r = this.aat != null ? this.aat : "Y";
+        h.s = this.aap != null ? this.aap : "Y:";
+        h.t = this.aar != null ? this.aar : "";
         var i = new DataLegendSeriesContext();
         i.e = ((function () {
             var $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -1930,20 +1931,20 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.add(h);
             return $ret;
         })());
-        i.h = this.l9();
+        i.h = this.ma();
         return i;
     };
-    ScatterBase.prototype.abi = function () {
-        if (this.za) {
-            this.zp = 0;
+    ScatterBase.prototype.abj = function () {
+        if (this.zb) {
             this.zq = 0;
-            for (var a = 0; a < this.y8.count; a++) {
-                this.zp += this.y8.item(a);
+            this.zr = 0;
+            for (var a = 0; a < this.y9.count; a++) {
                 this.zq += this.y9.item(a);
+                this.zr += this.za.item(a);
             }
-            this.zr = this.zp / this.y8.count;
             this.zs = this.zq / this.y9.count;
-            this.za = false;
+            this.zt = this.zr / this.za.count;
+            this.zb = false;
         }
     };
     ScatterBase.prototype.i6 = function (a, b) {
@@ -1967,26 +1968,26 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         switch (a) {
             case 5:
             case 2:
-                b = this.y8.maximum;
-                c = this.y9.maximum;
+                b = this.y9.maximum;
+                c = this.za.maximum;
                 break;
             case 4:
             case 1:
-                b = this.y8.minimum;
-                c = this.y9.minimum;
+                b = this.y9.minimum;
+                c = this.za.minimum;
                 break;
             case 6:
             case 3:
-                if (this.za) {
-                    this.abi();
+                if (this.zb) {
+                    this.abj();
                 }
-                b = this.zr;
-                c = this.zs;
+                b = this.zs;
+                c = this.zt;
                 break;
         }
         return [b, c];
     };
-    ScatterBase.prototype.v9 = function (a) {
+    ScatterBase.prototype.wa = function (a) {
         var b = this.getEffectiveViewport1(this.ct);
         var c = new ScalerParams(0, this.ct.by, this.ct.bx, this.xAxis.ch, b);
         c.c = b;
@@ -1997,13 +1998,13 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var e = isNaN_(a[1]) ? NaN : this.yAxis.ek(a[1], c);
         return { $type: Point_$type, x: d, y: e };
     };
-    ScatterBase.prototype.v8 = function (a) {
+    ScatterBase.prototype.v9 = function (a) {
         var b = this.ap(a);
-        return this.v9(b);
+        return this.wa(b);
     };
     ScatterBase.$t = markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.abj = DependencyProperty.i("ActualTrendLineBrush", Brush.$, ScatterBase.$, new PropertyMetadata(2, null, function (a, b) { return a.raisePropertyChanged("ActualTrendLineBrush", b.oldValue, b.newValue); }));
-    ScatterBase.$$p = markDep(DependencyProperty, PropertyMetadata, ScatterBase, 'raisePropertyChanged', ['ErrorBarSettings:yp:abk', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:z4:abl', [2, null], 'HighlightedYMemberPath:z6:abm', [2, null], 'IsCustomScatterMarkerStyleAllowed:zf:abn', [0, false], 'IsCustomScatterStyleAllowed:zg:abo', [0, false], 'ItemSearchMode:yz:abp', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:zz:abq', [1, 10000], 'MarkerCollisionAvoidance:yk:abr', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:z0:abs', [1, 400], 'XAxis::ab0', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aag:ab1', [2, null], 'XMemberAsLegendUnit:aai:ab2', [2, null], 'XMemberPath:aak:ab3', [2, null], 'YAxis::ab4', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aao:ab5', [2, null], 'YMemberAsLegendUnit:aaq:ab6', [2, null], 'YMemberPath:aas:ab7', [2, null], 'TrendLineType::aby', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::abx', [1, 1.5], 'TrendLinePeriod::abw', [1, 7], 'TrendLineBrush::abt', [Brush.$, null], 'TrendLineZIndex:z1:abz', [1, 1001], 'TrendLineDashArray:ab9:abu', [DoubleCollection.$], 'TrendLineDashCap:aca:abv', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.abk = DependencyProperty.i("ActualTrendLineBrush", Brush.$, ScatterBase.$, new PropertyMetadata(2, null, function (a, b) { return a.raisePropertyChanged("ActualTrendLineBrush", b.oldValue, b.newValue); }));
+    ScatterBase.$$p = markDep(DependencyProperty, PropertyMetadata, ScatterBase, 'raisePropertyChanged', ['ErrorBarSettings:yq:abl', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:z5:abm', [2, null], 'HighlightedYMemberPath:z7:abn', [2, null], 'IsCustomScatterMarkerStyleAllowed:zg:abo', [0, false], 'IsCustomScatterStyleAllowed:zh:abp', [0, false], 'ItemSearchMode:y0:abq', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:z0:abr', [1, 10000], 'MarkerCollisionAvoidance:yl:abs', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:z1:abt', [1, 400], 'XAxis::ab1', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aah:ab2', [2, null], 'XMemberAsLegendUnit:aaj:ab3', [2, null], 'XMemberPath:aal:ab4', [2, null], 'YAxis::ab5', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aap:ab6', [2, null], 'YMemberAsLegendUnit:aar:ab7', [2, null], 'YMemberPath:aat:ab8', [2, null], 'TrendLineType::abz', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::aby', [1, 1.5], 'TrendLinePeriod::abx', [1, 7], 'TrendLineBrush::abu', [Brush.$, null], 'TrendLineZIndex:z2:ab0', [1, 1001], 'TrendLineDashArray:aca:abv', [DoubleCollection.$], 'TrendLineDashCap:acb:abw', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 }(MarkerSeries));
 export { ScatterBase };
@@ -2082,7 +2083,7 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.dh = new Path();
         this.di = new Path();
         if (!this.q) {
-            this.c1.z0 = 2000;
+            this.c1.z1 = 2000;
         }
     };
     ScatterBaseView.prototype.dj = function (a) {
@@ -2101,12 +2102,12 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBaseView.prototype.cz = function () {
         var _this = this;
-        var a = new NumericMarkerManager(1, function (b) { return _this.c3.item(b); }, function (b) { return _this.c1.yn.c.item(b); }, runOn(this, this.de), runOn(this, this.cw), runOn(this, this.c4), function () { return _this.c1.yk; });
+        var a = new NumericMarkerManager(1, function (b) { return _this.c3.item(b); }, function (b) { return _this.c1.yo.c.item(b); }, runOn(this, this.de), runOn(this, this.cw), runOn(this, this.c4), function () { return _this.c1.yl; });
         a.q = runOn(this, this.dj);
         return a;
     };
     ScatterBaseView.prototype.de = function (a) {
-        this.c1.abc(a, this.c3);
+        this.c1.abd(a, this.c3);
     };
     ScatterBaseView.prototype.c5 = function () {
         return this.b8;
@@ -2115,11 +2116,11 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         return this.cy;
     };
     ScatterBaseView.prototype.cw = function () {
-        this.cy = this.c1.yf(this, this.c3, this.cy, this.by, this.bx);
+        this.cy = this.c1.yg(this, this.c3, this.cy, this.by, this.bx);
         return this.cy;
     };
     ScatterBaseView.prototype.c4 = function () {
-        this.c6 = this.c1.zo(this.c3, this.c6);
+        this.c6 = this.c1.zp(this.c3, this.c6);
         return this.c6;
     };
     ScatterBaseView.prototype.c7 = function () {
@@ -2132,10 +2133,10 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBaseView.prototype.df = function () {
         if (this.c1.trendLineBrush != null) {
-            this.c1.ab8 = this.c1.trendLineBrush;
+            this.c1.ab9 = this.c1.trendLineBrush;
         }
         else {
-            this.c1.ab8 = this.c1.u2;
+            this.c1.ab9 = this.c1.u3;
         }
     };
     ScatterBaseView.prototype.cj = function (a) {
@@ -2152,9 +2153,9 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
             if (this.c1.trendLineType != 0 && !b) {
                 var c = this.c2.g$j;
                 c.ad = this.c1.trendLineThickness;
-                c._stroke = this.c1.ab8;
-                c.ai = this.c1.ab9;
-                c.aj = this.c1.aca;
+                c._stroke = this.c1.ab9;
+                c.ai = this.c1.aca;
+                c.aj = this.c1.acb;
                 a.v(c);
             }
         }
@@ -2173,7 +2174,7 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         if (!stringIsNullOrEmpty(b)) {
             a += " style='color:" + b + "'";
         }
-        a += ">" + this.c1.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.c1.aak + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.c1.aas + "}</span></div>";
+        a += ">" + this.c1.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.c1.aal + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.c1.aat + "}</span></div>";
         return a;
     };
     ScatterBaseView.$t = markType(ScatterBaseView, 'ScatterBaseView', MarkerSeriesView.$);