igniteui-webcomponents-charts 5.2.0 → 5.3.0

package/esm5/lib/ScatterBase_combined.js

@@ -64,87 +64,87 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ScatterBase, _super);
     function ScatterBase() {
         var _this = _super.call(this) || this;
-        _this.yw = null;
+        _this.yv = null;
+        _this.ze = null;
         _this.zf = null;
-        _this.zg = null;
+        _this.ack = null;
         _this.acl = null;
-        _this.acm = null;
-        _this.y5 = 1;
+        _this.y4 = 1;
+        _this.yl = null;
         _this.ym = null;
-        _this.yn = null;
-        _this.y2 = null;
-        _this.y4 = null;
-        _this.y0 = null;
-        _this.zl = false;
+        _this.y1 = null;
+        _this.y3 = null;
+        _this.yz = null;
         _this.zk = false;
+        _this.zj = false;
+        _this.zc = null;
         _this.zd = null;
-        _this.ze = null;
         _this.assigningScatterStyle = null;
         _this.assigningScatterMarkerStyle = null;
-        _this.y9 = null;
-        _this.y3 = null;
-        _this.yz = null;
-        _this.zj = true;
+        _this.y8 = null;
+        _this.y2 = null;
+        _this.yy = null;
+        _this.zi = true;
+        _this.zx = 0;
         _this.zy = 0;
         _this.zz = 0;
         _this.z0 = 0;
-        _this.z1 = 0;
-        _this.y6 = _this.y7();
-        _this.y9 = new ScatterSeriesRenderManager();
-        _this.y3 = new ScatterFrame();
-        _this.acm = Rect.empty;
+        _this.y5 = _this.y6();
+        _this.y8 = new ScatterSeriesRenderManager();
+        _this.y2 = new ScatterFrame();
         _this.acl = Rect.empty;
+        _this.ack = Rect.empty;
         return _this;
     }
     ScatterBase.prototype.cs = function () {
         return new ScatterBaseView(this);
     };
-    ScatterBase.prototype.o2 = function () {
-        _super.prototype.o2.call(this);
+    ScatterBase.prototype.o1 = function () {
+        _super.prototype.o1.call(this);
         this.xAxis = null;
         this.yAxis = null;
     };
-    ScatterBase.prototype.q1 = function (a) {
-        _super.prototype.q1.call(this, a);
-        this.yx = a;
+    ScatterBase.prototype.q0 = function (a) {
+        _super.prototype.q0.call(this, a);
+        this.yw = a;
     };
-    ScatterBase.prototype.get_fw = function () {
+    ScatterBase.prototype.get_fv = function () {
         return true;
     };
     ScatterBase.prototype.ai = function () {
         return [this.xAxis, this.yAxis];
     };
-    ScatterBase.prototype.kq = function (a, b) {
-        var c = this.nd(b);
+    ScatterBase.prototype.kp = function (a, b) {
+        var c = this.nc(b);
         if (c == ScatterBase.$$p[12]) {
-            return this.kr(a, b, this.aat);
+            return this.kq(a, b, this.aas);
         }
         if (c == ScatterBase.$$p[16]) {
-            return this.kr(a, b, this.aa1);
+            return this.kq(a, b, this.aa0);
         }
         if (c == ScatterBase.$$p[1]) {
-            return this.kr(a, b, this.aad);
+            return this.kq(a, b, this.aac);
         }
         if (c == ScatterBase.$$p[2]) {
-            return this.kr(a, b, this.aaf);
+            return this.kq(a, b, this.aae);
         }
         return null;
     };
-    ScatterBase.prototype.md = function (a) {
-        var b = this.nd(a);
+    ScatterBase.prototype.mc = function (a) {
+        var b = this.nc(a);
         if (b == ScatterBase.$$p[12]) {
-            return this.aat;
+            return this.aas;
         }
         if (b == ScatterBase.$$p[16]) {
-            return this.aa1;
+            return this.aa0;
         }
         if (b == ScatterBase.$$p[1]) {
-            return this.aad;
+            return this.aac;
         }
         if (b == ScatterBase.$$p[2]) {
-            return this.aaf;
+            return this.aae;
         }
-        return _super.prototype.md.call(this, a);
+        return _super.prototype.mc.call(this, a);
     };
     ScatterBase.prototype.eb = function (a, b, c, d, e) {
         var _this = this;
@@ -152,27 +152,27 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return false;
         }
         var f = this.xAxis;
-        var g = new ScalerParams(1, this.db.v4, this.ws, f.ch);
+        var g = new ScalerParams(1, this.db.v4, this.wr, f.ch);
         g.c = this.getEffectiveViewport1(this.cv);
         var h = this.yAxis;
-        var i = new ScalerParams(1, this.db.v4, this.ws, h.ch);
+        var i = new ScalerParams(1, this.db.v4, this.wr, h.ch);
         i.c = this.getEffectiveViewport1(this.cv);
         a.clear();
-        this.w6.cj(function (j) {
+        this.w5.cj(function (j) {
             if (j._visibility == 0) {
                 var k = new SeriesPointOfInterest();
                 var l = j.n;
                 var m = j.o;
-                if (l < _this.ws.left || l > _this.ws.right || m < _this.ws.top || m > _this.ws.bottom) {
+                if (l < _this.wr.left || l > _this.wr.right || m < _this.wr.top || m > _this.wr.bottom) {
                     return;
                 }
                 k.d = f.eo(l, g);
                 k.e = h.eo(m, i);
                 k.b = j.content;
-                k.g = _this.vg;
+                k.g = _this.vf;
                 k.c = j.ak;
-                if (_this.g9) {
-                    k.g = _this.vn(j.ak);
+                if (_this.g8) {
+                    k.g = _this.vm(j.ak);
                 }
                 a.add(k);
             }
@@ -181,7 +181,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBase.prototype.b2 = function () {
         if (this.b3 == 0) {
-            if (this.z9 <= 2000) {
+            if (this.z8 <= 2000) {
                 return 1;
             }
             else {
@@ -192,58 +192,58 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return _super.prototype.b2.call(this);
         }
     };
-    ScatterBase.prototype.wp = function (a) {
-        if (!this.hasMarkers || !this.xg()) {
+    ScatterBase.prototype.wo = function (a) {
+        if (!this.hasMarkers || !this.xf()) {
             return Rect.empty;
         }
-        var b = this.w6.b1(this.v7(a));
+        var b = this.w5.b1(this.v6(a));
         if (b != null) {
-            return this.w6.cu(b);
+            return this.w5.cu(b);
         }
         return Rect.empty;
     };
-    ScatterBase.prototype.gw = function (a, b) {
-        if (this.xh(a, b)) {
+    ScatterBase.prototype.gv = function (a, b) {
+        if (this.xg(a, b)) {
             return true;
         }
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "zh", {
+    Object.defineProperty(ScatterBase.prototype, "zg", {
         get: function () {
-            return this.zf;
+            return this.ze;
         },
         set: function (a) {
-            if (this.zf != a) {
-                var b = this.zh;
-                this.zf = a;
-                this.raisePropertyChanged("XColumn", b, this.zh);
+            if (this.ze != a) {
+                var b = this.zg;
+                this.ze = a;
+                this.raisePropertyChanged("XColumn", b, this.zg);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ScatterBase.prototype, "zi", {
+    Object.defineProperty(ScatterBase.prototype, "zh", {
         get: function () {
-            return this.zg;
+            return this.zf;
         },
         set: function (a) {
-            if (this.zg != a) {
-                var b = this.zi;
-                this.zg = a;
-                this.raisePropertyChanged("YColumn", b, this.zi);
+            if (this.zf != a) {
+                var b = this.zh;
+                this.zf = a;
+                this.raisePropertyChanged("YColumn", b, this.zh);
             }
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.gb = function () {
-        return this.highlightedItemsSource != null || (this.aad != null && this.aaf != null);
+    ScatterBase.prototype.ga = function () {
+        return this.highlightedItemsSource != null || (this.aac != null && this.aae != null);
     };
-    ScatterBase.prototype.zw = function () {
+    ScatterBase.prototype.zv = function () {
         return false;
     };
-    ScatterBase.prototype.ht = function () {
-        var a = _super.prototype.ht.call(this);
+    ScatterBase.prototype.hs = function () {
+        var a = _super.prototype.hs.call(this);
         {
             var b = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
@@ -253,7 +253,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.aa9));
+            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.aa8));
             a.add(b);
         }
         {
@@ -265,10 +265,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aa8));
+            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aa7));
             a.add(c);
         }
-        if (this.zw()) {
+        if (this.zv()) {
             var d = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -285,7 +285,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             })());
             a.add(d);
         }
-        if (!this.zw()) {
+        if (!this.zv()) {
             var e = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -295,10 +295,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.r0));
+            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.rz));
             a.add(e);
         }
-        if (!this.zw()) {
+        if (!this.zv()) {
             var f = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -308,31 +308,31 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.r0));
+            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.rz));
             a.add(f);
         }
         return a;
     };
-    ScatterBase.prototype.aa8 = function (a, b) {
-        if (this.aad != null) {
-            b.value = this.aad;
+    ScatterBase.prototype.aa7 = function (a, b) {
+        if (this.aac != null) {
+            b.value = this.aac;
             return;
         }
-        b.value = this.aat;
+        b.value = this.aas;
     };
-    ScatterBase.prototype.aa9 = function (a, b) {
-        if (this.aaf != null) {
-            b.value = this.aaf;
+    ScatterBase.prototype.aa8 = function (a, b) {
+        if (this.aae != null) {
+            b.value = this.aae;
             return;
         }
-        b.value = this.aa1;
+        b.value = this.aa0;
     };
-    Object.defineProperty(ScatterBase.prototype, "aci", {
+    Object.defineProperty(ScatterBase.prototype, "ach", {
         get: function () {
-            return this.c(ScatterBase.abt);
+            return this.c(ScatterBase.abs);
         },
         set: function (a) {
-            this.h(ScatterBase.abt, a);
+            this.h(ScatterBase.abs, a);
         },
         enumerable: false,
         configurable: true
@@ -351,8 +351,8 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.qb = function () {
-        _super.prototype.qb.call(this);
+    ScatterBase.prototype.qa = function () {
+        _super.prototype.qa.call(this);
         if (this.xAxis != null) {
             this.xAxis.ib(false);
         }
@@ -360,32 +360,32 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             this.yAxis.ib(false);
         }
     };
-    ScatterBase.prototype.q9 = function (a, b, c, d) {
-        _super.prototype.q9.call(this, a, b, c, d);
-        if (this.yx.c2.g$b(a, b, c, d)) {
-            this.rr(false);
-            this.ql();
+    ScatterBase.prototype.q8 = function (a, b, c, d) {
+        _super.prototype.q8.call(this, a, b, c, d);
+        if (this.yw.c2.g$b(a, b, c, d)) {
+            this.rq(false);
+            this.qk();
         }
         switch (b) {
             case ScatterBase.$$p[10]:
             case ScatterBase.$$p[14]:
             case ScatterBase.$$p[11]:
             case ScatterBase.$$p[15]:
-                this.qf();
+                this.qe();
                 break;
             case "FastItemsSource":
                 if (typeCast(IFastItemsSource_$type, c) != null) {
+                    c.deregisterColumn(this.zg);
                     c.deregisterColumn(this.zh);
-                    c.deregisterColumn(this.zi);
+                    this.zg = null;
                     this.zh = null;
-                    this.zi = null;
                 }
                 if (typeCast(IFastItemsSource_$type, d) != null) {
-                    this.zh = this.dk(this.aat);
-                    this.zi = this.dk(this.aa1);
+                    this.zg = this.dk(this.aas);
+                    this.zh = this.dk(this.aa0);
                 }
                 if ((this.yAxis != null && !this.yAxis.c1()) || (this.xAxis != null && !this.xAxis.c1())) {
-                    this.rr(this.gg && c != null);
+                    this.rq(this.gf && c != null);
                 }
                 break;
             case ScatterBase.$$p[9]:
@@ -396,9 +396,9 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     d.ct(this);
                 }
                 if ((this.xAxis != null && !this.xAxis.c1()) || (d == null && c != null)) {
-                    this.rr(false);
+                    this.rq(false);
                 }
-                this.ql();
+                this.qk();
                 break;
             case ScatterBase.$$p[13]:
                 if (c != null) {
@@ -408,134 +408,134 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     d.ct(this);
                 }
                 if ((this.yAxis != null && !this.yAxis.c1()) || (d == null && c != null)) {
-                    this.rr(false);
+                    this.rq(false);
                 }
-                this.ql();
+                this.qk();
                 break;
             case ScatterBase.$$p[12]:
                 if (this.dn != null) {
-                    this.dn.deregisterColumn(this.zh);
-                    this.zh = this.dk(this.aat);
+                    this.dn.deregisterColumn(this.zg);
+                    this.zg = this.dk(this.aas);
                 }
                 break;
             case "XColumn":
-                this.yx.c2.g$i();
+                this.yw.c2.g$i();
                 if (this.xAxis != null && !this.xAxis.c1()) {
-                    this.rr(this.gg && this.d7);
+                    this.rq(this.gf && this.d7);
                 }
                 break;
             case ScatterBase.$$p[16]:
                 if (this.dn != null) {
-                    this.dn.deregisterColumn(this.zi);
-                    this.zi = this.dk(this.aa1);
+                    this.dn.deregisterColumn(this.zh);
+                    this.zh = this.dk(this.aa0);
                 }
                 break;
             case "YColumn":
-                this.yx.c2.g$i();
+                this.yw.c2.g$i();
                 if (this.yAxis != null && !this.yAxis.c1()) {
-                    this.rr(this.gg && this.d7);
+                    this.rq(this.gf && this.d7);
                 }
                 break;
             case ScatterBase.$$p[7]:
-                this.rr(false);
-                this.ql();
+                this.rq(false);
+                this.qk();
                 break;
             case ScatterBase.$$p[8]:
-                this.rr(false);
-                this.ql();
+                this.rq(false);
+                this.qk();
                 break;
             case "TransitionProgress":
-                this.y4.c(this.jq, this.y2, this.y0);
-                this.aa3();
+                this.y3.c(this.jp, this.y1, this.yz);
+                this.aa2();
                 try {
                     if (this.d5(this.cv)) {
                         return;
                     }
-                    if ((Math.round(this.jq * 100000) / 100000) == 1) {
-                        this.abq(this.y0, this.yx);
+                    if ((Math.round(this.jp * 100000) / 100000) == 1) {
+                        this.abp(this.yz, this.yw);
                     }
                     else {
-                        this.abq(this.y4, this.yx);
+                        this.abp(this.y3, this.yw);
                     }
                     if (this.db != null) {
                         this.db.qo(this);
                     }
                 }
                 finally {
-                    this.abr();
+                    this.abq();
                 }
                 break;
             case "TrendLineBrush":
-                this.rf(b);
+                this.re(b);
                 break;
             case ScatterBase.$$p[0]:
-                if (this.yy != null) {
-                    this.yy.r = this;
+                if (this.yx != null) {
+                    this.yx.r = this;
                 }
-                this.rr(false);
-                this.ql();
+                this.rq(false);
+                this.qk();
                 break;
             case "TrendLineType":
-                this.ql();
+                this.qk();
                 break;
             case ScatterBase.$$p[4]:
-                this.zl = this.zt();
-                this.rr(false);
+                this.zk = this.zs();
+                this.rq(false);
                 break;
             case ScatterBase.$$p[3]:
-                this.zk = this.zs();
-                this.rr(false);
+                this.zj = this.zr();
+                this.rq(false);
                 break;
             case ScatterBase.$$p[5]:
-                this.y6 = this.y7();
+                this.y5 = this.y6();
                 break;
         }
     };
-    ScatterBase.prototype.zt = function () {
-        return this.zp;
-    };
     ScatterBase.prototype.zs = function () {
         return this.zo;
     };
-    ScatterBase.prototype.zn = function (a) {
+    ScatterBase.prototype.zr = function () {
+        return this.zn;
+    };
+    ScatterBase.prototype.zm = function (a) {
         if (typeCast(NumericYAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.zm = function (a) {
+    ScatterBase.prototype.zl = function (a) {
         if (typeCast(NumericXAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.abr = function () {
+    ScatterBase.prototype.abq = function () {
+        this.ack = Rect.empty;
         this.acl = Rect.empty;
-        this.acm = Rect.empty;
     };
-    ScatterBase.prototype.aa3 = function () {
-        var a = this.getViewInfo(this.acl, this.acm);
-        this.acl = a.p0;
-        this.acm = a.p1;
+    ScatterBase.prototype.aa2 = function () {
+        var a = this.getViewInfo(this.ack, this.acl);
+        this.ack = a.p0;
+        this.acl = a.p1;
     };
-    ScatterBase.prototype.zr = function (a, b) {
+    ScatterBase.prototype.zq = function (a, b) {
         if (b != 3) {
             return true;
         }
         if (a == null) {
             return true;
         }
-        if (this.aat == a || this.aa1 == a) {
+        if (this.aas == a || this.aa0 == a) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.pb = function (a, b, c, d) {
+    ScatterBase.prototype.pa = function (a, b, c, d) {
         var e = false;
-        if (!this.zr(d, a)) {
+        if (!this.zq(d, a)) {
             return;
         }
-        this.yx.c2.g$e(a, b, c, d);
+        this.yw.c2.g$e(a, b, c, d);
         if (this.xAxis != null && !this.xAxis.c1()) {
             e = true;
         }
@@ -543,29 +543,29 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             e = true;
         }
         if (a == 0 || a == 2 || a == 3 || a == 4) {
-            this.zj = true;
+            this.zi = true;
         }
         else if (a == 1) {
             for (var f = b; f < b + c; f++) {
+                this.zx += this.zg.item(f);
                 this.zy += this.zh.item(f);
-                this.zz += this.zi.item(f);
             }
+            this.zz = this.zx / this.zg.count;
             this.z0 = this.zy / this.zh.count;
-            this.z1 = this.zz / this.zi.count;
         }
         if (e) {
-            this.rr(true);
+            this.rq(true);
         }
     };
-    ScatterBase.prototype.abi = function (a) {
-        this.abj(a, null);
+    ScatterBase.prototype.abh = function (a) {
+        this.abi(a, null);
     };
-    ScatterBase.prototype.abj = function (a, b) {
+    ScatterBase.prototype.abi = function (a, b) {
         var e_1, _a, e_2, _b;
-        var c = this.zh != null ? this.zh.count : 0;
-        var d = this.zi != null ? this.zi.count : 0;
+        var c = this.zg != null ? this.zg.count : 0;
+        var d = this.zh != null ? this.zh.count : 0;
         var e = Math.min(c, d);
-        if (e <= this.z9) {
+        if (e <= this.z8) {
             a.m.clear();
             var f = new List$1(OwnedPoint.$, 0);
             try {
@@ -631,77 +631,77 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     ScatterBase.prototype.ay = function (a) {
-        if (a != null && a == this.xAxis && this.zh != null) {
-            return new AxisRange(this.zh.minimum, this.zh.maximum);
+        if (a != null && a == this.xAxis && this.zg != null) {
+            return new AxisRange(this.zg.minimum, this.zg.maximum);
         }
-        if (a != null && a == this.yAxis && this.zi != null) {
-            return new AxisRange(this.zi.minimum, this.zi.maximum);
+        if (a != null && a == this.yAxis && this.zh != null) {
+            return new AxisRange(this.zh.minimum, this.zh.maximum);
         }
         return null;
     };
-    ScatterBase.prototype.kn = function (a) {
-        var b = this.j3(a);
+    ScatterBase.prototype.km = function (a) {
+        var b = this.j2(a);
         if (this.dn != null && b >= 0 && b < this.dn.count) {
             return this.dn.item(b);
         }
         return null;
     };
-    Object.defineProperty(ScatterBase.prototype, "y6", {
+    Object.defineProperty(ScatterBase.prototype, "y5", {
         get: function () {
-            return this.y5;
+            return this.y4;
         },
         set: function (a) {
-            var b = this.y5;
-            this.y5 = a;
-            if (b != this.y5) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.y5));
+            var b = this.y4;
+            this.y4 = a;
+            if (b != this.y4) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.y4));
             }
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.y7 = function () {
-        if (this.y8 != 0) {
-            return this.y8;
+    ScatterBase.prototype.y6 = function () {
+        if (this.y7 != 0) {
+            return this.y7;
         }
-        return this.zq ? 4 : 1;
+        return this.zp ? 4 : 1;
     };
-    ScatterBase.prototype.j3 = function (a) {
-        var b = truncate(Math.round(this.ir(a)));
+    ScatterBase.prototype.j2 = function (a) {
+        var b = truncate(Math.round(this.iq(a)));
         return b;
     };
-    ScatterBase.prototype.ir = function (a) {
-        switch (this.y6) {
-            case 1: return this.z5(a);
-            case 3: return this.z6(a);
-            case 2: return this.z3(a);
-            case 4: return this.z4(a);
-            case 5: return this.z2(a);
+    ScatterBase.prototype.iq = function (a) {
+        switch (this.y5) {
+            case 1: return this.z4(a);
+            case 3: return this.z5(a);
+            case 2: return this.z2(a);
+            case 4: return this.z3(a);
+            case 5: return this.z1(a);
         }
         return -1;
     };
-    ScatterBase.prototype.z4 = function (a) {
-        return this.z7(a, false);
-    };
     ScatterBase.prototype.z3 = function (a) {
-        var b = this.v7(a);
+        return this.z6(a, false);
+    };
+    ScatterBase.prototype.z2 = function (a) {
+        var b = this.v6(a);
         var c = b.x;
         var d = b.y;
-        if (this.dn == null || this.xAxis == null || this.yAxis == null || this.zh == null || this.zi == null) {
+        if (this.dn == null || this.xAxis == null || this.yAxis == null || this.zg == null || this.zh == null) {
             return -1;
         }
-        if (this.dn.count > this.z8) {
+        if (this.dn.count > this.z7) {
             return -1;
         }
-        this.aa6();
-        var e = this.ym;
-        var f = this.yn;
+        this.aa5();
+        var e = this.yl;
+        var f = this.ym;
         if (e == null || f == null) {
             return -1;
         }
         var g = 1.7976931348623157E+308;
         var h = -1;
-        for (var i = 0; i < this.zh.count; i++) {
+        for (var i = 0; i < this.zg.count; i++) {
             var j = e[i];
             var k = f[i];
             var l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -712,66 +712,66 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h;
     };
-    ScatterBase.prototype.aa6 = function () {
+    ScatterBase.prototype.aa5 = function () {
         var _this = this;
         var a = this.cv.by;
         var b = this.cv.bx;
         var c = this.getEffectiveViewport();
-        if (this.yw == null) {
+        if (this.yv == null) {
             return;
         }
-        var d = new ScalerParams(0, a, b, this.yw.d, c);
+        var d = new ScalerParams(0, a, b, this.yv.d, c);
         var e = ((function () {
-            var $ret = new ScalerParams(0, a, b, _this.yw.e, c);
-            $ret.b = _this.iy();
+            var $ret = new ScalerParams(0, a, b, _this.yv.e, c);
+            $ret.b = _this.ix();
             return $ret;
         })());
-        if (this.ym == null || this.yn == null) {
-            var f = arrayShallowClone(this.zh.asArray());
-            var g = arrayShallowClone(this.zi.asArray());
+        if (this.yl == null || this.ym == null) {
+            var f = arrayShallowClone(this.zg.asArray());
+            var g = arrayShallowClone(this.zh.asArray());
             this.xAxis.hq(boxArray$1(f), 0, f.length, d);
             this.yAxis.hq(boxArray$1(g), 0, g.length, e);
-            this.ym = f;
-            this.yn = g;
+            this.yl = f;
+            this.ym = g;
         }
     };
-    ScatterBase.prototype.get_zq = function () {
+    ScatterBase.prototype.get_zp = function () {
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "zq", {
+    Object.defineProperty(ScatterBase.prototype, "zp", {
         get: function () {
-            return this.get_zq();
+            return this.get_zp();
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.z7 = function (a, b) {
-        if (!this.zq) {
+    ScatterBase.prototype.z6 = function (a, b) {
+        if (!this.zp) {
             return -1;
         }
         var c = { $type: Point_$type, x: 0, y: 0 };
         var d = true;
-        var e = this.y1();
+        var e = this.y0();
         if (e == null) {
             return -1;
         }
         if (e.m == null) {
             return -1;
         }
-        if (this.dn == null || this.dn.count > this.z8) {
+        if (this.dn == null || this.dn.count > this.z7) {
             return -1;
         }
-        this.aa6();
-        var f = this.ym;
-        var g = this.yn;
+        this.aa5();
+        var f = this.yl;
+        var g = this.ym;
         if (f == null || g == null) {
             return -1;
         }
-        var h = this.v7(a);
+        var h = this.v6(a);
         var i = 1.7976931348623157E+308;
         var j = -1;
-        for (var k = 0; k < this.ym.length; k++) {
-            var l = { $type: Point_$type, x: this.ym[k], y: this.yn[k] };
+        for (var k = 0; k < this.yl.length; k++) {
+            var l = { $type: Point_$type, x: this.yl[k], y: this.ym[k] };
             if (k > 0) {
                 if (!b || e.j.containsKey(this.dn.item(k)) || e.j.containsKey(this.dn.item(k - 1))) {
                     var m = GeometryUtil.h(h, c, l);
@@ -784,8 +784,8 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             c = l;
         }
         if (j >= 0) {
-            var n = { $type: Point_$type, x: this.ym[j], y: this.yn[j] };
-            var o = { $type: Point_$type, x: this.ym[j - 1], y: this.yn[j - 1] };
+            var n = { $type: Point_$type, x: this.yl[j], y: this.ym[j] };
+            var o = { $type: Point_$type, x: this.yl[j - 1], y: this.ym[j - 1] };
             if (!b || (e.j.containsKey(this.dn.item(j)) && e.j.containsKey(this.dn.item(j - 1)))) {
                 var p = GeometryUtil.m(h, o, n);
                 return (j - 1) + p;
@@ -799,25 +799,25 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.z6 = function (a) {
-        return this.z7(a, true);
+    ScatterBase.prototype.z5 = function (a) {
+        return this.z6(a, true);
     };
-    ScatterBase.prototype.z2 = function (a) {
+    ScatterBase.prototype.z1 = function (a) {
         var _this = this;
-        var b = this.v7(a);
+        var b = this.v6(a);
         var c = b.x;
         var d = b.y;
-        if (this.yx.c3.e > this.z8) {
+        if (this.yw.c3.e > this.z7) {
             return -1;
         }
         var e = -1;
-        this.w6.ck(function (f) {
-            var g = _this.yx.cu(f);
+        this.w5.ck(function (f) {
+            var g = _this.yw.cu(f);
             var h = g.left;
             var i = g.top;
             var j = g.width;
             var k = g.height;
-            if (_this.xd) {
+            if (_this.xc) {
                 var l = h + j / 2;
                 var m = i + k / 2;
                 var n = (j / 2) * (j / 2);
@@ -838,19 +838,19 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         });
         return e;
     };
-    ScatterBase.prototype.z5 = function (a) {
+    ScatterBase.prototype.z4 = function (a) {
         var _this = this;
         var b = null;
         var c = 1.7976931348623157E+308;
-        var d = this.v7(a);
+        var d = this.v6(a);
         var e = d.x;
         var f = d.y;
-        if (this.yx.c3.e > this.z8) {
+        if (this.yw.c3.e > this.z7) {
             return -1;
         }
-        this.yx.da(function (g) {
+        this.yw.da(function (g) {
             if (g._visibility == 0) {
-                var h = _this.yx.cu(g);
+                var h = _this.yw.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);
@@ -865,9 +865,9 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.wc = function (a, b, c) {
+    ScatterBase.prototype.wb = function (a, b, c) {
         var _this = this;
-        if (this.xAxis == null || this.yAxis == null || this.zh == null || this.zi == null) {
+        if (this.xAxis == null || this.yAxis == null || this.zg == null || this.zh == null) {
             return { $type: Point_$type, x: NaN, y: NaN };
         }
         var d = this.cv.by;
@@ -876,11 +876,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var g = new ScalerParams(0, d, e, this.xAxis.ch, f);
         var h = ((function () {
             var $ret = new ScalerParams(0, d, e, _this.yAxis.ch, f);
-            $ret.b = _this.iy();
+            $ret.b = _this.ix();
             return $ret;
         })());
         if (b) {
-            var i = this.ir(a);
+            var i = this.iq(a);
             if (i == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
@@ -899,45 +899,45 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 j = this.dn.count - 1;
             }
             if (k == j) {
-                var l = this.xAxis.el(this.zh.item(j), g);
-                var m = this.yAxis.el(this.zi.item(j), h);
+                var l = this.xAxis.el(this.zg.item(j), g);
+                var m = this.yAxis.el(this.zh.item(j), h);
                 return { $type: Point_$type, x: l, y: m };
             }
             var n = i - Math.floor(i);
-            var o = this.xAxis.el(this.zh.item(j), g);
-            var p = this.yAxis.el(this.zi.item(j), h);
-            var q = this.xAxis.el(this.zh.item(k), g);
-            var r = this.yAxis.el(this.zi.item(k), h);
+            var o = this.xAxis.el(this.zg.item(j), g);
+            var p = this.yAxis.el(this.zh.item(j), h);
+            var q = this.xAxis.el(this.zg.item(k), g);
+            var r = this.yAxis.el(this.zh.item(k), h);
             var s = q - o;
             var t = r - p;
             return { $type: Point_$type, x: o + s * n, y: p + t * n };
         }
         else {
-            var u = this.j3(a);
+            var u = this.j2(a);
             if (u == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            var v = this.xAxis.el(this.zh.item(u), g);
-            var w = this.yAxis.el(this.zi.item(u), h);
+            var v = this.xAxis.el(this.zg.item(u), g);
+            var w = this.yAxis.el(this.zh.item(u), h);
             return { $type: Point_$type, x: v, y: w };
         }
     };
-    ScatterBase.prototype.gd = function (a) {
+    ScatterBase.prototype.gc = function (a) {
         var _this = this;
         var b = this.db != null ? this.db.v4 : Rect.empty;
         b = b.copy();
         var c = this.db != null ? this.db.wk : Rect.empty;
         var d = new Rect(0, 0, 0, 1, 1);
-        var e = this.wl(this.cv);
+        var e = this.wk(this.cv);
         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);
-            $ret.b = _this.iy();
+            $ret.b = _this.ix();
             return $ret;
         })());
         var h = !b.isEmpty && !c.isEmpty && this.dn != null ? this.dn.indexOf(a) : -1;
-        var i = this.xAxis != null && this.zh != null && h < this.zh.count ? this.xAxis.el(this.zh.item(h), f) : NaN;
-        var j = this.yAxis != null && this.zi != null && h < this.zi.count ? this.yAxis.el(this.zi.item(h), g) : NaN;
+        var i = this.xAxis != null && this.zg != null && h < this.zg.count ? this.xAxis.el(this.zg.item(h), f) : NaN;
+        var j = this.yAxis != null && this.zh != null && h < this.zh.count ? this.yAxis.el(this.zh.item(h), g) : NaN;
         if (!isNaN_(i)) {
             if (i < b.left + 0.1 * b.width) {
                 i = i + 0.4 * b.width;
@@ -963,23 +963,23 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h >= 0;
     };
-    ScatterBase.prototype.sq = function (a, b) {
-        this.rr(false);
+    ScatterBase.prototype.sp = function (a, b) {
+        this.rq(false);
     };
-    ScatterBase.prototype.sr = function (a, b) {
-        this.rr(false);
+    ScatterBase.prototype.sq = function (a, b) {
+        this.rq(false);
     };
-    ScatterBase.prototype.y1 = function () {
-        var a = this.y0;
+    ScatterBase.prototype.y0 = function () {
+        var a = this.yz;
         if (this.d3()) {
             if (this.dc.g) {
                 this.dc.t();
             }
-            a = this.y4;
+            a = this.y3;
         }
         return a;
     };
-    ScatterBase.prototype.aa4 = function (a, b, c, d, e) {
+    ScatterBase.prototype.aa3 = function (a, b, c, d, e) {
         var _this = this;
         b.g = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
         var f = this.getEffectiveViewport1(a);
@@ -987,14 +987,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var h;
         var i;
         var j = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.yw.d, f);
+            var $ret = new ScalerParams(0, d, e, _this.yv.d, f);
             $ret.c = _this.getEffectiveViewport1(a);
             return $ret;
         })());
         var k = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.yw.e, f);
+            var $ret = new ScalerParams(0, d, e, _this.yv.e, f);
             $ret.c = _this.getEffectiveViewport1(a);
-            $ret.b = _this.iy();
+            $ret.b = _this.ix();
             return $ret;
         })());
         var l = false;
@@ -1007,9 +1007,9 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         var _loop_1 = function (o) {
-            h = this_1.zh.item(o);
-            i = this_1.zi.item(o);
-            var p = { $type: Point_$type, x: this_1.yw.a.el(h, j), y: this_1.yw.b.el(i, k) };
+            h = this_1.zg.item(o);
+            i = this_1.zh.item(o);
+            var p = { $type: Point_$type, x: this_1.yv.a.el(h, j), y: this_1.yv.b.el(i, k) };
             if (l) {
                 if (p.x < e.left || p.x > e.right) {
                     if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -1037,17 +1037,17 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             _loop_1(o);
         }
     };
-    ScatterBase.prototype.abf = function (a, b) {
+    ScatterBase.prototype.abe = function (a, b) {
         var _this = this;
+        this.yl = null;
         this.ym = null;
-        this.yn = null;
         a.j.clear();
         a.n.clear();
         a.h.clear();
         a.l.clear();
         a.i.clear();
         a.k.clear();
-        var c = Math.min(this.zh != null ? this.zh.count : 0, this.zi != null ? this.zi.count : 0);
+        var c = Math.min(this.zg != null ? this.zg.count : 0, this.zh != null ? this.zh.count : 0);
         var d = b.by;
         var e = b.bx;
         var f = this.getEffectiveViewport1(b);
@@ -1055,14 +1055,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         g.c = this.getEffectiveViewport1(b);
         var h = ((function () {
             var $ret = new ScalerParams(0, d, e, _this.yAxis.ch, f);
-            $ret.b = _this.iy();
+            $ret.b = _this.ix();
             return $ret;
         })());
         h.c = this.getEffectiveViewport1(b);
         if (c < 1) {
             return;
         }
-        this.yw = ((function () {
+        this.yv = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
@@ -1072,47 +1072,47 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return $ret;
         })());
         var i = b;
-        if (c <= this.z9) {
-            this.aa4(i, a, c, d, e);
+        if (c <= this.z8) {
+            this.aa3(i, a, c, d, e);
         }
-        if (this.xg()) {
-            b.c0.l(a.j, this.z9, d, e, this.id);
+        if (this.xf()) {
+            b.c0.l(a.j, this.z8, d, e, this.ic);
         }
         var j = ((function () {
             var $ret = new Clipper(0, e, false);
             $ret.i = a.n;
             return $ret;
         })());
-        var k = this.wj(b);
+        var k = this.wi(b);
         var l = this.xAxis.eo(k.left, g);
         var m = this.xAxis.eo(k.right, g);
-        b.c2.h(a.n, this.trendLineType, this.zh, this.zi, this.trendLinePeriod, function (n) { return _this.xAxis.el(n, g); }, function (n) { return _this.yAxis.el(n, h); }, ((function () {
+        b.c2.h(a.n, this.trendLineType, this.zg, this.zh, this.trendLinePeriod, function (n) { return _this.xAxis.el(n, g); }, function (n) { return _this.yAxis.el(n, h); }, ((function () {
             var $ret = new TrendResolutionParams();
-            $ret.d = _this.id;
+            $ret.d = _this.ic;
             $ret.i = e;
             $ret.h = f;
             $ret.j = d;
             return $ret;
         })()), j, l, m);
-        this.abd(a, b);
+        this.abc(a, b);
     };
-    ScatterBase.prototype.o5 = function (a, b) {
-        _super.prototype.o5.call(this, a, b);
+    ScatterBase.prototype.o4 = function (a, b) {
+        _super.prototype.o4.call(this, a, b);
         var c = b;
         c.c9(a);
     };
-    ScatterBase.prototype.get_fe = function () {
+    ScatterBase.prototype.get_fd = function () {
         return true;
     };
-    ScatterBase.prototype.zb = function (a, b, c) {
+    ScatterBase.prototype.za = function (a, b, c) {
         return null;
     };
-    ScatterBase.prototype.zc = function (a, b, c) {
+    ScatterBase.prototype.zb = function (a, b, c) {
         if (this.dn == null) {
             return null;
         }
-        var d = this.y1();
-        var e = this.yx.b1(this.v7(b));
+        var d = this.y0();
+        var e = this.yw.b1(this.v6(b));
         var f = -1;
         if (e == null) {
             if (a != null) {
@@ -1139,11 +1139,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return g;
     };
-    ScatterBase.prototype.wv = function (a, b) {
-        if (this.w8 != 1 && this.w8 != 13) {
-            var c = this.w6.cv();
-            var d = (c.width / 2) + (this.xj / 2);
-            var e = (c.height / 2) + (this.xj / 2);
+    ScatterBase.prototype.wu = function (a, b) {
+        if (this.w7 != 1 && this.w7 != 13) {
+            var c = this.w5.cv();
+            var d = (c.width / 2) + (this.xi / 2);
+            var e = (c.height / 2) + (this.xi / 2);
             var f = d;
             var g = d;
             var h = e;
@@ -1164,7 +1164,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Thickness(1, 0, 0, 0, 0);
     };
-    ScatterBase.prototype.za = function (a, b, c) {
+    ScatterBase.prototype.y9 = function (a, b, c) {
         var d = new HighlightingInfo();
         d.i = this;
         d.g = 0;
@@ -1176,41 +1176,41 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return d;
     };
     ScatterBase.prototype.dg = function (a, b, c) {
-        if (this.ed && this.fz(this.bx) && !c) {
-            var d = this.zb(a, b, this.zd);
-            this.zd = d;
+        if (this.ed && this.fy(this.bx) && !c) {
+            var d = this.za(a, b, this.zc);
+            this.zc = d;
             return d;
         }
         else {
-            var e = this.za(a, b, this.zd);
-            this.zd = e;
+            var e = this.y9(a, b, this.zc);
+            this.zc = e;
             return e;
         }
     };
     ScatterBase.prototype.dh = function (a, b, c) {
-        if (this.fz(this.bx) && !c) {
-            var d = this.zc(a, b, this.ze);
-            this.ze = d;
+        if (this.fy(this.bx) && !c) {
+            var d = this.zb(a, b, this.zd);
+            this.zd = d;
             return d;
         }
         else {
-            var e = this.za(a, b, this.ze);
+            var e = this.y9(a, b, this.zd);
             e.d = true;
-            this.ze = e;
+            this.zd = e;
             return e;
         }
     };
-    ScatterBase.prototype.zv = function () {
-        return (this.assigningScatterStyle != null && this.zl) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
-    };
     ScatterBase.prototype.zu = function () {
-        return (this.assigningScatterMarkerStyle != null && this.zk) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
+        return (this.assigningScatterStyle != null && this.zk) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
+    };
+    ScatterBase.prototype.zt = function () {
+        return (this.assigningScatterMarkerStyle != null && this.zj) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
     };
-    ScatterBase.prototype.abq = function (a, b) {
+    ScatterBase.prototype.abp = function (a, b) {
         var _this = this;
-        this.qx();
+        this.qw();
         var c = b.bx;
-        this.yw = ((function () {
+        this.yv = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
@@ -1218,10 +1218,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.e = _this.yAxis.ch;
             return $ret;
         })());
-        if (this.xg()) {
-            b.c0.j(a.j, this.xi);
-            if (this.zu()) {
-                this.aa5(b, a);
+        if (this.xf()) {
+            b.c0.j(a.j, this.xh);
+            if (this.zt()) {
+                this.aa4(b, a);
             }
         }
         b.cr();
@@ -1231,29 +1231,29 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return $ret;
         })());
         b.c2.g$h(a.n, d);
-        this.abn(a, b);
+        this.abm(a, b);
     };
     ScatterBase.prototype.ak = function (a, b) {
         var c = new List$1(ChartSelection.$, 0);
-        this.p4(a, c, b);
+        this.p3(a, c, b);
         return c.toArray();
     };
-    ScatterBase.prototype.p4 = function (a, b, c) {
-        this.aa7(a, b, c, 0, null);
+    ScatterBase.prototype.p3 = function (a, b, c) {
+        this.aa6(a, b, c, 0, null);
     };
-    ScatterBase.prototype.aa7 = function (a, b, c, d, e) {
+    ScatterBase.prototype.aa6 = function (a, b, c, d, e) {
         var _this = this;
-        var f = this.wr(a);
+        var f = this.wq(a);
         var g = this.dn.count;
-        var h = this.yw.a;
-        var i = this.yw.b;
-        var j = this.wj(this.cv);
+        var h = this.yv.a;
+        var i = this.yv.b;
+        var j = this.wi(this.cv);
         var k = new ScalerParams(0, f, this.db.wk, h.ch, this.getEffectiveViewport());
         var l = new ScalerParams(0, f, this.db.wk, i.ch, this.getEffectiveViewport());
         if (d == 0) {
             var _loop_2 = function (m) {
-                var n = h.el(this_2.zh.item(m), k);
-                var o = i.el(this_2.zi.item(m), l);
+                var n = h.el(this_2.zg.item(m), k);
+                var o = i.el(this_2.zh.item(m), l);
                 if (n < j.width && n > 0 && o < j.height && o > 0) {
                     if (c == 7 || c == 6) {
                         b.add(((function () {
@@ -1289,8 +1289,8 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         else {
             var _loop_3 = function (p) {
-                var q = h.el(this_3.zh.item(p), k);
-                var r = i.el(this_3.zi.item(p), l);
+                var q = h.el(this_3.zg.item(p), k);
+                var r = i.el(this_3.zh.item(p), l);
                 var s = e.item(p) / f.height;
                 var t = e.item(p) / f.width;
                 var u = new Rect(0, q - t / 2, r - s / 2, t, s);
@@ -1328,11 +1328,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.yp = function (a, b) {
-        return this.yq(a, b);
+    ScatterBase.prototype.yo = function (a, b) {
+        return this.yp(a, b);
     };
-    ScatterBase.prototype.yq = function (a, b) {
-        if (b < a || a < 0 || a > this.zh.count || b < 0 || b > this.zh.count) {
+    ScatterBase.prototype.yp = function (a, b) {
+        if (b < a || a < 0 || a > this.zg.count || b < 0 || b > this.zg.count) {
             return null;
         }
         var c = new Array((b - a) + 1);
@@ -1342,15 +1342,15 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ScatterBase.prototype.aa5 = function (a, b) {
+    ScatterBase.prototype.aa4 = function (a, b) {
         var _this = this;
         a.b7 = true;
-        this.y9.ay(this, this.zu(), runOn(this, this.yp));
-        var c = this.y9.d;
+        this.y8.ay(this, this.zt(), runOn(this, this.yo));
+        var c = this.y8.d;
         var d = c != null;
         var e = this.getEffectiveViewport1(a);
         var f = this.dn == null ? 0 : this.dn.count;
-        this.yx.cj(function (g) {
+        this.yw.cj(function (g) {
             if (g._visibility == 0) {
                 var h = g.ak;
                 var i = g.content;
@@ -1359,19 +1359,19 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     g.content = i;
                 }
                 if (d) {
-                    _this.aba(h, f, a.q);
+                    _this.aa9(h, f, a.q);
                 }
-                _this.y9.ac(g, i);
+                _this.y8.ac(g, i);
             }
         });
     };
-    ScatterBase.prototype.abb = function (a, b, c) {
+    ScatterBase.prototype.aba = function (a, b, c) {
         var d = this.bx != 1;
         var e = this.cp != 1;
         var f = this.co != 1;
-        this.y9.a0(this.y9.b, a, b, false);
-        this.y9.ab(this.ib);
-        var g = this.y9.ax;
+        this.y8.a0(this.y8.b, a, b, false);
+        this.y8.ab(this.ia);
+        var g = this.y8.ax;
         var h = null;
         var i = null;
         var j = null;
@@ -1389,16 +1389,16 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             g.b = h;
         }
         g.h = c;
-        this.abl(g);
-        this.y9.z(this, h, i, j, c, d, e, f, a < 0);
+        this.abk(g);
+        this.y8.z(this, h, i, j, c, d, e, f, a < 0);
     };
-    ScatterBase.prototype.aba = function (a, b, c) {
+    ScatterBase.prototype.aa9 = function (a, b, c) {
         var d = this.bx != 1;
         var e = this.cp != 1;
         var f = this.co != 1;
-        this.y9.a0(this.y9.d, a, b, true);
-        this.y9.aa(this.ib);
-        var g = this.y9.aw;
+        this.y8.a0(this.y8.d, a, b, true);
+        this.y8.aa(this.ia);
+        var g = this.y8.aw;
         var h = null;
         var i = null;
         var j = null;
@@ -1434,27 +1434,27 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             g.d = i;
         }
         g.h = c;
-        this.abk(g);
-        this.y9.y(this, h, i, j, c, d, e, f, g.v, this.db.dl.totalHighWaterMark, g.x, this.db.dm.totalHighWaterMark, g.t, this.db.dk.totalHighWaterMark);
+        this.abj(g);
+        this.y8.y(this, h, i, j, c, d, e, f, g.v, this.db.dl.totalHighWaterMark, g.x, this.db.dm.totalHighWaterMark, g.t, this.db.dk.totalHighWaterMark);
     };
-    ScatterBase.prototype.abl = function (a) {
-        if (this.assigningScatterStyle != null && this.zl) {
+    ScatterBase.prototype.abk = function (a) {
+        if (this.assigningScatterStyle != null && this.zk) {
             this.assigningScatterStyle(this, a);
         }
     };
-    ScatterBase.prototype.abk = function (a) {
-        if (this.assigningScatterMarkerStyle != null && this.zk) {
+    ScatterBase.prototype.abj = function (a) {
+        if (this.assigningScatterMarkerStyle != null && this.zj) {
             this.assigningScatterMarkerStyle(this, a);
         }
     };
-    ScatterBase.prototype.abd = function (a, b) {
+    ScatterBase.prototype.abc = function (a, b) {
         var e_3, _a;
         var c = new ErrorBarsHelper(this, b);
-        if (this.yy == null) {
+        if (this.yx == null) {
             return;
         }
-        var d = this.yy.u;
-        var e = this.yy.v;
+        var d = this.yx.u;
+        var e = this.yx.v;
         var f = 0;
         var g = 0;
         var h = 0;
@@ -1466,35 +1466,35 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            var l = this.abg(k, c, d, h, i, true);
+                            var l = this.abf(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            var m = this.abe(k, c, d, h, i, true);
+                            var m = this.abd(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            var n = this.abc(k, c, d, j, h, i, true);
+                            var n = this.abb(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            var o = this.abh(c, d, f, h, i, true);
+                            var o = this.abg(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            var p = this.abe(k, c, d, h, i, true);
+                            var p = this.abd(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     var q = new OwnedPoint();
-                    q.c = c.l(d, this.yw.a, k.c, f);
+                    q.c = c.l(d, this.yv.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1502,35 +1502,35 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            var r = this.abg(k, c, e, h, i, false);
+                            var r = this.abf(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            var s = this.abe(k, c, e, h, i, false);
+                            var s = this.abd(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            var t = this.abc(k, c, e, j, h, i, false);
+                            var t = this.abb(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            var u = this.abh(c, e, g, h, i, false);
+                            var u = this.abg(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            var v = this.abe(k, c, e, h, i, false);
+                            var v = this.abd(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     var w = new OwnedPoint();
-                    w.c = c.m(e, this.yw.b, k.c, g);
+                    w.c = c.m(e, this.yv.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
@@ -1551,18 +1551,18 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.abg = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.abf = function (a, b, c, d, e, f) {
         if (f) {
             var g = void 0;
             var h = void 0, i = void 0;
-            i = this.yw.a;
-            if (this.yy.s == 0) {
+            i = this.yv.a;
+            if (this.yx.s == 0) {
                 g = a.c.x;
-                h = this.yw.a;
+                h = this.yv.a;
             }
             else {
                 g = a.c.y;
-                h = this.yw.b;
+                h = this.yv.b;
             }
             var j = b.f(g, c, h, i, d, e);
             d = j.p4;
@@ -1571,14 +1571,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         else {
             var k = void 0;
             var l = void 0, m = void 0;
-            m = this.yw.b;
-            if (this.yy.t == 0) {
+            m = this.yv.b;
+            if (this.yx.t == 0) {
                 k = a.c.x;
-                l = this.yw.a;
+                l = this.yv.a;
             }
             else {
                 k = a.c.y;
-                l = this.yw.b;
+                l = this.yv.b;
             }
             var n = b.f(k, c, l, m, d, e);
             d = n.p4;
@@ -1589,14 +1589,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.abe = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.abd = function (a, b, c, d, e, f) {
         if (f) {
-            var g = b.j(a.c.x, c, this.yw.a, d, e);
+            var g = b.j(a.c.x, c, this.yv.a, d, e);
             d = g.p3;
             e = g.p4;
         }
         else {
-            var h = b.j(a.c.y, c, this.yw.b, d, e);
+            var h = b.j(a.c.y, c, this.yv.b, d, e);
             d = h.p3;
             e = h.p4;
         }
@@ -1605,18 +1605,18 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.abc = function (a, b, c, d, e, f, g) {
+    ScatterBase.prototype.abb = function (a, b, c, d, e, f, g) {
         var h = c.getItemColumn();
         var i = this.dn.indexOf(d);
         if (h != null && i < h.count) {
             var j = h.item(i);
             if (g) {
-                var k = b.h(a.c.x, j, this.yw.a, e, f);
+                var k = b.h(a.c.x, j, this.yv.a, e, f);
                 e = k.p3;
                 f = k.p4;
             }
             else {
-                var l = b.h(a.c.y, j, this.yw.b, e, f);
+                var l = b.h(a.c.y, j, this.yv.b, e, f);
                 e = l.p3;
                 f = l.p4;
             }
@@ -1630,16 +1630,16 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p5: f
         };
     };
-    ScatterBase.prototype.abh = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.abg = 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.yw.a, d, e);
+            var h = a.k(c, b, this.yv.a, d, e);
             d = h.p3;
             e = h.p4;
         }
         else {
-            var i = a.k(c, b, this.yw.b, d, e);
+            var i = a.k(c, b, this.yv.b, d, e);
             d = i.p3;
             e = i.p4;
         }
@@ -1649,20 +1649,20 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.abn = function (a, b) {
-        if (!b.o() || this.yy == null) {
+    ScatterBase.prototype.abm = function (a, b) {
+        if (!b.o() || this.yx == null) {
             b.db();
             return;
         }
+        this.abn(a, b);
         this.abo(a, b);
-        this.abp(a, b);
     };
-    ScatterBase.prototype.abo = function (a, b) {
+    ScatterBase.prototype.abn = function (a, b) {
         var e_4, _a;
         b.c7();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.yy.u;
+        var e = this.yx.u;
         try {
             for (var _b = __values(fromEnum(a.j.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1671,10 +1671,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.yy.o == 1 || this.yy.o == 2) {
+                        if (this.yx.o == 1 || this.yx.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.yy.o == 1 || this.yy.o == 3) {
+                        if (this.yx.o == 1 || this.yx.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1696,12 +1696,12 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         b.dc(d);
     };
-    ScatterBase.prototype.abp = function (a, b) {
+    ScatterBase.prototype.abo = function (a, b) {
         var e_5, _a;
         b.c8();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.yy.v;
+        var e = this.yx.v;
         try {
             for (var _b = __values(fromEnum(a.j.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1710,10 +1710,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.yy.p == 1 || this.yy.p == 2) {
+                        if (this.yx.p == 1 || this.yx.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.yy.p == 1 || this.yy.p == 3) {
+                        if (this.yx.p == 1 || this.yx.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
@@ -1734,17 +1734,17 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.he = function (a, b, c) {
+    ScatterBase.prototype.hd = function (a, b, c) {
         var d = true;
-        if (!_super.prototype.he.call(this, a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.zh == null || this.zi == null || this.zh.count == 0 || this.zi.count == 0 || this.dn == null || this.dn.count != this.zh.count || this.dn.count != this.zi.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.l4 == this.xAxis.l3 || this.yAxis.l4 == this.yAxis.l3) {
+        if (!_super.prototype.hd.call(this, a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.zg == null || this.zh == null || this.zg.count == 0 || this.zh.count == 0 || this.dn == null || this.dn.count != this.zg.count || this.dn.count != this.zh.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.l4 == this.xAxis.l3 || this.yAxis.l4 == this.yAxis.l3) {
             d = false;
         }
         return d;
     };
     ScatterBase.prototype.getViewInfo = function (a, b) {
-        if (!this.acl.isEmpty && !this.acm.isEmpty) {
-            a = this.acl;
-            b = this.acm;
+        if (!this.ack.isEmpty && !this.acl.isEmpty) {
+            a = this.ack;
+            b = this.acl;
             return {
                 p0: a,
                 p1: b
@@ -1757,53 +1757,53 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p1: b
         };
     };
-    ScatterBase.prototype.rs = function (a) {
-        _super.prototype.rs.call(this, a);
-        this.aa3();
+    ScatterBase.prototype.rr = function (a) {
+        _super.prototype.rr.call(this, a);
+        this.aa2();
         try {
             if (this.d5(this.cv)) {
                 return;
             }
-            if (this.dn != null && this.dn.count > this.z9) {
+            if (this.dn != null && this.dn.count > this.z8) {
                 a = false;
             }
-            if (this.gf(a) && !this.gr) {
-                var b = this.y2;
+            if (this.ge(a) && !this.gq) {
+                var b = this.y1;
                 if (this.d3()) {
                     if (this.dc.g) {
                         this.dc.t();
                     }
-                    this.y2 = this.y4;
-                    this.y4 = b;
+                    this.y1 = this.y3;
+                    this.y3 = b;
                 }
                 else {
-                    this.y2 = this.y0;
-                    this.y0 = b;
+                    this.y1 = this.yz;
+                    this.yz = b;
                 }
-                this.abf(this.y0, this.yx);
-                this.r7();
+                this.abe(this.yz, this.yw);
+                this.r6();
             }
             else {
-                if (!this.gr) {
-                    this.abf(this.y0, this.yx);
+                if (!this.gq) {
+                    this.abe(this.yz, this.yw);
                 }
-                this.abq(this.y0, this.yx);
+                this.abp(this.yz, this.yw);
             }
         }
         finally {
-            this.abr();
+            this.abq();
         }
     };
-    ScatterBase.prototype.sh = function () {
-        _super.prototype.sh.call(this);
+    ScatterBase.prototype.sg = function () {
+        _super.prototype.sg.call(this);
         if (this.index < 0) {
             return;
         }
-        this.yx.df();
+        this.yw.df();
     };
-    ScatterBase.prototype.rt = function (a, b) {
-        _super.prototype.rt.call(this, a, b);
-        if (!this.g0) {
+    ScatterBase.prototype.rs = function (a, b) {
+        _super.prototype.rs.call(this, a, b);
+        if (!this.gz) {
             this.cv.a4(b);
             return;
         }
@@ -1812,29 +1812,29 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return;
         }
         var c = typeCast(ScatterBaseView.$, this.cu);
-        if (!this.gs) {
-            this.y3 = new ScatterFrame();
-            this.abf(this.y3, c);
+        if (!this.gr) {
+            this.y2 = new ScatterFrame();
+            this.abe(this.y2, c);
         }
-        this.gs = false;
-        this.abq(this.y3, c);
-        this.g0 = false;
+        this.gr = false;
+        this.abp(this.y2, c);
+        this.gz = false;
     };
-    ScatterBase.prototype.rq = function (a, b, c, d, e) {
-        _super.prototype.rq.call(this, a, b, c, d, e);
+    ScatterBase.prototype.rp = function (a, b, c, d, e) {
+        _super.prototype.rp.call(this, a, b, c, d, e);
         var f = this.ba.a$j.item(d);
         var g = f;
         f.a3(c);
         if (this.d5(g)) {
             return;
         }
-        if (this.yz == null) {
-            this.yz = new ScatterFrame();
+        if (this.yy == null) {
+            this.yy = new ScatterFrame();
         }
-        this.abf(this.yz, g);
-        this.abq(this.yz, g);
+        this.abe(this.yy, g);
+        this.abp(this.yy, g);
     };
-    ScatterBase.prototype.abm = function (a, b) {
+    ScatterBase.prototype.abl = function (a, b) {
         var e_6, _a, e_7, _b;
         var c = new List$1(Base.$, 0);
         try {
@@ -1878,11 +1878,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.yo = function (a, b, c, d, e) {
+    ScatterBase.prototype.yn = function (a, b, c, d, e) {
         var _this = this;
-        if (c == null || c.length != this.yw.c.count) {
-            c = new Array(this.yw.c.count);
-            for (var f = 0; f < this.yw.c.count; f++) {
+        if (c == null || c.length != this.yv.c.count) {
+            c = new Array(this.yv.c.count);
+            for (var f = 0; f < this.yv.c.count; f++) {
                 c[f] = PointUtil.create();
             }
         }
@@ -1895,31 +1895,31 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var i = ((function () {
             var $ret = new ScalerParams(0, d, e, _this.yAxis.ch, g);
             $ret.c = _this.getEffectiveViewport1(a);
-            $ret.b = _this.iy();
+            $ret.b = _this.ix();
             return $ret;
         })());
-        var j = this.wj(a);
-        var k = this.yw.a.eo(j.left, h);
-        var l = this.yw.a.eo(j.right, h);
-        var m = this.yw.b.eo(j.bottom, i);
-        var n = this.yw.b.eo(j.top, i);
-        if (this.yw.d) {
+        var j = this.wi(a);
+        var k = this.yv.a.eo(j.left, h);
+        var l = this.yv.a.eo(j.right, h);
+        var m = this.yv.b.eo(j.bottom, i);
+        var n = this.yv.b.eo(j.top, i);
+        if (this.yv.d) {
             var o = k;
             k = l;
             l = o;
         }
-        if (this.yw.e) {
+        if (this.yv.e) {
             var p = m;
             m = n;
             n = p;
         }
-        var q = this.yw;
+        var q = this.yv;
         var r = q.a;
         var s = q.b;
         var t;
         var u;
-        var v = this.zh;
-        var w = this.zi;
+        var v = this.zg;
+        var w = this.zh;
         var x = false;
         var y = 0;
         var z = 0;
@@ -1933,7 +1933,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 z -= ab;
             }
         }
-        for (var ac = 0; ac < this.yw.c.count; ac++) {
+        for (var ac = 0; ac < this.yv.c.count; ac++) {
             t = v.item(ac);
             u = w.item(ac);
             var ad = 1E-10;
@@ -1966,7 +1966,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ScatterBase.prototype.zx = function (a, b) {
+    ScatterBase.prototype.zw = function (a, b) {
         var e_8, _a;
         if (b == null) {
             b = new List$1(Number_$type, 2, a.e);
@@ -1997,32 +1997,32 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    ScatterBase.prototype.pz = function (a) {
-        _super.prototype.pz.call(this, a);
-        this.bc.exportTrendlineData(this, a, this.yx.c2.g$j);
+    ScatterBase.prototype.py = function (a) {
+        _super.prototype.py.call(this, a);
+        this.bc.exportTrendlineData(this, a, this.yw.c2.g$j);
     };
-    ScatterBase.prototype.iy = function () {
-        return Series.iz(this.zi, null);
+    ScatterBase.prototype.ix = function () {
+        return Series.iy(this.zh, null);
     };
     ScatterBase.prototype.getDataLegendSeriesContextAt = function (a, b) {
         var c = { $type: Point_$type, x: a, y: b };
-        var d = this.kn(c);
-        var e = d == null ? NaN : this.ix(d, "XMemberPath");
-        var f = d == null ? NaN : this.ix(d, "YMemberPath");
+        var d = this.km(c);
+        var e = d == null ? NaN : this.iw(d, "XMemberPath");
+        var f = d == null ? NaN : this.iw(d, "YMemberPath");
         var g = new DataLegendSeriesValueInfo();
         g.l = e;
         g.a = 13;
         g.q = "X";
-        g.r = this.aat != null ? this.aat : "X";
-        g.s = this.aap != null ? this.aap : "X:";
-        g.t = this.aar != null ? this.aar : "";
+        g.r = this.aas != null ? this.aas : "X";
+        g.s = this.aao != null ? this.aao : "X:";
+        g.t = this.aaq != null ? this.aaq : "";
         var h = new DataLegendSeriesValueInfo();
         h.l = f;
         h.a = 14;
         h.q = "Y";
-        h.r = this.aa1 != null ? this.aa1 : "Y";
-        h.s = this.aax != null ? this.aax : "Y:";
-        h.t = this.aaz != null ? this.aaz : "";
+        h.r = this.aa0 != null ? this.aa0 : "Y";
+        h.s = this.aaw != null ? this.aaw : "Y:";
+        h.t = this.aay != null ? this.aay : "";
         var i = new DataLegendSeriesContext();
         i.e = ((function () {
             var $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -2030,23 +2030,23 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.add(h);
             return $ret;
         })());
-        i.h = this.mc();
+        i.h = this.mb();
         return i;
     };
-    ScatterBase.prototype.abs = function () {
-        if (this.zj) {
+    ScatterBase.prototype.abr = function () {
+        if (this.zi) {
+            this.zx = 0;
             this.zy = 0;
-            this.zz = 0;
-            for (var a = 0; a < this.zh.count; a++) {
+            for (var a = 0; a < this.zg.count; a++) {
+                this.zx += this.zg.item(a);
                 this.zy += this.zh.item(a);
-                this.zz += this.zi.item(a);
             }
+            this.zz = this.zx / this.zg.count;
             this.z0 = this.zy / this.zh.count;
-            this.z1 = this.zz / this.zi.count;
-            this.zj = false;
+            this.zi = false;
         }
     };
-    ScatterBase.prototype.i8 = function (a, b) {
+    ScatterBase.prototype.i7 = function (a, b) {
         if (b == null || !b.cj) {
             return NaN;
         }
@@ -2067,43 +2067,43 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         switch (a) {
             case 5:
             case 2:
-                b = this.zh.maximum;
-                c = this.zi.maximum;
+                b = this.zg.maximum;
+                c = this.zh.maximum;
                 break;
             case 4:
             case 1:
-                b = this.zh.minimum;
-                c = this.zi.minimum;
+                b = this.zg.minimum;
+                c = this.zh.minimum;
                 break;
             case 6:
             case 3:
-                if (this.zj) {
-                    this.abs();
+                if (this.zi) {
+                    this.abr();
                 }
-                b = this.z0;
-                c = this.z1;
+                b = this.zz;
+                c = this.z0;
                 break;
         }
         return [b, c];
     };
-    ScatterBase.prototype.wg = function (a) {
+    ScatterBase.prototype.wf = function (a) {
         var b = this.getEffectiveViewport1(this.cv);
         var c = new ScalerParams(0, this.cv.by, this.cv.bx, this.xAxis.ch, b);
         c.c = b;
         var d = isNaN_(a[0]) ? NaN : this.xAxis.el(a[0], c);
         c = new ScalerParams(0, this.cv.by, this.cv.bx, this.yAxis.ch, b);
-        c.b = this.iy();
+        c.b = this.ix();
         c.c = b;
         var e = isNaN_(a[1]) ? NaN : this.yAxis.el(a[1], c);
         return { $type: Point_$type, x: d, y: e };
     };
-    ScatterBase.prototype.wf = function (a) {
+    ScatterBase.prototype.we = function (a) {
         var b = this.aq(a);
-        return this.wg(b);
+        return this.wf(b);
     };
     ScatterBase.$t = markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.abt = 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:yy:abu', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aad:abv', [2, null], 'HighlightedYMemberPath:aaf:abw', [2, null], 'IsCustomScatterMarkerStyleAllowed:zo:abx', [0, false], 'IsCustomScatterStyleAllowed:zp:aby', [0, false], 'ItemSearchMode:y8:abz', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:z8:ab0', [1, 10000], 'MarkerCollisionAvoidance:yt:ab1', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:z9:ab2', [1, 400], 'XAxis::aca', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aap:acb', [2, null], 'XMemberAsLegendUnit:aar:acc', [2, null], 'XMemberPath:aat:acd', [2, null], 'YAxis::ace', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aax:acf', [2, null], 'YMemberAsLegendUnit:aaz:acg', [2, null], 'YMemberPath:aa1:ach', [2, null], 'TrendLineType::ab8', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::ab7', [1, 1.5], 'TrendLinePeriod::ab6', [1, 7], 'TrendLineBrush::ab3', [Brush.$, null], 'TrendLineZIndex:aaa:ab9', [1, 1001], 'TrendLineDashArray:acj:ab4', [DoubleCollection.$], 'TrendLineDashCap:ack:ab5', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.abs = 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:yx:abt', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aac:abu', [2, null], 'HighlightedYMemberPath:aae:abv', [2, null], 'IsCustomScatterMarkerStyleAllowed:zn:abw', [0, false], 'IsCustomScatterStyleAllowed:zo:abx', [0, false], 'ItemSearchMode:y7:aby', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:z7:abz', [1, 10000], 'MarkerCollisionAvoidance:ys:ab0', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:z8:ab1', [1, 400], 'XAxis::ab9', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aao:aca', [2, null], 'XMemberAsLegendUnit:aaq:acb', [2, null], 'XMemberPath:aas:acc', [2, null], 'YAxis::acd', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aaw:ace', [2, null], 'YMemberAsLegendUnit:aay:acf', [2, null], 'YMemberPath:aa0:acg', [2, null], 'TrendLineType::ab7', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::ab6', [1, 1.5], 'TrendLinePeriod::ab5', [1, 7], 'TrendLineBrush::ab2', [Brush.$, null], 'TrendLineZIndex:z9:ab8', [1, 1001], 'TrendLineDashArray:aci:ab3', [DoubleCollection.$], 'TrendLineDashCap:acj:ab4', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 }(MarkerSeries));
 export { ScatterBase };
@@ -2182,7 +2182,7 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.dh = new Path();
         this.di = new Path();
         if (!this.q) {
-            this.c1.z9 = 2000;
+            this.c1.z8 = 2000;
         }
     };
     ScatterBaseView.prototype.dj = function (a) {
@@ -2201,12 +2201,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.yw.c.item(b); }, runOn(this, this.de), runOn(this, this.cw), runOn(this, this.c4), function () { return _this.c1.yt; });
+        var a = new NumericMarkerManager(1, function (b) { return _this.c3.item(b); }, function (b) { return _this.c1.yv.c.item(b); }, runOn(this, this.de), runOn(this, this.cw), runOn(this, this.c4), function () { return _this.c1.ys; });
         a.q = runOn(this, this.dj);
         return a;
     };
     ScatterBaseView.prototype.de = function (a) {
-        this.c1.abm(a, this.c3);
+        this.c1.abl(a, this.c3);
     };
     ScatterBaseView.prototype.c5 = function () {
         return this.b8;
@@ -2215,11 +2215,11 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         return this.cy;
     };
     ScatterBaseView.prototype.cw = function () {
-        this.cy = this.c1.yo(this, this.c3, this.cy, this.by, this.bx);
+        this.cy = this.c1.yn(this, this.c3, this.cy, this.by, this.bx);
         return this.cy;
     };
     ScatterBaseView.prototype.c4 = function () {
-        this.c6 = this.c1.zx(this.c3, this.c6);
+        this.c6 = this.c1.zw(this.c3, this.c6);
         return this.c6;
     };
     ScatterBaseView.prototype.c7 = function () {
@@ -2232,10 +2232,10 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBaseView.prototype.df = function () {
         if (this.c1.trendLineBrush != null) {
-            this.c1.aci = this.c1.trendLineBrush;
+            this.c1.ach = this.c1.trendLineBrush;
         }
         else {
-            this.c1.aci = this.c1.u9;
+            this.c1.ach = this.c1.u8;
         }
     };
     ScatterBaseView.prototype.cj = function (a) {
@@ -2252,9 +2252,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.aci;
-                c.ai = this.c1.acj;
-                c.aj = this.c1.ack;
+                c._stroke = this.c1.ach;
+                c.ai = this.c1.aci;
+                c.aj = this.c1.acj;
                 a.v(c);
             }
         }
@@ -2273,7 +2273,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.aat + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.c1.aa1 + "}</span></div>";
+        a += ">" + this.c1.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.c1.aas + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.c1.aa0 + "}</span></div>";
         return a;
     };
     ScatterBaseView.$t = markType(ScatterBaseView, 'ScatterBaseView', MarkerSeriesView.$);