igniteui-webcomponents-charts 6.0.2-beta.4 → 6.0.2-beta.5

package/esm2015/lib/ScatterBase_combined.js

@@ -69,9 +69,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             this.xAxis = null;
             this.yAxis = null;
         }
-        q7(a) {
-            super.q7(a);
-            this.y7 = a;
+        q8(a) {
+            super.q8(a);
+            this.y8 = a;
         }
         get_fx() {
             return true;
@@ -82,32 +82,32 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         ku(a, b) {
             let c = this.ni(b);
             if (c == ScatterBase.$$p[12]) {
-                return this.kv(a, b, this.aa3);
+                return this.kv(a, b, this.aa4);
             }
             if (c == ScatterBase.$$p[16]) {
-                return this.kv(a, b, this.abb);
+                return this.kv(a, b, this.abc);
             }
             if (c == ScatterBase.$$p[1]) {
-                return this.kv(a, b, this.aan);
+                return this.kv(a, b, this.aao);
             }
             if (c == ScatterBase.$$p[2]) {
-                return this.kv(a, b, this.aap);
+                return this.kv(a, b, this.aaq);
             }
             return null;
         }
         mi(a) {
             let b = this.ni(a);
             if (b == ScatterBase.$$p[12]) {
-                return this.aa3;
+                return this.aa4;
             }
             if (b == ScatterBase.$$p[16]) {
-                return this.abb;
+                return this.abc;
             }
             if (b == ScatterBase.$$p[1]) {
-                return this.aan;
+                return this.aao;
             }
             if (b == ScatterBase.$$p[2]) {
-                return this.aap;
+                return this.aaq;
             }
             return super.mi(a);
         }
@@ -116,27 +116,27 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return false;
             }
             let f = this.xAxis;
-            let g = new ScalerParams(1, this.dc.xm, this.w2, f.df);
+            let g = new ScalerParams(1, this.dc.xn, this.w3, f.df);
             g.c = this.getEffectiveViewport1(this.cw);
             let h = this.yAxis;
-            let i = new ScalerParams(1, this.dc.xm, this.w2, h.df);
+            let i = new ScalerParams(1, this.dc.xn, this.w3, h.df);
             i.c = this.getEffectiveViewport1(this.cw);
             a.clear();
-            this.xg.cw((j) => {
+            this.xh.cw((j) => {
                 if (j._visibility == 0) {
                     let k = new SeriesPointOfInterest();
                     let l = j.n;
                     let m = j.o;
-                    if (!e && (l < this.w2.left || l > this.w2.right || m < this.w2.top || m > this.w2.bottom)) {
+                    if (!e && (l < this.w3.left || l > this.w3.right || m < this.w3.top || m > this.w3.bottom)) {
                         return;
                     }
                     k.d = f.fw(l, g);
                     k.e = h.fw(m, i);
                     k.b = j.content;
-                    k.g = this.vq;
+                    k.g = this.vr;
                     k.c = j.ak;
                     if (this.ha) {
-                        k.g = this.vx(j.ak);
+                        k.g = this.vy(j.ak);
                     }
                     a.add(k);
                 }
@@ -145,7 +145,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         b3() {
             if (this.b4 == 0) {
-                if (this.aaj <= 2000) {
+                if (this.aak <= 2000) {
                     return 1;
                 }
                 else {
@@ -156,64 +156,54 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return super.b3();
             }
         }
-        wz(a) {
-            if (!this.hasMarkers || !this.xq()) {
+        w0(a) {
+            if (!this.hasMarkers || !this.xr()) {
                 return Rect.empty;
             }
-            let b = this.xg.ce(this.wh(a));
+            let b = this.xh.ce(this.wi(a));
             if (b != null) {
-                return this.xg.c7(b);
+                return this.xh.c7(b);
             }
             return Rect.empty;
         }
         gx(a, b) {
-            if (this.xr(a, b)) {
+            if (this.xs(a, b)) {
                 return true;
             }
             return false;
         }
         constructor() {
             super();
-            this.y6 = null;
-            this.zp = null;
+            this.y7 = null;
             this.zq = null;
-            this.acv = null;
+            this.zr = null;
             this.acw = null;
-            this.zf = 1;
-            this.yw = null;
+            this.acx = null;
+            this.zg = 1;
             this.yx = null;
-            this.zc = null;
-            this.ze = null;
-            this.za = null;
+            this.yy = null;
+            this.zd = null;
+            this.zf = null;
+            this.zb = null;
+            this.zw = false;
             this.zv = false;
-            this.zu = false;
-            this.zn = null;
             this.zo = null;
+            this.zp = null;
             this.assigningScatterStyle = null;
             this.assigningScatterMarkerStyle = null;
-            this.zj = null;
-            this.zd = null;
-            this.y9 = null;
-            this.zt = true;
-            this.z8 = 0;
+            this.zk = null;
+            this.ze = null;
+            this.za = null;
+            this.zu = true;
             this.z9 = 0;
             this.aaa = 0;
             this.aab = 0;
-            this.zg = this.zh();
-            this.zj = new ScatterSeriesRenderManager();
-            this.zd = new ScatterFrame();
+            this.aac = 0;
+            this.zh = this.zi();
+            this.zk = new ScatterSeriesRenderManager();
+            this.ze = new ScatterFrame();
+            this.acx = Rect.empty;
             this.acw = Rect.empty;
-            this.acv = Rect.empty;
-        }
-        get zr() {
-            return this.zp;
-        }
-        set zr(a) {
-            if (this.zp != a) {
-                let b = this.zr;
-                this.zp = a;
-                this.raisePropertyChanged("XColumn", b, this.zr);
-            }
         }
         get zs() {
             return this.zq;
@@ -222,13 +212,23 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             if (this.zq != a) {
                 let b = this.zs;
                 this.zq = a;
-                this.raisePropertyChanged("YColumn", b, this.zs);
+                this.raisePropertyChanged("XColumn", b, this.zs);
+            }
+        }
+        get zt() {
+            return this.zr;
+        }
+        set zt(a) {
+            if (this.zr != a) {
+                let b = this.zt;
+                this.zr = a;
+                this.raisePropertyChanged("YColumn", b, this.zt);
             }
         }
         gc() {
-            return this.highlightedItemsSource != null || (this.aan != null && this.aap != null);
+            return this.highlightedItemsSource != null || (this.aao != null && this.aaq != null);
         }
-        z6() {
+        z7() {
             return false;
         }
         hu() {
@@ -242,7 +242,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.abj));
+                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.abk));
                 a.add(b);
             }
             {
@@ -254,10 +254,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.abi));
+                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.abj));
                 a.add(c);
             }
-            if (this.z6()) {
+            if (this.z7()) {
                 let d = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -274,7 +274,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 })());
                 a.add(d);
             }
-            if (!this.z6()) {
+            if (!this.z7()) {
                 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.r8));
+                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.r9));
                 a.add(e);
             }
-            if (!this.z6()) {
+            if (!this.z7()) {
                 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.r8));
+                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.r9));
                 a.add(f);
             }
             return a;
         }
-        abi(a, b) {
-            if (this.aan != null) {
-                b.value = this.aan;
+        abj(a, b) {
+            if (this.aao != null) {
+                b.value = this.aao;
                 return;
             }
-            b.value = this.aa3;
+            b.value = this.aa4;
         }
-        abj(a, b) {
-            if (this.aap != null) {
-                b.value = this.aap;
+        abk(a, b) {
+            if (this.aaq != null) {
+                b.value = this.aaq;
                 return;
             }
-            b.value = this.abb;
+            b.value = this.abc;
         }
-        get acs() {
-            return this.c(ScatterBase.ab3);
+        get act() {
+            return this.c(ScatterBase.ab4);
         }
-        set acs(a) {
-            this.h(ScatterBase.ab3, a);
+        set act(a) {
+            this.h(ScatterBase.ab4, a);
         }
         get GetErrorBarsXAxis() {
             return this.xAxis;
@@ -337,32 +337,32 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 this.yAxis.k3(false);
             }
         }
-        rg(a, b, c, d) {
-            super.rg(a, b, c, d);
-            if (this.y7.df.g$e(a, b, c, d)) {
-                this.ry(false);
-                this.qr();
+        rh(a, b, c, d) {
+            super.rh(a, b, c, d);
+            if (this.y8.df.g$e(a, b, c, d)) {
+                this.rz(false);
+                this.qs();
             }
             switch (b) {
                 case ScatterBase.$$p[10]:
                 case ScatterBase.$$p[14]:
                 case ScatterBase.$$p[11]:
                 case ScatterBase.$$p[15]:
-                    this.ql();
+                    this.qm();
                     break;
                 case "FastItemsSource":
                     if (typeCast(IFastItemsSource_$type, c) != null) {
-                        c.deregisterColumn(this.zr);
                         c.deregisterColumn(this.zs);
-                        this.zr = null;
+                        c.deregisterColumn(this.zt);
                         this.zs = null;
+                        this.zt = null;
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.zr = this.dl(this.aa3);
-                        this.zs = this.dl(this.abb);
+                        this.zs = this.dl(this.aa4);
+                        this.zt = this.dl(this.abc);
                     }
                     if ((this.yAxis != null && !this.yAxis.d2()) || (this.xAxis != null && !this.xAxis.d2())) {
-                        this.ry(this.gh && c != null);
+                        this.rz(this.gh && c != null);
                     }
                     break;
                 case ScatterBase.$$p[9]:
@@ -373,9 +373,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.du(this);
                     }
                     if ((this.xAxis != null && !this.xAxis.d2()) || (d == null && c != null)) {
-                        this.ry(false);
+                        this.rz(false);
                     }
-                    this.qr();
+                    this.qs();
                     break;
                 case ScatterBase.$$p[13]:
                     if (c != null) {
@@ -385,136 +385,136 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.du(this);
                     }
                     if ((this.yAxis != null && !this.yAxis.d2()) || (d == null && c != null)) {
-                        this.ry(false);
+                        this.rz(false);
                     }
-                    this.qr();
+                    this.qs();
                     break;
                 case ScatterBase.$$p[12]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.zr);
-                        this.zr = this.dl(this.aa3);
+                        this.dp.deregisterColumn(this.zs);
+                        this.zs = this.dl(this.aa4);
                     }
                     break;
                 case "XColumn":
-                    this.y7.df.g$m();
+                    this.y8.df.g$m();
                     if (this.xAxis != null && !this.xAxis.d2()) {
-                        this.ry(this.gh && this.d9);
+                        this.rz(this.gh && this.d9);
                     }
                     break;
                 case ScatterBase.$$p[16]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.zs);
-                        this.zs = this.dl(this.abb);
+                        this.dp.deregisterColumn(this.zt);
+                        this.zt = this.dl(this.abc);
                     }
                     break;
                 case "YColumn":
-                    this.y7.df.g$m();
+                    this.y8.df.g$m();
                     if (this.yAxis != null && !this.yAxis.d2()) {
-                        this.ry(this.gh && this.d9);
+                        this.rz(this.gh && this.d9);
                     }
                     break;
                 case ScatterBase.$$p[7]:
-                    this.ry(false);
-                    this.qr();
+                    this.rz(false);
+                    this.qs();
                     break;
                 case ScatterBase.$$p[8]:
-                    this.ry(false);
-                    this.qr();
+                    this.rz(false);
+                    this.qs();
                     break;
                 case "TransitionProgress":
-                    this.ze.c(this.ju, this.zc, this.za);
-                    this.abd();
+                    this.zf.c(this.ju, this.zd, this.zb);
+                    this.abe();
                     try {
                         if (this.d7(this.cw)) {
                             return;
                         }
                         if ((Math.round(this.ju * 100000) / 100000) == 1) {
-                            this.ab0(this.za, this.y7);
+                            this.ab1(this.zb, this.y8);
                         }
                         else {
-                            this.ab0(this.ze, this.y7);
+                            this.ab1(this.zf, this.y8);
                         }
                         if (this.dc != null) {
-                            this.dc.rz(this);
+                            this.dc.r0(this);
                         }
                     }
                     finally {
-                        this.ab1();
+                        this.ab2();
                     }
                     break;
                 case "TrendLineBrush":
-                    this.rm(b);
+                    this.rn(b);
                     break;
                 case ScatterBase.$$p[0]:
-                    if (this.y8 != null) {
-                        this.y8.r = this;
+                    if (this.y9 != null) {
+                        this.y9.r = this;
                     }
-                    this.ry(false);
-                    this.qr();
+                    this.rz(false);
+                    this.qs();
                     break;
                 case "TrendLineType":
-                    this.qr();
+                    this.qs();
                     break;
                 case ScatterBase.$$p[4]:
-                    this.zv = this.z3();
-                    this.ry(false);
+                    this.zw = this.z4();
+                    this.rz(false);
                     break;
                 case ScatterBase.$$p[3]:
-                    this.zu = this.z2();
-                    this.ry(false);
+                    this.zv = this.z3();
+                    this.rz(false);
                     break;
                 case ScatterBase.$$p[5]:
-                    this.zg = this.zh();
+                    this.zh = this.zi();
                     break;
             }
         }
+        z4() {
+            return this.z0;
+        }
         z3() {
             return this.zz;
         }
-        z2() {
-            return this.zy;
-        }
-        zx(a) {
+        zy(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        zw(a) {
+        zx(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        ab1() {
-            this.acv = Rect.empty;
+        ab2() {
             this.acw = Rect.empty;
+            this.acx = Rect.empty;
         }
-        abd() {
-            let a = this.getViewInfo(this.acv, this.acw);
-            this.acv = a.p0;
-            this.acw = a.p1;
+        abe() {
+            let a = this.getViewInfo(this.acw, this.acx);
+            this.acw = a.p0;
+            this.acx = a.p1;
         }
-        z1(a, b) {
+        z2(a, b) {
             if (b != 3) {
                 return true;
             }
             if (a == null) {
                 return true;
             }
-            if (this.aa3 == a || this.abb == a) {
+            if (this.aa4 == a || this.abc == a) {
                 return true;
             }
             return false;
         }
         ph(a, b, c, d) {
             let e = false;
-            if (!this.z1(d, a)) {
+            if (!this.z2(d, a)) {
                 return;
             }
-            this.y7.df.g$i(a, b, c, d);
-            if (this.y7.aa.count > 0) {
-                for (let f of fromEnum(this.y7.aa)) {
+            this.y8.df.g$i(a, b, c, d);
+            if (this.y8.aa.count > 0) {
+                for (let f of fromEnum(this.y8.aa)) {
                     f.g$i(a, b, c, d);
                 }
             }
@@ -525,28 +525,28 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 e = true;
             }
             if (a == 0 || a == 2 || a == 3 || a == 4) {
-                this.zt = true;
+                this.zu = true;
             }
             else if (a == 1) {
                 for (let g = b; g < b + c; g++) {
-                    this.z8 += this.zr.item(g);
                     this.z9 += this.zs.item(g);
+                    this.aaa += this.zt.item(g);
                 }
-                this.aaa = this.z8 / this.zr.count;
                 this.aab = this.z9 / this.zs.count;
+                this.aac = this.aaa / this.zt.count;
             }
             if (e) {
-                this.ry(true);
+                this.rz(true);
             }
         }
-        abs(a) {
-            this.abt(a, null);
+        abt(a) {
+            this.abu(a, null);
         }
-        abt(a, b) {
-            let c = this.zr != null ? this.zr.count : 0;
-            let d = this.zs != null ? this.zs.count : 0;
+        abu(a, b) {
+            let c = this.zs != null ? this.zs.count : 0;
+            let d = this.zt != null ? this.zt.count : 0;
             let e = Math.min(c, d);
-            if (e <= this.aaj) {
+            if (e <= this.aak) {
                 a.n.clear();
                 let f = new List$1(OwnedPoint.$, 0);
                 for (let g of fromEnum(a.v.values)) {
@@ -580,12 +580,12 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
         }
         ay(a) {
-            if (a != null && a == this.xAxis && this.zr != null) {
-                return new AxisRange(this.zr.minimum, this.zr.maximum);
-            }
-            if (a != null && a == this.yAxis && this.zs != null) {
+            if (a != null && a == this.xAxis && this.zs != null) {
                 return new AxisRange(this.zs.minimum, this.zs.maximum);
             }
+            if (a != null && a == this.yAxis && this.zt != null) {
+                return new AxisRange(this.zt.minimum, this.zt.maximum);
+            }
             return null;
         }
         kr(a) {
@@ -595,58 +595,58 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        get zg() {
-            return this.zf;
+        get zh() {
+            return this.zg;
         }
-        set zg(a) {
-            let b = this.zf;
-            this.zf = a;
-            if (b != this.zf) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.zf));
+        set zh(a) {
+            let b = this.zg;
+            this.zg = a;
+            if (b != this.zg) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.zg));
             }
         }
-        zh() {
-            if (this.zi != 0) {
-                return this.zi;
+        zi() {
+            if (this.zj != 0) {
+                return this.zj;
             }
-            return this.z0 ? 4 : 1;
+            return this.z1 ? 4 : 1;
         }
         j7(a) {
             let b = truncate(Math.round(this.it(a)));
             return b;
         }
         it(a) {
-            switch (this.zg) {
-                case 1: return this.aaf(a);
-                case 3: return this.aag(a);
-                case 2: return this.aad(a);
-                case 4: return this.aae(a);
-                case 5: return this.aac(a);
+            switch (this.zh) {
+                case 1: return this.aag(a);
+                case 3: return this.aah(a);
+                case 2: return this.aae(a);
+                case 4: return this.aaf(a);
+                case 5: return this.aad(a);
             }
             return -1;
         }
-        aae(a) {
-            return this.aah(a, false);
+        aaf(a) {
+            return this.aai(a, false);
         }
-        aad(a) {
-            let b = this.wh(a);
+        aae(a) {
+            let b = this.wi(a);
             let c = b.x;
             let d = b.y;
-            if (this.dp == null || this.xAxis == null || this.yAxis == null || this.zr == null || this.zs == null) {
+            if (this.dp == null || this.xAxis == null || this.yAxis == null || this.zs == null || this.zt == null) {
                 return -1;
             }
-            if (this.dp.count > this.aai) {
+            if (this.dp.count > this.aaj) {
                 return -1;
             }
-            this.abg();
-            let e = this.yw;
-            let f = this.yx;
+            this.abh();
+            let e = this.yx;
+            let f = this.yy;
             if (e == null || f == null) {
                 return -1;
             }
             let g = 1.7976931348623157E+308;
             let h = -1;
-            for (let i = 0; i < this.zr.count; i++) {
+            for (let i = 0; i < this.zs.count; i++) {
                 let j = e[i];
                 let k = f[i];
                 let l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -657,61 +657,61 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        abg() {
+        abh() {
             let a = this.cw.ca;
             let b = this.cw.b9;
             let c = this.getEffectiveViewport();
-            if (this.y6 == null) {
+            if (this.y7 == null) {
                 return;
             }
-            let d = new ScalerParams(0, a, b, this.y6.d, c);
+            let d = new ScalerParams(0, a, b, this.y7.d, c);
             let e = ((() => {
-                let $ret = new ScalerParams(0, a, b, this.y6.e, c);
+                let $ret = new ScalerParams(0, a, b, this.y7.e, c);
                 $ret.b = this.i0();
                 return $ret;
             })());
-            if (this.yw == null || this.yx == null) {
-                let f = arrayShallowClone(this.zr.asArray());
-                let g = arrayShallowClone(this.zs.asArray());
+            if (this.yx == null || this.yy == null) {
+                let f = arrayShallowClone(this.zs.asArray());
+                let g = arrayShallowClone(this.zt.asArray());
                 this.xAxis.j6(boxArray$1(f), 0, f.length, d);
                 this.yAxis.j6(boxArray$1(g), 0, g.length, e);
-                this.yw = f;
-                this.yx = g;
+                this.yx = f;
+                this.yy = g;
             }
         }
-        get_z0() {
+        get_z1() {
             return false;
         }
-        get z0() {
-            return this.get_z0();
+        get z1() {
+            return this.get_z1();
         }
-        aah(a, b) {
-            if (!this.z0) {
+        aai(a, b) {
+            if (!this.z1) {
                 return -1;
             }
             let c = { $type: Point_$type, x: 0, y: 0 };
             let d = true;
-            let e = this.zb();
+            let e = this.zc();
             if (e == null) {
                 return -1;
             }
             if (e.n == null) {
                 return -1;
             }
-            if (this.dp == null || this.dp.count > this.aai) {
+            if (this.dp == null || this.dp.count > this.aaj) {
                 return -1;
             }
-            this.abg();
-            let f = this.yw;
-            let g = this.yx;
+            this.abh();
+            let f = this.yx;
+            let g = this.yy;
             if (f == null || g == null) {
                 return -1;
             }
-            let h = this.wh(a);
+            let h = this.wi(a);
             let i = 1.7976931348623157E+308;
             let j = -1;
-            for (let k = 0; k < this.yw.length; k++) {
-                let l = { $type: Point_$type, x: this.yw[k], y: this.yx[k] };
+            for (let k = 0; k < this.yx.length; k++) {
+                let l = { $type: Point_$type, x: this.yx[k], y: this.yy[k] };
                 if (k > 0) {
                     if (!b || e.j.containsKey(this.dp.item(k)) || e.j.containsKey(this.dp.item(k - 1))) {
                         let m = GeometryUtil.h(h, c, l);
@@ -724,8 +724,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 c = l;
             }
             if (j >= 0) {
-                let n = { $type: Point_$type, x: this.yw[j], y: this.yx[j] };
-                let o = { $type: Point_$type, x: this.yw[j - 1], y: this.yx[j - 1] };
+                let n = { $type: Point_$type, x: this.yx[j], y: this.yy[j] };
+                let o = { $type: Point_$type, x: this.yx[j - 1], y: this.yy[j - 1] };
                 if (!b || (e.j.containsKey(this.dp.item(j)) && e.j.containsKey(this.dp.item(j - 1)))) {
                     let p = GeometryUtil.m(h, o, n);
                     return (j - 1) + p;
@@ -739,24 +739,24 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        aag(a) {
-            return this.aah(a, true);
+        aah(a) {
+            return this.aai(a, true);
         }
-        aac(a) {
-            let b = this.wh(a);
+        aad(a) {
+            let b = this.wi(a);
             let c = b.x;
             let d = b.y;
-            if (this.y7.dg.e > this.aai) {
+            if (this.y8.dg.e > this.aaj) {
                 return -1;
             }
             let e = -1;
-            this.xg.cx((f) => {
-                let g = this.y7.c7(f);
+            this.xh.cx((f) => {
+                let g = this.y8.c7(f);
                 let h = g.left;
                 let i = g.top;
                 let j = g.width;
                 let k = g.height;
-                if (this.xn) {
+                if (this.xo) {
                     let l = h + j / 2;
                     let m = i + k / 2;
                     let n = (j / 2) * (j / 2);
@@ -777,18 +777,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             });
             return e;
         }
-        aaf(a) {
+        aag(a) {
             let b = null;
             let c = 1.7976931348623157E+308;
-            let d = this.wh(a);
+            let d = this.wi(a);
             let e = d.x;
             let f = d.y;
-            if (this.y7.dg.e > this.aai) {
+            if (this.y8.dg.e > this.aaj) {
                 return -1;
             }
-            this.y7.dn((g) => {
+            this.y8.dn((g) => {
                 if (g._visibility == 0) {
-                    let h = this.y7.c7(g);
+                    let h = this.y8.c7(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);
@@ -803,8 +803,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        wm(a, b, c) {
-            if (this.xAxis == null || this.yAxis == null || this.zr == null || this.zs == null) {
+        wn(a, b, c) {
+            if (this.xAxis == null || this.yAxis == null || this.zs == null || this.zt == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
             let d = this.cw.ca;
@@ -836,15 +836,15 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     j = this.dp.count - 1;
                 }
                 if (k == j) {
-                    let l = this.xAxis.ft(this.zr.item(j), g);
-                    let m = this.yAxis.ft(this.zs.item(j), h);
+                    let l = this.xAxis.ft(this.zs.item(j), g);
+                    let m = this.yAxis.ft(this.zt.item(j), h);
                     return { $type: Point_$type, x: l, y: m };
                 }
                 let n = i - Math.floor(i);
-                let o = this.xAxis.ft(this.zr.item(j), g);
-                let p = this.yAxis.ft(this.zs.item(j), h);
-                let q = this.xAxis.ft(this.zr.item(k), g);
-                let r = this.yAxis.ft(this.zs.item(k), h);
+                let o = this.xAxis.ft(this.zs.item(j), g);
+                let p = this.yAxis.ft(this.zt.item(j), h);
+                let q = this.xAxis.ft(this.zs.item(k), g);
+                let r = this.yAxis.ft(this.zt.item(k), h);
                 let s = q - o;
                 let t = r - p;
                 return { $type: Point_$type, x: o + s * n, y: p + t * n };
@@ -854,17 +854,17 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (u == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
-                let v = this.xAxis.ft(this.zr.item(u), g);
-                let w = this.yAxis.ft(this.zs.item(u), h);
+                let v = this.xAxis.ft(this.zs.item(u), g);
+                let w = this.yAxis.ft(this.zt.item(u), h);
                 return { $type: Point_$type, x: v, y: w };
             }
         }
         ge(a) {
-            let b = this.dc != null ? this.dc.xm : Rect.empty;
+            let b = this.dc != null ? this.dc.xn : Rect.empty;
             b = b.copy();
-            let c = this.dc != null ? this.dc.x4 : Rect.empty;
+            let c = this.dc != null ? this.dc.x5 : Rect.empty;
             let d = new Rect(0, 0, 0, 1, 1);
-            let e = this.wv(this.cw);
+            let e = this.ww(this.cw);
             let f = new ScalerParams(0, d, d, this.xAxis.df, e);
             let g = ((() => {
                 let $ret = new ScalerParams(0, d, d, this.yAxis.df, e);
@@ -872,8 +872,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             let h = !b.isEmpty && !c.isEmpty && this.dp != null ? this.dp.indexOf(a) : -1;
-            let i = this.xAxis != null && this.zr != null && h < this.zr.count ? this.xAxis.ft(this.zr.item(h), f) : NaN;
-            let j = this.yAxis != null && this.zs != null && h < this.zs.count ? this.yAxis.ft(this.zs.item(h), g) : NaN;
+            let i = this.xAxis != null && this.zs != null && h < this.zs.count ? this.xAxis.ft(this.zs.item(h), f) : NaN;
+            let j = this.yAxis != null && this.zt != null && h < this.zt.count ? this.yAxis.ft(this.zt.item(h), g) : NaN;
             if (!isNaN_(i)) {
                 if (i < b.left + 0.1 * b.width) {
                     i = i + 0.4 * b.width;
@@ -899,35 +899,35 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h >= 0;
         }
-        sy(a, b) {
-            this.ry(false);
-        }
         sz(a, b) {
-            this.ry(false);
+            this.rz(false);
+        }
+        s0(a, b) {
+            this.rz(false);
         }
-        zb() {
-            let a = this.za;
+        zc() {
+            let a = this.zb;
             if (this.d4()) {
                 if (this.dd.g) {
                     this.dd.t();
                 }
-                a = this.ze;
+                a = this.zf;
             }
             return a;
         }
-        abe(a, b, c, d, e) {
+        abf(a, b, c, d, e) {
             b.g = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
             let f = this.getEffectiveViewport1(a);
             let g = this.dp;
             let h;
             let i;
             let j = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.y6.d, f);
+                let $ret = new ScalerParams(0, d, e, this.y7.d, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 return $ret;
             })());
             let k = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.y6.e, f);
+                let $ret = new ScalerParams(0, d, e, this.y7.e, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 $ret.b = this.i0();
                 return $ret;
@@ -936,15 +936,15 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             let m = 0;
             if (this.dc != null) {
                 if (this.dc.gl()) {
-                    let n = this.dc.n1(d, j);
+                    let n = this.dc.n2(d, j);
                     l = n.c;
                     m = n.d;
                 }
             }
             for (let o = 0; o < c; o++) {
-                h = this.zr.item(o);
-                i = this.zs.item(o);
-                let p = { $type: Point_$type, x: this.y6.a.ft(h, j), y: this.y6.b.ft(i, k) };
+                h = this.zs.item(o);
+                i = this.zt.item(o);
+                let p = { $type: Point_$type, x: this.y7.a.ft(h, j), y: this.y7.b.ft(i, k) };
                 if (l) {
                     if (p.x < e.left || p.x > e.right) {
                         if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -968,16 +968,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        abp(a, b) {
-            this.yw = null;
+        abq(a, b) {
             this.yx = null;
+            this.yy = null;
             a.j.clear();
             a.o.clear();
             a.h.clear();
             a.l.clear();
             a.i.clear();
             a.k.clear();
-            let c = Math.min(this.zr != null ? this.zr.count : 0, this.zs != null ? this.zs.count : 0);
+            let c = Math.min(this.zs != null ? this.zs.count : 0, this.zt != null ? this.zt.count : 0);
             let d = b.ca;
             let e = b.b9;
             let f = this.getEffectiveViewport1(b);
@@ -992,7 +992,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             if (c < 1) {
                 return;
             }
-            this.y6 = ((() => {
+            this.y7 = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -1002,21 +1002,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             let i = b;
-            if (c <= this.aaj) {
-                this.abe(i, a, c, d, e);
+            if (c <= this.aak) {
+                this.abf(i, a, c, d, e);
             }
-            if (this.xq()) {
-                b.dd.l(a.j, this.aaj, d, e, this.ie);
+            if (this.xr()) {
+                b.dd.l(a.j, this.aak, d, e, this.ie);
             }
             let j = ((() => {
                 let $ret = new Clipper(0, e, false);
                 $ret.i = a.o;
                 return $ret;
             })());
-            let k = this.wt(b);
+            let k = this.wu(b);
             let l = this.xAxis.fw(k.left, g);
             let m = this.xAxis.fw(k.right, g);
-            b.df.j(a.o, this.trendLineType, this.zr, this.zs, this.trendLinePeriod, (n) => this.xAxis.ft(n, g), (n) => this.yAxis.ft(n, h), ((() => {
+            b.df.j(a.o, this.trendLineType, this.zs, this.zt, this.trendLinePeriod, (n) => this.xAxis.ft(n, g), (n) => this.yAxis.ft(n, h), ((() => {
                 let $ret = new TrendResolutionParams();
                 $ret.d = this.ie;
                 $ret.i = e;
@@ -1029,7 +1029,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 for (let n = 0; n < b.aa.count; n++) {
                     a.m.add(new List$1(Point_$type, 0));
                     let o = b.aa._inner[n];
-                    o.j(a.m._inner[n], o.g$b, this.zr, this.zs, o.g$f, (p) => this.xAxis.ft(p, g), (p) => this.yAxis.ft(p, h), ((() => {
+                    o.j(a.m._inner[n], o.g$b, this.zs, this.zt, o.g$f, (p) => this.xAxis.ft(p, g), (p) => this.yAxis.ft(p, h), ((() => {
                         let $ret = new TrendResolutionParams();
                         $ret.d = this.ie;
                         $ret.i = e;
@@ -1039,7 +1039,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     })()), j, l, m);
                 }
             }
-            this.abn(a, b);
+            this.abo(a, b);
         }
         pb(a, b) {
             super.pb(a, b);
@@ -1049,15 +1049,15 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         get_ff() {
             return true;
         }
-        zl(a, b, c) {
+        zm(a, b, c) {
             return null;
         }
-        zm(a, b, c) {
+        zn(a, b, c) {
             if (this.dp == null) {
                 return null;
             }
-            let d = this.zb();
-            let e = this.y7.ce(this.wh(b));
+            let d = this.zc();
+            let e = this.y8.ce(this.wi(b));
             let f = -1;
             if (e == null) {
                 if (a != null) {
@@ -1084,11 +1084,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return g;
         }
-        w5(a, b) {
-            if (this.xi != 1 && this.xi != 13) {
-                let c = this.xg.c8();
-                let d = (c.width / 2) + (this.xt / 2);
-                let e = (c.height / 2) + (this.xt / 2);
+        w6(a, b) {
+            if (this.xj != 1 && this.xj != 13) {
+                let c = this.xh.c8();
+                let d = (c.width / 2) + (this.xu / 2);
+                let e = (c.height / 2) + (this.xu / 2);
                 let f = d;
                 let g = d;
                 let h = e;
@@ -1109,7 +1109,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return new Thickness(1, 0, 0, 0, 0);
         }
-        zk(a, b, c) {
+        zl(a, b, c) {
             let d = new HighlightingInfo();
             d.i = this;
             d.g = 0;
@@ -1122,39 +1122,39 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         dh(a, b, c) {
             if (this.ef && this.f0(this.by) && !c) {
-                let d = this.zl(a, b, this.zn);
-                this.zn = d;
+                let d = this.zm(a, b, this.zo);
+                this.zo = d;
                 return d;
             }
             else {
-                let e = this.zk(a, b, this.zn);
-                this.zn = e;
+                let e = this.zl(a, b, this.zo);
+                this.zo = e;
                 return e;
             }
         }
         di(a, b, c) {
             if (this.f0(this.by) && !c) {
-                let d = this.zm(a, b, this.zo);
-                this.zo = d;
+                let d = this.zn(a, b, this.zp);
+                this.zp = d;
                 return d;
             }
             else {
-                let e = this.zk(a, b, this.zo);
+                let e = this.zl(a, b, this.zp);
                 e.d = true;
-                this.zo = e;
+                this.zp = e;
                 return e;
             }
         }
-        z5() {
-            return (this.assigningScatterStyle != null && this.zv) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
+        z6() {
+            return (this.assigningScatterStyle != null && this.zw) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
         }
-        z4() {
-            return (this.assigningScatterMarkerStyle != null && this.zu) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
+        z5() {
+            return (this.assigningScatterMarkerStyle != null && this.zv) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
         }
-        ab0(a, b) {
-            this.q3();
+        ab1(a, b) {
+            this.q4();
             let c = b.b9;
-            this.y6 = ((() => {
+            this.y7 = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -1162,10 +1162,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.e = this.yAxis.df;
                 return $ret;
             })());
-            if (this.xq()) {
-                b.dd.j(a.j, this.xs);
-                if (this.z4()) {
-                    this.abf(b, a);
+            if (this.xr()) {
+                b.dd.j(a.j, this.xt);
+                if (this.z5()) {
+                    this.abg(b, a);
                 }
             }
             b.c4();
@@ -1181,7 +1181,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     f.g$l(a.m._inner[e], d);
                 }
             }
-            this.abx(a, b);
+            this.aby(a, b);
         }
         ak(a, b) {
             let c = new List$1(ChartSelection.$, 0);
@@ -1189,20 +1189,20 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             return c.toArray();
         }
         qa(a, b, c) {
-            this.abh(a, b, c, 0, null);
+            this.abi(a, b, c, 0, null);
         }
-        abh(a, b, c, d, e) {
-            let f = this.dc.x1(this.dc.xr(a));
+        abi(a, b, c, d, e) {
+            let f = this.dc.x2(this.dc.xs(a));
             let g = this.dp.count;
-            let h = this.y6.a;
-            let i = this.y6.b;
-            let j = this.dc.xu(this.w2, this.getEffectiveViewport(), f);
-            let k = new ScalerParams(0, f, this.dc.x4, h.df, this.getEffectiveViewport());
-            let l = new ScalerParams(0, f, this.dc.x4, i.df, this.getEffectiveViewport());
+            let h = this.y7.a;
+            let i = this.y7.b;
+            let j = this.dc.xv(this.w3, this.getEffectiveViewport(), f);
+            let k = new ScalerParams(0, f, this.dc.x5, h.df, this.getEffectiveViewport());
+            let l = new ScalerParams(0, f, this.dc.x5, i.df, this.getEffectiveViewport());
             if (d == 0) {
                 for (let m = 0; m < g; m++) {
-                    let n = h.ft(this.zr.item(m), k);
-                    let o = i.ft(this.zs.item(m), l);
+                    let n = h.ft(this.zs.item(m), k);
+                    let o = i.ft(this.zt.item(m), l);
                     if (n < j.width && n > 0 && o < j.height && o > 0) {
                         if (c == 7 || c == 6) {
                             b.add(((() => {
@@ -1232,8 +1232,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             else {
                 for (let p = 0; p < g; p++) {
-                    let q = h.ft(this.zr.item(p), k);
-                    let r = i.ft(this.zs.item(p), l);
+                    let q = h.ft(this.zs.item(p), k);
+                    let r = i.ft(this.zt.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);
@@ -1265,11 +1265,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        yz(a, b) {
-            return this.y0(a, b);
-        }
         y0(a, b) {
-            if (b < a || a < 0 || a > this.zr.count || b < 0 || b > this.zr.count) {
+            return this.y1(a, b);
+        }
+        y1(a, b) {
+            if (b < a || a < 0 || a > this.zs.count || b < 0 || b > this.zs.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
@@ -1279,14 +1279,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        abf(a, b) {
+        abg(a, b) {
             a.ck = true;
-            this.zj.ay(this, this.z4(), runOn(this, this.yz));
-            let c = this.zj.d;
+            this.zk.ay(this, this.z5(), runOn(this, this.y0));
+            let c = this.zk.d;
             let d = c != null;
             let e = this.getEffectiveViewport1(a);
             let f = this.dp == null ? 0 : this.dp.count;
-            this.y7.cw((g) => {
+            this.y8.cw((g) => {
                 if (g._visibility == 0) {
                     let h = g.ak;
                     let i = g.content;
@@ -1295,19 +1295,19 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         g.content = i;
                     }
                     if (d) {
-                        this.abk(h, f, a.t);
+                        this.abl(h, f, a.t);
                     }
-                    this.zj.ac(g, i);
+                    this.zk.ac(g, i);
                 }
             });
         }
-        abl(a, b, c) {
+        abm(a, b, c) {
             let d = this.by != 1;
             let e = this.cq != 1;
             let f = this.cp != 1;
-            this.zj.a0(this.zj.b, a, b, false);
-            this.zj.ab(this.ic);
-            let g = this.zj.ax;
+            this.zk.a0(this.zk.b, a, b, false);
+            this.zk.ab(this.ic);
+            let g = this.zk.ax;
             let h = null;
             let i = null;
             let j = null;
@@ -1325,16 +1325,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 g.b = h;
             }
             g.h = c;
-            this.abv(g);
-            this.zj.z(this, h, i, j, c, d, e, f, a < 0);
+            this.abw(g);
+            this.zk.z(this, h, i, j, c, d, e, f, a < 0);
         }
-        abk(a, b, c) {
+        abl(a, b, c) {
             let d = this.by != 1;
             let e = this.cq != 1;
             let f = this.cp != 1;
-            this.zj.a0(this.zj.d, a, b, true);
-            this.zj.aa(this.ic);
-            let g = this.zj.aw;
+            this.zk.a0(this.zk.d, a, b, true);
+            this.zk.aa(this.ic);
+            let g = this.zk.aw;
             let h = null;
             let i = null;
             let j = null;
@@ -1370,26 +1370,26 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 g.d = i;
             }
             g.h = c;
-            this.abu(g);
-            this.zj.y(this, h, i, j, c, d, e, f, g.v, this.dc.d0.totalHighWaterMark, g.x, this.dc.d1.totalHighWaterMark, g.t, this.dc.dz.totalHighWaterMark);
+            this.abv(g);
+            this.zk.y(this, h, i, j, c, d, e, f, g.v, this.dc.d0.totalHighWaterMark, g.x, this.dc.d1.totalHighWaterMark, g.t, this.dc.dz.totalHighWaterMark);
         }
-        abv(a) {
-            if (this.assigningScatterStyle != null && this.zv) {
+        abw(a) {
+            if (this.assigningScatterStyle != null && this.zw) {
                 this.assigningScatterStyle(this, a);
             }
         }
-        abu(a) {
-            if (this.assigningScatterMarkerStyle != null && this.zu) {
+        abv(a) {
+            if (this.assigningScatterMarkerStyle != null && this.zv) {
                 this.assigningScatterMarkerStyle(this, a);
             }
         }
-        abn(a, b) {
+        abo(a, b) {
             let c = new ErrorBarsHelper(this, b);
-            if (this.y8 == null) {
+            if (this.y9 == null) {
                 return;
             }
-            let d = this.y8.u;
-            let e = this.y8.v;
+            let d = this.y9.u;
+            let e = this.y9.v;
             let f = 0;
             let g = 0;
             let h = 0;
@@ -1399,35 +1399,35 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            let l = this.abq(k, c, d, h, i, true);
+                            let l = this.abr(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            let m = this.abo(k, c, d, h, i, true);
+                            let m = this.abp(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            let n = this.abm(k, c, d, j, h, i, true);
+                            let n = this.abn(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            let o = this.abr(c, d, f, h, i, true);
+                            let o = this.abs(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            let p = this.abo(k, c, d, h, i, true);
+                            let p = this.abp(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     let q = new OwnedPoint();
-                    q.c = c.l(d, this.y6.a, k.c, f);
+                    q.c = c.l(d, this.y7.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1435,53 +1435,53 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            let r = this.abq(k, c, e, h, i, false);
+                            let r = this.abr(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            let s = this.abo(k, c, e, h, i, false);
+                            let s = this.abp(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            let t = this.abm(k, c, e, j, h, i, false);
+                            let t = this.abn(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            let u = this.abr(c, e, g, h, i, false);
+                            let u = this.abs(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            let v = this.abo(k, c, e, h, i, false);
+                            let v = this.abp(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     let w = new OwnedPoint();
-                    w.c = c.m(e, this.y6.b, k.c, g);
+                    w.c = c.m(e, this.y7.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
                 }
             }
         }
-        abq(a, b, c, d, e, f) {
+        abr(a, b, c, d, e, f) {
             if (f) {
                 let g;
                 let h, i;
-                i = this.y6.a;
-                if (this.y8.s == 0) {
+                i = this.y7.a;
+                if (this.y9.s == 0) {
                     g = a.c.x;
-                    h = this.y6.a;
+                    h = this.y7.a;
                 }
                 else {
                     g = a.c.y;
-                    h = this.y6.b;
+                    h = this.y7.b;
                 }
                 let j = b.f(g, c, h, i, d, e);
                 d = j.p4;
@@ -1490,14 +1490,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             else {
                 let k;
                 let l, m;
-                m = this.y6.b;
-                if (this.y8.t == 0) {
+                m = this.y7.b;
+                if (this.y9.t == 0) {
                     k = a.c.x;
-                    l = this.y6.a;
+                    l = this.y7.a;
                 }
                 else {
                     k = a.c.y;
-                    l = this.y6.b;
+                    l = this.y7.b;
                 }
                 let n = b.f(k, c, l, m, d, e);
                 d = n.p4;
@@ -1508,14 +1508,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abo(a, b, c, d, e, f) {
+        abp(a, b, c, d, e, f) {
             if (f) {
-                let g = b.j(a.c.x, c, this.y6.a, d, e);
+                let g = b.j(a.c.x, c, this.y7.a, d, e);
                 d = g.p3;
                 e = g.p4;
             }
             else {
-                let h = b.j(a.c.y, c, this.y6.b, d, e);
+                let h = b.j(a.c.y, c, this.y7.b, d, e);
                 d = h.p3;
                 e = h.p4;
             }
@@ -1524,18 +1524,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abm(a, b, c, d, e, f, g) {
+        abn(a, b, c, d, e, f, g) {
             let h = c.getItemColumn();
             let i = this.dp.indexOf(d);
             if (h != null && i < h.count) {
                 let j = h.item(i);
                 if (g) {
-                    let k = b.h(a.c.x, j, this.y6.a, e, f);
+                    let k = b.h(a.c.x, j, this.y7.a, e, f);
                     e = k.p3;
                     f = k.p4;
                 }
                 else {
-                    let l = b.h(a.c.y, j, this.y6.b, e, f);
+                    let l = b.h(a.c.y, j, this.y7.b, e, f);
                     e = l.p3;
                     f = l.p4;
                 }
@@ -1549,16 +1549,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        abr(a, b, c, d, e, f) {
+        abs(a, b, c, d, e, f) {
             let g = a.i(b, c);
             c = g.p1;
             if (f) {
-                let h = a.k(c, b, this.y6.a, d, e);
+                let h = a.k(c, b, this.y7.a, d, e);
                 d = h.p3;
                 e = h.p4;
             }
             else {
-                let i = a.k(c, b, this.y6.b, d, e);
+                let i = a.k(c, b, this.y7.b, d, e);
                 d = i.p3;
                 e = i.p4;
             }
@@ -1568,29 +1568,29 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abx(a, b) {
-            if (!b.r() || this.y8 == null) {
+        aby(a, b) {
+            if (!b.r() || this.y9 == null) {
                 b.dp();
                 return;
             }
-            this.aby(a, b);
             this.abz(a, b);
+            this.ab0(a, b);
         }
-        aby(a, b) {
+        abz(a, b) {
             b.dk();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.y8.u;
+            let e = this.y9.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.y8.o == 1 || this.y8.o == 2) {
+                        if (this.y9.o == 1 || this.y9.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.y8.o == 1 || this.y8.o == 3) {
+                        if (this.y9.o == 1 || this.y9.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1598,21 +1598,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             b.dq(d);
         }
-        abz(a, b) {
+        ab0(a, b) {
             b.dl();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.y8.v;
+            let e = this.y9.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.y8.p == 1 || this.y8.p == 2) {
+                        if (this.y9.p == 1 || this.y9.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.y8.p == 1 || this.y8.p == 3) {
+                        if (this.y9.p == 1 || this.y9.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
@@ -1621,15 +1621,15 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         hf(a, b, c) {
             let d = true;
-            if (!super.hf(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.b0 == null || this.yAxis.b0 == null || this.zr == null || this.zs == null || this.zr.count == 0 || this.zs.count == 0 || this.dp == null || this.dp.count != this.zr.count || this.dp.count != this.zs.count || this.xAxis.b0 == null || this.yAxis.b0 == null || this.xAxis.pr == this.xAxis.pq || this.yAxis.pr == this.yAxis.pq) {
+            if (!super.hf(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.b0 == null || this.yAxis.b0 == null || this.zs == null || this.zt == null || this.zs.count == 0 || this.zt.count == 0 || this.dp == null || this.dp.count != this.zs.count || this.dp.count != this.zt.count || this.xAxis.b0 == null || this.yAxis.b0 == null || this.xAxis.pr == this.xAxis.pq || this.yAxis.pr == this.yAxis.pq) {
                 d = false;
             }
             return d;
         }
         getViewInfo(a, b) {
-            if (!this.acv.isEmpty && !this.acw.isEmpty) {
-                a = this.acv;
-                b = this.acw;
+            if (!this.acw.isEmpty && !this.acx.isEmpty) {
+                a = this.acw;
+                b = this.acx;
                 return {
                     p0: a,
                     p1: b
@@ -1642,52 +1642,52 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        rz(a) {
-            super.rz(a);
-            this.abd();
+        r0(a) {
+            super.r0(a);
+            this.abe();
             try {
                 if (this.d7(this.cw)) {
                     return;
                 }
-                if (this.dp != null && this.dp.count > this.aaj) {
+                if (this.dp != null && this.dp.count > this.aak) {
                     a = false;
                 }
                 if (this.gg(a) && !this.gs) {
-                    let b = this.zc;
+                    let b = this.zd;
                     if (this.d4()) {
                         if (this.dd.g) {
                             this.dd.t();
                         }
-                        this.zc = this.ze;
-                        this.ze = b;
+                        this.zd = this.zf;
+                        this.zf = b;
                     }
                     else {
-                        this.zc = this.za;
-                        this.za = b;
+                        this.zd = this.zb;
+                        this.zb = b;
                     }
-                    this.abp(this.za, this.y7);
-                    this.sf();
+                    this.abq(this.zb, this.y8);
+                    this.sg();
                 }
                 else {
                     if (!this.gs) {
-                        this.abp(this.za, this.y7);
+                        this.abq(this.zb, this.y8);
                     }
-                    this.ab0(this.za, this.y7);
+                    this.ab1(this.zb, this.y8);
                 }
             }
             finally {
-                this.ab1();
+                this.ab2();
             }
         }
-        sp() {
-            super.sp();
+        sq() {
+            super.sq();
             if (this.index < 0) {
                 return;
             }
-            this.y7.dt();
+            this.y8.dt();
         }
-        r0(a, b) {
-            super.r0(a, b);
+        r1(a, b) {
+            super.r1(a, b);
             if (!this.g1) {
                 this.cw.be(b);
                 return;
@@ -1697,34 +1697,34 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return;
             }
             let c = typeCast(ScatterBaseView.$, this.cv);
-            this.r1();
+            this.r2();
             this.g1 = false;
         }
-        r1() {
-            super.r1();
+        r2() {
+            super.r2();
             let a = typeCast(ScatterBaseView.$, this.cv);
             if (!this.gt) {
-                this.zd = new ScatterFrame();
-                this.abp(this.zd, a);
+                this.ze = new ScatterFrame();
+                this.abq(this.ze, a);
             }
             this.gt = false;
-            this.ab0(this.zd, a);
+            this.ab1(this.ze, a);
         }
-        rx(a, b, c, d, e) {
-            super.rx(a, b, c, d, e);
+        ry(a, b, c, d, e) {
+            super.ry(a, b, c, d, e);
             let f = this.ba.a$j.item(d);
             let g = f;
             f.bd(c);
             if (this.d7(g)) {
                 return;
             }
-            if (this.y9 == null) {
-                this.y9 = new ScatterFrame();
+            if (this.za == null) {
+                this.za = new ScatterFrame();
             }
-            this.abp(this.y9, g);
-            this.ab0(this.y9, g);
+            this.abq(this.za, g);
+            this.ab1(this.za, g);
         }
-        abw(a, b) {
+        abx(a, b) {
             let c = new List$1(Base.$, 0);
             for (let d of fromEnum(b.c)) {
                 if (!a.containsKey(d)) {
@@ -1735,10 +1735,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 b.h(e);
             }
         }
-        yy(a, b, c, d, e) {
-            if (c == null || c.length != this.y6.c.count) {
-                c = new Array(this.y6.c.count);
-                for (let f = 0; f < this.y6.c.count; f++) {
+        yz(a, b, c, d, e) {
+            if (c == null || c.length != this.y7.c.count) {
+                c = new Array(this.y7.c.count);
+                for (let f = 0; f < this.y7.c.count; f++) {
                     c[f] = PointUtil.create();
                 }
             }
@@ -1754,34 +1754,34 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.b = this.i0();
                 return $ret;
             })());
-            let j = this.wt(a);
-            let k = this.y6.a.fw(j.left, h);
-            let l = this.y6.a.fw(j.right, h);
-            let m = this.y6.b.fw(j.bottom, i);
-            let n = this.y6.b.fw(j.top, i);
-            if (this.y6.d) {
+            let j = this.wu(a);
+            let k = this.y7.a.fw(j.left, h);
+            let l = this.y7.a.fw(j.right, h);
+            let m = this.y7.b.fw(j.bottom, i);
+            let n = this.y7.b.fw(j.top, i);
+            if (this.y7.d) {
                 let o = k;
                 k = l;
                 l = o;
             }
-            if (this.y6.e) {
+            if (this.y7.e) {
                 let p = m;
                 m = n;
                 n = p;
             }
-            let q = this.y6;
+            let q = this.y7;
             let r = q.a;
             let s = q.b;
             let t;
             let u;
-            let v = this.zr;
-            let w = this.zs;
+            let v = this.zs;
+            let w = this.zt;
             let x = false;
             let y = 0;
             let z = 0;
             if (this.dc != null) {
                 if (this.dc.gl()) {
-                    let aa = this.dc.n1(d, h);
+                    let aa = this.dc.n2(d, h);
                     x = aa.c;
                     y = aa.d;
                     z = r.fw(0 + y, h);
@@ -1789,7 +1789,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     z -= ab;
                 }
             }
-            for (let ac = 0; ac < this.y6.c.count; ac++) {
+            for (let ac = 0; ac < this.y7.c.count; ac++) {
                 t = v.item(ac);
                 u = w.item(ac);
                 let ad = 1E-10;
@@ -1822,7 +1822,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        z7(a, b) {
+        z8(a, b) {
             if (b == null) {
                 b = new List$1(Number_$type, 2, a.e);
             }
@@ -1838,10 +1838,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         p5(a) {
             super.p5(a);
-            this.bc.exportTrendlineData(this, a, this.y7.df.g$n);
+            this.bc.exportTrendlineData(this, a, this.y8.df.g$n);
         }
         i0() {
-            return Series.i1(this.zs, null);
+            return Series.i1(this.zt, null);
         }
         getDataLegendSeriesContextAt(a, b) {
             let c = { $type: Point_$type, x: a, y: b };
@@ -1852,16 +1852,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             g.l = e;
             g.a = 13;
             g.q = "X";
-            g.r = this.aa3 != null ? this.aa3 : "X";
-            g.s = this.aaz != null ? this.aaz : "X:";
-            g.t = this.aa1 != null ? this.aa1 : "";
+            g.r = this.aa4 != null ? this.aa4 : "X";
+            g.s = this.aa0 != null ? this.aa0 : "X:";
+            g.t = this.aa2 != null ? this.aa2 : "";
             let h = new DataLegendSeriesValueInfo();
             h.l = f;
             h.a = 14;
             h.q = "Y";
-            h.r = this.abb != null ? this.abb : "Y";
-            h.s = this.aa7 != null ? this.aa7 : "Y:";
-            h.t = this.aa9 != null ? this.aa9 : "";
+            h.r = this.abc != null ? this.abc : "Y";
+            h.s = this.aa8 != null ? this.aa8 : "Y:";
+            h.t = this.aba != null ? this.aba : "";
             let i = new DataLegendSeriesContext();
             i.e = ((() => {
                 let $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -1872,17 +1872,17 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             i.h = this.mh();
             return i;
         }
-        ab2() {
-            if (this.zt) {
-                this.z8 = 0;
+        ab3() {
+            if (this.zu) {
                 this.z9 = 0;
-                for (let a = 0; a < this.zr.count; a++) {
-                    this.z8 += this.zr.item(a);
+                this.aaa = 0;
+                for (let a = 0; a < this.zs.count; a++) {
                     this.z9 += this.zs.item(a);
+                    this.aaa += this.zt.item(a);
                 }
-                this.aaa = this.z8 / this.zr.count;
                 this.aab = this.z9 / this.zs.count;
-                this.zt = false;
+                this.aac = this.aaa / this.zt.count;
+                this.zu = false;
             }
         }
         jb(a, b) {
@@ -1906,26 +1906,26 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             switch (a) {
                 case 5:
                 case 2:
-                    b = this.zr.maximum;
-                    c = this.zs.maximum;
+                    b = this.zs.maximum;
+                    c = this.zt.maximum;
                     break;
                 case 4:
                 case 1:
-                    b = this.zr.minimum;
-                    c = this.zs.minimum;
+                    b = this.zs.minimum;
+                    c = this.zt.minimum;
                     break;
                 case 6:
                 case 3:
-                    if (this.zt) {
-                        this.ab2();
+                    if (this.zu) {
+                        this.ab3();
                     }
-                    b = this.aaa;
-                    c = this.aab;
+                    b = this.aab;
+                    c = this.aac;
                     break;
             }
             return [b, c];
         }
-        wq(a) {
+        wr(a) {
             let b = this.getEffectiveViewport1(this.cw);
             let c = new ScalerParams(0, this.cw.ca, this.cw.b9, this.xAxis.df, b);
             c.c = b;
@@ -1936,17 +1936,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             let e = isNaN_(a[1]) ? NaN : this.yAxis.ft(a[1], c);
             return { $type: Point_$type, x: d, y: e };
         }
-        wp(a) {
+        wq(a) {
             let b = this.aq(a);
-            return this.wq(b);
+            return this.wr(b);
         }
         bd() {
             return new ScatterTrendLineManager();
         }
+        qj() {
+            super.qj();
+            this.y8.df.g$m();
+        }
     }
     ScatterBase.$t = /*@__PURE__*/ markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.ab3 = /*@__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:y8:ab4', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aan:ab5', [2, null], 'HighlightedYMemberPath:aap:ab6', [2, null], 'IsCustomScatterMarkerStyleAllowed:zy:ab7', [0, false], 'IsCustomScatterStyleAllowed:zz:ab8', [0, false], 'ItemSearchMode:zi:ab9', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:aai:aca', [1, 10000], 'MarkerCollisionAvoidance:y3:acb', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:aaj:acc', [1, 400], 'XAxis::ack', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aaz:acl', [2, null], 'XMemberAsLegendUnit:aa1:acm', [2, null], 'XMemberPath:aa3:acn', [2, null], 'YAxis::aco', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aa7:acp', [2, null], 'YMemberAsLegendUnit:aa9:acq', [2, null], 'YMemberPath:abb:acr', [2, null], 'TrendLineType::aci', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::ach', [1, 1.5], 'TrendLinePeriod::acg', [1, 7], 'TrendLineBrush::acd', [Brush.$, null], 'TrendLineZIndex:aak:acj', [1, 1001], 'TrendLineDashArray:act:ace', [DoubleCollection.$], 'TrendLineDashCap:acu:acf', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.ab4 = /*@__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:y9:ab5', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aao:ab6', [2, null], 'HighlightedYMemberPath:aaq:ab7', [2, null], 'IsCustomScatterMarkerStyleAllowed:zz:ab8', [0, false], 'IsCustomScatterStyleAllowed:z0:ab9', [0, false], 'ItemSearchMode:zj:aca', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:aaj:acb', [1, 10000], 'MarkerCollisionAvoidance:y4:acc', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:aak:acd', [1, 400], 'XAxis::acl', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aa0:acm', [2, null], 'XMemberAsLegendUnit:aa2:acn', [2, null], 'XMemberPath:aa4:aco', [2, null], 'YAxis::acp', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aa8:acq', [2, null], 'YMemberAsLegendUnit:aba:acr', [2, null], 'YMemberPath:abc:acs', [2, null], 'TrendLineType::acj', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::aci', [1, 1.5], 'TrendLinePeriod::ach', [1, 7], 'TrendLineBrush::ace', [Brush.$, null], 'TrendLineZIndex:aal:ack', [1, 1001], 'TrendLineDashArray:acu:acf', [DoubleCollection.$], 'TrendLineDashCap:acv:acg', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 })();
 /**
@@ -2022,7 +2026,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             this.dv = new Path();
             this.dw = new Path();
             if (!this.t) {
-                this.de.aaj = 2000;
+                this.de.aak = 2000;
             }
         }
         dx(a) {
@@ -2040,12 +2044,12 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return new Size(1, this.du.width, this.du.height);
         }
         dc() {
-            let a = new NumericMarkerManager(1, (b) => this.dg.item(b), (b) => this.de.y6.c.item(b), runOn(this, this.ds), runOn(this, this.c9), runOn(this, this.dh), () => this.de.y3);
+            let a = new NumericMarkerManager(1, (b) => this.dg.item(b), (b) => this.de.y7.c.item(b), runOn(this, this.ds), runOn(this, this.c9), runOn(this, this.dh), () => this.de.y4);
             a.q = runOn(this, this.dx);
             return a;
         }
         ds(a) {
-            this.de.abw(a, this.dg);
+            this.de.abx(a, this.dg);
         }
         di() {
             return this.cl;
@@ -2054,11 +2058,11 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return this.db;
         }
         c9() {
-            this.db = this.de.yy(this, this.dg, this.db, this.ca, this.b9);
+            this.db = this.de.yz(this, this.dg, this.db, this.ca, this.b9);
             return this.db;
         }
         dh() {
-            this.dj = this.de.z7(this.dg, this.dj);
+            this.dj = this.de.z8(this.dg, this.dj);
             return this.dj;
         }
         dk() {
@@ -2071,10 +2075,10 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
         }
         dt() {
             if (this.de.trendLineBrush != null) {
-                this.de.acs = this.de.trendLineBrush;
+                this.de.act = this.de.trendLineBrush;
             }
             else {
-                this.de.acs = this.de.vj;
+                this.de.act = this.de.vk;
             }
         }
         cw(a) {
@@ -2091,9 +2095,9 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
                 if (this.de.trendLineType != 0 && !b) {
                     let c = this.df.g$n;
                     c.ad = this.de.trendLineThickness;
-                    c._stroke = this.de.acs;
-                    c.ai = this.de.act;
-                    c.aj = this.de.acu;
+                    c._stroke = this.de.act;
+                    c.ai = this.de.acu;
+                    c.aj = this.de.acv;
                     a.v(c);
                 }
             }
@@ -2112,7 +2116,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             if (!stringIsNullOrEmpty(b)) {
                 a += " style='color:" + b + "'";
             }
-            a += ">" + this.de.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.de.aa3 + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.de.abb + "}</span></div>";
+            a += ">" + this.de.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.de.aa4 + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.de.abc + "}</span></div>";
             return a;
         }
     }