igniteui-webcomponents-charts 5.0.2 → 5.0.3-beta.0

package/esm5/lib/ScatterBase_combined.js

@@ -44,6 +44,7 @@ import { Thickness } from "igniteui-webcomponents-core";
 import { Size } from "igniteui-webcomponents-core";
 import { AssigningScatterStyleEventArgs } from "./AssigningScatterStyleEventArgs";
 import { AssigningScatterMarkerStyleEventArgs } from "./AssigningScatterMarkerStyleEventArgs";
+import { ChartSelection } from "./ChartSelection";
 import { SeriesRenderManager } from "./SeriesRenderManager";
 import { ErrorBarsHelper } from "./ErrorBarsHelper";
 import { PathGeometry } from "igniteui-webcomponents-core";
@@ -63,186 +64,186 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ScatterBase, _super);
     function ScatterBase() {
         var _this = _super.call(this) || this;
-        _this.yo = null;
-        _this.y7 = null;
+        _this.yr = null;
+        _this.za = null;
+        _this.zb = null;
+        _this.acg = null;
+        _this.ach = null;
+        _this.y0 = 1;
+        _this.yh = null;
+        _this.yi = null;
+        _this.yx = null;
+        _this.yz = null;
+        _this.yv = null;
+        _this.zg = false;
+        _this.zf = false;
         _this.y8 = null;
-        _this.acc = null;
-        _this.acd = null;
-        _this.yx = 1;
-        _this.ye = null;
-        _this.yf = null;
-        _this.yu = null;
-        _this.yw = null;
-        _this.ys = null;
-        _this.zd = false;
-        _this.zc = false;
-        _this.y5 = null;
-        _this.y6 = null;
+        _this.y9 = null;
         _this.assigningScatterStyle = null;
         _this.assigningScatterMarkerStyle = null;
-        _this.y1 = null;
-        _this.yv = null;
-        _this.yr = null;
-        _this.zb = true;
-        _this.zq = 0;
-        _this.zr = 0;
-        _this.zs = 0;
+        _this.y4 = null;
+        _this.yy = null;
+        _this.yu = null;
+        _this.ze = true;
         _this.zt = 0;
-        _this.yy = _this.yz();
-        _this.y1 = new ScatterSeriesRenderManager();
-        _this.yv = new ScatterFrame();
-        _this.acd = Rect.empty;
-        _this.acc = Rect.empty;
+        _this.zu = 0;
+        _this.zv = 0;
+        _this.zw = 0;
+        _this.y1 = _this.y2();
+        _this.y4 = new ScatterSeriesRenderManager();
+        _this.yy = new ScatterFrame();
+        _this.ach = Rect.empty;
+        _this.acg = Rect.empty;
         return _this;
     }
-    ScatterBase.prototype.cq = function () {
+    ScatterBase.prototype.cr = function () {
         return new ScatterBaseView(this);
     };
-    ScatterBase.prototype.o0 = function () {
-        _super.prototype.o0.call(this);
+    ScatterBase.prototype.o1 = function () {
+        _super.prototype.o1.call(this);
         this.xAxis = null;
         this.yAxis = null;
     };
-    ScatterBase.prototype.qx = function (a) {
-        _super.prototype.qx.call(this, a);
-        this.yp = a;
+    ScatterBase.prototype.qz = function (a) {
+        _super.prototype.qz.call(this, a);
+        this.ys = a;
     };
-    ScatterBase.prototype.get_fu = function () {
+    ScatterBase.prototype.get_fv = function () {
         return true;
     };
     ScatterBase.prototype.ai = function () {
         return [this.xAxis, this.yAxis];
     };
-    ScatterBase.prototype.ko = function (a, b) {
-        var c = this.nb(b);
+    ScatterBase.prototype.kp = function (a, b) {
+        var c = this.nc(b);
         if (c == ScatterBase.$$p[12]) {
-            return this.kp(a, b, this.aal);
+            return this.kq(a, b, this.aao);
         }
         if (c == ScatterBase.$$p[16]) {
-            return this.kp(a, b, this.aat);
+            return this.kq(a, b, this.aaw);
         }
         if (c == ScatterBase.$$p[1]) {
-            return this.kp(a, b, this.z5);
+            return this.kq(a, b, this.z8);
         }
         if (c == ScatterBase.$$p[2]) {
-            return this.kp(a, b, this.z7);
+            return this.kq(a, b, this.aaa);
         }
         return null;
     };
-    ScatterBase.prototype.mb = function (a) {
-        var b = this.nb(a);
+    ScatterBase.prototype.mc = function (a) {
+        var b = this.nc(a);
         if (b == ScatterBase.$$p[12]) {
-            return this.aal;
+            return this.aao;
         }
         if (b == ScatterBase.$$p[16]) {
-            return this.aat;
+            return this.aaw;
         }
         if (b == ScatterBase.$$p[1]) {
-            return this.z5;
+            return this.z8;
         }
         if (b == ScatterBase.$$p[2]) {
-            return this.z7;
+            return this.aaa;
         }
-        return _super.prototype.mb.call(this, a);
+        return _super.prototype.mc.call(this, a);
     };
-    ScatterBase.prototype.d9 = function (a, b, c, d, e) {
+    ScatterBase.prototype.ea = function (a, b, c, d, e) {
         var _this = this;
         if (!this.hasMarkers) {
             return false;
         }
         var f = this.xAxis;
-        var g = new ScalerParams(1, this.c9.vl, this.wl, f.ch);
-        g.c = this.getEffectiveViewport1(this.ct);
+        var g = new ScalerParams(1, this.da.vx, this.wo, f.ch);
+        g.c = this.getEffectiveViewport1(this.cu);
         var h = this.yAxis;
-        var i = new ScalerParams(1, this.c9.vl, this.wl, h.ch);
-        i.c = this.getEffectiveViewport1(this.ct);
+        var i = new ScalerParams(1, this.da.vx, this.wo, h.ch);
+        i.c = this.getEffectiveViewport1(this.cu);
         a.clear();
-        this.wy.cj(function (j) {
+        this.w1.cj(function (j) {
             if (j._visibility == 0) {
                 var k = new SeriesPointOfInterest();
                 var l = j.n;
                 var m = j.o;
-                if (l < _this.wl.left || l > _this.wl.right || m < _this.wl.top || m > _this.wl.bottom) {
+                if (l < _this.wo.left || l > _this.wo.right || m < _this.wo.top || m > _this.wo.bottom) {
                     return;
                 }
                 k.d = f.en(l, g);
                 k.e = h.en(m, i);
                 k.b = j.content;
-                k.g = _this.va;
+                k.g = _this.vc;
                 k.c = j.ak;
-                if (_this.g7) {
-                    k.g = _this.vh(j.ak);
+                if (_this.g8) {
+                    k.g = _this.vj(j.ak);
                 }
                 a.add(k);
             }
         });
         return true;
     };
-    ScatterBase.prototype.b0 = function () {
-        if (this.b1 == 0) {
-            if (this.z1 <= 2000) {
+    ScatterBase.prototype.b1 = function () {
+        if (this.b2 == 0) {
+            if (this.z4 <= 2000) {
                 return 1;
             }
             else {
-                return _super.prototype.b0.call(this);
+                return _super.prototype.b1.call(this);
             }
         }
         else {
-            return _super.prototype.b0.call(this);
+            return _super.prototype.b1.call(this);
         }
     };
-    ScatterBase.prototype.wj = function (a) {
-        if (!this.hasMarkers || !this.w8()) {
+    ScatterBase.prototype.wl = function (a) {
+        if (!this.hasMarkers || !this.xb()) {
             return Rect.empty;
         }
-        var b = this.wy.b1(this.v1(a));
+        var b = this.w1.b1(this.v3(a));
         if (b != null) {
-            return this.wy.cu(b);
+            return this.w1.cu(b);
         }
         return Rect.empty;
     };
-    ScatterBase.prototype.gu = function (a, b) {
-        if (this.w9(a, b)) {
+    ScatterBase.prototype.gv = function (a, b) {
+        if (this.xc(a, b)) {
             return true;
         }
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "y9", {
+    Object.defineProperty(ScatterBase.prototype, "zc", {
         get: function () {
-            return this.y7;
+            return this.za;
         },
         set: function (a) {
-            if (this.y7 != a) {
-                var b = this.y9;
-                this.y7 = a;
-                this.raisePropertyChanged("XColumn", b, this.y9);
+            if (this.za != a) {
+                var b = this.zc;
+                this.za = a;
+                this.raisePropertyChanged("XColumn", b, this.zc);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ScatterBase.prototype, "za", {
+    Object.defineProperty(ScatterBase.prototype, "zd", {
         get: function () {
-            return this.y8;
+            return this.zb;
         },
         set: function (a) {
-            if (this.y8 != a) {
-                var b = this.za;
-                this.y8 = a;
-                this.raisePropertyChanged("YColumn", b, this.za);
+            if (this.zb != a) {
+                var b = this.zd;
+                this.zb = a;
+                this.raisePropertyChanged("YColumn", b, this.zd);
             }
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.f9 = function () {
-        return this.highlightedItemsSource != null || (this.z5 != null && this.z7 != null);
+    ScatterBase.prototype.ga = function () {
+        return this.highlightedItemsSource != null || (this.z8 != null && this.aaa != null);
     };
-    ScatterBase.prototype.zo = function () {
+    ScatterBase.prototype.zr = function () {
         return false;
     };
-    ScatterBase.prototype.hr = function () {
-        var a = _super.prototype.hr.call(this);
+    ScatterBase.prototype.hs = function () {
+        var a = _super.prototype.hs.call(this);
         {
             var b = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
@@ -252,7 +253,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.aa0));
+            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.aa4));
             a.add(b);
         }
         {
@@ -264,10 +265,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aaz));
+            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aa3));
             a.add(c);
         }
-        if (this.zo()) {
+        if (this.zr()) {
             var d = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -284,7 +285,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             })());
             a.add(d);
         }
-        if (!this.zo()) {
+        if (!this.zr()) {
             var e = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -294,10 +295,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.rv));
+            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.rx));
             a.add(e);
         }
-        if (!this.zo()) {
+        if (!this.zr()) {
             var f = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -307,31 +308,31 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.rv));
+            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.rx));
             a.add(f);
         }
         return a;
     };
-    ScatterBase.prototype.aaz = function (a, b) {
-        if (this.z5 != null) {
-            b.value = this.z5;
+    ScatterBase.prototype.aa3 = function (a, b) {
+        if (this.z8 != null) {
+            b.value = this.z8;
             return;
         }
-        b.value = this.aal;
+        b.value = this.aao;
     };
-    ScatterBase.prototype.aa0 = function (a, b) {
-        if (this.z7 != null) {
-            b.value = this.z7;
+    ScatterBase.prototype.aa4 = function (a, b) {
+        if (this.aaa != null) {
+            b.value = this.aaa;
             return;
         }
-        b.value = this.aat;
+        b.value = this.aaw;
     };
-    Object.defineProperty(ScatterBase.prototype, "ab9", {
+    Object.defineProperty(ScatterBase.prototype, "acd", {
         get: function () {
-            return this.c(ScatterBase.abk);
+            return this.c(ScatterBase.abo);
         },
         set: function (a) {
-            this.h(ScatterBase.abk, a);
+            this.h(ScatterBase.abo, a);
         },
         enumerable: false,
         configurable: true
@@ -350,8 +351,8 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.p6 = function () {
-        _super.prototype.p6.call(this);
+    ScatterBase.prototype.p8 = function () {
+        _super.prototype.p8.call(this);
         if (this.xAxis != null) {
             this.xAxis.h9(false);
         }
@@ -359,32 +360,32 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             this.yAxis.h9(false);
         }
     };
-    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();
+    ScatterBase.prototype.q7 = function (a, b, c, d) {
+        _super.prototype.q7.call(this, a, b, c, d);
+        if (this.ys.c2.g$b(a, b, c, d)) {
+            this.rp(false);
+            this.qj();
         }
         switch (b) {
             case ScatterBase.$$p[10]:
             case ScatterBase.$$p[14]:
             case ScatterBase.$$p[11]:
             case ScatterBase.$$p[15]:
-                this.qb();
+                this.qd();
                 break;
             case "FastItemsSource":
                 if (typeCast(IFastItemsSource_$type, c) != null) {
-                    c.deregisterColumn(this.y9);
-                    c.deregisterColumn(this.za);
-                    this.y9 = null;
-                    this.za = null;
+                    c.deregisterColumn(this.zc);
+                    c.deregisterColumn(this.zd);
+                    this.zc = null;
+                    this.zd = null;
                 }
                 if (typeCast(IFastItemsSource_$type, d) != null) {
-                    this.y9 = this.di(this.aal);
-                    this.za = this.di(this.aat);
+                    this.zc = this.dj(this.aao);
+                    this.zd = this.dj(this.aaw);
                 }
                 if ((this.yAxis != null && !this.yAxis.c1()) || (this.xAxis != null && !this.xAxis.c1())) {
-                    this.rn(this.ge && c != null);
+                    this.rp(this.gf && c != null);
                 }
                 break;
             case ScatterBase.$$p[9]:
@@ -395,9 +396,9 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     d.ct(this);
                 }
                 if ((this.xAxis != null && !this.xAxis.c1()) || (d == null && c != null)) {
-                    this.rn(false);
+                    this.rp(false);
                 }
-                this.qh();
+                this.qj();
                 break;
             case ScatterBase.$$p[13]:
                 if (c != null) {
@@ -407,134 +408,134 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     d.ct(this);
                 }
                 if ((this.yAxis != null && !this.yAxis.c1()) || (d == null && c != null)) {
-                    this.rn(false);
+                    this.rp(false);
                 }
-                this.qh();
+                this.qj();
                 break;
             case ScatterBase.$$p[12]:
-                if (this.dl != null) {
-                    this.dl.deregisterColumn(this.y9);
-                    this.y9 = this.di(this.aal);
+                if (this.dm != null) {
+                    this.dm.deregisterColumn(this.zc);
+                    this.zc = this.dj(this.aao);
                 }
                 break;
             case "XColumn":
-                this.yp.c2.g$i();
+                this.ys.c2.g$i();
                 if (this.xAxis != null && !this.xAxis.c1()) {
-                    this.rn(this.ge && this.d5);
+                    this.rp(this.gf && this.d6);
                 }
                 break;
             case ScatterBase.$$p[16]:
-                if (this.dl != null) {
-                    this.dl.deregisterColumn(this.za);
-                    this.za = this.di(this.aat);
+                if (this.dm != null) {
+                    this.dm.deregisterColumn(this.zd);
+                    this.zd = this.dj(this.aaw);
                 }
                 break;
             case "YColumn":
-                this.yp.c2.g$i();
+                this.ys.c2.g$i();
                 if (this.yAxis != null && !this.yAxis.c1()) {
-                    this.rn(this.ge && this.d5);
+                    this.rp(this.gf && this.d6);
                 }
                 break;
             case ScatterBase.$$p[7]:
-                this.rn(false);
-                this.qh();
+                this.rp(false);
+                this.qj();
                 break;
             case ScatterBase.$$p[8]:
-                this.rn(false);
-                this.qh();
+                this.rp(false);
+                this.qj();
                 break;
             case "TransitionProgress":
-                this.yw.c(this.jo, this.yu, this.ys);
-                this.aav();
+                this.yz.c(this.jp, this.yx, this.yv);
+                this.aay();
                 try {
-                    if (this.d3(this.ct)) {
+                    if (this.d4(this.cu)) {
                         return;
                     }
-                    if ((Math.round(this.jo * 100000) / 100000) == 1) {
-                        this.abh(this.ys, this.yp);
+                    if ((Math.round(this.jp * 100000) / 100000) == 1) {
+                        this.abl(this.yv, this.ys);
                     }
                     else {
-                        this.abh(this.yw, this.yp);
+                        this.abl(this.yz, this.ys);
                     }
-                    if (this.c9 != null) {
-                        this.c9.qa(this);
+                    if (this.da != null) {
+                        this.da.qj(this);
                     }
                 }
                 finally {
-                    this.abi();
+                    this.abm();
                 }
                 break;
             case "TrendLineBrush":
-                this.rb(b);
+                this.rd(b);
                 break;
             case ScatterBase.$$p[0]:
-                if (this.yq != null) {
-                    this.yq.r = this;
+                if (this.yt != null) {
+                    this.yt.r = this;
                 }
-                this.rn(false);
-                this.qh();
+                this.rp(false);
+                this.qj();
                 break;
             case "TrendLineType":
-                this.qh();
+                this.qj();
                 break;
             case ScatterBase.$$p[4]:
-                this.zd = this.zl();
-                this.rn(false);
+                this.zg = this.zo();
+                this.rp(false);
                 break;
             case ScatterBase.$$p[3]:
-                this.zc = this.zk();
-                this.rn(false);
+                this.zf = this.zn();
+                this.rp(false);
                 break;
             case ScatterBase.$$p[5]:
-                this.yy = this.yz();
+                this.y1 = this.y2();
                 break;
         }
     };
-    ScatterBase.prototype.zl = function () {
-        return this.zh;
+    ScatterBase.prototype.zo = function () {
+        return this.zk;
     };
-    ScatterBase.prototype.zk = function () {
-        return this.zg;
+    ScatterBase.prototype.zn = function () {
+        return this.zj;
     };
-    ScatterBase.prototype.zf = function (a) {
+    ScatterBase.prototype.zi = function (a) {
         if (typeCast(NumericYAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.ze = function (a) {
+    ScatterBase.prototype.zh = function (a) {
         if (typeCast(NumericXAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.abi = function () {
-        this.acc = Rect.empty;
-        this.acd = Rect.empty;
+    ScatterBase.prototype.abm = function () {
+        this.acg = Rect.empty;
+        this.ach = Rect.empty;
     };
-    ScatterBase.prototype.aav = function () {
-        var a = this.getViewInfo(this.acc, this.acd);
-        this.acc = a.p0;
-        this.acd = a.p1;
+    ScatterBase.prototype.aay = function () {
+        var a = this.getViewInfo(this.acg, this.ach);
+        this.acg = a.p0;
+        this.ach = a.p1;
     };
-    ScatterBase.prototype.zj = function (a, b) {
+    ScatterBase.prototype.zm = function (a, b) {
         if (b != 3) {
             return true;
         }
         if (a == null) {
             return true;
         }
-        if (this.aal == a || this.aat == a) {
+        if (this.aao == a || this.aaw == a) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.o9 = function (a, b, c, d) {
+    ScatterBase.prototype.pa = function (a, b, c, d) {
         var e = false;
-        if (!this.zj(d, a)) {
+        if (!this.zm(d, a)) {
             return;
         }
-        this.yp.c2.g$e(a, b, c, d);
+        this.ys.c2.g$e(a, b, c, d);
         if (this.xAxis != null && !this.xAxis.c1()) {
             e = true;
         }
@@ -542,29 +543,29 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             e = true;
         }
         if (a == 0 || a == 2 || a == 3 || a == 4) {
-            this.zb = true;
+            this.ze = true;
         }
         else if (a == 1) {
             for (var f = b; f < b + c; f++) {
-                this.zq += this.y9.item(f);
-                this.zr += this.za.item(f);
+                this.zt += this.zc.item(f);
+                this.zu += this.zd.item(f);
             }
-            this.zs = this.zq / this.y9.count;
-            this.zt = this.zr / this.za.count;
+            this.zv = this.zt / this.zc.count;
+            this.zw = this.zu / this.zd.count;
         }
         if (e) {
-            this.rn(true);
+            this.rp(true);
         }
     };
-    ScatterBase.prototype.aa9 = function (a) {
-        this.aba(a, null);
+    ScatterBase.prototype.abd = function (a) {
+        this.abe(a, null);
     };
-    ScatterBase.prototype.aba = function (a, b) {
+    ScatterBase.prototype.abe = function (a, b) {
         var e_1, _a, e_2, _b;
-        var c = this.y9 != null ? this.y9.count : 0;
-        var d = this.za != null ? this.za.count : 0;
+        var c = this.zc != null ? this.zc.count : 0;
+        var d = this.zd != null ? this.zd.count : 0;
         var e = Math.min(c, d);
-        if (e <= this.z1) {
+        if (e <= this.z4) {
             a.m.clear();
             var f = new List$1(OwnedPoint.$, 0);
             try {
@@ -586,7 +587,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                         throw e_1.error;
                 }
             }
-            var h_1 = this.dl;
+            var h_1 = this.dm;
             f.aa(function (i, j) {
                 var k = h_1.indexOf(i.a);
                 var l = h_1.indexOf(j.a);
@@ -629,78 +630,78 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.ax = function (a) {
-        if (a != null && a == this.xAxis && this.y9 != null) {
-            return new AxisRange(this.y9.minimum, this.y9.maximum);
+    ScatterBase.prototype.ay = function (a) {
+        if (a != null && a == this.xAxis && this.zc != null) {
+            return new AxisRange(this.zc.minimum, this.zc.maximum);
         }
-        if (a != null && a == this.yAxis && this.za != null) {
-            return new AxisRange(this.za.minimum, this.za.maximum);
+        if (a != null && a == this.yAxis && this.zd != null) {
+            return new AxisRange(this.zd.minimum, this.zd.maximum);
         }
         return null;
     };
-    ScatterBase.prototype.kl = function (a) {
-        var b = this.j1(a);
-        if (this.dl != null && b >= 0 && b < this.dl.count) {
-            return this.dl.item(b);
+    ScatterBase.prototype.km = function (a) {
+        var b = this.j2(a);
+        if (this.dm != null && b >= 0 && b < this.dm.count) {
+            return this.dm.item(b);
         }
         return null;
     };
-    Object.defineProperty(ScatterBase.prototype, "yy", {
+    Object.defineProperty(ScatterBase.prototype, "y1", {
         get: function () {
-            return this.yx;
+            return this.y0;
         },
         set: function (a) {
-            var b = this.yx;
-            this.yx = a;
-            if (b != this.yx) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.yx));
+            var b = this.y0;
+            this.y0 = a;
+            if (b != this.y0) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.y0));
             }
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.yz = function () {
-        if (this.y0 != 0) {
-            return this.y0;
+    ScatterBase.prototype.y2 = function () {
+        if (this.y3 != 0) {
+            return this.y3;
         }
-        return this.zi ? 4 : 1;
+        return this.zl ? 4 : 1;
     };
-    ScatterBase.prototype.j1 = function (a) {
-        var b = truncate(Math.round(this.ip(a)));
+    ScatterBase.prototype.j2 = function (a) {
+        var b = truncate(Math.round(this.iq(a)));
         return b;
     };
-    ScatterBase.prototype.ip = function (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);
+    ScatterBase.prototype.iq = function (a) {
+        switch (this.y1) {
+            case 1: return this.z0(a);
+            case 3: return this.z1(a);
+            case 2: return this.zy(a);
+            case 4: return this.zz(a);
+            case 5: return this.zx(a);
         }
         return -1;
     };
-    ScatterBase.prototype.zw = function (a) {
-        return this.zz(a, false);
+    ScatterBase.prototype.zz = function (a) {
+        return this.z2(a, false);
     };
-    ScatterBase.prototype.zv = function (a) {
-        var b = this.v1(a);
+    ScatterBase.prototype.zy = function (a) {
+        var b = this.v3(a);
         var c = b.x;
         var d = b.y;
-        if (this.dl == null || this.xAxis == null || this.yAxis == null || this.y9 == null || this.za == null) {
+        if (this.dm == null || this.xAxis == null || this.yAxis == null || this.zc == null || this.zd == null) {
             return -1;
         }
-        if (this.dl.count > this.z0) {
+        if (this.dm.count > this.z3) {
             return -1;
         }
-        this.aay();
-        var e = this.ye;
-        var f = this.yf;
+        this.aa1();
+        var e = this.yh;
+        var f = this.yi;
         if (e == null || f == null) {
             return -1;
         }
         var g = 1.7976931348623157E+308;
         var h = -1;
-        for (var i = 0; i < this.y9.count; i++) {
+        for (var i = 0; i < this.zc.count; i++) {
             var j = e[i];
             var k = f[i];
             var l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -711,69 +712,69 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h;
     };
-    ScatterBase.prototype.aay = function () {
+    ScatterBase.prototype.aa1 = function () {
         var _this = this;
-        var a = this.ct.by;
-        var b = this.ct.bx;
+        var a = this.cu.by;
+        var b = this.cu.bx;
         var c = this.getEffectiveViewport();
-        if (this.yo == null) {
+        if (this.yr == null) {
             return;
         }
-        var d = new ScalerParams(0, a, b, this.yo.d, c);
+        var d = new ScalerParams(0, a, b, this.yr.d, c);
         var e = ((function () {
-            var $ret = new ScalerParams(0, a, b, _this.yo.e, c);
-            $ret.b = _this.iw();
+            var $ret = new ScalerParams(0, a, b, _this.yr.e, c);
+            $ret.b = _this.ix();
             return $ret;
         })());
-        if (this.ye == null || this.yf == null) {
-            var f = arrayShallowClone(this.y9.asArray());
-            var g = arrayShallowClone(this.za.asArray());
+        if (this.yh == null || this.yi == null) {
+            var f = arrayShallowClone(this.zc.asArray());
+            var g = arrayShallowClone(this.zd.asArray());
             this.xAxis.ho(boxArray$1(f), 0, f.length, d);
             this.yAxis.ho(boxArray$1(g), 0, g.length, e);
-            this.ye = f;
-            this.yf = g;
+            this.yh = f;
+            this.yi = g;
         }
     };
-    ScatterBase.prototype.get_zi = function () {
+    ScatterBase.prototype.get_zl = function () {
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "zi", {
+    Object.defineProperty(ScatterBase.prototype, "zl", {
         get: function () {
-            return this.get_zi();
+            return this.get_zl();
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.zz = function (a, b) {
-        if (!this.zi) {
+    ScatterBase.prototype.z2 = function (a, b) {
+        if (!this.zl) {
             return -1;
         }
         var c = { $type: Point_$type, x: 0, y: 0 };
         var d = true;
-        var e = this.yt();
+        var e = this.yw();
         if (e == null) {
             return -1;
         }
         if (e.m == null) {
             return -1;
         }
-        if (this.dl == null || this.dl.count > this.z0) {
+        if (this.dm == null || this.dm.count > this.z3) {
             return -1;
         }
-        this.aay();
-        var f = this.ye;
-        var g = this.yf;
+        this.aa1();
+        var f = this.yh;
+        var g = this.yi;
         if (f == null || g == null) {
             return -1;
         }
-        var h = this.v1(a);
+        var h = this.v3(a);
         var i = 1.7976931348623157E+308;
         var j = -1;
-        for (var k = 0; k < this.ye.length; k++) {
-            var l = { $type: Point_$type, x: this.ye[k], y: this.yf[k] };
+        for (var k = 0; k < this.yh.length; k++) {
+            var l = { $type: Point_$type, x: this.yh[k], y: this.yi[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);
+                if (!b || e.j.containsKey(this.dm.item(k)) || e.j.containsKey(this.dm.item(k - 1))) {
+                    var m = GeometryUtil.h(h, c, l);
                     if (m < i) {
                         i = m;
                         j = k;
@@ -783,13 +784,13 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             c = l;
         }
         if (j >= 0) {
-            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);
+            var n = { $type: Point_$type, x: this.yh[j], y: this.yi[j] };
+            var o = { $type: Point_$type, x: this.yh[j - 1], y: this.yi[j - 1] };
+            if (!b || (e.j.containsKey(this.dm.item(j)) && e.j.containsKey(this.dm.item(j - 1)))) {
+                var p = GeometryUtil.m(h, o, n);
                 return (j - 1) + p;
             }
-            else if (e.j.containsKey(this.dl.item(j))) {
+            else if (e.j.containsKey(this.dm.item(j))) {
                 return j;
             }
             else {
@@ -798,25 +799,25 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.zy = function (a) {
-        return this.zz(a, true);
+    ScatterBase.prototype.z1 = function (a) {
+        return this.z2(a, true);
     };
-    ScatterBase.prototype.zu = function (a) {
+    ScatterBase.prototype.zx = function (a) {
         var _this = this;
-        var b = this.v1(a);
+        var b = this.v3(a);
         var c = b.x;
         var d = b.y;
-        if (this.yp.c3.e > this.z0) {
+        if (this.ys.c3.e > this.z3) {
             return -1;
         }
         var e = -1;
-        this.wy.ck(function (f) {
-            var g = _this.yp.cu(f);
+        this.w1.ck(function (f) {
+            var g = _this.ys.cu(f);
             var h = g.left;
             var i = g.top;
             var j = g.width;
             var k = g.height;
-            if (_this.w5) {
+            if (_this.w8) {
                 var l = h + j / 2;
                 var m = i + k / 2;
                 var n = (j / 2) * (j / 2);
@@ -837,19 +838,19 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         });
         return e;
     };
-    ScatterBase.prototype.zx = function (a) {
+    ScatterBase.prototype.z0 = function (a) {
         var _this = this;
         var b = null;
         var c = 1.7976931348623157E+308;
-        var d = this.v1(a);
+        var d = this.v3(a);
         var e = d.x;
         var f = d.y;
-        if (this.yp.c3.e > this.z0) {
+        if (this.ys.c3.e > this.z3) {
             return -1;
         }
-        this.yp.da(function (g) {
+        this.ys.da(function (g) {
             if (g._visibility == 0) {
-                var h = _this.yp.cu(g);
+                var h = _this.ys.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,22 +865,22 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.v6 = function (a, b, c) {
+    ScatterBase.prototype.v8 = function (a, b, c) {
         var _this = this;
-        if (this.xAxis == null || this.yAxis == null || this.y9 == null || this.za == null) {
+        if (this.xAxis == null || this.yAxis == null || this.zc == null || this.zd == null) {
             return { $type: Point_$type, x: NaN, y: NaN };
         }
-        var d = this.ct.by;
-        var e = this.ct.bx;
+        var d = this.cu.by;
+        var e = this.cu.bx;
         var f = this.getEffectiveViewport();
         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.iw();
+            $ret.b = _this.ix();
             return $ret;
         })());
         if (b) {
-            var i = this.ip(a);
+            var i = this.iq(a);
             if (i == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
@@ -891,52 +892,52 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             if (k < 0) {
                 k = 0;
             }
-            if (k > this.dl.count - 1) {
-                k = this.dl.count - 1;
+            if (k > this.dm.count - 1) {
+                k = this.dm.count - 1;
             }
-            if (j > this.dl.count - 1) {
-                j = this.dl.count - 1;
+            if (j > this.dm.count - 1) {
+                j = this.dm.count - 1;
             }
             if (k == j) {
-                var l = this.xAxis.ek(this.y9.item(j), g);
-                var m = this.yAxis.ek(this.za.item(j), h);
+                var l = this.xAxis.ek(this.zc.item(j), g);
+                var m = this.yAxis.ek(this.zd.item(j), h);
                 return { $type: Point_$type, x: l, y: m };
             }
             var n = i - Math.floor(i);
-            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 o = this.xAxis.ek(this.zc.item(j), g);
+            var p = this.yAxis.ek(this.zd.item(j), h);
+            var q = this.xAxis.ek(this.zc.item(k), g);
+            var r = this.yAxis.ek(this.zd.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.j1(a);
+            var u = this.j2(a);
             if (u == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            var v = this.xAxis.ek(this.y9.item(u), g);
-            var w = this.yAxis.ek(this.za.item(u), h);
+            var v = this.xAxis.ek(this.zc.item(u), g);
+            var w = this.yAxis.ek(this.zd.item(u), h);
             return { $type: Point_$type, x: v, y: w };
         }
     };
-    ScatterBase.prototype.gb = function (a) {
+    ScatterBase.prototype.gc = function (a) {
         var _this = this;
-        var b = this.c9 != null ? this.c9.vl : Rect.empty;
+        var b = this.da != null ? this.da.vx : Rect.empty;
         b = b.copy();
-        var c = this.c9 != null ? this.c9.v0 : Rect.empty;
+        var c = this.da != null ? this.da.wc : Rect.empty;
         var d = new Rect(0, 0, 0, 1, 1);
-        var e = this.wf(this.ct);
+        var e = this.wh(this.cu);
         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.iw();
+            $ret.b = _this.ix();
             return $ret;
         })());
-        var h = !b.isEmpty && !c.isEmpty && this.dl != null ? this.dl.indexOf(a) : -1;
-        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;
+        var h = !b.isEmpty && !c.isEmpty && this.dm != null ? this.dm.indexOf(a) : -1;
+        var i = this.xAxis != null && this.zc != null && h < this.zc.count ? this.xAxis.ek(this.zc.item(h), f) : NaN;
+        var j = this.yAxis != null && this.zd != null && h < this.zd.count ? this.yAxis.ek(this.zd.item(h), g) : NaN;
         if (!isNaN_(i)) {
             if (i < b.left + 0.1 * b.width) {
                 i = i + 0.4 * b.width;
@@ -957,58 +958,58 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 b.y = j - 0.5 * b.height;
             }
         }
-        if (this.c1 != null) {
-            this.c1.au(this.c9, b, true);
+        if (this.c2 != null) {
+            this.c2.au(this.da, b, true);
         }
         return h >= 0;
     };
-    ScatterBase.prototype.sk = function (a, b) {
-        this.rn(false);
+    ScatterBase.prototype.sm = function (a, b) {
+        this.rp(false);
     };
-    ScatterBase.prototype.sl = function (a, b) {
-        this.rn(false);
+    ScatterBase.prototype.sn = function (a, b) {
+        this.rp(false);
     };
-    ScatterBase.prototype.yt = function () {
-        var a = this.ys;
-        if (this.d1()) {
-            if (this.da.g) {
-                this.da.t();
+    ScatterBase.prototype.yw = function () {
+        var a = this.yv;
+        if (this.d2()) {
+            if (this.db.g) {
+                this.db.t();
             }
-            a = this.yw;
+            a = this.yz;
         }
         return a;
     };
-    ScatterBase.prototype.aaw = function (a, b, c, d, e) {
+    ScatterBase.prototype.aaz = function (a, b, c, d, e) {
         var _this = this;
         b.g = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
         var f = this.getEffectiveViewport1(a);
-        var g = this.dl;
+        var g = this.dm;
         var h;
         var i;
         var j = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.yo.d, f);
+            var $ret = new ScalerParams(0, d, e, _this.yr.d, f);
             $ret.c = _this.getEffectiveViewport1(a);
             return $ret;
         })());
         var k = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.yo.e, f);
+            var $ret = new ScalerParams(0, d, e, _this.yr.e, f);
             $ret.c = _this.getEffectiveViewport1(a);
-            $ret.b = _this.iw();
+            $ret.b = _this.ix();
             return $ret;
         })());
         var l = false;
         var m = 0;
-        if (this.c9 != null) {
-            if (this.c9.fz()) {
-                var n = this.c9.mt(d, j);
+        if (this.da != null) {
+            if (this.da.f2()) {
+                var n = this.da.mz(d, j);
                 l = n.c;
                 m = n.d;
             }
         }
         var _loop_1 = function (o) {
-            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) };
+            h = this_1.zc.item(o);
+            i = this_1.zd.item(o);
+            var p = { $type: Point_$type, x: this_1.yr.a.ek(h, j), y: this_1.yr.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 +1037,17 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             _loop_1(o);
         }
     };
-    ScatterBase.prototype.aa6 = function (a, b) {
+    ScatterBase.prototype.aba = function (a, b) {
         var _this = this;
-        this.ye = null;
-        this.yf = null;
+        this.yh = null;
+        this.yi = null;
         a.j.clear();
         a.n.clear();
         a.h.clear();
         a.l.clear();
         a.i.clear();
         a.k.clear();
-        var c = Math.min(this.y9 != null ? this.y9.count : 0, this.za != null ? this.za.count : 0);
+        var c = Math.min(this.zc != null ? this.zc.count : 0, this.zd != null ? this.zd.count : 0);
         var d = b.by;
         var e = b.bx;
         var f = this.getEffectiveViewport1(b);
@@ -1054,68 +1055,68 @@ 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.iw();
+            $ret.b = _this.ix();
             return $ret;
         })());
         h.c = this.getEffectiveViewport1(b);
         if (c < 1) {
             return;
         }
-        this.yo = ((function () {
+        this.yr = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
             $ret.d = _this.xAxis.ch;
             $ret.e = _this.yAxis.ch;
-            $ret.c = _this.dl;
+            $ret.c = _this.dm;
             return $ret;
         })());
         var i = b;
-        if (c <= this.z1) {
-            this.aaw(i, a, c, d, e);
+        if (c <= this.z4) {
+            this.aaz(i, a, c, d, e);
         }
-        if (this.w8()) {
-            b.c0.l(a.j, this.z1, d, e, this.ib);
+        if (this.xb()) {
+            b.c0.l(a.j, this.z4, d, e, this.ic);
         }
         var j = ((function () {
             var $ret = new Clipper(0, e, false);
             $ret.i = a.n;
             return $ret;
         })());
-        var k = this.wd(b);
+        var k = this.wf(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.y9, this.za, 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.zc, this.zd, 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.d = _this.ic;
             $ret.i = e;
             $ret.h = f;
             $ret.j = d;
             return $ret;
         })()), j, l, m);
-        this.aa4(a, b);
+        this.aa8(a, b);
     };
-    ScatterBase.prototype.o3 = function (a, b) {
-        _super.prototype.o3.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_fc = function () {
+    ScatterBase.prototype.get_fd = function () {
         return true;
     };
-    ScatterBase.prototype.y3 = function (a, b, c) {
+    ScatterBase.prototype.y6 = function (a, b, c) {
         return null;
     };
-    ScatterBase.prototype.y4 = function (a, b, c) {
-        if (this.dl == null) {
+    ScatterBase.prototype.y7 = function (a, b, c) {
+        if (this.dm == null) {
             return null;
         }
-        var d = this.yt();
-        var e = this.yp.b1(this.v1(b));
+        var d = this.yw();
+        var e = this.ys.b1(this.v3(b));
         var f = -1;
         if (e == null) {
             if (a != null) {
-                f = this.dl.indexOf(a);
+                f = this.dm.indexOf(a);
             }
             else {
                 return null;
@@ -1138,11 +1139,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return g;
     };
-    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);
+    ScatterBase.prototype.wq = function (a, b) {
+        if (this.w3 != 1 && this.w3 != 13) {
+            var c = this.w1.cv();
+            var d = (c.width / 2) + (this.xe / 2);
+            var e = (c.height / 2) + (this.xe / 2);
             var f = d;
             var g = d;
             var h = e;
@@ -1163,53 +1164,53 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Thickness(1, 0, 0, 0, 0);
     };
-    ScatterBase.prototype.y2 = function (a, b, c) {
+    ScatterBase.prototype.y5 = function (a, b, c) {
         var d = new HighlightingInfo();
         d.i = this;
         d.g = 0;
-        d.f = this.dl.count - 1;
+        d.f = this.dm.count - 1;
         d.c = true;
         if (c != null && c.g == d.g && c.f == d.f) {
             return c;
         }
         return d;
     };
-    ScatterBase.prototype.de = function (a, b, c) {
-        if (this.eb && this.fx(this.bv) && !c) {
-            var d = this.y3(a, b, this.y5);
-            this.y5 = d;
+    ScatterBase.prototype.df = function (a, b, c) {
+        if (this.ec && this.fy(this.bw) && !c) {
+            var d = this.y6(a, b, this.y8);
+            this.y8 = d;
             return d;
         }
         else {
-            var e = this.y2(a, b, this.y5);
-            this.y5 = e;
+            var e = this.y5(a, b, this.y8);
+            this.y8 = e;
             return e;
         }
     };
-    ScatterBase.prototype.df = function (a, b, c) {
-        if (this.fx(this.bv) && !c) {
-            var d = this.y4(a, b, this.y6);
-            this.y6 = d;
+    ScatterBase.prototype.dg = function (a, b, c) {
+        if (this.fy(this.bw) && !c) {
+            var d = this.y7(a, b, this.y9);
+            this.y9 = d;
             return d;
         }
         else {
-            var e = this.y2(a, b, this.y6);
+            var e = this.y5(a, b, this.y9);
             e.d = true;
-            this.y6 = e;
+            this.y9 = e;
             return e;
         }
     };
-    ScatterBase.prototype.zn = function () {
-        return (this.assigningScatterStyle != null && this.zd) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
+    ScatterBase.prototype.zq = function () {
+        return (this.assigningScatterStyle != null && this.zg) || this.d1 || (this.bw != 1) || (this.co != 1) || (this.cn != 1);
     };
-    ScatterBase.prototype.zm = function () {
-        return (this.assigningScatterMarkerStyle != null && this.zc) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
+    ScatterBase.prototype.zp = function () {
+        return (this.assigningScatterMarkerStyle != null && this.zf) || this.d1 || (this.bw != 1) || (this.co != 1) || (this.cn != 1);
     };
-    ScatterBase.prototype.abh = function (a, b) {
+    ScatterBase.prototype.abl = function (a, b) {
         var _this = this;
-        this.qt();
+        this.qv();
         var c = b.bx;
-        this.yo = ((function () {
+        this.yr = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
@@ -1217,10 +1218,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.e = _this.yAxis.ch;
             return $ret;
         })());
-        if (this.w8()) {
-            b.c0.j(a.j, this.xa);
-            if (this.zm()) {
-                this.aax(b, a);
+        if (this.xb()) {
+            b.c0.j(a.j, this.xd);
+            if (this.zp()) {
+                this.aa0(b, a);
             }
         }
         b.cr();
@@ -1230,31 +1231,126 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return $ret;
         })());
         b.c2.g$h(a.n, d);
-        this.abe(a, b);
+        this.abi(a, b);
+    };
+    ScatterBase.prototype.ak = function (a, b) {
+        var c = new List$1(ChartSelection.$, 0);
+        this.p1(a, c, b);
+        return c.toArray();
+    };
+    ScatterBase.prototype.p1 = function (a, b, c) {
+        this.aa2(a, b, c, 0, null);
+    };
+    ScatterBase.prototype.aa2 = function (a, b, c, d, e) {
+        var _this = this;
+        var f = this.wn(a);
+        var g = this.dm.count;
+        var h = this.yr.a;
+        var i = this.yr.b;
+        var j = this.wf(this.cu);
+        var k = new ScalerParams(0, f, this.da.wc, h.ch, this.getEffectiveViewport());
+        var l = new ScalerParams(0, f, this.da.wc, i.ch, this.getEffectiveViewport());
+        if (d == 0) {
+            var _loop_2 = function (m) {
+                var n = h.ek(this_2.zc.item(m), k);
+                var o = i.ek(this_2.zd.item(m), l);
+                if (n < j.width && n > 0 && o < j.height && o > 0) {
+                    if (c == 7 || c == 6) {
+                        b.add(((function () {
+                            var $ret = new ChartSelection();
+                            $ret.series = _this;
+                            return $ret;
+                        })()));
+                        return { value: void 0 };
+                    }
+                    else if (c == 2 || c == 1) {
+                        b.add(((function () {
+                            var $ret = new ChartSelection();
+                            $ret.item = _this.dm.item(m);
+                            return $ret;
+                        })()));
+                    }
+                    else {
+                        b.add(((function () {
+                            var $ret = new ChartSelection();
+                            $ret.item = _this.dm.item(m);
+                            $ret.series = _this;
+                            return $ret;
+                        })()));
+                    }
+                }
+            };
+            var this_2 = this;
+            for (var m = 0; m < g; m++) {
+                var state_1 = _loop_2(m);
+                if (typeof state_1 === "object")
+                    return state_1.value;
+            }
+        }
+        else {
+            var _loop_3 = function (p) {
+                var q = h.ek(this_3.zc.item(p), k);
+                var r = i.ek(this_3.zd.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);
+                if (j.intersectsWith(u)) {
+                    if (c == 7 || c == 6) {
+                        b.add(((function () {
+                            var $ret = new ChartSelection();
+                            $ret.series = _this;
+                            return $ret;
+                        })()));
+                        return { value: void 0 };
+                    }
+                    else if (c == 2 || c == 1) {
+                        b.add(((function () {
+                            var $ret = new ChartSelection();
+                            $ret.item = _this.dm.item(p);
+                            return $ret;
+                        })()));
+                    }
+                    else {
+                        b.add(((function () {
+                            var $ret = new ChartSelection();
+                            $ret.item = _this.dm.item(p);
+                            $ret.series = _this;
+                            return $ret;
+                        })()));
+                    }
+                }
+            };
+            var this_3 = this;
+            for (var p = 0; p < g; p++) {
+                var state_2 = _loop_3(p);
+                if (typeof state_2 === "object")
+                    return state_2.value;
+            }
+        }
     };
-    ScatterBase.prototype.yh = function (a, b) {
-        return this.yi(a, b);
+    ScatterBase.prototype.yk = function (a, b) {
+        return this.yl(a, b);
     };
-    ScatterBase.prototype.yi = function (a, b) {
-        if (b < a || a < 0 || a > this.y9.count || b < 0 || b > this.y9.count) {
+    ScatterBase.prototype.yl = function (a, b) {
+        if (b < a || a < 0 || a > this.zc.count || b < 0 || b > this.zc.count) {
             return null;
         }
         var c = new Array((b - a) + 1);
         for (var d = a; d <= b; d++) {
             var e = d;
-            c[d - a] = this.dl.item(d);
+            c[d - a] = this.dm.item(d);
         }
         return c;
     };
-    ScatterBase.prototype.aax = function (a, b) {
+    ScatterBase.prototype.aa0 = function (a, b) {
         var _this = this;
         a.b7 = true;
-        this.y1.ay(this, this.zm(), runOn(this, this.yh));
-        var c = this.y1.d;
+        this.y4.ay(this, this.zp(), runOn(this, this.yk));
+        var c = this.y4.d;
         var d = c != null;
         var e = this.getEffectiveViewport1(a);
-        var f = this.dl == null ? 0 : this.dl.count;
-        this.yp.cj(function (g) {
+        var f = this.dm == null ? 0 : this.dm.count;
+        this.ys.cj(function (g) {
             if (g._visibility == 0) {
                 var h = g.ak;
                 var i = g.content;
@@ -1263,99 +1359,99 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     g.content = i;
                 }
                 if (d) {
-                    _this.aa1(h, f, a.q);
+                    _this.aa5(h, f, a.q);
                 }
-                _this.y1.ac(g, i);
+                _this.y4.ac(g, i);
             }
         });
     };
-    ScatterBase.prototype.aa2 = function (a, b, c) {
-        var d = this.bv != 1;
-        var e = this.cn != 1;
-        var f = this.cm != 1;
-        this.y1.a0(this.y1.b, a, b, false);
-        this.y1.ab(this.h9);
-        var g = this.y1.ax;
+    ScatterBase.prototype.aa6 = function (a, b, c) {
+        var d = this.bw != 1;
+        var e = this.co != 1;
+        var f = this.cn != 1;
+        this.y4.a0(this.y4.b, a, b, false);
+        this.y4.ab(this.ia);
+        var g = this.y4.ax;
         var h = null;
         var i = null;
         var j = null;
-        var k = this.dl;
-        if (d && this.c9 != null) {
-            h = this.c9.dj.getHighlightingInfo(this, k, g.z, g.y, false);
+        var k = this.dm;
+        if (d && this.da != null) {
+            h = this.da.dk.getHighlightingInfo(this, k, g.z, g.y, false);
             g.c = h;
         }
-        if (e && this.c9 != null) {
-            h = this.c9.dk.getHighlightingInfo(this, k, g.z, g.y, false);
+        if (e && this.da != null) {
+            h = this.da.dl.getHighlightingInfo(this, k, g.z, g.y, false);
             g.d = h;
         }
-        if (f && this.c9 != null) {
-            h = this.c9.di.getHighlightingInfo(this, k, g.z, g.y, false);
+        if (f && this.da != null) {
+            h = this.da.dj.getHighlightingInfo(this, k, g.z, g.y, false);
             g.b = h;
         }
         g.h = c;
-        this.abc(g);
-        this.y1.z(this, h, i, j, c, d, e, f, a < 0);
-    };
-    ScatterBase.prototype.aa1 = function (a, b, c) {
-        var d = this.bv != 1;
-        var e = this.cn != 1;
-        var f = this.cm != 1;
-        this.y1.a0(this.y1.d, a, b, true);
-        this.y1.aa(this.h9);
-        var g = this.y1.aw;
+        this.abg(g);
+        this.y4.z(this, h, i, j, c, d, e, f, a < 0);
+    };
+    ScatterBase.prototype.aa5 = function (a, b, c) {
+        var d = this.bw != 1;
+        var e = this.co != 1;
+        var f = this.cn != 1;
+        this.y4.a0(this.y4.d, a, b, true);
+        this.y4.aa(this.ia);
+        var g = this.y4.aw;
         var h = null;
         var i = null;
         var j = null;
-        var k = this.dl;
+        var k = this.dm;
         var l = null;
         var m = null;
         var n = null;
-        if (d && this.c9 != null) {
-            h = this.c9.dj.getHighlightingInfo(this, k, g.z, g.y, true);
-            if (this.c9.dj.isCrossContextHighlight(this)) {
-                l = this.c9.dj.getHighlightingInfo(this, k, g.z, g.y, true);
+        if (d && this.da != null) {
+            h = this.da.dk.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (this.da.dk.isCrossContextHighlight(this)) {
+                l = this.da.dk.getHighlightingInfo(this, k, g.z, g.y, true);
             }
             g.c = h;
         }
-        if (e && this.c9 != null) {
-            i = this.c9.dk.getHighlightingInfo(this, k, g.z, g.y, true);
-            if (i == null && this.bl != null) {
-                i = this.c9.dk.getHighlightingInfo(this.bl, this.bl.dl, g.z, g.y, true);
+        if (e && this.da != null) {
+            i = this.da.dl.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (i == null && this.bm != null) {
+                i = this.da.dl.getHighlightingInfo(this.bm, this.bm.dm, g.z, g.y, true);
             }
-            if (this.c9.dk.isCrossContextHighlight(this)) {
-                m = this.c9.dk.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (this.da.dl.isCrossContextHighlight(this)) {
+                m = this.da.dl.getHighlightingInfo(this, k, g.z, g.y, true);
             }
             g.d = i;
         }
-        if (f && this.c9 != null) {
-            j = this.c9.di.getHighlightingInfo(this, k, g.z, g.y, true);
-            if (this.c9.di.isCrossContextHighlight(this)) {
-                n = this.c9.di.getHighlightingInfo(this, k, g.z, g.y, true);
+        if (f && this.da != null) {
+            j = this.da.dj.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (this.da.dj.isCrossContextHighlight(this)) {
+                n = this.da.dj.getHighlightingInfo(this, k, g.z, g.y, true);
             }
             g.d = i;
         }
         g.h = c;
-        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);
+        this.abf(g);
+        this.y4.y(this, h, i, j, c, d, e, f, g.v, this.da.dk.totalHighWaterMark, g.x, this.da.dl.totalHighWaterMark, g.t, this.da.dj.totalHighWaterMark);
     };
-    ScatterBase.prototype.abc = function (a) {
-        if (this.assigningScatterStyle != null && this.zd) {
+    ScatterBase.prototype.abg = function (a) {
+        if (this.assigningScatterStyle != null && this.zg) {
             this.assigningScatterStyle(this, a);
         }
     };
-    ScatterBase.prototype.abb = function (a) {
-        if (this.assigningScatterMarkerStyle != null && this.zc) {
+    ScatterBase.prototype.abf = function (a) {
+        if (this.assigningScatterMarkerStyle != null && this.zf) {
             this.assigningScatterMarkerStyle(this, a);
         }
     };
-    ScatterBase.prototype.aa4 = function (a, b) {
+    ScatterBase.prototype.aa8 = function (a, b) {
         var e_3, _a;
         var c = new ErrorBarsHelper(this, b);
-        if (this.yq == null) {
+        if (this.yt == null) {
             return;
         }
-        var d = this.yq.u;
-        var e = this.yq.v;
+        var d = this.yt.u;
+        var e = this.yt.v;
         var f = 0;
         var g = 0;
         var h = 0;
@@ -1367,35 +1463,35 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            var l = this.aa7(k, c, d, h, i, true);
+                            var l = this.abb(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            var m = this.aa5(k, c, d, h, i, true);
+                            var m = this.aa9(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            var n = this.aa3(k, c, d, j, h, i, true);
+                            var n = this.aa7(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            var o = this.aa8(c, d, f, h, i, true);
+                            var o = this.abc(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            var p = this.aa5(k, c, d, h, i, true);
+                            var p = this.aa9(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     var q = new OwnedPoint();
-                    q.c = c.l(d, this.yo.a, k.c, f);
+                    q.c = c.l(d, this.yr.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1403,35 +1499,35 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            var r = this.aa7(k, c, e, h, i, false);
+                            var r = this.abb(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            var s = this.aa5(k, c, e, h, i, false);
+                            var s = this.aa9(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            var t = this.aa3(k, c, e, j, h, i, false);
+                            var t = this.aa7(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            var u = this.aa8(c, e, g, h, i, false);
+                            var u = this.abc(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            var v = this.aa5(k, c, e, h, i, false);
+                            var v = this.aa9(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     var w = new OwnedPoint();
-                    w.c = c.m(e, this.yo.b, k.c, g);
+                    w.c = c.m(e, this.yr.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
@@ -1452,18 +1548,18 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.aa7 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.abb = function (a, b, c, d, e, f) {
         if (f) {
             var g = void 0;
             var h = void 0, i = void 0;
-            i = this.yo.a;
-            if (this.yq.s == 0) {
+            i = this.yr.a;
+            if (this.yt.s == 0) {
                 g = a.c.x;
-                h = this.yo.a;
+                h = this.yr.a;
             }
             else {
                 g = a.c.y;
-                h = this.yo.b;
+                h = this.yr.b;
             }
             var j = b.f(g, c, h, i, d, e);
             d = j.p4;
@@ -1472,14 +1568,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         else {
             var k = void 0;
             var l = void 0, m = void 0;
-            m = this.yo.b;
-            if (this.yq.t == 0) {
+            m = this.yr.b;
+            if (this.yt.t == 0) {
                 k = a.c.x;
-                l = this.yo.a;
+                l = this.yr.a;
             }
             else {
                 k = a.c.y;
-                l = this.yo.b;
+                l = this.yr.b;
             }
             var n = b.f(k, c, l, m, d, e);
             d = n.p4;
@@ -1490,14 +1586,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.aa5 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.aa9 = function (a, b, c, d, e, f) {
         if (f) {
-            var g = b.j(a.c.x, c, this.yo.a, d, e);
+            var g = b.j(a.c.x, c, this.yr.a, d, e);
             d = g.p3;
             e = g.p4;
         }
         else {
-            var h = b.j(a.c.y, c, this.yo.b, d, e);
+            var h = b.j(a.c.y, c, this.yr.b, d, e);
             d = h.p3;
             e = h.p4;
         }
@@ -1506,18 +1602,18 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.aa3 = function (a, b, c, d, e, f, g) {
+    ScatterBase.prototype.aa7 = function (a, b, c, d, e, f, g) {
         var h = c.getItemColumn();
-        var i = this.dl.indexOf(d);
+        var i = this.dm.indexOf(d);
         if (h != null && i < h.count) {
             var j = h.item(i);
             if (g) {
-                var k = b.h(a.c.x, j, this.yo.a, e, f);
+                var k = b.h(a.c.x, j, this.yr.a, e, f);
                 e = k.p3;
                 f = k.p4;
             }
             else {
-                var l = b.h(a.c.y, j, this.yo.b, e, f);
+                var l = b.h(a.c.y, j, this.yr.b, e, f);
                 e = l.p3;
                 f = l.p4;
             }
@@ -1531,16 +1627,16 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p5: f
         };
     };
-    ScatterBase.prototype.aa8 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.abc = 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.yo.a, d, e);
+            var h = a.k(c, b, this.yr.a, d, e);
             d = h.p3;
             e = h.p4;
         }
         else {
-            var i = a.k(c, b, this.yo.b, d, e);
+            var i = a.k(c, b, this.yr.b, d, e);
             d = i.p3;
             e = i.p4;
         }
@@ -1550,20 +1646,20 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.abe = function (a, b) {
-        if (!b.o() || this.yq == null) {
+    ScatterBase.prototype.abi = function (a, b) {
+        if (!b.o() || this.yt == null) {
             b.db();
             return;
         }
-        this.abf(a, b);
-        this.abg(a, b);
+        this.abj(a, b);
+        this.abk(a, b);
     };
-    ScatterBase.prototype.abf = function (a, b) {
+    ScatterBase.prototype.abj = function (a, b) {
         var e_4, _a;
         b.c7();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.yq.u;
+        var e = this.yt.u;
         try {
             for (var _b = __values(fromEnum(a.j.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1572,10 +1668,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.yq.o == 1 || this.yq.o == 2) {
+                        if (this.yt.o == 1 || this.yt.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.yq.o == 1 || this.yq.o == 3) {
+                        if (this.yt.o == 1 || this.yt.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1597,12 +1693,12 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         b.dc(d);
     };
-    ScatterBase.prototype.abg = function (a, b) {
+    ScatterBase.prototype.abk = function (a, b) {
         var e_5, _a;
         b.c8();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.yq.v;
+        var e = this.yt.v;
         try {
             for (var _b = __values(fromEnum(a.j.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1611,10 +1707,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.yq.p == 1 || this.yq.p == 2) {
+                        if (this.yt.p == 1 || this.yt.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.yq.p == 1 || this.yq.p == 3) {
+                        if (this.yt.p == 1 || this.yt.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
@@ -1635,107 +1731,107 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.hc = function (a, b, c) {
+    ScatterBase.prototype.hd = 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.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) {
+        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.zc == null || this.zd == null || this.zc.count == 0 || this.zd.count == 0 || this.dm == null || this.dm.count != this.zc.count || this.dm.count != this.zd.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.l2 == this.xAxis.l1 || this.yAxis.l2 == this.yAxis.l1) {
             d = false;
         }
         return d;
     };
     ScatterBase.prototype.getViewInfo = function (a, b) {
-        if (!this.acc.isEmpty && !this.acd.isEmpty) {
-            a = this.acc;
-            b = this.acd;
+        if (!this.acg.isEmpty && !this.ach.isEmpty) {
+            a = this.acg;
+            b = this.ach;
             return {
                 p0: a,
                 p1: b
             };
         }
-        a = this.ct.bx;
-        b = this.ct.by;
+        a = this.cu.bx;
+        b = this.cu.by;
         return {
             p0: a,
             p1: b
         };
     };
-    ScatterBase.prototype.ro = function (a) {
-        _super.prototype.ro.call(this, a);
-        this.aav();
+    ScatterBase.prototype.rq = function (a) {
+        _super.prototype.rq.call(this, a);
+        this.aay();
         try {
-            if (this.d3(this.ct)) {
+            if (this.d4(this.cu)) {
                 return;
             }
-            if (this.dl != null && this.dl.count > this.z1) {
+            if (this.dm != null && this.dm.count > this.z4) {
                 a = false;
             }
-            if (this.gd(a) && !this.gp) {
-                var b = this.yu;
-                if (this.d1()) {
-                    if (this.da.g) {
-                        this.da.t();
+            if (this.ge(a) && !this.gq) {
+                var b = this.yx;
+                if (this.d2()) {
+                    if (this.db.g) {
+                        this.db.t();
                     }
-                    this.yu = this.yw;
-                    this.yw = b;
+                    this.yx = this.yz;
+                    this.yz = b;
                 }
                 else {
-                    this.yu = this.ys;
-                    this.ys = b;
+                    this.yx = this.yv;
+                    this.yv = b;
                 }
-                this.aa6(this.ys, this.yp);
-                this.r1();
+                this.aba(this.yv, this.ys);
+                this.r3();
             }
             else {
-                if (!this.gp) {
-                    this.aa6(this.ys, this.yp);
+                if (!this.gq) {
+                    this.aba(this.yv, this.ys);
                 }
-                this.abh(this.ys, this.yp);
+                this.abl(this.yv, this.ys);
             }
         }
         finally {
-            this.abi();
+            this.abm();
         }
     };
-    ScatterBase.prototype.sb = function () {
-        _super.prototype.sb.call(this);
+    ScatterBase.prototype.sd = function () {
+        _super.prototype.sd.call(this);
         if (this.index < 0) {
             return;
         }
-        this.yp.df();
+        this.ys.df();
     };
-    ScatterBase.prototype.rp = function (a, b) {
-        _super.prototype.rp.call(this, a, b);
-        if (!this.gy) {
-            this.ct.a4(b);
+    ScatterBase.prototype.rr = function (a, b) {
+        _super.prototype.rr.call(this, a, b);
+        if (!this.gz) {
+            this.cu.a4(b);
             return;
         }
-        this.ct.a4(b);
-        if (this.d3(this.cs)) {
+        this.cu.a4(b);
+        if (this.d4(this.ct)) {
             return;
         }
-        var c = typeCast(ScatterBaseView.$, this.cs);
-        if (!this.gq) {
-            this.yv = new ScatterFrame();
-            this.aa6(this.yv, c);
+        var c = typeCast(ScatterBaseView.$, this.ct);
+        if (!this.gr) {
+            this.yy = new ScatterFrame();
+            this.aba(this.yy, c);
         }
-        this.gq = false;
-        this.abh(this.yv, c);
-        this.gy = false;
+        this.gr = false;
+        this.abl(this.yy, c);
+        this.gz = false;
     };
-    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);
+    ScatterBase.prototype.ro = function (a, b, c, d, e) {
+        _super.prototype.ro.call(this, a, b, c, d, e);
+        var f = this.ba.a$j.item(d);
         var g = f;
         f.a3(c);
-        if (this.d3(g)) {
+        if (this.d4(g)) {
             return;
         }
-        if (this.yr == null) {
-            this.yr = new ScatterFrame();
+        if (this.yu == null) {
+            this.yu = new ScatterFrame();
         }
-        this.aa6(this.yr, g);
-        this.abh(this.yr, g);
+        this.aba(this.yu, g);
+        this.abl(this.yu, g);
     };
-    ScatterBase.prototype.abd = function (a, b) {
+    ScatterBase.prototype.abh = function (a, b) {
         var e_6, _a, e_7, _b;
         var c = new List$1(Base.$, 0);
         try {
@@ -1779,11 +1875,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.yg = function (a, b, c, d, e) {
+    ScatterBase.prototype.yj = function (a, b, c, d, e) {
         var _this = this;
-        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++) {
+        if (c == null || c.length != this.yr.c.count) {
+            c = new Array(this.yr.c.count);
+            for (var f = 0; f < this.yr.c.count; f++) {
                 c[f] = PointUtil.create();
             }
         }
@@ -1796,37 +1892,37 @@ 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.iw();
+            $ret.b = _this.ix();
             return $ret;
         })());
-        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 j = this.wf(a);
+        var k = this.yr.a.en(j.left, h);
+        var l = this.yr.a.en(j.right, h);
+        var m = this.yr.b.en(j.bottom, i);
+        var n = this.yr.b.en(j.top, i);
+        if (this.yr.d) {
             var o = k;
             k = l;
             l = o;
         }
-        if (this.yo.e) {
+        if (this.yr.e) {
             var p = m;
             m = n;
             n = p;
         }
-        var q = this.yo;
+        var q = this.yr;
         var r = q.a;
         var s = q.b;
         var t;
         var u;
-        var v = this.y9;
-        var w = this.za;
+        var v = this.zc;
+        var w = this.zd;
         var x = false;
         var y = 0;
         var z = 0;
-        if (this.c9 != null) {
-            if (this.c9.fz()) {
-                var aa = this.c9.mt(d, h);
+        if (this.da != null) {
+            if (this.da.f2()) {
+                var aa = this.da.mz(d, h);
                 x = aa.c;
                 y = aa.d;
                 z = r.en(0 + y, h);
@@ -1834,7 +1930,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 z -= ab;
             }
         }
-        for (var ac = 0; ac < this.yo.c.count; ac++) {
+        for (var ac = 0; ac < this.yr.c.count; ac++) {
             t = v.item(ac);
             u = w.item(ac);
             var ad = 1E-10;
@@ -1867,7 +1963,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ScatterBase.prototype.zp = function (a, b) {
+    ScatterBase.prototype.zs = function (a, b) {
         var e_8, _a;
         if (b == null) {
             b = new List$1(Number_$type, 2, a.e);
@@ -1876,7 +1972,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             b.clear();
         }
         var c = 0;
-        var d = this.dl;
+        var d = this.dm;
         try {
             for (var _b = __values(fromEnum(a.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var e = _c.value;
@@ -1898,32 +1994,32 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    ScatterBase.prototype.pv = function (a) {
-        _super.prototype.pv.call(this, a);
-        this.bb.exportTrendlineData(this, a, this.yp.c2.g$j);
+    ScatterBase.prototype.pw = function (a) {
+        _super.prototype.pw.call(this, a);
+        this.bc.exportTrendlineData(this, a, this.ys.c2.g$j);
     };
-    ScatterBase.prototype.iw = function () {
-        return Series.ix(this.za, null);
+    ScatterBase.prototype.ix = function () {
+        return Series.iy(this.zd, null);
     };
     ScatterBase.prototype.getDataLegendSeriesContextAt = function (a, b) {
         var c = { $type: Point_$type, x: a, y: b };
-        var d = this.kl(c);
-        var e = d == null ? NaN : this.iv(d, "XMemberPath");
-        var f = d == null ? NaN : this.iv(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.aal != null ? this.aal : "X";
-        g.s = this.aah != null ? this.aah : "X:";
-        g.t = this.aaj != null ? this.aaj : "";
+        g.r = this.aao != null ? this.aao : "X";
+        g.s = this.aak != null ? this.aak : "X:";
+        g.t = this.aam != null ? this.aam : "";
         var h = new DataLegendSeriesValueInfo();
         h.l = f;
         h.a = 14;
         h.q = "Y";
-        h.r = this.aat != null ? this.aat : "Y";
-        h.s = this.aap != null ? this.aap : "Y:";
-        h.t = this.aar != null ? this.aar : "";
+        h.r = this.aaw != null ? this.aaw : "Y";
+        h.s = this.aas != null ? this.aas : "Y:";
+        h.t = this.aau != null ? this.aau : "";
         var i = new DataLegendSeriesContext();
         i.e = ((function () {
             var $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -1931,30 +2027,30 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.add(h);
             return $ret;
         })());
-        i.h = this.ma();
+        i.h = this.mb();
         return i;
     };
-    ScatterBase.prototype.abj = function () {
-        if (this.zb) {
-            this.zq = 0;
-            this.zr = 0;
-            for (var a = 0; a < this.y9.count; a++) {
-                this.zq += this.y9.item(a);
-                this.zr += this.za.item(a);
+    ScatterBase.prototype.abn = function () {
+        if (this.ze) {
+            this.zt = 0;
+            this.zu = 0;
+            for (var a = 0; a < this.zc.count; a++) {
+                this.zt += this.zc.item(a);
+                this.zu += this.zd.item(a);
             }
-            this.zs = this.zq / this.y9.count;
-            this.zt = this.zr / this.za.count;
-            this.zb = false;
+            this.zv = this.zt / this.zc.count;
+            this.zw = this.zu / this.zd.count;
+            this.ze = false;
         }
     };
-    ScatterBase.prototype.i6 = function (a, b) {
+    ScatterBase.prototype.i7 = function (a, b) {
         if (b == null || !b.cj) {
             return NaN;
         }
         if (b != this.xAxis && b != this.yAxis) {
             return NaN;
         }
-        var c = this.ap(a);
+        var c = this.aq(a);
         if (b.cp) {
             return c[1];
         }
@@ -1962,49 +2058,49 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return c[0];
         }
     };
-    ScatterBase.prototype.ap = function (a) {
+    ScatterBase.prototype.aq = function (a) {
         var b = NaN;
         var c = NaN;
         switch (a) {
             case 5:
             case 2:
-                b = this.y9.maximum;
-                c = this.za.maximum;
+                b = this.zc.maximum;
+                c = this.zd.maximum;
                 break;
             case 4:
             case 1:
-                b = this.y9.minimum;
-                c = this.za.minimum;
+                b = this.zc.minimum;
+                c = this.zd.minimum;
                 break;
             case 6:
             case 3:
-                if (this.zb) {
-                    this.abj();
+                if (this.ze) {
+                    this.abn();
                 }
-                b = this.zs;
-                c = this.zt;
+                b = this.zv;
+                c = this.zw;
                 break;
         }
         return [b, c];
     };
-    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);
+    ScatterBase.prototype.wc = function (a) {
+        var b = this.getEffectiveViewport1(this.cu);
+        var c = new ScalerParams(0, this.cu.by, this.cu.bx, this.xAxis.ch, b);
         c.c = b;
         var d = isNaN_(a[0]) ? NaN : this.xAxis.ek(a[0], c);
-        c = new ScalerParams(0, this.ct.by, this.ct.bx, this.yAxis.ch, b);
-        c.b = this.iw();
+        c = new ScalerParams(0, this.cu.by, this.cu.bx, this.yAxis.ch, b);
+        c.b = this.ix();
         c.c = b;
         var e = isNaN_(a[1]) ? NaN : this.yAxis.ek(a[1], c);
         return { $type: Point_$type, x: d, y: e };
     };
-    ScatterBase.prototype.v9 = function (a) {
-        var b = this.ap(a);
-        return this.wa(b);
+    ScatterBase.prototype.wb = function (a) {
+        var b = this.aq(a);
+        return this.wc(b);
     };
     ScatterBase.$t = markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    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)]]);
+    ScatterBase.abo = 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:yt:abp', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:z8:abq', [2, null], 'HighlightedYMemberPath:aaa:abr', [2, null], 'IsCustomScatterMarkerStyleAllowed:zj:abs', [0, false], 'IsCustomScatterStyleAllowed:zk:abt', [0, false], 'ItemSearchMode:y3:abu', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:z3:abv', [1, 10000], 'MarkerCollisionAvoidance:yo:abw', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:z4:abx', [1, 400], 'XAxis::ab5', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aak:ab6', [2, null], 'XMemberAsLegendUnit:aam:ab7', [2, null], 'XMemberPath:aao:ab8', [2, null], 'YAxis::ab9', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aas:aca', [2, null], 'YMemberAsLegendUnit:aau:acb', [2, null], 'YMemberPath:aaw:acc', [2, null], 'TrendLineType::ab3', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::ab2', [1, 1.5], 'TrendLinePeriod::ab1', [1, 7], 'TrendLineBrush::aby', [Brush.$, null], 'TrendLineZIndex:z5:ab4', [1, 1001], 'TrendLineDashArray:ace:abz', [DoubleCollection.$], 'TrendLineDashCap:acf:ab0', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 }(MarkerSeries));
 export { ScatterBase };
@@ -2083,7 +2179,7 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.dh = new Path();
         this.di = new Path();
         if (!this.q) {
-            this.c1.z1 = 2000;
+            this.c1.z4 = 2000;
         }
     };
     ScatterBaseView.prototype.dj = function (a) {
@@ -2102,12 +2198,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.yo.c.item(b); }, runOn(this, this.de), runOn(this, this.cw), runOn(this, this.c4), function () { return _this.c1.yl; });
+        var a = new NumericMarkerManager(1, function (b) { return _this.c3.item(b); }, function (b) { return _this.c1.yr.c.item(b); }, runOn(this, this.de), runOn(this, this.cw), runOn(this, this.c4), function () { return _this.c1.yo; });
         a.q = runOn(this, this.dj);
         return a;
     };
     ScatterBaseView.prototype.de = function (a) {
-        this.c1.abd(a, this.c3);
+        this.c1.abh(a, this.c3);
     };
     ScatterBaseView.prototype.c5 = function () {
         return this.b8;
@@ -2116,11 +2212,11 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         return this.cy;
     };
     ScatterBaseView.prototype.cw = function () {
-        this.cy = this.c1.yg(this, this.c3, this.cy, this.by, this.bx);
+        this.cy = this.c1.yj(this, this.c3, this.cy, this.by, this.bx);
         return this.cy;
     };
     ScatterBaseView.prototype.c4 = function () {
-        this.c6 = this.c1.zp(this.c3, this.c6);
+        this.c6 = this.c1.zs(this.c3, this.c6);
         return this.c6;
     };
     ScatterBaseView.prototype.c7 = function () {
@@ -2133,10 +2229,10 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBaseView.prototype.df = function () {
         if (this.c1.trendLineBrush != null) {
-            this.c1.ab9 = this.c1.trendLineBrush;
+            this.c1.acd = this.c1.trendLineBrush;
         }
         else {
-            this.c1.ab9 = this.c1.u3;
+            this.c1.acd = this.c1.u5;
         }
     };
     ScatterBaseView.prototype.cj = function (a) {
@@ -2153,9 +2249,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.ab9;
-                c.ai = this.c1.aca;
-                c.aj = this.c1.acb;
+                c._stroke = this.c1.acd;
+                c.ai = this.c1.ace;
+                c.aj = this.c1.acf;
                 a.v(c);
             }
         }
@@ -2170,11 +2266,11 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBaseView.prototype.getDefaultTooltipTemplate = function () {
         var a = "<div class='ui-chart-default-tooltip-content'><span";
-        var b = this.e.a9.a$u(this.e);
+        var b = this.e.ba.a$u(this.e);
         if (!stringIsNullOrEmpty(b)) {
             a += " style='color:" + b + "'";
         }
-        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>";
+        a += ">" + this.c1.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.c1.aao + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.c1.aaw + "}</span></div>";
         return a;
     };
     ScatterBaseView.$t = markType(ScatterBaseView, 'ScatterBaseView', MarkerSeriesView.$);