igniteui-webcomponents-charts 4.6.0 → 4.7.0

package/esm5/lib/ScatterBase_combined.js

@@ -22,13 +22,14 @@ import { ScatterItemSearchMode_$type } from "./ScatterItemSearchMode";
 import { ScatterErrorBarSettings } from "./ScatterErrorBarSettings";
 import { HighlightingInfo } from "./HighlightingInfo";
 import { ScatterFrame } from "./ScatterFrame";
-import { Base, enumGetBox, Number_$type, typeCast, fromEnum, Point_$type, runOn, markType, markDep, PointUtil } from "igniteui-webcomponents-core";
+import { Base, runOn, delegateCombine, enumGetBox, Number_$type, typeCast, fromEnum, Point_$type, markType, markDep, PointUtil } from "igniteui-webcomponents-core";
 import { List$1 } from "igniteui-webcomponents-core";
 import { SeriesPointOfInterest } from "./SeriesPointOfInterest";
 import { ScalerParams } from "./ScalerParams";
 import { Rect } from "igniteui-webcomponents-core";
 import { Marker } from "./Marker";
 import { MarkerSeriesView } from "./MarkerSeriesView";
+import { SeriesLayerPropertyOverlay } from "./SeriesLayerPropertyOverlay";
 import { IFastItemsSource_$type } from "igniteui-webcomponents-core";
 import { Clipper } from "igniteui-webcomponents-core";
 import { OwnedPoint } from "./OwnedPoint";
@@ -62,84 +63,84 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ScatterBase, _super);
     function ScatterBase() {
         var _this = _super.call(this) || this;
-        _this.r5 = null;
-        _this.sj = null;
-        _this.sk = null;
-        _this.ve = null;
+        _this.vu = null;
+        _this.v8 = null;
+        _this.v9 = null;
+        _this.zc = null;
+        _this.zd = null;
+        _this.v3 = 1;
         _this.vf = null;
-        _this.se = 1;
-        _this.rq = null;
-        _this.rr = null;
-        _this.sb = null;
-        _this.sd = null;
-        _this.r9 = null;
-        _this.sp = false;
-        _this.so = false;
-        _this.r1 = null;
-        _this.r2 = null;
+        _this.vg = null;
+        _this.v0 = null;
+        _this.v2 = null;
+        _this.vy = null;
+        _this.we = false;
+        _this.wd = false;
+        _this.vq = null;
+        _this.vr = null;
         _this.assigningScatterStyle = null;
         _this.assigningScatterMarkerStyle = null;
-        _this.si = null;
-        _this.sc = null;
-        _this.r8 = null;
-        _this.sn = true;
-        _this.s1 = 0;
-        _this.s2 = 0;
-        _this.s3 = 0;
-        _this.s4 = 0;
-        _this.sf = _this.sg();
-        _this.si = new ScatterSeriesRenderManager();
-        _this.sc = new ScatterFrame();
-        _this.vf = Rect.empty;
-        _this.ve = Rect.empty;
+        _this.v7 = null;
+        _this.v1 = null;
+        _this.vx = null;
+        _this.wc = true;
+        _this.wr = 0;
+        _this.ws = 0;
+        _this.wt = 0;
+        _this.wu = 0;
+        _this.v4 = _this.v5();
+        _this.v7 = new ScatterSeriesRenderManager();
+        _this.v1 = new ScatterFrame();
+        _this.zd = Rect.empty;
+        _this.zc = Rect.empty;
         return _this;
     }
-    ScatterBase.prototype.by = function () {
+    ScatterBase.prototype.cg = function () {
         return new ScatterBaseView(this);
     };
-    ScatterBase.prototype.kz = function () {
-        _super.prototype.kz.call(this);
+    ScatterBase.prototype.ng = function () {
+        _super.prototype.ng.call(this);
         this.xAxis = null;
         this.yAxis = null;
     };
-    ScatterBase.prototype.l4 = function (a) {
-        _super.prototype.l4.call(this, a);
-        this.r6 = a;
+    ScatterBase.prototype.o0 = function (a) {
+        _super.prototype.o0.call(this, a);
+        this.vv = a;
     };
-    ScatterBase.prototype.get_ef = function () {
+    ScatterBase.prototype.get_e9 = function () {
         return true;
     };
     ScatterBase.prototype.ag = function () {
         return [this.xAxis, this.yAxis];
     };
-    ScatterBase.prototype.h1 = function (a, b) {
-        var c = this.jv(b);
-        if (c == ScatterBase.$$p[10]) {
-            return this.h2(a, b, this.tr);
+    ScatterBase.prototype.ju = function (a, b) {
+        var c = this.lv(b);
+        if (c == ScatterBase.$$p[12]) {
+            return this.jv(a, b, this.xl);
         }
-        if (c == ScatterBase.$$p[14]) {
-            return this.h2(a, b, this.tz);
+        if (c == ScatterBase.$$p[16]) {
+            return this.jv(a, b, this.xt);
         }
         return null;
     };
-    ScatterBase.prototype.c2 = function (a, b, c, d) {
+    ScatterBase.prototype.ds = function (a, b, c, d) {
         var _this = this;
         if (!this.hasMarkers) {
             return false;
         }
         var e = this.xAxis;
-        var f = new ScalerParams(1, this.ce.tk, this.p7, e.ch);
-        f.c = this.getEffectiveViewport1(this.b1);
+        var f = new ScalerParams(1, this.cy.tn, this.tw, e.ch);
+        f.c = this.getEffectiveViewport1(this.cj);
         var g = this.yAxis;
-        var h = new ScalerParams(1, this.ce.tk, this.p7, g.ch);
-        h.c = this.getEffectiveViewport1(this.b1);
+        var h = new ScalerParams(1, this.cy.tn, this.tw, g.ch);
+        h.c = this.getEffectiveViewport1(this.cj);
         a.clear();
-        this.qk.cf(function (i) {
+        this.t9.ci(function (i) {
             if (i._visibility == 0) {
                 var j = new SeriesPointOfInterest();
                 var k = i.n;
                 var l = i.o;
-                if (k < _this.p7.left || k > _this.p7.right || l < _this.p7.top || l > _this.p7.bottom) {
+                if (k < _this.tw.left || k > _this.tw.right || l < _this.tw.top || l > _this.tw.bottom) {
                     return;
                 }
                 j.b = e.em(k, f);
@@ -150,69 +151,160 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         });
         return true;
     };
-    ScatterBase.prototype.bq = function () {
-        if (this.br == 0) {
-            if (this.tb <= 2000) {
+    ScatterBase.prototype.bx = function () {
+        if (this.by == 0) {
+            if (this.w1 <= 2000) {
                 return 1;
             }
             else {
-                return _super.prototype.bq.call(this);
+                return _super.prototype.bx.call(this);
             }
         }
         else {
-            return _super.prototype.bq.call(this);
+            return _super.prototype.bx.call(this);
         }
     };
-    ScatterBase.prototype.p5 = function (a) {
-        if (!this.hasMarkers || !this.qn()) {
+    ScatterBase.prototype.tu = function (a) {
+        if (!this.hasMarkers || !this.uc()) {
             return Rect.empty;
         }
-        var b = this.qk.by(this.pn(a));
+        var b = this.t9.b1(this.tc(a));
         if (b != null) {
-            return this.qk.cp(b);
+            return this.t9.cs(b);
         }
         return Rect.empty;
     };
-    ScatterBase.prototype.ez = function (a, b) {
-        if (this.qo(a, b)) {
+    ScatterBase.prototype.f4 = function (a, b) {
+        if (this.ud(a, b)) {
             return true;
         }
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "sl", {
+    Object.defineProperty(ScatterBase.prototype, "wa", {
         get: function () {
-            return this.sj;
+            return this.v8;
         },
         set: function (a) {
-            if (this.sj != a) {
-                var b = this.sl;
-                this.sj = a;
-                this.raisePropertyChanged("XColumn", b, this.sl);
+            if (this.v8 != a) {
+                var b = this.wa;
+                this.v8 = a;
+                this.raisePropertyChanged("XColumn", b, this.wa);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ScatterBase.prototype, "sm", {
+    Object.defineProperty(ScatterBase.prototype, "wb", {
         get: function () {
-            return this.sk;
+            return this.v9;
         },
         set: function (a) {
-            if (this.sk != a) {
-                var b = this.sm;
-                this.sk = a;
-                this.raisePropertyChanged("YColumn", b, this.sm);
+            if (this.v9 != a) {
+                var b = this.wb;
+                this.v9 = a;
+                this.raisePropertyChanged("YColumn", b, this.wb);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ScatterBase.prototype, "vb", {
+    ScatterBase.prototype.fn = function () {
+        return this.highlightedItemsSource != null || (this.w5 != null && this.w7 != null);
+    };
+    ScatterBase.prototype.wp = function () {
+        return false;
+    };
+    ScatterBase.prototype.g0 = function () {
+        var a = _super.prototype.g0.call(this);
+        {
+            var b = ((function () {
+                var $ret = new SeriesLayerPropertyOverlay();
+                $ret.ad = "YMemberPath";
+                $ret.p = true;
+                $ret.y = "HighlightedYMemberPath";
+                $ret.q = true;
+                return $ret;
+            })());
+            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.x0));
+            a.add(b);
+        }
+        {
+            var c = ((function () {
+                var $ret = new SeriesLayerPropertyOverlay();
+                $ret.ad = "XMemberPath";
+                $ret.p = true;
+                $ret.y = "HighlightedXMemberPath";
+                $ret.q = true;
+                return $ret;
+            })());
+            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.xz));
+            a.add(c);
+        }
+        if (this.wp()) {
+            var d = ((function () {
+                var $ret = new SeriesLayerPropertyOverlay();
+                $ret.r = true;
+                $ret.ad = "DashArray";
+                $ret.p = true;
+                $ret.x = ((function () {
+                    var $ret = new DoubleCollection();
+                    $ret.add(5);
+                    $ret.add(5);
+                    return $ret;
+                })());
+                $ret.q = true;
+                return $ret;
+            })());
+            a.add(d);
+        }
+        if (!this.wp()) {
+            var e = ((function () {
+                var $ret = new SeriesLayerPropertyOverlay();
+                $ret.r = true;
+                $ret.ad = "Brush";
+                $ret.p = true;
+                $ret.y = "ActualBrush";
+                $ret.q = true;
+                return $ret;
+            })());
+            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.px));
+            a.add(e);
+        }
+        if (!this.wp()) {
+            var f = ((function () {
+                var $ret = new SeriesLayerPropertyOverlay();
+                $ret.r = true;
+                $ret.ad = "Outline";
+                $ret.p = true;
+                $ret.y = "ActualOutline";
+                $ret.q = true;
+                return $ret;
+            })());
+            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.px));
+            a.add(f);
+        }
+        return a;
+    };
+    ScatterBase.prototype.xz = function (a, b) {
+        if (this.w5 != null) {
+            b.value = this.w5;
+            return;
+        }
+        b.value = this.xl;
+    };
+    ScatterBase.prototype.x0 = function (a, b) {
+        if (this.w7 != null) {
+            b.value = this.w7;
+            return;
+        }
+        b.value = this.xt;
+    };
+    Object.defineProperty(ScatterBase.prototype, "y9", {
         get: function () {
-            return this.c(ScatterBase.uo);
+            return this.c(ScatterBase.yk);
         },
         set: function (a) {
-            this.h(ScatterBase.uo, a);
+            this.h(ScatterBase.yk, a);
         },
         enumerable: false,
         configurable: true
@@ -231,8 +323,8 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.lk = function () {
-        _super.prototype.lk.call(this);
+    ScatterBase.prototype.ob = function () {
+        _super.prototype.ob.call(this);
         if (this.xAxis != null) {
             this.xAxis.h8(false);
         }
@@ -240,29 +332,29 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             this.yAxis.h8(false);
         }
     };
-    ScatterBase.prototype.l9 = function (a, b, c, d) {
-        _super.prototype.l9.call(this, a, b, c, d);
-        if (this.r6.cx.g$b(a, b, c, d)) {
-            this.mn(false);
-            this.lu();
+    ScatterBase.prototype.o8 = function (a, b, c, d) {
+        _super.prototype.o8.call(this, a, b, c, d);
+        if (this.vv.c0.g$b(a, b, c, d)) {
+            this.pp(false);
+            this.ol();
         }
         switch (b) {
             case "FastItemsSource":
                 if (typeCast(IFastItemsSource_$type, c) != null) {
-                    c.deregisterColumn(this.sl);
-                    c.deregisterColumn(this.sm);
-                    this.sl = null;
-                    this.sm = null;
+                    c.deregisterColumn(this.wa);
+                    c.deregisterColumn(this.wb);
+                    this.wa = null;
+                    this.wb = null;
                 }
                 if (typeCast(IFastItemsSource_$type, d) != null) {
-                    this.sl = this.ci(this.tr);
-                    this.sm = this.ci(this.tz);
+                    this.wa = this.c3(this.xl);
+                    this.wb = this.c3(this.xt);
                 }
                 if ((this.yAxis != null && !this.yAxis.c1()) || (this.xAxis != null && !this.xAxis.c1())) {
-                    this.mn(false);
+                    this.pp(this.fq && c != null);
                 }
                 break;
-            case ScatterBase.$$p[7]:
+            case ScatterBase.$$p[9]:
                 if (c != null) {
                     c.b0(this);
                 }
@@ -270,11 +362,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     d.ct(this);
                 }
                 if ((this.xAxis != null && !this.xAxis.c1()) || (d == null && c != null)) {
-                    this.mn(false);
+                    this.pp(false);
                 }
-                this.lu();
+                this.ol();
                 break;
-            case ScatterBase.$$p[11]:
+            case ScatterBase.$$p[13]:
                 if (c != null) {
                     c.b0(this);
                 }
@@ -282,134 +374,134 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     d.ct(this);
                 }
                 if ((this.yAxis != null && !this.yAxis.c1()) || (d == null && c != null)) {
-                    this.mn(false);
+                    this.pp(false);
                 }
-                this.lu();
+                this.ol();
                 break;
-            case ScatterBase.$$p[10]:
-                if (this.cl != null) {
-                    this.cl.deregisterColumn(this.sl);
-                    this.sl = this.ci(this.tr);
+            case ScatterBase.$$p[12]:
+                if (this.c6 != null) {
+                    this.c6.deregisterColumn(this.wa);
+                    this.wa = this.c3(this.xl);
                 }
                 break;
             case "XColumn":
-                this.r6.cx.g$i();
+                this.vv.c0.g$i();
                 if (this.xAxis != null && !this.xAxis.c1()) {
-                    this.mn(false);
+                    this.pp(this.fq && this.dn);
                 }
                 break;
-            case ScatterBase.$$p[14]:
-                if (this.cl != null) {
-                    this.cl.deregisterColumn(this.sm);
-                    this.sm = this.ci(this.tz);
+            case ScatterBase.$$p[16]:
+                if (this.c6 != null) {
+                    this.c6.deregisterColumn(this.wb);
+                    this.wb = this.c3(this.xt);
                 }
                 break;
             case "YColumn":
-                this.r6.cx.g$i();
+                this.vv.c0.g$i();
                 if (this.yAxis != null && !this.yAxis.c1()) {
-                    this.mn(false);
+                    this.pp(this.fq && this.dn);
                 }
                 break;
-            case ScatterBase.$$p[5]:
-                this.mn(false);
-                this.lu();
+            case ScatterBase.$$p[7]:
+                this.pp(false);
+                this.ol();
                 break;
-            case ScatterBase.$$p[6]:
-                this.mn(false);
-                this.lu();
+            case ScatterBase.$$p[8]:
+                this.pp(false);
+                this.ol();
                 break;
             case "TransitionProgress":
-                this.sd.c(this.g5, this.sb, this.r9);
-                this.t1();
+                this.v2.c(this.iv, this.v0, this.vy);
+                this.xv();
                 try {
-                    if (this.cy(this.b1)) {
+                    if (this.dl(this.cj)) {
                         return;
                     }
-                    if ((Math.round(this.g5 * 100000) / 100000) == 1) {
-                        this.ul(this.r9, this.r6);
+                    if ((Math.round(this.iv * 100000) / 100000) == 1) {
+                        this.yh(this.vy, this.vv);
                     }
                     else {
-                        this.ul(this.sd, this.r6);
+                        this.yh(this.v2, this.vv);
                     }
-                    if (this.ce != null) {
-                        this.ce.ol(this);
+                    if (this.cy != null) {
+                        this.cy.on(this);
                     }
                 }
                 finally {
-                    this.um();
+                    this.yi();
                 }
                 break;
             case "TrendLineBrush":
-                this.m1();
+                this.pe(b);
                 break;
             case ScatterBase.$$p[0]:
-                if (this.r7 != null) {
-                    this.r7.r = this;
+                if (this.vw != null) {
+                    this.vw.r = this;
                 }
-                this.mn(false);
-                this.lu();
+                this.pp(false);
+                this.ol();
                 break;
             case "TrendLineType":
-                this.lu();
-                break;
-            case ScatterBase.$$p[2]:
-                this.sp = this.sx();
-                this.mn(false);
+                this.ol();
                 break;
-            case ScatterBase.$$p[1]:
-                this.so = this.sw();
-                this.mn(false);
+            case ScatterBase.$$p[4]:
+                this.we = this.wm();
+                this.pp(false);
                 break;
             case ScatterBase.$$p[3]:
-                this.sf = this.sg();
+                this.wd = this.wl();
+                this.pp(false);
+                break;
+            case ScatterBase.$$p[5]:
+                this.v4 = this.v5();
                 break;
         }
     };
-    ScatterBase.prototype.sx = function () {
-        return this.st;
+    ScatterBase.prototype.wm = function () {
+        return this.wi;
     };
-    ScatterBase.prototype.sw = function () {
-        return this.ss;
+    ScatterBase.prototype.wl = function () {
+        return this.wh;
     };
-    ScatterBase.prototype.sr = function (a) {
+    ScatterBase.prototype.wg = function (a) {
         if (typeCast(NumericYAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.sq = function (a) {
+    ScatterBase.prototype.wf = function (a) {
         if (typeCast(NumericXAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.um = function () {
-        this.ve = Rect.empty;
-        this.vf = Rect.empty;
+    ScatterBase.prototype.yi = function () {
+        this.zc = Rect.empty;
+        this.zd = Rect.empty;
     };
-    ScatterBase.prototype.t1 = function () {
-        var a = this.getViewInfo(this.ve, this.vf);
-        this.ve = a.p0;
-        this.vf = a.p1;
+    ScatterBase.prototype.xv = function () {
+        var a = this.getViewInfo(this.zc, this.zd);
+        this.zc = a.p0;
+        this.zd = a.p1;
     };
-    ScatterBase.prototype.sv = function (a, b) {
+    ScatterBase.prototype.wk = function (a, b) {
         if (b != 3) {
             return true;
         }
         if (a == null) {
             return true;
         }
-        if (this.tr == a || this.tz == a) {
+        if (this.xl == a || this.xt == a) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.k5 = function (a, b, c, d) {
+    ScatterBase.prototype.no = function (a, b, c, d) {
         var e = false;
-        if (!this.sv(d, a)) {
+        if (!this.wk(d, a)) {
             return;
         }
-        this.r6.cx.g$e(a, b, c, d);
+        this.vv.c0.g$e(a, b, c, d);
         if (this.xAxis != null && !this.xAxis.c1()) {
             e = true;
         }
@@ -417,29 +509,29 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             e = true;
         }
         if (a == 0 || a == 2 || a == 3 || a == 4) {
-            this.sn = true;
+            this.wc = true;
         }
         else if (a == 1) {
             for (var f = b; f < b + c; f++) {
-                this.s1 += this.sl.item(f);
-                this.s2 += this.sm.item(f);
+                this.wr += this.wa.item(f);
+                this.ws += this.wb.item(f);
             }
-            this.s3 = this.s1 / this.sl.count;
-            this.s4 = this.s2 / this.sm.count;
+            this.wt = this.wr / this.wa.count;
+            this.wu = this.ws / this.wb.count;
         }
         if (e) {
-            this.mn(true);
+            this.pp(true);
         }
     };
-    ScatterBase.prototype.ud = function (a) {
-        this.ue(a, null);
+    ScatterBase.prototype.x9 = function (a) {
+        this.ya(a, null);
     };
-    ScatterBase.prototype.ue = function (a, b) {
+    ScatterBase.prototype.ya = function (a, b) {
         var e_1, _a, e_2, _b;
-        var c = this.sl != null ? this.sl.count : 0;
-        var d = this.sm != null ? this.sm.count : 0;
+        var c = this.wa != null ? this.wa.count : 0;
+        var d = this.wb != null ? this.wb.count : 0;
         var e = Math.min(c, d);
-        if (e <= this.tb) {
+        if (e <= this.w1) {
             a.m.clear();
             var f = new List$1(OwnedPoint.$, 0);
             try {
@@ -461,7 +553,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                         throw e_1.error;
                 }
             }
-            var h_1 = this.cl;
+            var h_1 = this.c6;
             f.aa(function (i, j) {
                 var k = h_1.indexOf(i.a);
                 var l = h_1.indexOf(j.a);
@@ -505,76 +597,76 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     ScatterBase.prototype.aq = function (a) {
-        if (a != null && a == this.xAxis && this.sl != null) {
-            return new AxisRange(this.sl.minimum, this.sl.maximum);
+        if (a != null && a == this.xAxis && this.wa != null) {
+            return new AxisRange(this.wa.minimum, this.wa.maximum);
         }
-        if (a != null && a == this.yAxis && this.sm != null) {
-            return new AxisRange(this.sm.minimum, this.sm.maximum);
+        if (a != null && a == this.yAxis && this.wb != null) {
+            return new AxisRange(this.wb.minimum, this.wb.maximum);
         }
         return null;
     };
-    ScatterBase.prototype.hy = function (a) {
-        var b = this.hi(a);
-        if (this.cl != null && b >= 0 && b < this.cl.count) {
-            return this.cl.item(b);
+    ScatterBase.prototype.jr = function (a) {
+        var b = this.i8(a);
+        if (this.c6 != null && b >= 0 && b < this.c6.count) {
+            return this.c6.item(b);
         }
         return null;
     };
-    Object.defineProperty(ScatterBase.prototype, "sf", {
+    Object.defineProperty(ScatterBase.prototype, "v4", {
         get: function () {
-            return this.se;
+            return this.v3;
         },
         set: function (a) {
-            var b = this.se;
-            this.se = a;
-            if (b != this.se) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.se));
+            var b = this.v3;
+            this.v3 = a;
+            if (b != this.v3) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.v3));
             }
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.sg = function () {
-        if (this.sh != 0) {
-            return this.sh;
+    ScatterBase.prototype.v5 = function () {
+        if (this.v6 != 0) {
+            return this.v6;
         }
-        return this.su ? 4 : 1;
+        return this.wj ? 4 : 1;
     };
-    ScatterBase.prototype.hi = function (a) {
-        var b = truncate(Math.round(this.f9(a)));
+    ScatterBase.prototype.i8 = function (a) {
+        var b = truncate(Math.round(this.hv(a)));
         return b;
     };
-    ScatterBase.prototype.f9 = function (a) {
-        switch (this.sf) {
-            case 1: return this.s7(a);
-            case 3: return this.s8(a);
-            case 2: return this.s5(a);
-            case 4: return this.s6(a);
+    ScatterBase.prototype.hv = function (a) {
+        switch (this.v4) {
+            case 1: return this.wx(a);
+            case 3: return this.wy(a);
+            case 2: return this.wv(a);
+            case 4: return this.ww(a);
         }
         return -1;
     };
-    ScatterBase.prototype.s6 = function (a) {
-        return this.s9(a, false);
+    ScatterBase.prototype.ww = function (a) {
+        return this.wz(a, false);
     };
-    ScatterBase.prototype.s5 = function (a) {
-        var b = this.pn(a);
+    ScatterBase.prototype.wv = function (a) {
+        var b = this.tc(a);
         var c = b.x;
         var d = b.y;
-        if (this.cl == null || this.xAxis == null || this.yAxis == null || this.sl == null || this.sm == null) {
+        if (this.c6 == null || this.xAxis == null || this.yAxis == null || this.wa == null || this.wb == null) {
             return -1;
         }
-        if (this.cl.count > this.ta) {
+        if (this.c6.count > this.w0) {
             return -1;
         }
-        this.t4();
-        var e = this.rq;
-        var f = this.rr;
+        this.xy();
+        var e = this.vf;
+        var f = this.vg;
         if (e == null || f == null) {
             return -1;
         }
         var g = 1.7976931348623157E+308;
         var h = -1;
-        for (var i = 0; i < this.sl.count; i++) {
+        for (var i = 0; i < this.wa.count; i++) {
             var j = e[i];
             var k = f[i];
             var l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -585,68 +677,68 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h;
     };
-    ScatterBase.prototype.t4 = function () {
+    ScatterBase.prototype.xy = function () {
         var _this = this;
-        var a = this.b1.bv;
-        var b = this.b1.bu;
+        var a = this.cj.by;
+        var b = this.cj.bx;
         var c = this.getEffectiveViewport();
-        if (this.r5 == null) {
+        if (this.vu == null) {
             return;
         }
-        var d = new ScalerParams(0, a, b, this.r5.d, c);
+        var d = new ScalerParams(0, a, b, this.vu.d, c);
         var e = ((function () {
-            var $ret = new ScalerParams(0, a, b, _this.r5.e, c);
-            $ret.b = _this.gg();
+            var $ret = new ScalerParams(0, a, b, _this.vu.e, c);
+            $ret.b = _this.h2();
             return $ret;
         })());
-        if (this.rq == null || this.rr == null) {
-            var f = arrayShallowClone(this.sl.asArray());
-            var g = arrayShallowClone(this.sm.asArray());
+        if (this.vf == null || this.vg == null) {
+            var f = arrayShallowClone(this.wa.asArray());
+            var g = arrayShallowClone(this.wb.asArray());
             this.xAxis.hn(boxArray$1(f), 0, f.length, d);
             this.yAxis.hn(boxArray$1(g), 0, g.length, e);
-            this.rq = f;
-            this.rr = g;
+            this.vf = f;
+            this.vg = g;
         }
     };
-    ScatterBase.prototype.get_su = function () {
+    ScatterBase.prototype.get_wj = function () {
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "su", {
+    Object.defineProperty(ScatterBase.prototype, "wj", {
         get: function () {
-            return this.get_su();
+            return this.get_wj();
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.s9 = function (a, b) {
-        if (!this.su) {
+    ScatterBase.prototype.wz = function (a, b) {
+        if (!this.wj) {
             return -1;
         }
         var c = { $type: Point_$type, x: 0, y: 0 };
         var d = true;
-        var e = this.sa();
+        var e = this.vz();
         if (e == null) {
             return -1;
         }
         if (e.m == null) {
             return -1;
         }
-        if (this.cl == null || this.cl.count > this.ta) {
+        if (this.c6 == null || this.c6.count > this.w0) {
             return -1;
         }
-        this.t4();
-        var f = this.rq;
-        var g = this.rr;
+        this.xy();
+        var f = this.vf;
+        var g = this.vg;
         if (f == null || g == null) {
             return -1;
         }
-        var h = this.pn(a);
+        var h = this.tc(a);
         var i = 1.7976931348623157E+308;
         var j = -1;
-        for (var k = 0; k < this.rq.length; k++) {
-            var l = { $type: Point_$type, x: this.rq[k], y: this.rr[k] };
+        for (var k = 0; k < this.vf.length; k++) {
+            var l = { $type: Point_$type, x: this.vf[k], y: this.vg[k] };
             if (k > 0) {
-                if (!b || e.j.containsKey(this.cl.item(k)) || e.j.containsKey(this.cl.item(k - 1))) {
+                if (!b || e.j.containsKey(this.c6.item(k)) || e.j.containsKey(this.c6.item(k - 1))) {
                     var m = GeometryUtil.d(h, c, l);
                     if (m < i) {
                         i = m;
@@ -657,13 +749,13 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             c = l;
         }
         if (j >= 0) {
-            var n = { $type: Point_$type, x: this.rq[j], y: this.rr[j] };
-            var o = { $type: Point_$type, x: this.rq[j - 1], y: this.rr[j - 1] };
-            if (!b || (e.j.containsKey(this.cl.item(j)) && e.j.containsKey(this.cl.item(j - 1)))) {
+            var n = { $type: Point_$type, x: this.vf[j], y: this.vg[j] };
+            var o = { $type: Point_$type, x: this.vf[j - 1], y: this.vg[j - 1] };
+            if (!b || (e.j.containsKey(this.c6.item(j)) && e.j.containsKey(this.c6.item(j - 1)))) {
                 var p = GeometryUtil.h(h, o, n);
                 return (j - 1) + p;
             }
-            else if (e.j.containsKey(this.cl.item(j))) {
+            else if (e.j.containsKey(this.c6.item(j))) {
                 return j;
             }
             else {
@@ -672,22 +764,22 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.s8 = function (a) {
-        return this.s9(a, true);
+    ScatterBase.prototype.wy = function (a) {
+        return this.wz(a, true);
     };
-    ScatterBase.prototype.s7 = function (a) {
+    ScatterBase.prototype.wx = function (a) {
         var _this = this;
         var b = null;
         var c = 1.7976931348623157E+308;
-        var d = this.pn(a);
+        var d = this.tc(a);
         var e = d.x;
         var f = d.y;
-        if (this.r6.cy.e > this.ta) {
+        if (this.vv.c1.e > this.w0) {
             return -1;
         }
-        this.r6.c5(function (g) {
+        this.vv.c8(function (g) {
             if (g._visibility == 0) {
-                var h = _this.r6.cp(g);
+                var h = _this.vv.cs(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);
@@ -702,22 +794,22 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.ps = function (a, b, c) {
+    ScatterBase.prototype.th = function (a, b, c) {
         var _this = this;
-        if (this.xAxis == null || this.yAxis == null || this.sl == null || this.sm == null) {
+        if (this.xAxis == null || this.yAxis == null || this.wa == null || this.wb == null) {
             return { $type: Point_$type, x: NaN, y: NaN };
         }
-        var d = this.b1.bv;
-        var e = this.b1.bu;
+        var d = this.cj.by;
+        var e = this.cj.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.gg();
+            $ret.b = _this.h2();
             return $ret;
         })());
         if (b) {
-            var i = this.f9(a);
+            var i = this.hv(a);
             if (i == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
@@ -729,52 +821,52 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             if (k < 0) {
                 k = 0;
             }
-            if (k > this.cl.count - 1) {
-                k = this.cl.count - 1;
+            if (k > this.c6.count - 1) {
+                k = this.c6.count - 1;
             }
-            if (j > this.cl.count - 1) {
-                j = this.cl.count - 1;
+            if (j > this.c6.count - 1) {
+                j = this.c6.count - 1;
             }
             if (k == j) {
-                var l = this.xAxis.ej(this.sl.item(j), g);
-                var m = this.yAxis.ej(this.sm.item(j), h);
+                var l = this.xAxis.ej(this.wa.item(j), g);
+                var m = this.yAxis.ej(this.wb.item(j), h);
                 return { $type: Point_$type, x: l, y: m };
             }
             var n = i - Math.floor(i);
-            var o = this.xAxis.ej(this.sl.item(j), g);
-            var p = this.yAxis.ej(this.sm.item(j), h);
-            var q = this.xAxis.ej(this.sl.item(k), g);
-            var r = this.yAxis.ej(this.sm.item(k), h);
+            var o = this.xAxis.ej(this.wa.item(j), g);
+            var p = this.yAxis.ej(this.wb.item(j), h);
+            var q = this.xAxis.ej(this.wa.item(k), g);
+            var r = this.yAxis.ej(this.wb.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.hi(a);
+            var u = this.i8(a);
             if (u == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            var v = this.xAxis.ej(this.sl.item(u), g);
-            var w = this.yAxis.ej(this.sm.item(u), h);
+            var v = this.xAxis.ej(this.wa.item(u), g);
+            var w = this.yAxis.ej(this.wb.item(u), h);
             return { $type: Point_$type, x: v, y: w };
         }
     };
-    ScatterBase.prototype.eq = function (a) {
+    ScatterBase.prototype.fo = function (a) {
         var _this = this;
-        var b = this.ce != null ? this.ce.tk : Rect.empty;
+        var b = this.cy != null ? this.cy.tn : Rect.empty;
         b = b.copy();
-        var c = this.ce != null ? this.ce.tz : Rect.empty;
+        var c = this.cy != null ? this.cy.t2 : Rect.empty;
         var d = new Rect(0, 0, 0, 1, 1);
-        var e = this.p1(this.b1);
+        var e = this.tq(this.cj);
         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.gg();
+            $ret.b = _this.h2();
             return $ret;
         })());
-        var h = !b.isEmpty && !c.isEmpty && this.cl != null ? this.cl.indexOf(a) : -1;
-        var i = this.xAxis != null && this.sl != null && h < this.sl.count ? this.xAxis.ej(this.sl.item(h), f) : NaN;
-        var j = this.yAxis != null && this.sm != null && h < this.sm.count ? this.yAxis.ej(this.sm.item(h), g) : NaN;
+        var h = !b.isEmpty && !c.isEmpty && this.c6 != null ? this.c6.indexOf(a) : -1;
+        var i = this.xAxis != null && this.wa != null && h < this.wa.count ? this.xAxis.ej(this.wa.item(h), f) : NaN;
+        var j = this.yAxis != null && this.wb != null && h < this.wb.count ? this.yAxis.ej(this.wb.item(h), g) : NaN;
         if (!isNaN_(i)) {
             if (i < b.left + 0.1 * b.width) {
                 i = i + 0.4 * b.width;
@@ -795,58 +887,58 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 b.y = j - 0.5 * b.height;
             }
         }
-        if (this.b9 != null) {
-            this.b9.au(this.ce, b, true);
+        if (this.cr != null) {
+            this.cr.au(this.cy, b, true);
         }
         return h >= 0;
     };
-    ScatterBase.prototype.na = function (a, b) {
-        this.mn(false);
+    ScatterBase.prototype.qm = function (a, b) {
+        this.pp(false);
     };
-    ScatterBase.prototype.nb = function (a, b) {
-        this.mn(false);
+    ScatterBase.prototype.qn = function (a, b) {
+        this.pp(false);
     };
-    ScatterBase.prototype.sa = function () {
-        var a = this.r9;
-        if (this.cw()) {
-            if (this.cf.g) {
-                this.cf.t();
+    ScatterBase.prototype.vz = function () {
+        var a = this.vy;
+        if (this.dj()) {
+            if (this.cz.g) {
+                this.cz.t();
             }
-            a = this.sd;
+            a = this.v2;
         }
         return a;
     };
-    ScatterBase.prototype.t2 = function (a, b, c, d, e) {
+    ScatterBase.prototype.xw = 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.cl;
+        var g = this.c6;
         var h;
         var i;
         var j = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.r5.d, f);
+            var $ret = new ScalerParams(0, d, e, _this.vu.d, f);
             $ret.c = _this.getEffectiveViewport1(a);
             return $ret;
         })());
         var k = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.r5.e, f);
+            var $ret = new ScalerParams(0, d, e, _this.vu.e, f);
             $ret.c = _this.getEffectiveViewport1(a);
-            $ret.b = _this.gg();
+            $ret.b = _this.h2();
             return $ret;
         })());
         var l = false;
         var m = 0;
-        if (this.ce != null) {
-            if (this.ce.fa()) {
-                var n = this.ce.lm(d, j);
+        if (this.cy != null) {
+            if (this.cy.fb()) {
+                var n = this.cy.lo(d, j);
                 l = n.c;
                 m = n.d;
             }
         }
         var _loop_1 = function (o) {
-            h = this_1.sl.item(o);
-            i = this_1.sm.item(o);
-            var p = { $type: Point_$type, x: this_1.r5.a.ej(h, j), y: this_1.r5.b.ej(i, k) };
+            h = this_1.wa.item(o);
+            i = this_1.wb.item(o);
+            var p = { $type: Point_$type, x: this_1.vu.a.ej(h, j), y: this_1.vu.b.ej(i, k) };
             if (l) {
                 if (p.x < e.left || p.x > e.right) {
                     if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -874,82 +966,82 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             _loop_1(o);
         }
     };
-    ScatterBase.prototype.ua = function (a, b) {
+    ScatterBase.prototype.x6 = function (a, b) {
         var _this = this;
-        this.rq = null;
-        this.rr = null;
+        this.vf = null;
+        this.vg = null;
         a.j.clear();
         a.n.clear();
         a.h.clear();
         a.l.clear();
         a.i.clear();
         a.k.clear();
-        var c = Math.min(this.sl != null ? this.sl.count : 0, this.sm != null ? this.sm.count : 0);
-        var d = b.bv;
-        var e = b.bu;
+        var c = Math.min(this.wa != null ? this.wa.count : 0, this.wb != null ? this.wb.count : 0);
+        var d = b.by;
+        var e = b.bx;
         var f = this.getEffectiveViewport1(b);
         var g = new ScalerParams(0, d, e, this.xAxis.ch, f);
         g.c = this.getEffectiveViewport1(b);
         var h = ((function () {
             var $ret = new ScalerParams(0, d, e, _this.yAxis.ch, f);
-            $ret.b = _this.gg();
+            $ret.b = _this.h2();
             return $ret;
         })());
         h.c = this.getEffectiveViewport1(b);
         if (c < 1) {
             return;
         }
-        this.r5 = ((function () {
+        this.vu = ((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.cl;
+            $ret.c = _this.c6;
             return $ret;
         })());
         var i = b;
-        if (c <= this.tb) {
-            this.t2(i, a, c, d, e);
+        if (c <= this.w1) {
+            this.xw(i, a, c, d, e);
         }
-        if (this.qn()) {
-            b.cv.l(a.j, this.tb, d, e, this.fx);
+        if (this.uc()) {
+            b.cy.l(a.j, this.w1, d, e, this.hj);
         }
         var j = ((function () {
             var $ret = new Clipper(0, e, false);
             $ret.i = a.n;
             return $ret;
         })());
-        var k = this.pz(b);
+        var k = this.to(b);
         var l = this.xAxis.em(k.left, g);
         var m = this.xAxis.em(k.right, g);
-        b.cx.h(a.n, this.trendLineType, this.sl, this.sm, this.trendLinePeriod, function (n) { return _this.xAxis.ej(n, g); }, function (n) { return _this.yAxis.ej(n, h); }, ((function () {
+        b.c0.h(a.n, this.trendLineType, this.wa, this.wb, this.trendLinePeriod, function (n) { return _this.xAxis.ej(n, g); }, function (n) { return _this.yAxis.ej(n, h); }, ((function () {
             var $ret = new TrendResolutionParams();
-            $ret.d = _this.fx;
+            $ret.d = _this.hj;
             $ret.h = e;
             $ret.i = d;
             return $ret;
         })()), j, l, m);
-        this.t8(a, b);
+        this.x4(a, b);
     };
-    ScatterBase.prototype.k2 = function (a, b) {
-        _super.prototype.k2.call(this, a, b);
+    ScatterBase.prototype.nj = function (a, b) {
+        _super.prototype.nj.call(this, a, b);
         var c = b;
-        c.c4(a);
+        c.c7(a);
     };
-    ScatterBase.prototype.get_d0 = function () {
+    ScatterBase.prototype.get_es = function () {
         return true;
     };
-    ScatterBase.prototype.rz = function (a, b, c) {
+    ScatterBase.prototype.vo = function (a, b, c) {
         return null;
     };
-    ScatterBase.prototype.r0 = function (a, b, c) {
-        var d = this.sa();
-        var e = this.r6.by(this.pn(b));
+    ScatterBase.prototype.vp = function (a, b, c) {
+        var d = this.vz();
+        var e = this.vv.b1(this.tc(b));
         var f = -1;
         if (e == null) {
             if (a != null) {
-                f = this.cl.indexOf(a);
+                f = this.c6.indexOf(a);
             }
             else {
                 return null;
@@ -972,11 +1064,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return g;
     };
-    ScatterBase.prototype.p9 = function (a, b) {
-        if (this.ql != 1 && this.ql != 13) {
-            var c = this.qk.cq();
-            var d = (c.width / 2) + (this.qq / 2);
-            var e = (c.height / 2) + (this.qq / 2);
+    ScatterBase.prototype.ty = function (a, b) {
+        if (this.ua != 1 && this.ua != 13) {
+            var c = this.t9.ct();
+            var d = (c.width / 2) + (this.uf / 2);
+            var e = (c.height / 2) + (this.uf / 2);
             var f = d;
             var g = d;
             var h = e;
@@ -997,11 +1089,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Thickness(1, 0, 0, 0, 0);
     };
-    ScatterBase.prototype.ry = function (a, b, c) {
+    ScatterBase.prototype.vn = function (a, b, c) {
         var d = new HighlightingInfo();
         d.b = this;
         d.h = 0;
-        d.g = this.cl.count - 1;
+        d.g = this.c6.count - 1;
         d.d = true;
         if (c != null && c.h == d.h && c.g == d.g) {
             return c;
@@ -1009,40 +1101,41 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return d;
     };
     ScatterBase.prototype.ax = function (a, b, c) {
-        if (this.c3 && this.ei(this.bl) && !c) {
-            var d = this.rz(a, b, this.r1);
-            this.r1 = d;
+        if (this.du && this.fc(this.bs) && !c) {
+            var d = this.vo(a, b, this.vq);
+            this.vq = d;
             return d;
         }
         else {
-            var e = this.ry(a, b, this.r1);
-            this.r1 = e;
+            var e = this.vn(a, b, this.vq);
+            this.vq = e;
             return e;
         }
     };
     ScatterBase.prototype.ay = function (a, b, c) {
-        if (this.ei(this.bl) && !c) {
-            var d = this.r0(a, b, this.r2);
-            this.r2 = d;
+        if (this.fc(this.bs) && !c) {
+            var d = this.vp(a, b, this.vr);
+            this.vr = d;
             return d;
         }
         else {
-            var e = this.ry(a, b, this.r2);
+            var e = this.vn(a, b, this.vr);
             e.e = true;
-            this.r2 = e;
+            this.vr = e;
             return e;
         }
     };
-    ScatterBase.prototype.sz = function () {
-        return (this.assigningScatterStyle != null && this.sp) || (this.bl != 1);
+    ScatterBase.prototype.wo = function () {
+        return (this.assigningScatterStyle != null && this.we) || (this.bs != 1);
     };
-    ScatterBase.prototype.sy = function () {
-        return (this.assigningScatterMarkerStyle != null && this.so) || (this.bl != 1);
+    ScatterBase.prototype.wn = function () {
+        return (this.assigningScatterMarkerStyle != null && this.wd) || (this.bs != 1);
     };
-    ScatterBase.prototype.ul = function (a, b) {
+    ScatterBase.prototype.yh = function (a, b) {
         var _this = this;
-        var c = b.bu;
-        this.r5 = ((function () {
+        this.ow();
+        var c = b.bx;
+        this.vu = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
@@ -1050,44 +1143,44 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.e = _this.yAxis.ch;
             return $ret;
         })());
-        if (this.qn()) {
-            b.cv.j(a.j, this.qp);
-            if (this.sy()) {
-                this.t3(b, a);
+        if (this.uc()) {
+            b.cy.j(a.j, this.ue);
+            if (this.wn()) {
+                this.xx(b, a);
             }
         }
-        b.cm();
+        b.cp();
         var d = ((function () {
             var $ret = new Clipper(1, NaN, c.bottom, NaN, c.top, false);
-            $ret.i = b.cx.g$j.an;
+            $ret.i = b.c0.g$j.an;
             return $ret;
         })());
-        b.cx.g$h(a.n, d);
-        this.ui(a, b);
+        b.c0.g$h(a.n, d);
+        this.ye(a, b);
     };
-    ScatterBase.prototype.rt = function (a, b) {
-        return this.ru(a, b);
+    ScatterBase.prototype.vi = function (a, b) {
+        return this.vj(a, b);
     };
-    ScatterBase.prototype.ru = function (a, b) {
-        if (b < a || a < 0 || a > this.sl.count || b < 0 || b > this.sl.count) {
+    ScatterBase.prototype.vj = function (a, b) {
+        if (b < a || a < 0 || a > this.wa.count || b < 0 || b > this.wa.count) {
             return null;
         }
         var c = new Array((b - a) + 1);
         for (var d = a; d <= b; d++) {
             var e = d;
-            c[d - a] = this.cl.item(d);
+            c[d - a] = this.c6.item(d);
         }
         return c;
     };
-    ScatterBase.prototype.t3 = function (a, b) {
+    ScatterBase.prototype.xx = function (a, b) {
         var _this = this;
-        a.b3 = true;
-        this.si.ay(this, this.sy(), runOn(this, this.rt));
-        var c = this.si.d;
+        a.b6 = true;
+        this.v7.ay(this, this.wn(), runOn(this, this.vi));
+        var c = this.v7.d;
         var d = c != null;
         var e = this.getEffectiveViewport1(a);
-        var f = this.cl == null ? 0 : this.cl.count;
-        this.r6.cf(function (g) {
+        var f = this.c6 == null ? 0 : this.c6.count;
+        this.vv.ci(function (g) {
             if (g._visibility == 0) {
                 var h = g.ak;
                 var i = g.content;
@@ -1096,64 +1189,64 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     g.content = i;
                 }
                 if (d) {
-                    _this.t5(h, f, a.q);
+                    _this.x1(h, f, a.q);
                 }
-                _this.si.ac(g, i);
+                _this.v7.ac(g, i);
             }
         });
     };
-    ScatterBase.prototype.t6 = function (a, b, c) {
-        var d = this.bl != 1;
-        this.si.a0(this.si.b, a, b, false);
-        this.si.ab(this.fv);
-        var e = this.si.ax;
+    ScatterBase.prototype.x2 = function (a, b, c) {
+        var d = this.bs != 1;
+        this.v7.a0(this.v7.b, a, b, false);
+        this.v7.ab(this.hh);
+        var e = this.v7.ax;
         var f = null;
-        var g = this.cl;
-        if (d && this.ce != null) {
-            f = this.ce.a7.getHighlightingInfo(this, g, e.o, e.n, false);
+        var g = this.c6;
+        if (d && this.cy != null) {
+            f = this.cy.a7.getHighlightingInfo(this, g, e.o, e.n, false);
             e.b = f;
         }
         e.f = c;
-        this.ug(e);
-        this.si.z(this, f, c, d, a < 0);
-    };
-    ScatterBase.prototype.t5 = function (a, b, c) {
-        var d = this.bl != 1;
-        this.si.a0(this.si.d, a, b, true);
-        this.si.aa(this.fv);
-        var e = this.si.aw;
+        this.yc(e);
+        this.v7.z(this, f, c, d, a < 0);
+    };
+    ScatterBase.prototype.x1 = function (a, b, c) {
+        var d = this.bs != 1;
+        this.v7.a0(this.v7.d, a, b, true);
+        this.v7.aa(this.hh);
+        var e = this.v7.aw;
         var f = null;
-        var g = this.cl;
+        var g = this.c6;
         var h = null;
-        if (d && this.ce != null) {
-            f = this.ce.a7.getHighlightingInfo(this, g, e.o, e.n, true);
-            if (this.ce.a7.isCrossSeriesHighlight(this)) {
-                h = this.ce.a7.getHighlightingInfo(this, g, e.o, e.n, true);
+        if (d && this.cy != null) {
+            f = this.cy.a7.getHighlightingInfo(this, g, e.o, e.n, true);
+            if (this.cy.a7.isCrossSeriesHighlight(this)) {
+                h = this.cy.a7.getHighlightingInfo(this, g, e.o, e.n, true);
             }
             e.b = f;
         }
         e.f = c;
-        this.uf(e);
-        this.si.y(this, f, c, d, e.m, this.ce.a7.totalHighlightingProgress);
+        this.yb(e);
+        this.v7.y(this, f, c, d, e.m, this.cy.a7.totalHighlightingProgress);
     };
-    ScatterBase.prototype.ug = function (a) {
-        if (this.assigningScatterStyle != null && this.sp) {
+    ScatterBase.prototype.yc = function (a) {
+        if (this.assigningScatterStyle != null && this.we) {
             this.assigningScatterStyle(this, a);
         }
     };
-    ScatterBase.prototype.uf = function (a) {
-        if (this.assigningScatterMarkerStyle != null && this.so) {
+    ScatterBase.prototype.yb = function (a) {
+        if (this.assigningScatterMarkerStyle != null && this.wd) {
             this.assigningScatterMarkerStyle(this, a);
         }
     };
-    ScatterBase.prototype.t8 = function (a, b) {
+    ScatterBase.prototype.x4 = function (a, b) {
         var e_3, _a;
         var c = new ErrorBarsHelper(this, b);
-        if (this.r7 == null) {
+        if (this.vw == null) {
             return;
         }
-        var d = this.r7.u;
-        var e = this.r7.v;
+        var d = this.vw.u;
+        var e = this.vw.v;
         var f = 0;
         var g = 0;
         var h = 0;
@@ -1165,35 +1258,35 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            var l = this.ub(k, c, d, h, i, true);
+                            var l = this.x7(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            var m = this.t9(k, c, d, h, i, true);
+                            var m = this.x5(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            var n = this.t7(k, c, d, j, h, i, true);
+                            var n = this.x3(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            var o = this.uc(c, d, f, h, i, true);
+                            var o = this.x8(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            var p = this.t9(k, c, d, h, i, true);
+                            var p = this.x5(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     var q = new OwnedPoint();
-                    q.c = c.l(d, this.r5.a, k.c, f);
+                    q.c = c.l(d, this.vu.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1201,35 +1294,35 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            var r = this.ub(k, c, e, h, i, false);
+                            var r = this.x7(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            var s = this.t9(k, c, e, h, i, false);
+                            var s = this.x5(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            var t = this.t7(k, c, e, j, h, i, false);
+                            var t = this.x3(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            var u = this.uc(c, e, g, h, i, false);
+                            var u = this.x8(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            var v = this.t9(k, c, e, h, i, false);
+                            var v = this.x5(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     var w = new OwnedPoint();
-                    w.c = c.m(e, this.r5.b, k.c, g);
+                    w.c = c.m(e, this.vu.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
@@ -1250,18 +1343,18 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.ub = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.x7 = function (a, b, c, d, e, f) {
         if (f) {
             var g = void 0;
             var h = void 0, i = void 0;
-            i = this.r5.a;
-            if (this.r7.s == 0) {
+            i = this.vu.a;
+            if (this.vw.s == 0) {
                 g = a.c.x;
-                h = this.r5.a;
+                h = this.vu.a;
             }
             else {
                 g = a.c.y;
-                h = this.r5.b;
+                h = this.vu.b;
             }
             var j = b.f(g, c, h, i, d, e);
             d = j.p4;
@@ -1270,14 +1363,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         else {
             var k = void 0;
             var l = void 0, m = void 0;
-            m = this.r5.b;
-            if (this.r7.t == 0) {
+            m = this.vu.b;
+            if (this.vw.t == 0) {
                 k = a.c.x;
-                l = this.r5.a;
+                l = this.vu.a;
             }
             else {
                 k = a.c.y;
-                l = this.r5.b;
+                l = this.vu.b;
             }
             var n = b.f(k, c, l, m, d, e);
             d = n.p4;
@@ -1288,14 +1381,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.t9 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.x5 = function (a, b, c, d, e, f) {
         if (f) {
-            var g = b.j(a.c.x, c, this.r5.a, d, e);
+            var g = b.j(a.c.x, c, this.vu.a, d, e);
             d = g.p3;
             e = g.p4;
         }
         else {
-            var h = b.j(a.c.y, c, this.r5.b, d, e);
+            var h = b.j(a.c.y, c, this.vu.b, d, e);
             d = h.p3;
             e = h.p4;
         }
@@ -1304,18 +1397,18 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.t7 = function (a, b, c, d, e, f, g) {
+    ScatterBase.prototype.x3 = function (a, b, c, d, e, f, g) {
         var h = c.getItemColumn();
-        var i = this.cl.indexOf(d);
+        var i = this.c6.indexOf(d);
         if (h != null && i < h.count) {
             var j = h.item(i);
             if (g) {
-                var k = b.h(a.c.x, j, this.r5.a, e, f);
+                var k = b.h(a.c.x, j, this.vu.a, e, f);
                 e = k.p3;
                 f = k.p4;
             }
             else {
-                var l = b.h(a.c.y, j, this.r5.b, e, f);
+                var l = b.h(a.c.y, j, this.vu.b, e, f);
                 e = l.p3;
                 f = l.p4;
             }
@@ -1329,16 +1422,16 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p5: f
         };
     };
-    ScatterBase.prototype.uc = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.x8 = 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.r5.a, d, e);
+            var h = a.k(c, b, this.vu.a, d, e);
             d = h.p3;
             e = h.p4;
         }
         else {
-            var i = a.k(c, b, this.r5.b, d, e);
+            var i = a.k(c, b, this.vu.b, d, e);
             d = i.p3;
             e = i.p4;
         }
@@ -1348,20 +1441,20 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.ui = function (a, b) {
-        if (!b.o() || this.r7 == null) {
-            b.c6();
+    ScatterBase.prototype.ye = function (a, b) {
+        if (!b.o() || this.vw == null) {
+            b.c9();
             return;
         }
-        this.uj(a, b);
-        this.uk(a, b);
+        this.yf(a, b);
+        this.yg(a, b);
     };
-    ScatterBase.prototype.uj = function (a, b) {
+    ScatterBase.prototype.yf = function (a, b) {
         var e_4, _a;
-        b.c2();
+        b.c5();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.r7.u;
+        var e = this.vw.u;
         try {
             for (var _b = __values(fromEnum(a.j.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1370,10 +1463,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.r7.o == 1 || this.r7.o == 2) {
+                        if (this.vw.o == 1 || this.vw.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.r7.o == 1 || this.r7.o == 3) {
+                        if (this.vw.o == 1 || this.vw.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1393,14 +1486,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     throw e_4.error;
             }
         }
-        b.c7(d);
+        b.da(d);
     };
-    ScatterBase.prototype.uk = function (a, b) {
+    ScatterBase.prototype.yg = function (a, b) {
         var e_5, _a;
-        b.c3();
+        b.c6();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.r7.v;
+        var e = this.vw.v;
         try {
             for (var _b = __values(fromEnum(a.j.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1409,10 +1502,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.r7.p == 1 || this.r7.p == 2) {
+                        if (this.vw.p == 1 || this.vw.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.r7.p == 1 || this.r7.p == 3) {
+                        if (this.vw.p == 1 || this.vw.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
@@ -1433,106 +1526,107 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.fd = function (a, b, c) {
+    ScatterBase.prototype.gl = function (a, b, c) {
         var d = true;
-        if (!_super.prototype.fd.call(this, a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.sl == null || this.sm == null || this.sl.count == 0 || this.sm.count == 0 || this.cl == null || this.cl.count != this.sl.count || this.cl.count != this.sm.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.lx == this.xAxis.lw || this.yAxis.lx == this.yAxis.lw) {
+        if (!_super.prototype.gl.call(this, a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.wa == null || this.wb == null || this.wa.count == 0 || this.wb.count == 0 || this.c6 == null || this.c6.count != this.wa.count || this.c6.count != this.wb.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.lx == this.xAxis.lw || this.yAxis.lx == this.yAxis.lw) {
             d = false;
         }
         return d;
     };
     ScatterBase.prototype.getViewInfo = function (a, b) {
-        if (!this.ve.isEmpty && !this.vf.isEmpty) {
-            a = this.ve;
-            b = this.vf;
+        if (!this.zc.isEmpty && !this.zd.isEmpty) {
+            a = this.zc;
+            b = this.zd;
             return {
                 p0: a,
                 p1: b
             };
         }
-        a = this.b1.bu;
-        b = this.b1.bv;
+        a = this.cj.bx;
+        b = this.cj.by;
         return {
             p0: a,
             p1: b
         };
     };
-    ScatterBase.prototype.mo = function (a) {
-        this.t1();
+    ScatterBase.prototype.pq = function (a) {
+        _super.prototype.pq.call(this, a);
+        this.xv();
         try {
-            if (this.cy(this.b1)) {
+            if (this.dl(this.cj)) {
                 return;
             }
-            if (this.cl != null && this.cl.count > this.tb) {
+            if (this.c6 != null && this.c6.count > this.w1) {
                 a = false;
             }
-            if (this.er(a) && !this.ew) {
-                var b = this.sb;
-                if (this.cw()) {
-                    if (this.cf.g) {
-                        this.cf.t();
+            if (this.fp(a) && !this.f0) {
+                var b = this.v0;
+                if (this.dj()) {
+                    if (this.cz.g) {
+                        this.cz.t();
                     }
-                    this.sb = this.sd;
-                    this.sd = b;
+                    this.v0 = this.v2;
+                    this.v2 = b;
                 }
                 else {
-                    this.sb = this.r9;
-                    this.r9 = b;
+                    this.v0 = this.vy;
+                    this.vy = b;
                 }
-                this.ua(this.r9, this.r6);
-                this.mw();
+                this.x6(this.vy, this.vv);
+                this.p3();
             }
             else {
-                if (!this.ew) {
-                    this.ua(this.r9, this.r6);
+                if (!this.f0) {
+                    this.x6(this.vy, this.vv);
                 }
-                this.ul(this.r9, this.r6);
+                this.yh(this.vy, this.vv);
             }
         }
         finally {
-            this.um();
+            this.yi();
         }
     };
-    ScatterBase.prototype.m1 = function () {
-        _super.prototype.m1.call(this);
+    ScatterBase.prototype.qd = function () {
+        _super.prototype.qd.call(this);
         if (this.index < 0) {
             return;
         }
-        this.r6.da();
+        this.vv.dd();
     };
-    ScatterBase.prototype.mp = function (a, b) {
-        _super.prototype.mp.call(this, a, b);
-        if (!this.e3) {
-            this.b1.a2(b);
+    ScatterBase.prototype.pr = function (a, b) {
+        _super.prototype.pr.call(this, a, b);
+        if (!this.f8) {
+            this.cj.a4(b);
             return;
         }
-        this.b1.a2(b);
-        if (this.cy(this.b0)) {
+        this.cj.a4(b);
+        if (this.dl(this.ci)) {
             return;
         }
-        var c = typeCast(ScatterBaseView.$, this.b0);
-        if (!this.ex) {
-            this.sc = new ScatterFrame();
-            this.ua(this.sc, c);
+        var c = typeCast(ScatterBaseView.$, this.ci);
+        if (!this.f1) {
+            this.v1 = new ScatterFrame();
+            this.x6(this.v1, c);
         }
-        this.ex = false;
-        this.ul(this.sc, c);
-        this.e3 = false;
+        this.f1 = false;
+        this.yh(this.v1, c);
+        this.f8 = false;
     };
-    ScatterBase.prototype.mm = function (a, b, c, d, e) {
-        _super.prototype.mm.call(this, a, b, c, d, e);
+    ScatterBase.prototype.po = function (a, b, c, d, e) {
+        _super.prototype.po.call(this, a, b, c, d, e);
         var f = this.a7.a$h.item(d);
         var g = f;
-        f.a1(c);
-        if (this.cy(g)) {
+        f.a3(c);
+        if (this.dl(g)) {
             return;
         }
-        if (this.r8 == null) {
-            this.r8 = new ScatterFrame();
+        if (this.vx == null) {
+            this.vx = new ScatterFrame();
         }
-        this.ua(this.r8, g);
-        this.ul(this.r8, g);
+        this.x6(this.vx, g);
+        this.yh(this.vx, g);
     };
-    ScatterBase.prototype.uh = function (a, b) {
+    ScatterBase.prototype.yd = function (a, b) {
         var e_6, _a, e_7, _b;
         var c = new List$1(Base.$, 0);
         try {
@@ -1576,11 +1670,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.rs = function (a, b, c, d, e) {
+    ScatterBase.prototype.vh = function (a, b, c, d, e) {
         var _this = this;
-        if (c == null || c.length != this.r5.c.count) {
-            c = new Array(this.r5.c.count);
-            for (var f = 0; f < this.r5.c.count; f++) {
+        if (c == null || c.length != this.vu.c.count) {
+            c = new Array(this.vu.c.count);
+            for (var f = 0; f < this.vu.c.count; f++) {
                 c[f] = PointUtil.create();
             }
         }
@@ -1593,37 +1687,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.gg();
+            $ret.b = _this.h2();
             return $ret;
         })());
-        var j = this.pz(a);
-        var k = this.r5.a.em(j.left, h);
-        var l = this.r5.a.em(j.right, h);
-        var m = this.r5.b.em(j.bottom, i);
-        var n = this.r5.b.em(j.top, i);
-        if (this.r5.d) {
+        var j = this.to(a);
+        var k = this.vu.a.em(j.left, h);
+        var l = this.vu.a.em(j.right, h);
+        var m = this.vu.b.em(j.bottom, i);
+        var n = this.vu.b.em(j.top, i);
+        if (this.vu.d) {
             var o = k;
             k = l;
             l = o;
         }
-        if (this.r5.e) {
+        if (this.vu.e) {
             var p = m;
             m = n;
             n = p;
         }
-        var q = this.r5;
+        var q = this.vu;
         var r = q.a;
         var s = q.b;
         var t;
         var u;
-        var v = this.sl;
-        var w = this.sm;
+        var v = this.wa;
+        var w = this.wb;
         var x = false;
         var y = 0;
         var z = 0;
-        if (this.ce != null) {
-            if (this.ce.fa()) {
-                var aa = this.ce.lm(d, h);
+        if (this.cy != null) {
+            if (this.cy.fb()) {
+                var aa = this.cy.lo(d, h);
                 x = aa.c;
                 y = aa.d;
                 z = r.em(0 + y, h);
@@ -1631,7 +1725,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 z -= ab;
             }
         }
-        for (var ac = 0; ac < this.r5.c.count; ac++) {
+        for (var ac = 0; ac < this.vu.c.count; ac++) {
             t = v.item(ac);
             u = w.item(ac);
             if (x) {
@@ -1663,7 +1757,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ScatterBase.prototype.s0 = function (a, b) {
+    ScatterBase.prototype.wq = function (a, b) {
         var e_8, _a;
         if (b == null) {
             b = new List$1(Number_$type, 2, a.e);
@@ -1672,7 +1766,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             b.clear();
         }
         var c = 0;
-        var d = this.cl;
+        var d = this.c6;
         try {
             for (var _b = __values(fromEnum(a.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var e = _c.value;
@@ -1694,32 +1788,32 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    ScatterBase.prototype.lc = function (a) {
-        _super.prototype.lc.call(this, a);
-        this.a9.exportTrendlineData(this, a, this.r6.cx.g$j);
+    ScatterBase.prototype.n1 = function (a) {
+        _super.prototype.n1.call(this, a);
+        this.a9.exportTrendlineData(this, a, this.vv.c0.g$j);
     };
-    ScatterBase.prototype.gg = function () {
-        return Series.gh(this.sm, null);
+    ScatterBase.prototype.h2 = function () {
+        return Series.h3(this.wb, null);
     };
     ScatterBase.prototype.getDataLegendSeriesContextAt = function (a, b) {
         var c = { $type: Point_$type, x: a, y: b };
-        var d = this.hy(c);
-        var e = d == null ? NaN : this.gf(d, "XMemberPath");
-        var f = d == null ? NaN : this.gf(d, "YMemberPath");
+        var d = this.jr(c);
+        var e = d == null ? NaN : this.h1(d, "XMemberPath");
+        var f = d == null ? NaN : this.h1(d, "YMemberPath");
         var g = new DataLegendSeriesValueInfo();
         g.l = e;
         g.a = 13;
         g.p = "X";
-        g.q = this.tr != null ? this.tr : "X";
-        g.r = this.tn != null ? this.tn : "X:";
-        g.s = this.tp != null ? this.tp : "";
+        g.q = this.xl != null ? this.xl : "X";
+        g.r = this.xh != null ? this.xh : "X:";
+        g.s = this.xj != null ? this.xj : "";
         var h = new DataLegendSeriesValueInfo();
         h.l = f;
         h.a = 14;
         h.p = "Y";
-        h.q = this.tz != null ? this.tz : "Y";
-        h.r = this.tv != null ? this.tv : "Y:";
-        h.s = this.tx != null ? this.tx : "";
+        h.q = this.xt != null ? this.xt : "Y";
+        h.r = this.xp != null ? this.xp : "Y:";
+        h.s = this.xr != null ? this.xr : "";
         var i = new DataLegendSeriesContext();
         i.f = ((function () {
             var $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -1730,20 +1824,20 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         i.b = this.aw();
         return i;
     };
-    ScatterBase.prototype.un = function () {
-        if (this.sn) {
-            this.s1 = 0;
-            this.s2 = 0;
-            for (var a = 0; a < this.sl.count; a++) {
-                this.s1 += this.sl.item(a);
-                this.s2 += this.sm.item(a);
+    ScatterBase.prototype.yj = function () {
+        if (this.wc) {
+            this.wr = 0;
+            this.ws = 0;
+            for (var a = 0; a < this.wa.count; a++) {
+                this.wr += this.wa.item(a);
+                this.ws += this.wb.item(a);
             }
-            this.s3 = this.s1 / this.sl.count;
-            this.s4 = this.s2 / this.sm.count;
-            this.sn = false;
+            this.wt = this.wr / this.wa.count;
+            this.wu = this.ws / this.wb.count;
+            this.wc = false;
         }
     };
-    ScatterBase.prototype.gq = function (a, b) {
+    ScatterBase.prototype.ic = function (a, b) {
         if (b == null || !b.cj) {
             return NaN;
         }
@@ -1764,43 +1858,43 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         switch (a) {
             case 5:
             case 2:
-                b = this.sl.maximum;
-                c = this.sm.maximum;
+                b = this.wa.maximum;
+                c = this.wb.maximum;
                 break;
             case 4:
             case 1:
-                b = this.sl.minimum;
-                c = this.sm.minimum;
+                b = this.wa.minimum;
+                c = this.wb.minimum;
                 break;
             case 6:
             case 3:
-                if (this.sn) {
-                    this.un();
+                if (this.wc) {
+                    this.yj();
                 }
-                b = this.s3;
-                c = this.s4;
+                b = this.wt;
+                c = this.wu;
                 break;
         }
         return [b, c];
     };
-    ScatterBase.prototype.pw = function (a) {
-        var b = this.getEffectiveViewport1(this.b1);
-        var c = new ScalerParams(0, this.b1.bv, this.b1.bu, this.xAxis.ch, b);
+    ScatterBase.prototype.tl = function (a) {
+        var b = this.getEffectiveViewport1(this.cj);
+        var c = new ScalerParams(0, this.cj.by, this.cj.bx, this.xAxis.ch, b);
         c.c = b;
         var d = isNaN_(a[0]) ? NaN : this.xAxis.ej(a[0], c);
-        c = new ScalerParams(0, this.b1.bv, this.b1.bu, this.yAxis.ch, b);
-        c.b = this.gg();
+        c = new ScalerParams(0, this.cj.by, this.cj.bx, this.yAxis.ch, b);
+        c.b = this.h2();
         c.c = b;
         var e = isNaN_(a[1]) ? NaN : this.yAxis.ej(a[1], c);
         return { $type: Point_$type, x: d, y: e };
     };
-    ScatterBase.prototype.pv = function (a) {
+    ScatterBase.prototype.tk = function (a) {
         var b = this.am(a);
-        return this.pw(b);
+        return this.tl(b);
     };
     ScatterBase.$t = markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.uo = 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:r7:up', [ScatterErrorBarSettings.$, null], 'IsCustomScatterMarkerStyleAllowed:ss:uq', [0, false], 'IsCustomScatterStyleAllowed:st:ur', [0, false], 'ItemSearchMode:sh:us', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:ta:ut', [1, 10000], 'MarkerCollisionAvoidance:rx:uu', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:tb:uv', [1, 400], 'XAxis::u3', [NumericXAxis.$, null], 'XMemberAsLegendLabel:tn:u4', [2, null], 'XMemberAsLegendUnit:tp:u5', [2, null], 'XMemberPath:tr:u6', [2, null], 'YAxis::u7', [NumericYAxis.$, null], 'YMemberAsLegendLabel:tv:u8', [2, null], 'YMemberAsLegendUnit:tx:u9', [2, null], 'YMemberPath:tz:va', [2, null], 'TrendLineType::u1', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::u0', [1, 1.5], 'TrendLinePeriod::uz', [1, 7], 'TrendLineBrush::uw', [Brush.$, null], 'TrendLineZIndex:tc:u2', [1, 1001], 'TrendLineDashArray:vc:ux', [DoubleCollection.$], 'TrendLineDashCap:vd:uy', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.yk = 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:vw:yl', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:w5:ym', [2, null], 'HighlightedYMemberPath:w7:yn', [2, null], 'IsCustomScatterMarkerStyleAllowed:wh:yo', [0, false], 'IsCustomScatterStyleAllowed:wi:yp', [0, false], 'ItemSearchMode:v6:yq', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:w0:yr', [1, 10000], 'MarkerCollisionAvoidance:vm:ys', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:w1:yt', [1, 400], 'XAxis::y1', [NumericXAxis.$, null], 'XMemberAsLegendLabel:xh:y2', [2, null], 'XMemberAsLegendUnit:xj:y3', [2, null], 'XMemberPath:xl:y4', [2, null], 'YAxis::y5', [NumericYAxis.$, null], 'YMemberAsLegendLabel:xp:y6', [2, null], 'YMemberAsLegendUnit:xr:y7', [2, null], 'YMemberPath:xt:y8', [2, null], 'TrendLineType::yz', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::yy', [1, 1.5], 'TrendLinePeriod::yx', [1, 7], 'TrendLineBrush::yu', [Brush.$, null], 'TrendLineZIndex:w2:y0', [1, 1001], 'TrendLineDashArray:za:yv', [DoubleCollection.$], 'TrendLineDashCap:zb:yw', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 }(MarkerSeries));
 export { ScatterBase };
@@ -1858,111 +1952,111 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ScatterBaseView, _super);
     function ScatterBaseView(a) {
         var _this = _super.call(this, a) || this;
-        _this.cv = null;
-        _this.ct = null;
+        _this.cy = null;
         _this.cw = null;
+        _this.cz = null;
+        _this.c4 = null;
+        _this.df = null;
+        _this.dg = null;
+        _this.c0 = null;
+        _this.de = null;
         _this.c1 = null;
-        _this.dc = null;
-        _this.dd = null;
-        _this.cx = null;
-        _this.db = null;
-        _this.cy = null;
-        _this.cw = a;
-        _this.cy = new HashPool$2(Base.$, Marker.$);
-        _this.ch(_this.cy);
-        _this.cx = new ScatterTrendLineManager();
+        _this.cz = a;
+        _this.c1 = new HashPool$2(Base.$, Marker.$);
+        _this.ck(_this.c1);
+        _this.c0 = new ScatterTrendLineManager();
         return _this;
     }
-    ScatterBaseView.prototype.as = function () {
-        _super.prototype.as.call(this);
-        this.cv = this.cu();
-        this.dc = new Path();
-        this.dd = new Path();
+    ScatterBaseView.prototype.au = function () {
+        _super.prototype.au.call(this);
+        this.cy = this.cx();
+        this.df = new Path();
+        this.dg = new Path();
         if (!this.q) {
-            this.cw.tb = 2000;
+            this.cz.w1 = 2000;
         }
     };
-    ScatterBaseView.prototype.de = function (a) {
-        if (this.db == null) {
-            this.db = new DataTemplateMeasureInfo();
-            this.db.context = this.k.h();
+    ScatterBaseView.prototype.dh = function (a) {
+        if (this.de == null) {
+            this.de = new DataTemplateMeasureInfo();
+            this.de.context = this.k.h();
         }
-        this.db.width = a.width;
-        this.db.height = a.height;
-        this.db.data = a.content;
+        this.de.width = a.width;
+        this.de.height = a.height;
+        this.de.data = a.content;
         var b = a.ah;
         if (b.measure != null) {
-            b.measure(this.db);
+            b.measure(this.de);
         }
-        return new Size(1, this.db.width, this.db.height);
+        return new Size(1, this.de.width, this.de.height);
     };
-    ScatterBaseView.prototype.cu = function () {
+    ScatterBaseView.prototype.cx = function () {
         var _this = this;
-        var a = new NumericMarkerManager(1, function (b) { return _this.cy.item(b); }, function (b) { return _this.cw.r5.c.item(b); }, runOn(this, this.c9), runOn(this, this.cr), runOn(this, this.cz), function () { return _this.cw.rx; });
-        a.q = runOn(this, this.de);
+        var a = new NumericMarkerManager(1, function (b) { return _this.c1.item(b); }, function (b) { return _this.cz.vu.c.item(b); }, runOn(this, this.dc), runOn(this, this.cu), runOn(this, this.c2), function () { return _this.cz.vm; });
+        a.q = runOn(this, this.dh);
         return a;
     };
-    ScatterBaseView.prototype.c9 = function (a) {
-        this.cw.uh(a, this.cy);
-    };
-    ScatterBaseView.prototype.c0 = function () {
-        return this.b4;
+    ScatterBaseView.prototype.dc = function (a) {
+        this.cz.yd(a, this.c1);
     };
-    ScatterBaseView.prototype.cs = function () {
-        return this.ct;
+    ScatterBaseView.prototype.c3 = function () {
+        return this.b7;
     };
-    ScatterBaseView.prototype.cr = function () {
-        this.ct = this.cw.rs(this, this.cy, this.ct, this.bv, this.bu);
-        return this.ct;
+    ScatterBaseView.prototype.cv = function () {
+        return this.cw;
     };
-    ScatterBaseView.prototype.cz = function () {
-        this.c1 = this.cw.s0(this.cy, this.c1);
-        return this.c1;
+    ScatterBaseView.prototype.cu = function () {
+        this.cw = this.cz.vh(this, this.c1, this.cw, this.by, this.bx);
+        return this.cw;
     };
     ScatterBaseView.prototype.c2 = function () {
+        this.c4 = this.cz.wq(this.c1, this.c4);
+        return this.c4;
     };
-    ScatterBaseView.prototype.c7 = function (a) {
+    ScatterBaseView.prototype.c5 = function () {
     };
-    ScatterBaseView.prototype.c3 = function () {
+    ScatterBaseView.prototype.da = function (a) {
     };
-    ScatterBaseView.prototype.c8 = function (a) {
+    ScatterBaseView.prototype.c6 = function () {
     };
-    ScatterBaseView.prototype.da = function () {
-        if (this.cw.trendLineBrush != null) {
-            this.cw.vb = this.cw.trendLineBrush;
+    ScatterBaseView.prototype.db = function (a) {
+    };
+    ScatterBaseView.prototype.dd = function () {
+        if (this.cz.trendLineBrush != null) {
+            this.cz.y9 = this.cz.trendLineBrush;
         }
         else {
-            this.cw.vb = this.cw.o5;
+            this.cz.y9 = this.cz.ss;
         }
     };
-    ScatterBaseView.prototype.cf = function (a) {
-        this.cy.f(a);
+    ScatterBaseView.prototype.ci = function (a) {
+        this.c1.f(a);
     };
-    ScatterBaseView.prototype.c5 = function (a) {
-        this.cy.g(a);
+    ScatterBaseView.prototype.c8 = function (a) {
+        this.c1.g(a);
     };
-    ScatterBaseView.prototype.c6 = function () {
+    ScatterBaseView.prototype.c9 = function () {
     };
-    ScatterBaseView.prototype.a5 = function (a, b) {
-        _super.prototype.a5.call(this, a, b);
+    ScatterBaseView.prototype.a7 = function (a, b) {
+        _super.prototype.a7.call(this, a, b);
         if (a.d) {
-            if (this.cw.trendLineType != 0 && !b) {
-                var c = this.cx.g$j;
-                c.ad = this.cw.trendLineThickness;
-                c._stroke = this.cw.vb;
-                c.ai = this.cw.vc;
-                c.aj = this.cw.vd;
+            if (this.cz.trendLineType != 0 && !b) {
+                var c = this.c0.g$j;
+                c.ad = this.cz.trendLineThickness;
+                c._stroke = this.cz.y9;
+                c.ai = this.cz.za;
+                c.aj = this.cz.zb;
                 a.v(c);
             }
         }
     };
-    ScatterBaseView.prototype.c4 = function (a) {
+    ScatterBaseView.prototype.c7 = function (a) {
         if (a) {
-            this.c6();
-            this.cy.clear();
+            this.c9();
+            this.c1.clear();
         }
-        this.cx.g$d();
-        this.aq();
+        this.c0.g$d();
+        this.as();
     };
     ScatterBaseView.prototype.getDefaultTooltipTemplate = function () {
         var a = "<div class='ui-chart-default-tooltip-content'><span";
@@ -1970,7 +2064,7 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         if (!stringIsNullOrEmpty(b)) {
             a += " style='color:" + b + "'";
         }
-        a += ">" + this.cw.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.cw.tr + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.cw.tz + "}</span></div>";
+        a += ">" + this.cz.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.cz.xl + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.cz.xt + "}</span></div>";
         return a;
     };
     ScatterBaseView.$t = markType(ScatterBaseView, 'ScatterBaseView', MarkerSeriesView.$);