igniteui-webcomponents-charts 5.2.0 → 5.3.0

package/esm2015/lib/ScatterBase_combined.js

@@ -64,79 +64,79 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         cs() {
             return new ScatterBaseView(this);
         }
-        o2() {
-            super.o2();
+        o1() {
+            super.o1();
             this.xAxis = null;
             this.yAxis = null;
         }
-        q1(a) {
-            super.q1(a);
-            this.yx = a;
+        q0(a) {
+            super.q0(a);
+            this.yw = a;
         }
-        get_fw() {
+        get_fv() {
             return true;
         }
         ai() {
             return [this.xAxis, this.yAxis];
         }
-        kq(a, b) {
-            let c = this.nd(b);
+        kp(a, b) {
+            let c = this.nc(b);
             if (c == ScatterBase.$$p[12]) {
-                return this.kr(a, b, this.aat);
+                return this.kq(a, b, this.aas);
             }
             if (c == ScatterBase.$$p[16]) {
-                return this.kr(a, b, this.aa1);
+                return this.kq(a, b, this.aa0);
             }
             if (c == ScatterBase.$$p[1]) {
-                return this.kr(a, b, this.aad);
+                return this.kq(a, b, this.aac);
             }
             if (c == ScatterBase.$$p[2]) {
-                return this.kr(a, b, this.aaf);
+                return this.kq(a, b, this.aae);
             }
             return null;
         }
-        md(a) {
-            let b = this.nd(a);
+        mc(a) {
+            let b = this.nc(a);
             if (b == ScatterBase.$$p[12]) {
-                return this.aat;
+                return this.aas;
             }
             if (b == ScatterBase.$$p[16]) {
-                return this.aa1;
+                return this.aa0;
             }
             if (b == ScatterBase.$$p[1]) {
-                return this.aad;
+                return this.aac;
             }
             if (b == ScatterBase.$$p[2]) {
-                return this.aaf;
+                return this.aae;
             }
-            return super.md(a);
+            return super.mc(a);
         }
         eb(a, b, c, d, e) {
             if (!this.hasMarkers) {
                 return false;
             }
             let f = this.xAxis;
-            let g = new ScalerParams(1, this.db.v4, this.ws, f.ch);
+            let g = new ScalerParams(1, this.db.v4, this.wr, f.ch);
             g.c = this.getEffectiveViewport1(this.cv);
             let h = this.yAxis;
-            let i = new ScalerParams(1, this.db.v4, this.ws, h.ch);
+            let i = new ScalerParams(1, this.db.v4, this.wr, h.ch);
             i.c = this.getEffectiveViewport1(this.cv);
             a.clear();
-            this.w6.cj((j) => {
+            this.w5.cj((j) => {
                 if (j._visibility == 0) {
                     let k = new SeriesPointOfInterest();
                     let l = j.n;
                     let m = j.o;
-                    if (l < this.ws.left || l > this.ws.right || m < this.ws.top || m > this.ws.bottom) {
+                    if (l < this.wr.left || l > this.wr.right || m < this.wr.top || m > this.wr.bottom) {
                         return;
                     }
                     k.d = f.eo(l, g);
                     k.e = h.eo(m, i);
                     k.b = j.content;
-                    k.g = this.vg;
+                    k.g = this.vf;
                     k.c = j.ak;
-                    if (this.g9) {
-                        k.g = this.vn(j.ak);
+                    if (this.g8) {
+                        k.g = this.vm(j.ak);
                     }
                     a.add(k);
                 }
@@ -145,7 +145,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         b2() {
             if (this.b3 == 0) {
-                if (this.z9 <= 2000) {
+                if (this.z8 <= 2000) {
                     return 1;
                 }
                 else {
@@ -156,54 +156,64 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return super.b2();
             }
         }
-        wp(a) {
-            if (!this.hasMarkers || !this.xg()) {
+        wo(a) {
+            if (!this.hasMarkers || !this.xf()) {
                 return Rect.empty;
             }
-            let b = this.w6.b1(this.v7(a));
+            let b = this.w5.b1(this.v6(a));
             if (b != null) {
-                return this.w6.cu(b);
+                return this.w5.cu(b);
             }
             return Rect.empty;
         }
-        gw(a, b) {
-            if (this.xh(a, b)) {
+        gv(a, b) {
+            if (this.xg(a, b)) {
                 return true;
             }
             return false;
         }
         constructor() {
             super();
-            this.yw = null;
+            this.yv = null;
+            this.ze = null;
             this.zf = null;
-            this.zg = null;
+            this.ack = null;
             this.acl = null;
-            this.acm = null;
-            this.y5 = 1;
+            this.y4 = 1;
+            this.yl = null;
             this.ym = null;
-            this.yn = null;
-            this.y2 = null;
-            this.y4 = null;
-            this.y0 = null;
-            this.zl = false;
+            this.y1 = null;
+            this.y3 = null;
+            this.yz = null;
             this.zk = false;
+            this.zj = false;
+            this.zc = null;
             this.zd = null;
-            this.ze = null;
             this.assigningScatterStyle = null;
             this.assigningScatterMarkerStyle = null;
-            this.y9 = null;
-            this.y3 = null;
-            this.yz = null;
-            this.zj = true;
+            this.y8 = null;
+            this.y2 = null;
+            this.yy = null;
+            this.zi = true;
+            this.zx = 0;
             this.zy = 0;
             this.zz = 0;
             this.z0 = 0;
-            this.z1 = 0;
-            this.y6 = this.y7();
-            this.y9 = new ScatterSeriesRenderManager();
-            this.y3 = new ScatterFrame();
-            this.acm = Rect.empty;
+            this.y5 = this.y6();
+            this.y8 = new ScatterSeriesRenderManager();
+            this.y2 = new ScatterFrame();
             this.acl = Rect.empty;
+            this.ack = Rect.empty;
+        }
+        get zg() {
+            return this.ze;
+        }
+        set zg(a) {
+            if (this.ze != a) {
+                let b = this.zg;
+                this.ze = a;
+                this.raisePropertyChanged("XColumn", b, this.zg);
+            }
         }
         get zh() {
             return this.zf;
@@ -212,27 +222,17 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             if (this.zf != a) {
                 let b = this.zh;
                 this.zf = a;
-                this.raisePropertyChanged("XColumn", b, this.zh);
+                this.raisePropertyChanged("YColumn", b, this.zh);
             }
         }
-        get zi() {
-            return this.zg;
+        ga() {
+            return this.highlightedItemsSource != null || (this.aac != null && this.aae != null);
         }
-        set zi(a) {
-            if (this.zg != a) {
-                let b = this.zi;
-                this.zg = a;
-                this.raisePropertyChanged("YColumn", b, this.zi);
-            }
-        }
-        gb() {
-            return this.highlightedItemsSource != null || (this.aad != null && this.aaf != null);
-        }
-        zw() {
+        zv() {
             return false;
         }
-        ht() {
-            let a = super.ht();
+        hs() {
+            let a = super.hs();
             {
                 let b = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
@@ -242,7 +242,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.aa9));
+                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.aa8));
                 a.add(b);
             }
             {
@@ -254,10 +254,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aa8));
+                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aa7));
                 a.add(c);
             }
-            if (this.zw()) {
+            if (this.zv()) {
                 let d = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -274,7 +274,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 })());
                 a.add(d);
             }
-            if (!this.zw()) {
+            if (!this.zv()) {
                 let e = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -284,10 +284,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.r0));
+                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.rz));
                 a.add(e);
             }
-            if (!this.zw()) {
+            if (!this.zv()) {
                 let f = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -297,30 +297,30 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.r0));
+                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.rz));
                 a.add(f);
             }
             return a;
         }
-        aa8(a, b) {
-            if (this.aad != null) {
-                b.value = this.aad;
+        aa7(a, b) {
+            if (this.aac != null) {
+                b.value = this.aac;
                 return;
             }
-            b.value = this.aat;
+            b.value = this.aas;
         }
-        aa9(a, b) {
-            if (this.aaf != null) {
-                b.value = this.aaf;
+        aa8(a, b) {
+            if (this.aae != null) {
+                b.value = this.aae;
                 return;
             }
-            b.value = this.aa1;
+            b.value = this.aa0;
         }
-        get aci() {
-            return this.c(ScatterBase.abt);
+        get ach() {
+            return this.c(ScatterBase.abs);
         }
-        set aci(a) {
-            this.h(ScatterBase.abt, a);
+        set ach(a) {
+            this.h(ScatterBase.abs, a);
         }
         get GetErrorBarsXAxis() {
             return this.xAxis;
@@ -328,8 +328,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         get GetErrorBarsYAxis() {
             return this.yAxis;
         }
-        qb() {
-            super.qb();
+        qa() {
+            super.qa();
             if (this.xAxis != null) {
                 this.xAxis.ib(false);
             }
@@ -337,32 +337,32 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 this.yAxis.ib(false);
             }
         }
-        q9(a, b, c, d) {
-            super.q9(a, b, c, d);
-            if (this.yx.c2.g$b(a, b, c, d)) {
-                this.rr(false);
-                this.ql();
+        q8(a, b, c, d) {
+            super.q8(a, b, c, d);
+            if (this.yw.c2.g$b(a, b, c, d)) {
+                this.rq(false);
+                this.qk();
             }
             switch (b) {
                 case ScatterBase.$$p[10]:
                 case ScatterBase.$$p[14]:
                 case ScatterBase.$$p[11]:
                 case ScatterBase.$$p[15]:
-                    this.qf();
+                    this.qe();
                     break;
                 case "FastItemsSource":
                     if (typeCast(IFastItemsSource_$type, c) != null) {
+                        c.deregisterColumn(this.zg);
                         c.deregisterColumn(this.zh);
-                        c.deregisterColumn(this.zi);
+                        this.zg = null;
                         this.zh = null;
-                        this.zi = null;
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.zh = this.dk(this.aat);
-                        this.zi = this.dk(this.aa1);
+                        this.zg = this.dk(this.aas);
+                        this.zh = this.dk(this.aa0);
                     }
                     if ((this.yAxis != null && !this.yAxis.c1()) || (this.xAxis != null && !this.xAxis.c1())) {
-                        this.rr(this.gg && c != null);
+                        this.rq(this.gf && c != null);
                     }
                     break;
                 case ScatterBase.$$p[9]:
@@ -373,9 +373,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.ct(this);
                     }
                     if ((this.xAxis != null && !this.xAxis.c1()) || (d == null && c != null)) {
-                        this.rr(false);
+                        this.rq(false);
                     }
-                    this.ql();
+                    this.qk();
                     break;
                 case ScatterBase.$$p[13]:
                     if (c != null) {
@@ -385,134 +385,134 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.ct(this);
                     }
                     if ((this.yAxis != null && !this.yAxis.c1()) || (d == null && c != null)) {
-                        this.rr(false);
+                        this.rq(false);
                     }
-                    this.ql();
+                    this.qk();
                     break;
                 case ScatterBase.$$p[12]:
                     if (this.dn != null) {
-                        this.dn.deregisterColumn(this.zh);
-                        this.zh = this.dk(this.aat);
+                        this.dn.deregisterColumn(this.zg);
+                        this.zg = this.dk(this.aas);
                     }
                     break;
                 case "XColumn":
-                    this.yx.c2.g$i();
+                    this.yw.c2.g$i();
                     if (this.xAxis != null && !this.xAxis.c1()) {
-                        this.rr(this.gg && this.d7);
+                        this.rq(this.gf && this.d7);
                     }
                     break;
                 case ScatterBase.$$p[16]:
                     if (this.dn != null) {
-                        this.dn.deregisterColumn(this.zi);
-                        this.zi = this.dk(this.aa1);
+                        this.dn.deregisterColumn(this.zh);
+                        this.zh = this.dk(this.aa0);
                     }
                     break;
                 case "YColumn":
-                    this.yx.c2.g$i();
+                    this.yw.c2.g$i();
                     if (this.yAxis != null && !this.yAxis.c1()) {
-                        this.rr(this.gg && this.d7);
+                        this.rq(this.gf && this.d7);
                     }
                     break;
                 case ScatterBase.$$p[7]:
-                    this.rr(false);
-                    this.ql();
+                    this.rq(false);
+                    this.qk();
                     break;
                 case ScatterBase.$$p[8]:
-                    this.rr(false);
-                    this.ql();
+                    this.rq(false);
+                    this.qk();
                     break;
                 case "TransitionProgress":
-                    this.y4.c(this.jq, this.y2, this.y0);
-                    this.aa3();
+                    this.y3.c(this.jp, this.y1, this.yz);
+                    this.aa2();
                     try {
                         if (this.d5(this.cv)) {
                             return;
                         }
-                        if ((Math.round(this.jq * 100000) / 100000) == 1) {
-                            this.abq(this.y0, this.yx);
+                        if ((Math.round(this.jp * 100000) / 100000) == 1) {
+                            this.abp(this.yz, this.yw);
                         }
                         else {
-                            this.abq(this.y4, this.yx);
+                            this.abp(this.y3, this.yw);
                         }
                         if (this.db != null) {
                             this.db.qo(this);
                         }
                     }
                     finally {
-                        this.abr();
+                        this.abq();
                     }
                     break;
                 case "TrendLineBrush":
-                    this.rf(b);
+                    this.re(b);
                     break;
                 case ScatterBase.$$p[0]:
-                    if (this.yy != null) {
-                        this.yy.r = this;
+                    if (this.yx != null) {
+                        this.yx.r = this;
                     }
-                    this.rr(false);
-                    this.ql();
+                    this.rq(false);
+                    this.qk();
                     break;
                 case "TrendLineType":
-                    this.ql();
+                    this.qk();
                     break;
                 case ScatterBase.$$p[4]:
-                    this.zl = this.zt();
-                    this.rr(false);
+                    this.zk = this.zs();
+                    this.rq(false);
                     break;
                 case ScatterBase.$$p[3]:
-                    this.zk = this.zs();
-                    this.rr(false);
+                    this.zj = this.zr();
+                    this.rq(false);
                     break;
                 case ScatterBase.$$p[5]:
-                    this.y6 = this.y7();
+                    this.y5 = this.y6();
                     break;
             }
         }
-        zt() {
-            return this.zp;
-        }
         zs() {
             return this.zo;
         }
-        zn(a) {
+        zr() {
+            return this.zn;
+        }
+        zm(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        zm(a) {
+        zl(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        abr() {
+        abq() {
+            this.ack = Rect.empty;
             this.acl = Rect.empty;
-            this.acm = Rect.empty;
         }
-        aa3() {
-            let a = this.getViewInfo(this.acl, this.acm);
-            this.acl = a.p0;
-            this.acm = a.p1;
+        aa2() {
+            let a = this.getViewInfo(this.ack, this.acl);
+            this.ack = a.p0;
+            this.acl = a.p1;
         }
-        zr(a, b) {
+        zq(a, b) {
             if (b != 3) {
                 return true;
             }
             if (a == null) {
                 return true;
             }
-            if (this.aat == a || this.aa1 == a) {
+            if (this.aas == a || this.aa0 == a) {
                 return true;
             }
             return false;
         }
-        pb(a, b, c, d) {
+        pa(a, b, c, d) {
             let e = false;
-            if (!this.zr(d, a)) {
+            if (!this.zq(d, a)) {
                 return;
             }
-            this.yx.c2.g$e(a, b, c, d);
+            this.yw.c2.g$e(a, b, c, d);
             if (this.xAxis != null && !this.xAxis.c1()) {
                 e = true;
             }
@@ -520,28 +520,28 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 e = true;
             }
             if (a == 0 || a == 2 || a == 3 || a == 4) {
-                this.zj = true;
+                this.zi = true;
             }
             else if (a == 1) {
                 for (let f = b; f < b + c; f++) {
+                    this.zx += this.zg.item(f);
                     this.zy += this.zh.item(f);
-                    this.zz += this.zi.item(f);
                 }
+                this.zz = this.zx / this.zg.count;
                 this.z0 = this.zy / this.zh.count;
-                this.z1 = this.zz / this.zi.count;
             }
             if (e) {
-                this.rr(true);
+                this.rq(true);
             }
         }
-        abi(a) {
-            this.abj(a, null);
+        abh(a) {
+            this.abi(a, null);
         }
-        abj(a, b) {
-            let c = this.zh != null ? this.zh.count : 0;
-            let d = this.zi != null ? this.zi.count : 0;
+        abi(a, b) {
+            let c = this.zg != null ? this.zg.count : 0;
+            let d = this.zh != null ? this.zh.count : 0;
             let e = Math.min(c, d);
-            if (e <= this.z9) {
+            if (e <= this.z8) {
                 a.m.clear();
                 let f = new List$1(OwnedPoint.$, 0);
                 for (let g of fromEnum(a.u.values)) {
@@ -575,73 +575,73 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
         }
         ay(a) {
-            if (a != null && a == this.xAxis && this.zh != null) {
-                return new AxisRange(this.zh.minimum, this.zh.maximum);
+            if (a != null && a == this.xAxis && this.zg != null) {
+                return new AxisRange(this.zg.minimum, this.zg.maximum);
             }
-            if (a != null && a == this.yAxis && this.zi != null) {
-                return new AxisRange(this.zi.minimum, this.zi.maximum);
+            if (a != null && a == this.yAxis && this.zh != null) {
+                return new AxisRange(this.zh.minimum, this.zh.maximum);
             }
             return null;
         }
-        kn(a) {
-            let b = this.j3(a);
+        km(a) {
+            let b = this.j2(a);
             if (this.dn != null && b >= 0 && b < this.dn.count) {
                 return this.dn.item(b);
             }
             return null;
         }
-        get y6() {
-            return this.y5;
+        get y5() {
+            return this.y4;
         }
-        set y6(a) {
-            let b = this.y5;
-            this.y5 = a;
-            if (b != this.y5) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.y5));
+        set y5(a) {
+            let b = this.y4;
+            this.y4 = a;
+            if (b != this.y4) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.y4));
             }
         }
-        y7() {
-            if (this.y8 != 0) {
-                return this.y8;
+        y6() {
+            if (this.y7 != 0) {
+                return this.y7;
             }
-            return this.zq ? 4 : 1;
+            return this.zp ? 4 : 1;
         }
-        j3(a) {
-            let b = truncate(Math.round(this.ir(a)));
+        j2(a) {
+            let b = truncate(Math.round(this.iq(a)));
             return b;
         }
-        ir(a) {
-            switch (this.y6) {
-                case 1: return this.z5(a);
-                case 3: return this.z6(a);
-                case 2: return this.z3(a);
-                case 4: return this.z4(a);
-                case 5: return this.z2(a);
+        iq(a) {
+            switch (this.y5) {
+                case 1: return this.z4(a);
+                case 3: return this.z5(a);
+                case 2: return this.z2(a);
+                case 4: return this.z3(a);
+                case 5: return this.z1(a);
             }
             return -1;
         }
-        z4(a) {
-            return this.z7(a, false);
-        }
         z3(a) {
-            let b = this.v7(a);
+            return this.z6(a, false);
+        }
+        z2(a) {
+            let b = this.v6(a);
             let c = b.x;
             let d = b.y;
-            if (this.dn == null || this.xAxis == null || this.yAxis == null || this.zh == null || this.zi == null) {
+            if (this.dn == null || this.xAxis == null || this.yAxis == null || this.zg == null || this.zh == null) {
                 return -1;
             }
-            if (this.dn.count > this.z8) {
+            if (this.dn.count > this.z7) {
                 return -1;
             }
-            this.aa6();
-            let e = this.ym;
-            let f = this.yn;
+            this.aa5();
+            let e = this.yl;
+            let f = this.ym;
             if (e == null || f == null) {
                 return -1;
             }
             let g = 1.7976931348623157E+308;
             let h = -1;
-            for (let i = 0; i < this.zh.count; i++) {
+            for (let i = 0; i < this.zg.count; i++) {
                 let j = e[i];
                 let k = f[i];
                 let l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -652,61 +652,61 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        aa6() {
+        aa5() {
             let a = this.cv.by;
             let b = this.cv.bx;
             let c = this.getEffectiveViewport();
-            if (this.yw == null) {
+            if (this.yv == null) {
                 return;
             }
-            let d = new ScalerParams(0, a, b, this.yw.d, c);
+            let d = new ScalerParams(0, a, b, this.yv.d, c);
             let e = ((() => {
-                let $ret = new ScalerParams(0, a, b, this.yw.e, c);
-                $ret.b = this.iy();
+                let $ret = new ScalerParams(0, a, b, this.yv.e, c);
+                $ret.b = this.ix();
                 return $ret;
             })());
-            if (this.ym == null || this.yn == null) {
-                let f = arrayShallowClone(this.zh.asArray());
-                let g = arrayShallowClone(this.zi.asArray());
+            if (this.yl == null || this.ym == null) {
+                let f = arrayShallowClone(this.zg.asArray());
+                let g = arrayShallowClone(this.zh.asArray());
                 this.xAxis.hq(boxArray$1(f), 0, f.length, d);
                 this.yAxis.hq(boxArray$1(g), 0, g.length, e);
-                this.ym = f;
-                this.yn = g;
+                this.yl = f;
+                this.ym = g;
             }
         }
-        get_zq() {
+        get_zp() {
             return false;
         }
-        get zq() {
-            return this.get_zq();
+        get zp() {
+            return this.get_zp();
         }
-        z7(a, b) {
-            if (!this.zq) {
+        z6(a, b) {
+            if (!this.zp) {
                 return -1;
             }
             let c = { $type: Point_$type, x: 0, y: 0 };
             let d = true;
-            let e = this.y1();
+            let e = this.y0();
             if (e == null) {
                 return -1;
             }
             if (e.m == null) {
                 return -1;
             }
-            if (this.dn == null || this.dn.count > this.z8) {
+            if (this.dn == null || this.dn.count > this.z7) {
                 return -1;
             }
-            this.aa6();
-            let f = this.ym;
-            let g = this.yn;
+            this.aa5();
+            let f = this.yl;
+            let g = this.ym;
             if (f == null || g == null) {
                 return -1;
             }
-            let h = this.v7(a);
+            let h = this.v6(a);
             let i = 1.7976931348623157E+308;
             let j = -1;
-            for (let k = 0; k < this.ym.length; k++) {
-                let l = { $type: Point_$type, x: this.ym[k], y: this.yn[k] };
+            for (let k = 0; k < this.yl.length; k++) {
+                let l = { $type: Point_$type, x: this.yl[k], y: this.ym[k] };
                 if (k > 0) {
                     if (!b || e.j.containsKey(this.dn.item(k)) || e.j.containsKey(this.dn.item(k - 1))) {
                         let m = GeometryUtil.h(h, c, l);
@@ -719,8 +719,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 c = l;
             }
             if (j >= 0) {
-                let n = { $type: Point_$type, x: this.ym[j], y: this.yn[j] };
-                let o = { $type: Point_$type, x: this.ym[j - 1], y: this.yn[j - 1] };
+                let n = { $type: Point_$type, x: this.yl[j], y: this.ym[j] };
+                let o = { $type: Point_$type, x: this.yl[j - 1], y: this.ym[j - 1] };
                 if (!b || (e.j.containsKey(this.dn.item(j)) && e.j.containsKey(this.dn.item(j - 1)))) {
                     let p = GeometryUtil.m(h, o, n);
                     return (j - 1) + p;
@@ -734,24 +734,24 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        z6(a) {
-            return this.z7(a, true);
+        z5(a) {
+            return this.z6(a, true);
         }
-        z2(a) {
-            let b = this.v7(a);
+        z1(a) {
+            let b = this.v6(a);
             let c = b.x;
             let d = b.y;
-            if (this.yx.c3.e > this.z8) {
+            if (this.yw.c3.e > this.z7) {
                 return -1;
             }
             let e = -1;
-            this.w6.ck((f) => {
-                let g = this.yx.cu(f);
+            this.w5.ck((f) => {
+                let g = this.yw.cu(f);
                 let h = g.left;
                 let i = g.top;
                 let j = g.width;
                 let k = g.height;
-                if (this.xd) {
+                if (this.xc) {
                     let l = h + j / 2;
                     let m = i + k / 2;
                     let n = (j / 2) * (j / 2);
@@ -772,18 +772,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             });
             return e;
         }
-        z5(a) {
+        z4(a) {
             let b = null;
             let c = 1.7976931348623157E+308;
-            let d = this.v7(a);
+            let d = this.v6(a);
             let e = d.x;
             let f = d.y;
-            if (this.yx.c3.e > this.z8) {
+            if (this.yw.c3.e > this.z7) {
                 return -1;
             }
-            this.yx.da((g) => {
+            this.yw.da((g) => {
                 if (g._visibility == 0) {
-                    let h = this.yx.cu(g);
+                    let h = this.yw.cu(g);
                     let i = h.left + h.width / 2;
                     let j = h.top + h.height / 2;
                     let k = (e - i) * (e - i) + (f - j) * (f - j);
@@ -798,8 +798,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        wc(a, b, c) {
-            if (this.xAxis == null || this.yAxis == null || this.zh == null || this.zi == null) {
+        wb(a, b, c) {
+            if (this.xAxis == null || this.yAxis == null || this.zg == null || this.zh == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
             let d = this.cv.by;
@@ -808,11 +808,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             let g = new ScalerParams(0, d, e, this.xAxis.ch, f);
             let h = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.ch, f);
-                $ret.b = this.iy();
+                $ret.b = this.ix();
                 return $ret;
             })());
             if (b) {
-                let i = this.ir(a);
+                let i = this.iq(a);
                 if (i == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
@@ -831,44 +831,44 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     j = this.dn.count - 1;
                 }
                 if (k == j) {
-                    let l = this.xAxis.el(this.zh.item(j), g);
-                    let m = this.yAxis.el(this.zi.item(j), h);
+                    let l = this.xAxis.el(this.zg.item(j), g);
+                    let m = this.yAxis.el(this.zh.item(j), h);
                     return { $type: Point_$type, x: l, y: m };
                 }
                 let n = i - Math.floor(i);
-                let o = this.xAxis.el(this.zh.item(j), g);
-                let p = this.yAxis.el(this.zi.item(j), h);
-                let q = this.xAxis.el(this.zh.item(k), g);
-                let r = this.yAxis.el(this.zi.item(k), h);
+                let o = this.xAxis.el(this.zg.item(j), g);
+                let p = this.yAxis.el(this.zh.item(j), h);
+                let q = this.xAxis.el(this.zg.item(k), g);
+                let r = this.yAxis.el(this.zh.item(k), h);
                 let s = q - o;
                 let t = r - p;
                 return { $type: Point_$type, x: o + s * n, y: p + t * n };
             }
             else {
-                let u = this.j3(a);
+                let u = this.j2(a);
                 if (u == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
-                let v = this.xAxis.el(this.zh.item(u), g);
-                let w = this.yAxis.el(this.zi.item(u), h);
+                let v = this.xAxis.el(this.zg.item(u), g);
+                let w = this.yAxis.el(this.zh.item(u), h);
                 return { $type: Point_$type, x: v, y: w };
             }
         }
-        gd(a) {
+        gc(a) {
             let b = this.db != null ? this.db.v4 : Rect.empty;
             b = b.copy();
             let c = this.db != null ? this.db.wk : Rect.empty;
             let d = new Rect(0, 0, 0, 1, 1);
-            let e = this.wl(this.cv);
+            let e = this.wk(this.cv);
             let f = new ScalerParams(0, d, d, this.xAxis.ch, e);
             let g = ((() => {
                 let $ret = new ScalerParams(0, d, d, this.yAxis.ch, e);
-                $ret.b = this.iy();
+                $ret.b = this.ix();
                 return $ret;
             })());
             let h = !b.isEmpty && !c.isEmpty && this.dn != null ? this.dn.indexOf(a) : -1;
-            let i = this.xAxis != null && this.zh != null && h < this.zh.count ? this.xAxis.el(this.zh.item(h), f) : NaN;
-            let j = this.yAxis != null && this.zi != null && h < this.zi.count ? this.yAxis.el(this.zi.item(h), g) : NaN;
+            let i = this.xAxis != null && this.zg != null && h < this.zg.count ? this.xAxis.el(this.zg.item(h), f) : NaN;
+            let j = this.yAxis != null && this.zh != null && h < this.zh.count ? this.yAxis.el(this.zh.item(h), g) : NaN;
             if (!isNaN_(i)) {
                 if (i < b.left + 0.1 * b.width) {
                     i = i + 0.4 * b.width;
@@ -894,37 +894,37 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h >= 0;
         }
-        sq(a, b) {
-            this.rr(false);
+        sp(a, b) {
+            this.rq(false);
         }
-        sr(a, b) {
-            this.rr(false);
+        sq(a, b) {
+            this.rq(false);
         }
-        y1() {
-            let a = this.y0;
+        y0() {
+            let a = this.yz;
             if (this.d3()) {
                 if (this.dc.g) {
                     this.dc.t();
                 }
-                a = this.y4;
+                a = this.y3;
             }
             return a;
         }
-        aa4(a, b, c, d, e) {
+        aa3(a, b, c, d, e) {
             b.g = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
             let f = this.getEffectiveViewport1(a);
             let g = this.dn;
             let h;
             let i;
             let j = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.yw.d, f);
+                let $ret = new ScalerParams(0, d, e, this.yv.d, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 return $ret;
             })());
             let k = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.yw.e, f);
+                let $ret = new ScalerParams(0, d, e, this.yv.e, f);
                 $ret.c = this.getEffectiveViewport1(a);
-                $ret.b = this.iy();
+                $ret.b = this.ix();
                 return $ret;
             })());
             let l = false;
@@ -937,9 +937,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
             for (let o = 0; o < c; o++) {
-                h = this.zh.item(o);
-                i = this.zi.item(o);
-                let p = { $type: Point_$type, x: this.yw.a.el(h, j), y: this.yw.b.el(i, k) };
+                h = this.zg.item(o);
+                i = this.zh.item(o);
+                let p = { $type: Point_$type, x: this.yv.a.el(h, j), y: this.yv.b.el(i, k) };
                 if (l) {
                     if (p.x < e.left || p.x > e.right) {
                         if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -963,16 +963,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        abf(a, b) {
+        abe(a, b) {
+            this.yl = null;
             this.ym = null;
-            this.yn = null;
             a.j.clear();
             a.n.clear();
             a.h.clear();
             a.l.clear();
             a.i.clear();
             a.k.clear();
-            let c = Math.min(this.zh != null ? this.zh.count : 0, this.zi != null ? this.zi.count : 0);
+            let c = Math.min(this.zg != null ? this.zg.count : 0, this.zh != null ? this.zh.count : 0);
             let d = b.by;
             let e = b.bx;
             let f = this.getEffectiveViewport1(b);
@@ -980,14 +980,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             g.c = this.getEffectiveViewport1(b);
             let h = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.ch, f);
-                $ret.b = this.iy();
+                $ret.b = this.ix();
                 return $ret;
             })());
             h.c = this.getEffectiveViewport1(b);
             if (c < 1) {
                 return;
             }
-            this.yw = ((() => {
+            this.yv = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -997,47 +997,47 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             let i = b;
-            if (c <= this.z9) {
-                this.aa4(i, a, c, d, e);
+            if (c <= this.z8) {
+                this.aa3(i, a, c, d, e);
             }
-            if (this.xg()) {
-                b.c0.l(a.j, this.z9, d, e, this.id);
+            if (this.xf()) {
+                b.c0.l(a.j, this.z8, d, e, this.ic);
             }
             let j = ((() => {
                 let $ret = new Clipper(0, e, false);
                 $ret.i = a.n;
                 return $ret;
             })());
-            let k = this.wj(b);
+            let k = this.wi(b);
             let l = this.xAxis.eo(k.left, g);
             let m = this.xAxis.eo(k.right, g);
-            b.c2.h(a.n, this.trendLineType, this.zh, this.zi, this.trendLinePeriod, (n) => this.xAxis.el(n, g), (n) => this.yAxis.el(n, h), ((() => {
+            b.c2.h(a.n, this.trendLineType, this.zg, this.zh, this.trendLinePeriod, (n) => this.xAxis.el(n, g), (n) => this.yAxis.el(n, h), ((() => {
                 let $ret = new TrendResolutionParams();
-                $ret.d = this.id;
+                $ret.d = this.ic;
                 $ret.i = e;
                 $ret.h = f;
                 $ret.j = d;
                 return $ret;
             })()), j, l, m);
-            this.abd(a, b);
+            this.abc(a, b);
         }
-        o5(a, b) {
-            super.o5(a, b);
+        o4(a, b) {
+            super.o4(a, b);
             let c = b;
             c.c9(a);
         }
-        get_fe() {
+        get_fd() {
             return true;
         }
-        zb(a, b, c) {
+        za(a, b, c) {
             return null;
         }
-        zc(a, b, c) {
+        zb(a, b, c) {
             if (this.dn == null) {
                 return null;
             }
-            let d = this.y1();
-            let e = this.yx.b1(this.v7(b));
+            let d = this.y0();
+            let e = this.yw.b1(this.v6(b));
             let f = -1;
             if (e == null) {
                 if (a != null) {
@@ -1064,11 +1064,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return g;
         }
-        wv(a, b) {
-            if (this.w8 != 1 && this.w8 != 13) {
-                let c = this.w6.cv();
-                let d = (c.width / 2) + (this.xj / 2);
-                let e = (c.height / 2) + (this.xj / 2);
+        wu(a, b) {
+            if (this.w7 != 1 && this.w7 != 13) {
+                let c = this.w5.cv();
+                let d = (c.width / 2) + (this.xi / 2);
+                let e = (c.height / 2) + (this.xi / 2);
                 let f = d;
                 let g = d;
                 let h = e;
@@ -1089,7 +1089,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return new Thickness(1, 0, 0, 0, 0);
         }
-        za(a, b, c) {
+        y9(a, b, c) {
             let d = new HighlightingInfo();
             d.i = this;
             d.g = 0;
@@ -1101,40 +1101,40 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             return d;
         }
         dg(a, b, c) {
-            if (this.ed && this.fz(this.bx) && !c) {
-                let d = this.zb(a, b, this.zd);
-                this.zd = d;
+            if (this.ed && this.fy(this.bx) && !c) {
+                let d = this.za(a, b, this.zc);
+                this.zc = d;
                 return d;
             }
             else {
-                let e = this.za(a, b, this.zd);
-                this.zd = e;
+                let e = this.y9(a, b, this.zc);
+                this.zc = e;
                 return e;
             }
         }
         dh(a, b, c) {
-            if (this.fz(this.bx) && !c) {
-                let d = this.zc(a, b, this.ze);
-                this.ze = d;
+            if (this.fy(this.bx) && !c) {
+                let d = this.zb(a, b, this.zd);
+                this.zd = d;
                 return d;
             }
             else {
-                let e = this.za(a, b, this.ze);
+                let e = this.y9(a, b, this.zd);
                 e.d = true;
-                this.ze = e;
+                this.zd = e;
                 return e;
             }
         }
-        zv() {
-            return (this.assigningScatterStyle != null && this.zl) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
-        }
         zu() {
-            return (this.assigningScatterMarkerStyle != null && this.zk) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
+            return (this.assigningScatterStyle != null && this.zk) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
         }
-        abq(a, b) {
-            this.qx();
+        zt() {
+            return (this.assigningScatterMarkerStyle != null && this.zj) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
+        }
+        abp(a, b) {
+            this.qw();
             let c = b.bx;
-            this.yw = ((() => {
+            this.yv = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -1142,10 +1142,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.e = this.yAxis.ch;
                 return $ret;
             })());
-            if (this.xg()) {
-                b.c0.j(a.j, this.xi);
-                if (this.zu()) {
-                    this.aa5(b, a);
+            if (this.xf()) {
+                b.c0.j(a.j, this.xh);
+                if (this.zt()) {
+                    this.aa4(b, a);
                 }
             }
             b.cr();
@@ -1155,28 +1155,28 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             b.c2.g$h(a.n, d);
-            this.abn(a, b);
+            this.abm(a, b);
         }
         ak(a, b) {
             let c = new List$1(ChartSelection.$, 0);
-            this.p4(a, c, b);
+            this.p3(a, c, b);
             return c.toArray();
         }
-        p4(a, b, c) {
-            this.aa7(a, b, c, 0, null);
+        p3(a, b, c) {
+            this.aa6(a, b, c, 0, null);
         }
-        aa7(a, b, c, d, e) {
-            let f = this.wr(a);
+        aa6(a, b, c, d, e) {
+            let f = this.wq(a);
             let g = this.dn.count;
-            let h = this.yw.a;
-            let i = this.yw.b;
-            let j = this.wj(this.cv);
+            let h = this.yv.a;
+            let i = this.yv.b;
+            let j = this.wi(this.cv);
             let k = new ScalerParams(0, f, this.db.wk, h.ch, this.getEffectiveViewport());
             let l = new ScalerParams(0, f, this.db.wk, i.ch, this.getEffectiveViewport());
             if (d == 0) {
                 for (let m = 0; m < g; m++) {
-                    let n = h.el(this.zh.item(m), k);
-                    let o = i.el(this.zi.item(m), l);
+                    let n = h.el(this.zg.item(m), k);
+                    let o = i.el(this.zh.item(m), l);
                     if (n < j.width && n > 0 && o < j.height && o > 0) {
                         if (c == 7 || c == 6) {
                             b.add(((() => {
@@ -1206,8 +1206,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             else {
                 for (let p = 0; p < g; p++) {
-                    let q = h.el(this.zh.item(p), k);
-                    let r = i.el(this.zi.item(p), l);
+                    let q = h.el(this.zg.item(p), k);
+                    let r = i.el(this.zh.item(p), l);
                     let s = e.item(p) / f.height;
                     let t = e.item(p) / f.width;
                     let u = new Rect(0, q - t / 2, r - s / 2, t, s);
@@ -1239,11 +1239,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        yp(a, b) {
-            return this.yq(a, b);
+        yo(a, b) {
+            return this.yp(a, b);
         }
-        yq(a, b) {
-            if (b < a || a < 0 || a > this.zh.count || b < 0 || b > this.zh.count) {
+        yp(a, b) {
+            if (b < a || a < 0 || a > this.zg.count || b < 0 || b > this.zg.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
@@ -1253,14 +1253,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        aa5(a, b) {
+        aa4(a, b) {
             a.b7 = true;
-            this.y9.ay(this, this.zu(), runOn(this, this.yp));
-            let c = this.y9.d;
+            this.y8.ay(this, this.zt(), runOn(this, this.yo));
+            let c = this.y8.d;
             let d = c != null;
             let e = this.getEffectiveViewport1(a);
             let f = this.dn == null ? 0 : this.dn.count;
-            this.yx.cj((g) => {
+            this.yw.cj((g) => {
                 if (g._visibility == 0) {
                     let h = g.ak;
                     let i = g.content;
@@ -1269,19 +1269,19 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         g.content = i;
                     }
                     if (d) {
-                        this.aba(h, f, a.q);
+                        this.aa9(h, f, a.q);
                     }
-                    this.y9.ac(g, i);
+                    this.y8.ac(g, i);
                 }
             });
         }
-        abb(a, b, c) {
+        aba(a, b, c) {
             let d = this.bx != 1;
             let e = this.cp != 1;
             let f = this.co != 1;
-            this.y9.a0(this.y9.b, a, b, false);
-            this.y9.ab(this.ib);
-            let g = this.y9.ax;
+            this.y8.a0(this.y8.b, a, b, false);
+            this.y8.ab(this.ia);
+            let g = this.y8.ax;
             let h = null;
             let i = null;
             let j = null;
@@ -1299,16 +1299,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 g.b = h;
             }
             g.h = c;
-            this.abl(g);
-            this.y9.z(this, h, i, j, c, d, e, f, a < 0);
+            this.abk(g);
+            this.y8.z(this, h, i, j, c, d, e, f, a < 0);
         }
-        aba(a, b, c) {
+        aa9(a, b, c) {
             let d = this.bx != 1;
             let e = this.cp != 1;
             let f = this.co != 1;
-            this.y9.a0(this.y9.d, a, b, true);
-            this.y9.aa(this.ib);
-            let g = this.y9.aw;
+            this.y8.a0(this.y8.d, a, b, true);
+            this.y8.aa(this.ia);
+            let g = this.y8.aw;
             let h = null;
             let i = null;
             let j = null;
@@ -1344,26 +1344,26 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 g.d = i;
             }
             g.h = c;
-            this.abk(g);
-            this.y9.y(this, h, i, j, c, d, e, f, g.v, this.db.dl.totalHighWaterMark, g.x, this.db.dm.totalHighWaterMark, g.t, this.db.dk.totalHighWaterMark);
+            this.abj(g);
+            this.y8.y(this, h, i, j, c, d, e, f, g.v, this.db.dl.totalHighWaterMark, g.x, this.db.dm.totalHighWaterMark, g.t, this.db.dk.totalHighWaterMark);
         }
-        abl(a) {
-            if (this.assigningScatterStyle != null && this.zl) {
+        abk(a) {
+            if (this.assigningScatterStyle != null && this.zk) {
                 this.assigningScatterStyle(this, a);
             }
         }
-        abk(a) {
-            if (this.assigningScatterMarkerStyle != null && this.zk) {
+        abj(a) {
+            if (this.assigningScatterMarkerStyle != null && this.zj) {
                 this.assigningScatterMarkerStyle(this, a);
             }
         }
-        abd(a, b) {
+        abc(a, b) {
             let c = new ErrorBarsHelper(this, b);
-            if (this.yy == null) {
+            if (this.yx == null) {
                 return;
             }
-            let d = this.yy.u;
-            let e = this.yy.v;
+            let d = this.yx.u;
+            let e = this.yx.v;
             let f = 0;
             let g = 0;
             let h = 0;
@@ -1373,35 +1373,35 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            let l = this.abg(k, c, d, h, i, true);
+                            let l = this.abf(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            let m = this.abe(k, c, d, h, i, true);
+                            let m = this.abd(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            let n = this.abc(k, c, d, j, h, i, true);
+                            let n = this.abb(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            let o = this.abh(c, d, f, h, i, true);
+                            let o = this.abg(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            let p = this.abe(k, c, d, h, i, true);
+                            let p = this.abd(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     let q = new OwnedPoint();
-                    q.c = c.l(d, this.yw.a, k.c, f);
+                    q.c = c.l(d, this.yv.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1409,53 +1409,53 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            let r = this.abg(k, c, e, h, i, false);
+                            let r = this.abf(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            let s = this.abe(k, c, e, h, i, false);
+                            let s = this.abd(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            let t = this.abc(k, c, e, j, h, i, false);
+                            let t = this.abb(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            let u = this.abh(c, e, g, h, i, false);
+                            let u = this.abg(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            let v = this.abe(k, c, e, h, i, false);
+                            let v = this.abd(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     let w = new OwnedPoint();
-                    w.c = c.m(e, this.yw.b, k.c, g);
+                    w.c = c.m(e, this.yv.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
                 }
             }
         }
-        abg(a, b, c, d, e, f) {
+        abf(a, b, c, d, e, f) {
             if (f) {
                 let g;
                 let h, i;
-                i = this.yw.a;
-                if (this.yy.s == 0) {
+                i = this.yv.a;
+                if (this.yx.s == 0) {
                     g = a.c.x;
-                    h = this.yw.a;
+                    h = this.yv.a;
                 }
                 else {
                     g = a.c.y;
-                    h = this.yw.b;
+                    h = this.yv.b;
                 }
                 let j = b.f(g, c, h, i, d, e);
                 d = j.p4;
@@ -1464,14 +1464,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             else {
                 let k;
                 let l, m;
-                m = this.yw.b;
-                if (this.yy.t == 0) {
+                m = this.yv.b;
+                if (this.yx.t == 0) {
                     k = a.c.x;
-                    l = this.yw.a;
+                    l = this.yv.a;
                 }
                 else {
                     k = a.c.y;
-                    l = this.yw.b;
+                    l = this.yv.b;
                 }
                 let n = b.f(k, c, l, m, d, e);
                 d = n.p4;
@@ -1482,14 +1482,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abe(a, b, c, d, e, f) {
+        abd(a, b, c, d, e, f) {
             if (f) {
-                let g = b.j(a.c.x, c, this.yw.a, d, e);
+                let g = b.j(a.c.x, c, this.yv.a, d, e);
                 d = g.p3;
                 e = g.p4;
             }
             else {
-                let h = b.j(a.c.y, c, this.yw.b, d, e);
+                let h = b.j(a.c.y, c, this.yv.b, d, e);
                 d = h.p3;
                 e = h.p4;
             }
@@ -1498,18 +1498,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abc(a, b, c, d, e, f, g) {
+        abb(a, b, c, d, e, f, g) {
             let h = c.getItemColumn();
             let i = this.dn.indexOf(d);
             if (h != null && i < h.count) {
                 let j = h.item(i);
                 if (g) {
-                    let k = b.h(a.c.x, j, this.yw.a, e, f);
+                    let k = b.h(a.c.x, j, this.yv.a, e, f);
                     e = k.p3;
                     f = k.p4;
                 }
                 else {
-                    let l = b.h(a.c.y, j, this.yw.b, e, f);
+                    let l = b.h(a.c.y, j, this.yv.b, e, f);
                     e = l.p3;
                     f = l.p4;
                 }
@@ -1523,16 +1523,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        abh(a, b, c, d, e, f) {
+        abg(a, b, c, d, e, f) {
             let g = a.i(b, c);
             c = g.p1;
             if (f) {
-                let h = a.k(c, b, this.yw.a, d, e);
+                let h = a.k(c, b, this.yv.a, d, e);
                 d = h.p3;
                 e = h.p4;
             }
             else {
-                let i = a.k(c, b, this.yw.b, d, e);
+                let i = a.k(c, b, this.yv.b, d, e);
                 d = i.p3;
                 e = i.p4;
             }
@@ -1542,29 +1542,29 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abn(a, b) {
-            if (!b.o() || this.yy == null) {
+        abm(a, b) {
+            if (!b.o() || this.yx == null) {
                 b.db();
                 return;
             }
+            this.abn(a, b);
             this.abo(a, b);
-            this.abp(a, b);
         }
-        abo(a, b) {
+        abn(a, b) {
             b.c7();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.yy.u;
+            let e = this.yx.u;
             for (let f of fromEnum(a.j.keys)) {
                 if (e != null && a.i.containsKey(f)) {
                     let g = a.i.item(f)[0];
                     let h = a.i.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         let i = a.h.item(f).c;
-                        if (this.yy.o == 1 || this.yy.o == 2) {
+                        if (this.yx.o == 1 || this.yx.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.yy.o == 1 || this.yy.o == 3) {
+                        if (this.yx.o == 1 || this.yx.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1572,38 +1572,38 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             b.dc(d);
         }
-        abp(a, b) {
+        abo(a, b) {
             b.c8();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.yy.v;
+            let e = this.yx.v;
             for (let f of fromEnum(a.j.keys)) {
                 if (e != null && a.k.containsKey(f)) {
                     let g = a.k.item(f)[0];
                     let h = a.k.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         let i = a.l.item(f).c;
-                        if (this.yy.p == 1 || this.yy.p == 2) {
+                        if (this.yx.p == 1 || this.yx.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.yy.p == 1 || this.yy.p == 3) {
+                        if (this.yx.p == 1 || this.yx.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
                 }
             }
         }
-        he(a, b, c) {
+        hd(a, b, c) {
             let d = true;
-            if (!super.he(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.zh == null || this.zi == null || this.zh.count == 0 || this.zi.count == 0 || this.dn == null || this.dn.count != this.zh.count || this.dn.count != this.zi.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.l4 == this.xAxis.l3 || this.yAxis.l4 == this.yAxis.l3) {
+            if (!super.hd(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.zg == null || this.zh == null || this.zg.count == 0 || this.zh.count == 0 || this.dn == null || this.dn.count != this.zg.count || this.dn.count != this.zh.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.l4 == this.xAxis.l3 || this.yAxis.l4 == this.yAxis.l3) {
                 d = false;
             }
             return d;
         }
         getViewInfo(a, b) {
-            if (!this.acl.isEmpty && !this.acm.isEmpty) {
-                a = this.acl;
-                b = this.acm;
+            if (!this.ack.isEmpty && !this.acl.isEmpty) {
+                a = this.ack;
+                b = this.acl;
                 return {
                     p0: a,
                     p1: b
@@ -1616,53 +1616,53 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        rs(a) {
-            super.rs(a);
-            this.aa3();
+        rr(a) {
+            super.rr(a);
+            this.aa2();
             try {
                 if (this.d5(this.cv)) {
                     return;
                 }
-                if (this.dn != null && this.dn.count > this.z9) {
+                if (this.dn != null && this.dn.count > this.z8) {
                     a = false;
                 }
-                if (this.gf(a) && !this.gr) {
-                    let b = this.y2;
+                if (this.ge(a) && !this.gq) {
+                    let b = this.y1;
                     if (this.d3()) {
                         if (this.dc.g) {
                             this.dc.t();
                         }
-                        this.y2 = this.y4;
-                        this.y4 = b;
+                        this.y1 = this.y3;
+                        this.y3 = b;
                     }
                     else {
-                        this.y2 = this.y0;
-                        this.y0 = b;
+                        this.y1 = this.yz;
+                        this.yz = b;
                     }
-                    this.abf(this.y0, this.yx);
-                    this.r7();
+                    this.abe(this.yz, this.yw);
+                    this.r6();
                 }
                 else {
-                    if (!this.gr) {
-                        this.abf(this.y0, this.yx);
+                    if (!this.gq) {
+                        this.abe(this.yz, this.yw);
                     }
-                    this.abq(this.y0, this.yx);
+                    this.abp(this.yz, this.yw);
                 }
             }
             finally {
-                this.abr();
+                this.abq();
             }
         }
-        sh() {
-            super.sh();
+        sg() {
+            super.sg();
             if (this.index < 0) {
                 return;
             }
-            this.yx.df();
+            this.yw.df();
         }
-        rt(a, b) {
-            super.rt(a, b);
-            if (!this.g0) {
+        rs(a, b) {
+            super.rs(a, b);
+            if (!this.gz) {
                 this.cv.a4(b);
                 return;
             }
@@ -1671,29 +1671,29 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return;
             }
             let c = typeCast(ScatterBaseView.$, this.cu);
-            if (!this.gs) {
-                this.y3 = new ScatterFrame();
-                this.abf(this.y3, c);
+            if (!this.gr) {
+                this.y2 = new ScatterFrame();
+                this.abe(this.y2, c);
             }
-            this.gs = false;
-            this.abq(this.y3, c);
-            this.g0 = false;
+            this.gr = false;
+            this.abp(this.y2, c);
+            this.gz = false;
         }
-        rq(a, b, c, d, e) {
-            super.rq(a, b, c, d, e);
+        rp(a, b, c, d, e) {
+            super.rp(a, b, c, d, e);
             let f = this.ba.a$j.item(d);
             let g = f;
             f.a3(c);
             if (this.d5(g)) {
                 return;
             }
-            if (this.yz == null) {
-                this.yz = new ScatterFrame();
+            if (this.yy == null) {
+                this.yy = new ScatterFrame();
             }
-            this.abf(this.yz, g);
-            this.abq(this.yz, g);
+            this.abe(this.yy, g);
+            this.abp(this.yy, g);
         }
-        abm(a, b) {
+        abl(a, b) {
             let c = new List$1(Base.$, 0);
             for (let d of fromEnum(b.c)) {
                 if (!a.containsKey(d)) {
@@ -1704,10 +1704,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 b.h(e);
             }
         }
-        yo(a, b, c, d, e) {
-            if (c == null || c.length != this.yw.c.count) {
-                c = new Array(this.yw.c.count);
-                for (let f = 0; f < this.yw.c.count; f++) {
+        yn(a, b, c, d, e) {
+            if (c == null || c.length != this.yv.c.count) {
+                c = new Array(this.yv.c.count);
+                for (let f = 0; f < this.yv.c.count; f++) {
                     c[f] = PointUtil.create();
                 }
             }
@@ -1720,31 +1720,31 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             let i = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.ch, g);
                 $ret.c = this.getEffectiveViewport1(a);
-                $ret.b = this.iy();
+                $ret.b = this.ix();
                 return $ret;
             })());
-            let j = this.wj(a);
-            let k = this.yw.a.eo(j.left, h);
-            let l = this.yw.a.eo(j.right, h);
-            let m = this.yw.b.eo(j.bottom, i);
-            let n = this.yw.b.eo(j.top, i);
-            if (this.yw.d) {
+            let j = this.wi(a);
+            let k = this.yv.a.eo(j.left, h);
+            let l = this.yv.a.eo(j.right, h);
+            let m = this.yv.b.eo(j.bottom, i);
+            let n = this.yv.b.eo(j.top, i);
+            if (this.yv.d) {
                 let o = k;
                 k = l;
                 l = o;
             }
-            if (this.yw.e) {
+            if (this.yv.e) {
                 let p = m;
                 m = n;
                 n = p;
             }
-            let q = this.yw;
+            let q = this.yv;
             let r = q.a;
             let s = q.b;
             let t;
             let u;
-            let v = this.zh;
-            let w = this.zi;
+            let v = this.zg;
+            let w = this.zh;
             let x = false;
             let y = 0;
             let z = 0;
@@ -1758,7 +1758,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     z -= ab;
                 }
             }
-            for (let ac = 0; ac < this.yw.c.count; ac++) {
+            for (let ac = 0; ac < this.yv.c.count; ac++) {
                 t = v.item(ac);
                 u = w.item(ac);
                 let ad = 1E-10;
@@ -1791,7 +1791,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        zx(a, b) {
+        zw(a, b) {
             if (b == null) {
                 b = new List$1(Number_$type, 2, a.e);
             }
@@ -1805,32 +1805,32 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        pz(a) {
-            super.pz(a);
-            this.bc.exportTrendlineData(this, a, this.yx.c2.g$j);
+        py(a) {
+            super.py(a);
+            this.bc.exportTrendlineData(this, a, this.yw.c2.g$j);
         }
-        iy() {
-            return Series.iz(this.zi, null);
+        ix() {
+            return Series.iy(this.zh, null);
         }
         getDataLegendSeriesContextAt(a, b) {
             let c = { $type: Point_$type, x: a, y: b };
-            let d = this.kn(c);
-            let e = d == null ? NaN : this.ix(d, "XMemberPath");
-            let f = d == null ? NaN : this.ix(d, "YMemberPath");
+            let d = this.km(c);
+            let e = d == null ? NaN : this.iw(d, "XMemberPath");
+            let f = d == null ? NaN : this.iw(d, "YMemberPath");
             let g = new DataLegendSeriesValueInfo();
             g.l = e;
             g.a = 13;
             g.q = "X";
-            g.r = this.aat != null ? this.aat : "X";
-            g.s = this.aap != null ? this.aap : "X:";
-            g.t = this.aar != null ? this.aar : "";
+            g.r = this.aas != null ? this.aas : "X";
+            g.s = this.aao != null ? this.aao : "X:";
+            g.t = this.aaq != null ? this.aaq : "";
             let h = new DataLegendSeriesValueInfo();
             h.l = f;
             h.a = 14;
             h.q = "Y";
-            h.r = this.aa1 != null ? this.aa1 : "Y";
-            h.s = this.aax != null ? this.aax : "Y:";
-            h.t = this.aaz != null ? this.aaz : "";
+            h.r = this.aa0 != null ? this.aa0 : "Y";
+            h.s = this.aaw != null ? this.aaw : "Y:";
+            h.t = this.aay != null ? this.aay : "";
             let i = new DataLegendSeriesContext();
             i.e = ((() => {
                 let $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -1838,23 +1838,23 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.add(h);
                 return $ret;
             })());
-            i.h = this.mc();
+            i.h = this.mb();
             return i;
         }
-        abs() {
-            if (this.zj) {
+        abr() {
+            if (this.zi) {
+                this.zx = 0;
                 this.zy = 0;
-                this.zz = 0;
-                for (let a = 0; a < this.zh.count; a++) {
+                for (let a = 0; a < this.zg.count; a++) {
+                    this.zx += this.zg.item(a);
                     this.zy += this.zh.item(a);
-                    this.zz += this.zi.item(a);
                 }
+                this.zz = this.zx / this.zg.count;
                 this.z0 = this.zy / this.zh.count;
-                this.z1 = this.zz / this.zi.count;
-                this.zj = false;
+                this.zi = false;
             }
         }
-        i8(a, b) {
+        i7(a, b) {
             if (b == null || !b.cj) {
                 return NaN;
             }
@@ -1875,44 +1875,44 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             switch (a) {
                 case 5:
                 case 2:
-                    b = this.zh.maximum;
-                    c = this.zi.maximum;
+                    b = this.zg.maximum;
+                    c = this.zh.maximum;
                     break;
                 case 4:
                 case 1:
-                    b = this.zh.minimum;
-                    c = this.zi.minimum;
+                    b = this.zg.minimum;
+                    c = this.zh.minimum;
                     break;
                 case 6:
                 case 3:
-                    if (this.zj) {
-                        this.abs();
+                    if (this.zi) {
+                        this.abr();
                     }
-                    b = this.z0;
-                    c = this.z1;
+                    b = this.zz;
+                    c = this.z0;
                     break;
             }
             return [b, c];
         }
-        wg(a) {
+        wf(a) {
             let b = this.getEffectiveViewport1(this.cv);
             let c = new ScalerParams(0, this.cv.by, this.cv.bx, this.xAxis.ch, b);
             c.c = b;
             let d = isNaN_(a[0]) ? NaN : this.xAxis.el(a[0], c);
             c = new ScalerParams(0, this.cv.by, this.cv.bx, this.yAxis.ch, b);
-            c.b = this.iy();
+            c.b = this.ix();
             c.c = b;
             let e = isNaN_(a[1]) ? NaN : this.yAxis.el(a[1], c);
             return { $type: Point_$type, x: d, y: e };
         }
-        wf(a) {
+        we(a) {
             let b = this.aq(a);
-            return this.wg(b);
+            return this.wf(b);
         }
     }
     ScatterBase.$t = /*@__PURE__*/ markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.abt = /*@__PURE__*/ DependencyProperty.i("ActualTrendLineBrush", Brush.$, ScatterBase.$, /*@__PURE__*/ new PropertyMetadata(2, null, (a, b) => a.raisePropertyChanged("ActualTrendLineBrush", b.oldValue, b.newValue)));
-    ScatterBase.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, ScatterBase, 'raisePropertyChanged', ['ErrorBarSettings:yy:abu', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aad:abv', [2, null], 'HighlightedYMemberPath:aaf:abw', [2, null], 'IsCustomScatterMarkerStyleAllowed:zo:abx', [0, false], 'IsCustomScatterStyleAllowed:zp:aby', [0, false], 'ItemSearchMode:y8:abz', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:z8:ab0', [1, 10000], 'MarkerCollisionAvoidance:yt:ab1', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:z9:ab2', [1, 400], 'XAxis::aca', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aap:acb', [2, null], 'XMemberAsLegendUnit:aar:acc', [2, null], 'XMemberPath:aat:acd', [2, null], 'YAxis::ace', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aax:acf', [2, null], 'YMemberAsLegendUnit:aaz:acg', [2, null], 'YMemberPath:aa1:ach', [2, null], 'TrendLineType::ab8', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::ab7', [1, 1.5], 'TrendLinePeriod::ab6', [1, 7], 'TrendLineBrush::ab3', [Brush.$, null], 'TrendLineZIndex:aaa:ab9', [1, 1001], 'TrendLineDashArray:acj:ab4', [DoubleCollection.$], 'TrendLineDashCap:ack:ab5', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.abs = /*@__PURE__*/ DependencyProperty.i("ActualTrendLineBrush", Brush.$, ScatterBase.$, /*@__PURE__*/ new PropertyMetadata(2, null, (a, b) => a.raisePropertyChanged("ActualTrendLineBrush", b.oldValue, b.newValue)));
+    ScatterBase.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, ScatterBase, 'raisePropertyChanged', ['ErrorBarSettings:yx:abt', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aac:abu', [2, null], 'HighlightedYMemberPath:aae:abv', [2, null], 'IsCustomScatterMarkerStyleAllowed:zn:abw', [0, false], 'IsCustomScatterStyleAllowed:zo:abx', [0, false], 'ItemSearchMode:y7:aby', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:z7:abz', [1, 10000], 'MarkerCollisionAvoidance:ys:ab0', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:z8:ab1', [1, 400], 'XAxis::ab9', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aao:aca', [2, null], 'XMemberAsLegendUnit:aaq:acb', [2, null], 'XMemberPath:aas:acc', [2, null], 'YAxis::acd', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aaw:ace', [2, null], 'YMemberAsLegendUnit:aay:acf', [2, null], 'YMemberPath:aa0:acg', [2, null], 'TrendLineType::ab7', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::ab6', [1, 1.5], 'TrendLinePeriod::ab5', [1, 7], 'TrendLineBrush::ab2', [Brush.$, null], 'TrendLineZIndex:z9:ab8', [1, 1001], 'TrendLineDashArray:aci:ab3', [DoubleCollection.$], 'TrendLineDashCap:acj:ab4', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 })();
 /**
@@ -1988,7 +1988,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             this.dh = new Path();
             this.di = new Path();
             if (!this.q) {
-                this.c1.z9 = 2000;
+                this.c1.z8 = 2000;
             }
         }
         dj(a) {
@@ -2006,12 +2006,12 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return new Size(1, this.dg.width, this.dg.height);
         }
         cz() {
-            let a = new NumericMarkerManager(1, (b) => this.c3.item(b), (b) => this.c1.yw.c.item(b), runOn(this, this.de), runOn(this, this.cw), runOn(this, this.c4), () => this.c1.yt);
+            let a = new NumericMarkerManager(1, (b) => this.c3.item(b), (b) => this.c1.yv.c.item(b), runOn(this, this.de), runOn(this, this.cw), runOn(this, this.c4), () => this.c1.ys);
             a.q = runOn(this, this.dj);
             return a;
         }
         de(a) {
-            this.c1.abm(a, this.c3);
+            this.c1.abl(a, this.c3);
         }
         c5() {
             return this.b8;
@@ -2020,11 +2020,11 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return this.cy;
         }
         cw() {
-            this.cy = this.c1.yo(this, this.c3, this.cy, this.by, this.bx);
+            this.cy = this.c1.yn(this, this.c3, this.cy, this.by, this.bx);
             return this.cy;
         }
         c4() {
-            this.c6 = this.c1.zx(this.c3, this.c6);
+            this.c6 = this.c1.zw(this.c3, this.c6);
             return this.c6;
         }
         c7() {
@@ -2037,10 +2037,10 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
         }
         df() {
             if (this.c1.trendLineBrush != null) {
-                this.c1.aci = this.c1.trendLineBrush;
+                this.c1.ach = this.c1.trendLineBrush;
             }
             else {
-                this.c1.aci = this.c1.u9;
+                this.c1.ach = this.c1.u8;
             }
         }
         cj(a) {
@@ -2057,9 +2057,9 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
                 if (this.c1.trendLineType != 0 && !b) {
                     let c = this.c2.g$j;
                     c.ad = this.c1.trendLineThickness;
-                    c._stroke = this.c1.aci;
-                    c.ai = this.c1.acj;
-                    c.aj = this.c1.ack;
+                    c._stroke = this.c1.ach;
+                    c.ai = this.c1.aci;
+                    c.aj = this.c1.acj;
                     a.v(c);
                 }
             }
@@ -2078,7 +2078,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             if (!stringIsNullOrEmpty(b)) {
                 a += " style='color:" + b + "'";
             }
-            a += ">" + this.c1.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.c1.aat + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.c1.aa1 + "}</span></div>";
+            a += ">" + this.c1.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.c1.aas + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.c1.aa0 + "}</span></div>";
             return a;
         }
     }