igniteui-webcomponents-charts 5.4.0 → 5.5.0-beta.0

package/esm2015/lib/ScatterBase_combined.js

@@ -64,79 +64,79 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         ct() {
             return new ScatterBaseView(this);
         }
-        o2() {
-            super.o2();
+        o4() {
+            super.o4();
             this.xAxis = null;
             this.yAxis = null;
         }
-        q1(a) {
-            super.q1(a);
-            this.yz = a;
+        q3(a) {
+            super.q3(a);
+            this.y2 = a;
         }
-        get_fw() {
+        get_fx() {
             return true;
         }
         ai() {
             return [this.xAxis, this.yAxis];
         }
-        kq(a, b) {
-            let c = this.nd(b);
+        kr(a, b) {
+            let c = this.nf(b);
             if (c == ScatterBase.$$p[12]) {
-                return this.kr(a, b, this.aav);
+                return this.ks(a, b, this.aay);
             }
             if (c == ScatterBase.$$p[16]) {
-                return this.kr(a, b, this.aa3);
+                return this.ks(a, b, this.aa6);
             }
             if (c == ScatterBase.$$p[1]) {
-                return this.kr(a, b, this.aaf);
+                return this.ks(a, b, this.aai);
             }
             if (c == ScatterBase.$$p[2]) {
-                return this.kr(a, b, this.aah);
+                return this.ks(a, b, this.aak);
             }
             return null;
         }
-        md(a) {
-            let b = this.nd(a);
+        mf(a) {
+            let b = this.nf(a);
             if (b == ScatterBase.$$p[12]) {
-                return this.aav;
+                return this.aay;
             }
             if (b == ScatterBase.$$p[16]) {
-                return this.aa3;
+                return this.aa6;
             }
             if (b == ScatterBase.$$p[1]) {
-                return this.aaf;
+                return this.aai;
             }
             if (b == ScatterBase.$$p[2]) {
-                return this.aah;
+                return this.aak;
             }
-            return super.md(a);
+            return super.mf(a);
         }
-        ec(a, b, c, d, e) {
+        ed(a, b, c, d, e) {
             if (!this.hasMarkers) {
                 return false;
             }
             let f = this.xAxis;
-            let g = new ScalerParams(1, this.dc.v5, this.wu, f.ch);
+            let g = new ScalerParams(1, this.dc.wh, this.wx, f.ch);
             g.c = this.getEffectiveViewport1(this.cw);
             let h = this.yAxis;
-            let i = new ScalerParams(1, this.dc.v5, this.wu, h.ch);
+            let i = new ScalerParams(1, this.dc.wh, this.wx, h.ch);
             i.c = this.getEffectiveViewport1(this.cw);
             a.clear();
-            this.w8.cn((j) => {
+            this.xb.cw((j) => {
                 if (j._visibility == 0) {
                     let k = new SeriesPointOfInterest();
                     let l = j.n;
                     let m = j.o;
-                    if (l < this.wu.left || l > this.wu.right || m < this.wu.top || m > this.wu.bottom) {
+                    if (l < this.wx.left || l > this.wx.right || m < this.wx.top || m > this.wx.bottom) {
                         return;
                     }
                     k.d = f.eo(l, g);
                     k.e = h.eo(m, i);
                     k.b = j.content;
-                    k.g = this.vi;
+                    k.g = this.vl;
                     k.c = j.ak;
-                    if (this.g9) {
-                        k.g = this.vp(j.ak);
+                    if (this.ha) {
+                        k.g = this.vs(j.ak);
                     }
                     a.add(k);
                 }
@@ -145,7 +145,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         b3() {
             if (this.b4 == 0) {
-                if (this.aab <= 2000) {
+                if (this.aae <= 2000) {
                     return 1;
                 }
                 else {
@@ -156,83 +156,83 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return super.b3();
             }
         }
-        wr(a) {
-            if (!this.hasMarkers || !this.xi()) {
+        wu(a) {
+            if (!this.hasMarkers || !this.xl()) {
                 return Rect.empty;
             }
-            let b = this.w8.b5(this.v9(a));
+            let b = this.xb.ce(this.wc(a));
             if (b != null) {
-                return this.w8.cy(b);
+                return this.xb.c7(b);
             }
             return Rect.empty;
         }
-        gw(a, b) {
-            if (this.xj(a, b)) {
+        gx(a, b) {
+            if (this.xm(a, b)) {
                 return true;
             }
             return false;
         }
         constructor() {
             super();
-            this.yy = null;
-            this.zh = null;
+            this.y1 = null;
+            this.zk = null;
+            this.zl = null;
+            this.acq = null;
+            this.acr = null;
+            this.za = 1;
+            this.yr = null;
+            this.ys = null;
+            this.y7 = null;
+            this.y9 = null;
+            this.y5 = null;
+            this.zq = false;
+            this.zp = false;
             this.zi = null;
-            this.acn = null;
-            this.aco = null;
-            this.y7 = 1;
-            this.yo = null;
-            this.yp = null;
-            this.y4 = null;
-            this.y6 = null;
-            this.y2 = null;
-            this.zn = false;
-            this.zm = false;
-            this.zf = null;
-            this.zg = null;
+            this.zj = null;
             this.assigningScatterStyle = null;
             this.assigningScatterMarkerStyle = null;
-            this.zb = null;
-            this.y5 = null;
-            this.y1 = null;
-            this.zl = true;
-            this.z0 = 0;
-            this.z1 = 0;
-            this.z2 = 0;
+            this.ze = null;
+            this.y8 = null;
+            this.y4 = null;
+            this.zo = true;
             this.z3 = 0;
-            this.y8 = this.y9();
-            this.zb = new ScatterSeriesRenderManager();
-            this.y5 = new ScatterFrame();
-            this.aco = Rect.empty;
-            this.acn = Rect.empty;
+            this.z4 = 0;
+            this.z5 = 0;
+            this.z6 = 0;
+            this.zb = this.zc();
+            this.ze = new ScatterSeriesRenderManager();
+            this.y8 = new ScatterFrame();
+            this.acr = Rect.empty;
+            this.acq = Rect.empty;
         }
-        get zj() {
-            return this.zh;
+        get zm() {
+            return this.zk;
         }
-        set zj(a) {
-            if (this.zh != a) {
-                let b = this.zj;
-                this.zh = a;
-                this.raisePropertyChanged("XColumn", b, this.zj);
+        set zm(a) {
+            if (this.zk != a) {
+                let b = this.zm;
+                this.zk = a;
+                this.raisePropertyChanged("XColumn", b, this.zm);
             }
         }
-        get zk() {
-            return this.zi;
+        get zn() {
+            return this.zl;
         }
-        set zk(a) {
-            if (this.zi != a) {
-                let b = this.zk;
-                this.zi = a;
-                this.raisePropertyChanged("YColumn", b, this.zk);
+        set zn(a) {
+            if (this.zl != a) {
+                let b = this.zn;
+                this.zl = a;
+                this.raisePropertyChanged("YColumn", b, this.zn);
             }
         }
-        gb() {
-            return this.highlightedItemsSource != null || (this.aaf != null && this.aah != null);
+        gc() {
+            return this.highlightedItemsSource != null || (this.aai != null && this.aak != null);
         }
-        zy() {
+        z1() {
             return false;
         }
-        ht() {
-            let a = super.ht();
+        hu() {
+            let a = super.hu();
             {
                 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.abb));
+                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.abe));
                 a.add(b);
             }
             {
@@ -254,10 +254,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aba));
+                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.abd));
                 a.add(c);
             }
-            if (this.zy()) {
+            if (this.z1()) {
                 let d = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -274,7 +274,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 })());
                 a.add(d);
             }
-            if (!this.zy()) {
+            if (!this.z1()) {
                 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.r2));
+                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.r4));
                 a.add(e);
             }
-            if (!this.zy()) {
+            if (!this.z1()) {
                 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.r2));
+                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.r4));
                 a.add(f);
             }
             return a;
         }
-        aba(a, b) {
-            if (this.aaf != null) {
-                b.value = this.aaf;
+        abd(a, b) {
+            if (this.aai != null) {
+                b.value = this.aai;
                 return;
             }
-            b.value = this.aav;
+            b.value = this.aay;
         }
-        abb(a, b) {
-            if (this.aah != null) {
-                b.value = this.aah;
+        abe(a, b) {
+            if (this.aak != null) {
+                b.value = this.aak;
                 return;
             }
-            b.value = this.aa3;
+            b.value = this.aa6;
         }
-        get ack() {
-            return this.c(ScatterBase.abv);
+        get acn() {
+            return this.c(ScatterBase.aby);
         }
-        set ack(a) {
-            this.h(ScatterBase.abv, a);
+        set acn(a) {
+            this.h(ScatterBase.aby, a);
         }
         get GetErrorBarsXAxis() {
             return this.xAxis;
@@ -328,8 +328,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         get GetErrorBarsYAxis() {
             return this.yAxis;
         }
-        qb() {
-            super.qb();
+        qd() {
+            super.qd();
             if (this.xAxis != null) {
                 this.xAxis.ib(false);
             }
@@ -337,32 +337,32 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 this.yAxis.ib(false);
             }
         }
-        ra(a, b, c, d) {
-            super.ra(a, b, c, d);
-            if (this.yz.c6.g$e(a, b, c, d)) {
-                this.rs(false);
-                this.ql();
+        rc(a, b, c, d) {
+            super.rc(a, b, c, d);
+            if (this.y2.df.g$e(a, b, c, d)) {
+                this.ru(false);
+                this.qn();
             }
             switch (b) {
                 case ScatterBase.$$p[10]:
                 case ScatterBase.$$p[14]:
                 case ScatterBase.$$p[11]:
                 case ScatterBase.$$p[15]:
-                    this.qf();
+                    this.qh();
                     break;
                 case "FastItemsSource":
                     if (typeCast(IFastItemsSource_$type, c) != null) {
-                        c.deregisterColumn(this.zj);
-                        c.deregisterColumn(this.zk);
-                        this.zj = null;
-                        this.zk = null;
+                        c.deregisterColumn(this.zm);
+                        c.deregisterColumn(this.zn);
+                        this.zm = null;
+                        this.zn = null;
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.zj = this.dl(this.aav);
-                        this.zk = this.dl(this.aa3);
+                        this.zm = this.dl(this.aay);
+                        this.zn = this.dl(this.aa6);
                     }
                     if ((this.yAxis != null && !this.yAxis.c1()) || (this.xAxis != null && !this.xAxis.c1())) {
-                        this.rs(this.gg && c != null);
+                        this.ru(this.gh && 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.rs(false);
+                        this.ru(false);
                     }
-                    this.ql();
+                    this.qn();
                     break;
                 case ScatterBase.$$p[13]:
                     if (c != null) {
@@ -385,134 +385,139 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.ct(this);
                     }
                     if ((this.yAxis != null && !this.yAxis.c1()) || (d == null && c != null)) {
-                        this.rs(false);
+                        this.ru(false);
                     }
-                    this.ql();
+                    this.qn();
                     break;
                 case ScatterBase.$$p[12]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.zj);
-                        this.zj = this.dl(this.aav);
+                        this.dp.deregisterColumn(this.zm);
+                        this.zm = this.dl(this.aay);
                     }
                     break;
                 case "XColumn":
-                    this.yz.c6.g$m();
+                    this.y2.df.g$m();
                     if (this.xAxis != null && !this.xAxis.c1()) {
-                        this.rs(this.gg && this.d8);
+                        this.ru(this.gh && this.d9);
                     }
                     break;
                 case ScatterBase.$$p[16]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.zk);
-                        this.zk = this.dl(this.aa3);
+                        this.dp.deregisterColumn(this.zn);
+                        this.zn = this.dl(this.aa6);
                     }
                     break;
                 case "YColumn":
-                    this.yz.c6.g$m();
+                    this.y2.df.g$m();
                     if (this.yAxis != null && !this.yAxis.c1()) {
-                        this.rs(this.gg && this.d8);
+                        this.ru(this.gh && this.d9);
                     }
                     break;
                 case ScatterBase.$$p[7]:
-                    this.rs(false);
-                    this.ql();
+                    this.ru(false);
+                    this.qn();
                     break;
                 case ScatterBase.$$p[8]:
-                    this.rs(false);
-                    this.ql();
+                    this.ru(false);
+                    this.qn();
                     break;
                 case "TransitionProgress":
-                    this.y6.c(this.jq, this.y4, this.y2);
-                    this.aa5();
+                    this.y9.c(this.jr, this.y7, this.y5);
+                    this.aa8();
                     try {
-                        if (this.d6(this.cw)) {
+                        if (this.d7(this.cw)) {
                             return;
                         }
-                        if ((Math.round(this.jq * 100000) / 100000) == 1) {
-                            this.abs(this.y2, this.yz);
+                        if ((Math.round(this.jr * 100000) / 100000) == 1) {
+                            this.abv(this.y5, this.y2);
                         }
                         else {
-                            this.abs(this.y6, this.yz);
+                            this.abv(this.y9, this.y2);
                         }
                         if (this.dc != null) {
-                            this.dc.qp(this);
+                            this.dc.qx(this);
                         }
                     }
                     finally {
-                        this.abt();
+                        this.abw();
                     }
                     break;
                 case "TrendLineBrush":
-                    this.rg(b);
+                    this.ri(b);
                     break;
                 case ScatterBase.$$p[0]:
-                    if (this.y0 != null) {
-                        this.y0.r = this;
+                    if (this.y3 != null) {
+                        this.y3.r = this;
                     }
-                    this.rs(false);
-                    this.ql();
+                    this.ru(false);
+                    this.qn();
                     break;
                 case "TrendLineType":
-                    this.ql();
+                    this.qn();
                     break;
                 case ScatterBase.$$p[4]:
-                    this.zn = this.zv();
-                    this.rs(false);
+                    this.zq = this.zy();
+                    this.ru(false);
                     break;
                 case ScatterBase.$$p[3]:
-                    this.zm = this.zu();
-                    this.rs(false);
+                    this.zp = this.zx();
+                    this.ru(false);
                     break;
                 case ScatterBase.$$p[5]:
-                    this.y8 = this.y9();
+                    this.zb = this.zc();
                     break;
             }
         }
-        zv() {
-            return this.zr;
+        zy() {
+            return this.zu;
         }
-        zu() {
-            return this.zq;
+        zx() {
+            return this.zt;
         }
-        zp(a) {
+        zs(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        zo(a) {
+        zr(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        abt() {
-            this.acn = Rect.empty;
-            this.aco = Rect.empty;
+        abw() {
+            this.acq = Rect.empty;
+            this.acr = Rect.empty;
         }
-        aa5() {
-            let a = this.getViewInfo(this.acn, this.aco);
-            this.acn = a.p0;
-            this.aco = a.p1;
+        aa8() {
+            let a = this.getViewInfo(this.acq, this.acr);
+            this.acq = a.p0;
+            this.acr = a.p1;
         }
-        zt(a, b) {
+        zw(a, b) {
             if (b != 3) {
                 return true;
             }
             if (a == null) {
                 return true;
             }
-            if (this.aav == a || this.aa3 == a) {
+            if (this.aay == a || this.aa6 == a) {
                 return true;
             }
             return false;
         }
-        pb(a, b, c, d) {
+        pd(a, b, c, d) {
             let e = false;
-            if (!this.zt(d, a)) {
+            if (!this.zw(d, a)) {
                 return;
             }
-            this.yz.c6.g$i(a, b, c, d);
+            this.y2.df.g$i(a, b, c, d);
+            if (this.y2.aa.count > 0) {
+                for (let f of fromEnum(this.y2.aa)) {
+                    f.g$i(a, b, c, d);
+                }
+            }
             if (this.xAxis != null && !this.xAxis.c1()) {
                 e = true;
             }
@@ -520,28 +525,28 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 e = true;
             }
             if (a == 0 || a == 2 || a == 3 || a == 4) {
-                this.zl = true;
+                this.zo = true;
             }
             else if (a == 1) {
-                for (let f = b; f < b + c; f++) {
-                    this.z0 += this.zj.item(f);
-                    this.z1 += this.zk.item(f);
+                for (let g = b; g < b + c; g++) {
+                    this.z3 += this.zm.item(g);
+                    this.z4 += this.zn.item(g);
                 }
-                this.z2 = this.z0 / this.zj.count;
-                this.z3 = this.z1 / this.zk.count;
+                this.z5 = this.z3 / this.zm.count;
+                this.z6 = this.z4 / this.zn.count;
             }
             if (e) {
-                this.rs(true);
+                this.ru(true);
             }
         }
-        abk(a) {
-            this.abl(a, null);
+        abn(a) {
+            this.abo(a, null);
         }
-        abl(a, b) {
-            let c = this.zj != null ? this.zj.count : 0;
-            let d = this.zk != null ? this.zk.count : 0;
+        abo(a, b) {
+            let c = this.zm != null ? this.zm.count : 0;
+            let d = this.zn != null ? this.zn.count : 0;
             let e = Math.min(c, d);
-            if (e <= this.aab) {
+            if (e <= this.aae) {
                 a.n.clear();
                 let f = new List$1(OwnedPoint.$, 0);
                 for (let g of fromEnum(a.v.values)) {
@@ -575,73 +580,73 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
         }
         ay(a) {
-            if (a != null && a == this.xAxis && this.zj != null) {
-                return new AxisRange(this.zj.minimum, this.zj.maximum);
+            if (a != null && a == this.xAxis && this.zm != null) {
+                return new AxisRange(this.zm.minimum, this.zm.maximum);
             }
-            if (a != null && a == this.yAxis && this.zk != null) {
-                return new AxisRange(this.zk.minimum, this.zk.maximum);
+            if (a != null && a == this.yAxis && this.zn != null) {
+                return new AxisRange(this.zn.minimum, this.zn.maximum);
             }
             return null;
         }
-        kn(a) {
-            let b = this.j3(a);
+        ko(a) {
+            let b = this.j4(a);
             if (this.dp != null && b >= 0 && b < this.dp.count) {
                 return this.dp.item(b);
             }
             return null;
         }
-        get y8() {
-            return this.y7;
+        get zb() {
+            return this.za;
         }
-        set y8(a) {
-            let b = this.y7;
-            this.y7 = a;
-            if (b != this.y7) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.y7));
+        set zb(a) {
+            let b = this.za;
+            this.za = a;
+            if (b != this.za) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.za));
             }
         }
-        y9() {
-            if (this.za != 0) {
-                return this.za;
+        zc() {
+            if (this.zd != 0) {
+                return this.zd;
             }
-            return this.zs ? 4 : 1;
+            return this.zv ? 4 : 1;
         }
-        j3(a) {
-            let b = truncate(Math.round(this.ir(a)));
+        j4(a) {
+            let b = truncate(Math.round(this.is(a)));
             return b;
         }
-        ir(a) {
-            switch (this.y8) {
-                case 1: return this.z7(a);
-                case 3: return this.z8(a);
-                case 2: return this.z5(a);
-                case 4: return this.z6(a);
-                case 5: return this.z4(a);
+        is(a) {
+            switch (this.zb) {
+                case 1: return this.aaa(a);
+                case 3: return this.aab(a);
+                case 2: return this.z8(a);
+                case 4: return this.z9(a);
+                case 5: return this.z7(a);
             }
             return -1;
         }
-        z6(a) {
-            return this.z9(a, false);
+        z9(a) {
+            return this.aac(a, false);
         }
-        z5(a) {
-            let b = this.v9(a);
+        z8(a) {
+            let b = this.wc(a);
             let c = b.x;
             let d = b.y;
-            if (this.dp == null || this.xAxis == null || this.yAxis == null || this.zj == null || this.zk == null) {
+            if (this.dp == null || this.xAxis == null || this.yAxis == null || this.zm == null || this.zn == null) {
                 return -1;
             }
-            if (this.dp.count > this.aaa) {
+            if (this.dp.count > this.aad) {
                 return -1;
             }
-            this.aa8();
-            let e = this.yo;
-            let f = this.yp;
+            this.abb();
+            let e = this.yr;
+            let f = this.ys;
             if (e == null || f == null) {
                 return -1;
             }
             let g = 1.7976931348623157E+308;
             let h = -1;
-            for (let i = 0; i < this.zj.count; i++) {
+            for (let i = 0; i < this.zm.count; i++) {
                 let j = e[i];
                 let k = f[i];
                 let l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -652,61 +657,61 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        aa8() {
-            let a = this.cw.b2;
-            let b = this.cw.b1;
+        abb() {
+            let a = this.cw.ca;
+            let b = this.cw.b9;
             let c = this.getEffectiveViewport();
-            if (this.yy == null) {
+            if (this.y1 == null) {
                 return;
             }
-            let d = new ScalerParams(0, a, b, this.yy.d, c);
+            let d = new ScalerParams(0, a, b, this.y1.d, c);
             let e = ((() => {
-                let $ret = new ScalerParams(0, a, b, this.yy.e, c);
-                $ret.b = this.iy();
+                let $ret = new ScalerParams(0, a, b, this.y1.e, c);
+                $ret.b = this.iz();
                 return $ret;
             })());
-            if (this.yo == null || this.yp == null) {
-                let f = arrayShallowClone(this.zj.asArray());
-                let g = arrayShallowClone(this.zk.asArray());
+            if (this.yr == null || this.ys == null) {
+                let f = arrayShallowClone(this.zm.asArray());
+                let g = arrayShallowClone(this.zn.asArray());
                 this.xAxis.hq(boxArray$1(f), 0, f.length, d);
                 this.yAxis.hq(boxArray$1(g), 0, g.length, e);
-                this.yo = f;
-                this.yp = g;
+                this.yr = f;
+                this.ys = g;
             }
         }
-        get_zs() {
+        get_zv() {
             return false;
         }
-        get zs() {
-            return this.get_zs();
+        get zv() {
+            return this.get_zv();
         }
-        z9(a, b) {
-            if (!this.zs) {
+        aac(a, b) {
+            if (!this.zv) {
                 return -1;
             }
             let c = { $type: Point_$type, x: 0, y: 0 };
             let d = true;
-            let e = this.y3();
+            let e = this.y6();
             if (e == null) {
                 return -1;
             }
             if (e.n == null) {
                 return -1;
             }
-            if (this.dp == null || this.dp.count > this.aaa) {
+            if (this.dp == null || this.dp.count > this.aad) {
                 return -1;
             }
-            this.aa8();
-            let f = this.yo;
-            let g = this.yp;
+            this.abb();
+            let f = this.yr;
+            let g = this.ys;
             if (f == null || g == null) {
                 return -1;
             }
-            let h = this.v9(a);
+            let h = this.wc(a);
             let i = 1.7976931348623157E+308;
             let j = -1;
-            for (let k = 0; k < this.yo.length; k++) {
-                let l = { $type: Point_$type, x: this.yo[k], y: this.yp[k] };
+            for (let k = 0; k < this.yr.length; k++) {
+                let l = { $type: Point_$type, x: this.yr[k], y: this.ys[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);
@@ -719,8 +724,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 c = l;
             }
             if (j >= 0) {
-                let n = { $type: Point_$type, x: this.yo[j], y: this.yp[j] };
-                let o = { $type: Point_$type, x: this.yo[j - 1], y: this.yp[j - 1] };
+                let n = { $type: Point_$type, x: this.yr[j], y: this.ys[j] };
+                let o = { $type: Point_$type, x: this.yr[j - 1], y: this.ys[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;
@@ -734,24 +739,24 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        z8(a) {
-            return this.z9(a, true);
+        aab(a) {
+            return this.aac(a, true);
         }
-        z4(a) {
-            let b = this.v9(a);
+        z7(a) {
+            let b = this.wc(a);
             let c = b.x;
             let d = b.y;
-            if (this.yz.c7.e > this.aaa) {
+            if (this.y2.dg.e > this.aad) {
                 return -1;
             }
             let e = -1;
-            this.w8.co((f) => {
-                let g = this.yz.cy(f);
+            this.xb.cx((f) => {
+                let g = this.y2.c7(f);
                 let h = g.left;
                 let i = g.top;
                 let j = g.width;
                 let k = g.height;
-                if (this.xf) {
+                if (this.xi) {
                     let l = h + j / 2;
                     let m = i + k / 2;
                     let n = (j / 2) * (j / 2);
@@ -772,18 +777,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             });
             return e;
         }
-        z7(a) {
+        aaa(a) {
             let b = null;
             let c = 1.7976931348623157E+308;
-            let d = this.v9(a);
+            let d = this.wc(a);
             let e = d.x;
             let f = d.y;
-            if (this.yz.c7.e > this.aaa) {
+            if (this.y2.dg.e > this.aad) {
                 return -1;
             }
-            this.yz.de((g) => {
+            this.y2.dn((g) => {
                 if (g._visibility == 0) {
-                    let h = this.yz.cy(g);
+                    let h = this.y2.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);
@@ -798,21 +803,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        we(a, b, c) {
-            if (this.xAxis == null || this.yAxis == null || this.zj == null || this.zk == null) {
+        wh(a, b, c) {
+            if (this.xAxis == null || this.yAxis == null || this.zm == null || this.zn == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            let d = this.cw.b2;
-            let e = this.cw.b1;
+            let d = this.cw.ca;
+            let e = this.cw.b9;
             let f = this.getEffectiveViewport();
             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.iz();
                 return $ret;
             })());
             if (b) {
-                let i = this.ir(a);
+                let i = this.is(a);
                 if (i == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
@@ -831,44 +836,44 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     j = this.dp.count - 1;
                 }
                 if (k == j) {
-                    let l = this.xAxis.el(this.zj.item(j), g);
-                    let m = this.yAxis.el(this.zk.item(j), h);
+                    let l = this.xAxis.el(this.zm.item(j), g);
+                    let m = this.yAxis.el(this.zn.item(j), h);
                     return { $type: Point_$type, x: l, y: m };
                 }
                 let n = i - Math.floor(i);
-                let o = this.xAxis.el(this.zj.item(j), g);
-                let p = this.yAxis.el(this.zk.item(j), h);
-                let q = this.xAxis.el(this.zj.item(k), g);
-                let r = this.yAxis.el(this.zk.item(k), h);
+                let o = this.xAxis.el(this.zm.item(j), g);
+                let p = this.yAxis.el(this.zn.item(j), h);
+                let q = this.xAxis.el(this.zm.item(k), g);
+                let r = this.yAxis.el(this.zn.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.j4(a);
                 if (u == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
-                let v = this.xAxis.el(this.zj.item(u), g);
-                let w = this.yAxis.el(this.zk.item(u), h);
+                let v = this.xAxis.el(this.zm.item(u), g);
+                let w = this.yAxis.el(this.zn.item(u), h);
                 return { $type: Point_$type, x: v, y: w };
             }
         }
-        gd(a) {
-            let b = this.dc != null ? this.dc.v5 : Rect.empty;
+        ge(a) {
+            let b = this.dc != null ? this.dc.wh : Rect.empty;
             b = b.copy();
-            let c = this.dc != null ? this.dc.wn : Rect.empty;
+            let c = this.dc != null ? this.dc.wz : Rect.empty;
             let d = new Rect(0, 0, 0, 1, 1);
-            let e = this.wn(this.cw);
+            let e = this.wq(this.cw);
             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.iz();
                 return $ret;
             })());
             let h = !b.isEmpty && !c.isEmpty && this.dp != null ? this.dp.indexOf(a) : -1;
-            let i = this.xAxis != null && this.zj != null && h < this.zj.count ? this.xAxis.el(this.zj.item(h), f) : NaN;
-            let j = this.yAxis != null && this.zk != null && h < this.zk.count ? this.yAxis.el(this.zk.item(h), g) : NaN;
+            let i = this.xAxis != null && this.zm != null && h < this.zm.count ? this.xAxis.el(this.zm.item(h), f) : NaN;
+            let j = this.yAxis != null && this.zn != null && h < this.zn.count ? this.yAxis.el(this.zn.item(h), g) : NaN;
             if (!isNaN_(i)) {
                 if (i < b.left + 0.1 * b.width) {
                     i = i + 0.4 * b.width;
@@ -894,52 +899,52 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h >= 0;
         }
-        ss(a, b) {
-            this.rs(false);
+        su(a, b) {
+            this.ru(false);
         }
-        st(a, b) {
-            this.rs(false);
+        sv(a, b) {
+            this.ru(false);
         }
-        y3() {
-            let a = this.y2;
+        y6() {
+            let a = this.y5;
             if (this.d4()) {
                 if (this.dd.g) {
                     this.dd.t();
                 }
-                a = this.y6;
+                a = this.y9;
             }
             return a;
         }
-        aa6(a, b, c, d, e) {
+        aa9(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.yy.d, f);
+                let $ret = new ScalerParams(0, d, e, this.y1.d, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 return $ret;
             })());
             let k = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.yy.e, f);
+                let $ret = new ScalerParams(0, d, e, this.y1.e, f);
                 $ret.c = this.getEffectiveViewport1(a);
-                $ret.b = this.iy();
+                $ret.b = this.iz();
                 return $ret;
             })());
             let l = false;
             let m = 0;
             if (this.dc != null) {
-                if (this.dc.f3()) {
-                    let n = this.dc.m5(d, j);
+                if (this.dc.f4()) {
+                    let n = this.dc.nd(d, j);
                     l = n.c;
                     m = n.d;
                 }
             }
             for (let o = 0; o < c; o++) {
-                h = this.zj.item(o);
-                i = this.zk.item(o);
-                let p = { $type: Point_$type, x: this.yy.a.el(h, j), y: this.yy.b.el(i, k) };
+                h = this.zm.item(o);
+                i = this.zn.item(o);
+                let p = { $type: Point_$type, x: this.y1.a.el(h, j), y: this.y1.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,31 +968,31 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        abh(a, b) {
-            this.yo = null;
-            this.yp = null;
+        abk(a, b) {
+            this.yr = null;
+            this.ys = null;
             a.j.clear();
             a.o.clear();
             a.h.clear();
             a.l.clear();
             a.i.clear();
             a.k.clear();
-            let c = Math.min(this.zj != null ? this.zj.count : 0, this.zk != null ? this.zk.count : 0);
-            let d = b.b2;
-            let e = b.b1;
+            let c = Math.min(this.zm != null ? this.zm.count : 0, this.zn != null ? this.zn.count : 0);
+            let d = b.ca;
+            let e = b.b9;
             let f = this.getEffectiveViewport1(b);
             let g = new ScalerParams(0, d, e, this.xAxis.ch, f);
             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.iz();
                 return $ret;
             })());
             h.c = this.getEffectiveViewport1(b);
             if (c < 1) {
                 return;
             }
-            this.yy = ((() => {
+            this.y1 = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -997,36 +1002,36 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             let i = b;
-            if (c <= this.aab) {
-                this.aa6(i, a, c, d, e);
+            if (c <= this.aae) {
+                this.aa9(i, a, c, d, e);
             }
-            if (this.xi()) {
-                b.c4.l(a.j, this.aab, d, e, this.id);
+            if (this.xl()) {
+                b.dd.l(a.j, this.aae, d, e, this.ie);
             }
             let j = ((() => {
                 let $ret = new Clipper(0, e, false);
                 $ret.i = a.o;
                 return $ret;
             })());
-            let k = this.wl(b);
+            let k = this.wo(b);
             let l = this.xAxis.eo(k.left, g);
             let m = this.xAxis.eo(k.right, g);
-            b.c6.j(a.o, this.trendLineType, this.zj, this.zk, this.trendLinePeriod, (n) => this.xAxis.el(n, g), (n) => this.yAxis.el(n, h), ((() => {
+            b.df.j(a.o, this.trendLineType, this.zm, this.zn, 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.ie;
                 $ret.i = e;
                 $ret.h = f;
                 $ret.j = d;
                 return $ret;
             })()), j, l, m);
-            if (b.w.count > 0) {
+            if (b.aa.count > 0) {
                 a.m.clear();
-                for (let n = 0; n < b.w.count; n++) {
+                for (let n = 0; n < b.aa.count; n++) {
                     a.m.add(new List$1(Point_$type, 0));
-                    let o = b.w._inner[n];
-                    o.j(a.m._inner[n], o.g$b, this.zj, this.zk, o.g$f, (p) => this.xAxis.el(p, g), (p) => this.yAxis.el(p, h), ((() => {
+                    let o = b.aa._inner[n];
+                    o.j(a.m._inner[n], o.g$b, this.zm, this.zn, o.g$f, (p) => this.xAxis.el(p, g), (p) => this.yAxis.el(p, h), ((() => {
                         let $ret = new TrendResolutionParams();
-                        $ret.d = this.id;
+                        $ret.d = this.ie;
                         $ret.i = e;
                         $ret.h = f;
                         $ret.j = d;
@@ -1034,25 +1039,25 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     })()), j, l, m);
                 }
             }
-            this.abf(a, b);
+            this.abi(a, b);
         }
-        o5(a, b) {
-            super.o5(a, b);
+        o7(a, b) {
+            super.o7(a, b);
             let c = b;
-            c.dd(a);
+            c.dm(a);
         }
-        get_fe() {
+        get_ff() {
             return true;
         }
-        zd(a, b, c) {
+        zg(a, b, c) {
             return null;
         }
-        ze(a, b, c) {
+        zh(a, b, c) {
             if (this.dp == null) {
                 return null;
             }
-            let d = this.y3();
-            let e = this.yz.b5(this.v9(b));
+            let d = this.y6();
+            let e = this.y2.ce(this.wc(b));
             let f = -1;
             if (e == null) {
                 if (a != null) {
@@ -1079,11 +1084,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return g;
         }
-        wx(a, b) {
-            if (this.xa != 1 && this.xa != 13) {
-                let c = this.w8.cz();
-                let d = (c.width / 2) + (this.xl / 2);
-                let e = (c.height / 2) + (this.xl / 2);
+        w0(a, b) {
+            if (this.xd != 1 && this.xd != 13) {
+                let c = this.xb.c8();
+                let d = (c.width / 2) + (this.xo / 2);
+                let e = (c.height / 2) + (this.xo / 2);
                 let f = d;
                 let g = d;
                 let h = e;
@@ -1104,7 +1109,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return new Thickness(1, 0, 0, 0, 0);
         }
-        zc(a, b, c) {
+        zf(a, b, c) {
             let d = new HighlightingInfo();
             d.i = this;
             d.g = 0;
@@ -1116,40 +1121,40 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             return d;
         }
         dh(a, b, c) {
-            if (this.ee && this.fz(this.by) && !c) {
-                let d = this.zd(a, b, this.zf);
-                this.zf = d;
+            if (this.ef && this.f0(this.by) && !c) {
+                let d = this.zg(a, b, this.zi);
+                this.zi = d;
                 return d;
             }
             else {
-                let e = this.zc(a, b, this.zf);
-                this.zf = e;
+                let e = this.zf(a, b, this.zi);
+                this.zi = e;
                 return e;
             }
         }
         di(a, b, c) {
-            if (this.fz(this.by) && !c) {
-                let d = this.ze(a, b, this.zg);
-                this.zg = d;
+            if (this.f0(this.by) && !c) {
+                let d = this.zh(a, b, this.zj);
+                this.zj = d;
                 return d;
             }
             else {
-                let e = this.zc(a, b, this.zg);
+                let e = this.zf(a, b, this.zj);
                 e.d = true;
-                this.zg = e;
+                this.zj = e;
                 return e;
             }
         }
-        zx() {
-            return (this.assigningScatterStyle != null && this.zn) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
+        z0() {
+            return (this.assigningScatterStyle != null && this.zq) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
         }
-        zw() {
-            return (this.assigningScatterMarkerStyle != null && this.zm) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
+        zz() {
+            return (this.assigningScatterMarkerStyle != null && this.zp) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
         }
-        abs(a, b) {
-            this.qx();
-            let c = b.b1;
-            this.yy = ((() => {
+        abv(a, b) {
+            this.qz();
+            let c = b.b9;
+            this.y1 = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -1157,47 +1162,47 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.e = this.yAxis.ch;
                 return $ret;
             })());
-            if (this.xi()) {
-                b.c4.j(a.j, this.xk);
-                if (this.zw()) {
-                    this.aa7(b, a);
+            if (this.xl()) {
+                b.dd.j(a.j, this.xn);
+                if (this.zz()) {
+                    this.aba(b, a);
                 }
             }
-            b.cv();
+            b.c4();
             let d = ((() => {
                 let $ret = new Clipper(1, NaN, c.bottom, NaN, c.top, false);
-                $ret.i = b.c6.g$n.an;
+                $ret.i = b.df.g$n.an;
                 return $ret;
             })());
-            b.c6.g$l(a.o, d);
-            if (b.w.count > 0) {
-                for (let e = 0; e < b.w.count; e++) {
-                    let f = b.w._inner[e];
+            b.df.g$l(a.o, d);
+            if (b.aa.count > 0) {
+                for (let e = 0; e < b.aa.count; e++) {
+                    let f = b.aa._inner[e];
                     f.g$l(a.m._inner[e], d);
                 }
             }
-            this.abp(a, b);
+            this.abs(a, b);
         }
         ak(a, b) {
             let c = new List$1(ChartSelection.$, 0);
-            this.p4(a, c, b);
+            this.p6(a, c, b);
             return c.toArray();
         }
-        p4(a, b, c) {
-            this.aa9(a, b, c, 0, null);
+        p6(a, b, c) {
+            this.abc(a, b, c, 0, null);
         }
-        aa9(a, b, c, d, e) {
-            let f = this.dc.wk(this.dc.wa(a));
+        abc(a, b, c, d, e) {
+            let f = this.dc.ww(this.dc.wm(a));
             let g = this.dp.count;
-            let h = this.yy.a;
-            let i = this.yy.b;
-            let j = this.dc.wd(this.wu, this.getEffectiveViewport(), f);
-            let k = new ScalerParams(0, f, this.dc.wn, h.ch, this.getEffectiveViewport());
-            let l = new ScalerParams(0, f, this.dc.wn, i.ch, this.getEffectiveViewport());
+            let h = this.y1.a;
+            let i = this.y1.b;
+            let j = this.dc.wp(this.wx, this.getEffectiveViewport(), f);
+            let k = new ScalerParams(0, f, this.dc.wz, h.ch, this.getEffectiveViewport());
+            let l = new ScalerParams(0, f, this.dc.wz, i.ch, this.getEffectiveViewport());
             if (d == 0) {
                 for (let m = 0; m < g; m++) {
-                    let n = h.el(this.zj.item(m), k);
-                    let o = i.el(this.zk.item(m), l);
+                    let n = h.el(this.zm.item(m), k);
+                    let o = i.el(this.zn.item(m), l);
                     if (n < j.width && n > 0 && o < j.height && o > 0) {
                         if (c == 7 || c == 6) {
                             b.add(((() => {
@@ -1227,8 +1232,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             else {
                 for (let p = 0; p < g; p++) {
-                    let q = h.el(this.zj.item(p), k);
-                    let r = i.el(this.zk.item(p), l);
+                    let q = h.el(this.zm.item(p), k);
+                    let r = i.el(this.zn.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);
@@ -1260,11 +1265,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        yr(a, b) {
-            return this.ys(a, b);
+        yu(a, b) {
+            return this.yv(a, b);
         }
-        ys(a, b) {
-            if (b < a || a < 0 || a > this.zj.count || b < 0 || b > this.zj.count) {
+        yv(a, b) {
+            if (b < a || a < 0 || a > this.zm.count || b < 0 || b > this.zm.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
@@ -1274,14 +1279,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        aa7(a, b) {
-            a.cb = true;
-            this.zb.ay(this, this.zw(), runOn(this, this.yr));
-            let c = this.zb.d;
+        aba(a, b) {
+            a.ck = true;
+            this.ze.ay(this, this.zz(), runOn(this, this.yu));
+            let c = this.ze.d;
             let d = c != null;
             let e = this.getEffectiveViewport1(a);
             let f = this.dp == null ? 0 : this.dp.count;
-            this.yz.cn((g) => {
+            this.y2.cw((g) => {
                 if (g._visibility == 0) {
                     let h = g.ak;
                     let i = g.content;
@@ -1290,19 +1295,19 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         g.content = i;
                     }
                     if (d) {
-                        this.abc(h, f, a.r);
+                        this.abf(h, f, a.t);
                     }
-                    this.zb.ac(g, i);
+                    this.ze.ac(g, i);
                 }
             });
         }
-        abd(a, b, c) {
+        abg(a, b, c) {
             let d = this.by != 1;
             let e = this.cq != 1;
             let f = this.cp != 1;
-            this.zb.a0(this.zb.b, a, b, false);
-            this.zb.ab(this.ib);
-            let g = this.zb.ax;
+            this.ze.a0(this.ze.b, a, b, false);
+            this.ze.ab(this.ic);
+            let g = this.ze.ax;
             let h = null;
             let i = null;
             let j = null;
@@ -1320,16 +1325,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 g.b = h;
             }
             g.h = c;
-            this.abn(g);
-            this.zb.z(this, h, i, j, c, d, e, f, a < 0);
+            this.abq(g);
+            this.ze.z(this, h, i, j, c, d, e, f, a < 0);
         }
-        abc(a, b, c) {
+        abf(a, b, c) {
             let d = this.by != 1;
             let e = this.cq != 1;
             let f = this.cp != 1;
-            this.zb.a0(this.zb.d, a, b, true);
-            this.zb.aa(this.ib);
-            let g = this.zb.aw;
+            this.ze.a0(this.ze.d, a, b, true);
+            this.ze.aa(this.ic);
+            let g = this.ze.aw;
             let h = null;
             let i = null;
             let j = null;
@@ -1365,26 +1370,26 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 g.d = i;
             }
             g.h = c;
-            this.abm(g);
-            this.zb.y(this, h, i, j, c, d, e, f, g.v, this.dc.dk.totalHighWaterMark, g.x, this.dc.dl.totalHighWaterMark, g.t, this.dc.dj.totalHighWaterMark);
+            this.abp(g);
+            this.ze.y(this, h, i, j, c, d, e, f, g.v, this.dc.dk.totalHighWaterMark, g.x, this.dc.dl.totalHighWaterMark, g.t, this.dc.dj.totalHighWaterMark);
         }
-        abn(a) {
-            if (this.assigningScatterStyle != null && this.zn) {
+        abq(a) {
+            if (this.assigningScatterStyle != null && this.zq) {
                 this.assigningScatterStyle(this, a);
             }
         }
-        abm(a) {
-            if (this.assigningScatterMarkerStyle != null && this.zm) {
+        abp(a) {
+            if (this.assigningScatterMarkerStyle != null && this.zp) {
                 this.assigningScatterMarkerStyle(this, a);
             }
         }
-        abf(a, b) {
+        abi(a, b) {
             let c = new ErrorBarsHelper(this, b);
-            if (this.y0 == null) {
+            if (this.y3 == null) {
                 return;
             }
-            let d = this.y0.u;
-            let e = this.y0.v;
+            let d = this.y3.u;
+            let e = this.y3.v;
             let f = 0;
             let g = 0;
             let h = 0;
@@ -1394,35 +1399,35 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            let l = this.abi(k, c, d, h, i, true);
+                            let l = this.abl(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            let m = this.abg(k, c, d, h, i, true);
+                            let m = this.abj(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            let n = this.abe(k, c, d, j, h, i, true);
+                            let n = this.abh(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            let o = this.abj(c, d, f, h, i, true);
+                            let o = this.abm(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            let p = this.abg(k, c, d, h, i, true);
+                            let p = this.abj(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     let q = new OwnedPoint();
-                    q.c = c.l(d, this.yy.a, k.c, f);
+                    q.c = c.l(d, this.y1.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1430,53 +1435,53 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            let r = this.abi(k, c, e, h, i, false);
+                            let r = this.abl(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            let s = this.abg(k, c, e, h, i, false);
+                            let s = this.abj(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            let t = this.abe(k, c, e, j, h, i, false);
+                            let t = this.abh(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            let u = this.abj(c, e, g, h, i, false);
+                            let u = this.abm(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            let v = this.abg(k, c, e, h, i, false);
+                            let v = this.abj(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     let w = new OwnedPoint();
-                    w.c = c.m(e, this.yy.b, k.c, g);
+                    w.c = c.m(e, this.y1.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
                 }
             }
         }
-        abi(a, b, c, d, e, f) {
+        abl(a, b, c, d, e, f) {
             if (f) {
                 let g;
                 let h, i;
-                i = this.yy.a;
-                if (this.y0.s == 0) {
+                i = this.y1.a;
+                if (this.y3.s == 0) {
                     g = a.c.x;
-                    h = this.yy.a;
+                    h = this.y1.a;
                 }
                 else {
                     g = a.c.y;
-                    h = this.yy.b;
+                    h = this.y1.b;
                 }
                 let j = b.f(g, c, h, i, d, e);
                 d = j.p4;
@@ -1485,14 +1490,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             else {
                 let k;
                 let l, m;
-                m = this.yy.b;
-                if (this.y0.t == 0) {
+                m = this.y1.b;
+                if (this.y3.t == 0) {
                     k = a.c.x;
-                    l = this.yy.a;
+                    l = this.y1.a;
                 }
                 else {
                     k = a.c.y;
-                    l = this.yy.b;
+                    l = this.y1.b;
                 }
                 let n = b.f(k, c, l, m, d, e);
                 d = n.p4;
@@ -1503,14 +1508,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abg(a, b, c, d, e, f) {
+        abj(a, b, c, d, e, f) {
             if (f) {
-                let g = b.j(a.c.x, c, this.yy.a, d, e);
+                let g = b.j(a.c.x, c, this.y1.a, d, e);
                 d = g.p3;
                 e = g.p4;
             }
             else {
-                let h = b.j(a.c.y, c, this.yy.b, d, e);
+                let h = b.j(a.c.y, c, this.y1.b, d, e);
                 d = h.p3;
                 e = h.p4;
             }
@@ -1519,18 +1524,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abe(a, b, c, d, e, f, g) {
+        abh(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.yy.a, e, f);
+                    let k = b.h(a.c.x, j, this.y1.a, e, f);
                     e = k.p3;
                     f = k.p4;
                 }
                 else {
-                    let l = b.h(a.c.y, j, this.yy.b, e, f);
+                    let l = b.h(a.c.y, j, this.y1.b, e, f);
                     e = l.p3;
                     f = l.p4;
                 }
@@ -1544,16 +1549,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        abj(a, b, c, d, e, f) {
+        abm(a, b, c, d, e, f) {
             let g = a.i(b, c);
             c = g.p1;
             if (f) {
-                let h = a.k(c, b, this.yy.a, d, e);
+                let h = a.k(c, b, this.y1.a, d, e);
                 d = h.p3;
                 e = h.p4;
             }
             else {
-                let i = a.k(c, b, this.yy.b, d, e);
+                let i = a.k(c, b, this.y1.b, d, e);
                 d = i.p3;
                 e = i.p4;
             }
@@ -1563,163 +1568,163 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abp(a, b) {
-            if (!b.p() || this.y0 == null) {
-                b.df();
+        abs(a, b) {
+            if (!b.r() || this.y3 == null) {
+                b.dp();
                 return;
             }
-            this.abq(a, b);
-            this.abr(a, b);
+            this.abt(a, b);
+            this.abu(a, b);
         }
-        abq(a, b) {
-            b.db();
+        abt(a, b) {
+            b.dk();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.y0.u;
+            let e = this.y3.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.y0.o == 1 || this.y0.o == 2) {
+                        if (this.y3.o == 1 || this.y3.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.y0.o == 1 || this.y0.o == 3) {
+                        if (this.y3.o == 1 || this.y3.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
                 }
             }
-            b.dg(d);
+            b.dq(d);
         }
-        abr(a, b) {
-            b.dc();
+        abu(a, b) {
+            b.dl();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.y0.v;
+            let e = this.y3.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.y0.p == 1 || this.y0.p == 2) {
+                        if (this.y3.p == 1 || this.y3.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.y0.p == 1 || this.y0.p == 3) {
+                        if (this.y3.p == 1 || this.y3.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
                 }
             }
         }
-        he(a, b, c) {
+        hf(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.zj == null || this.zk == null || this.zj.count == 0 || this.zk.count == 0 || this.dp == null || this.dp.count != this.zj.count || this.dp.count != this.zk.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.l4 == this.xAxis.l3 || this.yAxis.l4 == this.yAxis.l3) {
+            if (!super.hf(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.zm == null || this.zn == null || this.zm.count == 0 || this.zn.count == 0 || this.dp == null || this.dp.count != this.zm.count || this.dp.count != this.zn.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.acn.isEmpty && !this.aco.isEmpty) {
-                a = this.acn;
-                b = this.aco;
+            if (!this.acq.isEmpty && !this.acr.isEmpty) {
+                a = this.acq;
+                b = this.acr;
                 return {
                     p0: a,
                     p1: b
                 };
             }
-            a = this.cw.b1;
-            b = this.cw.b2;
+            a = this.cw.b9;
+            b = this.cw.ca;
             return {
                 p0: a,
                 p1: b
             };
         }
-        rt(a) {
-            super.rt(a);
-            this.aa5();
+        rv(a) {
+            super.rv(a);
+            this.aa8();
             try {
-                if (this.d6(this.cw)) {
+                if (this.d7(this.cw)) {
                     return;
                 }
-                if (this.dp != null && this.dp.count > this.aab) {
+                if (this.dp != null && this.dp.count > this.aae) {
                     a = false;
                 }
-                if (this.gf(a) && !this.gr) {
-                    let b = this.y4;
+                if (this.gg(a) && !this.gs) {
+                    let b = this.y7;
                     if (this.d4()) {
                         if (this.dd.g) {
                             this.dd.t();
                         }
-                        this.y4 = this.y6;
-                        this.y6 = b;
+                        this.y7 = this.y9;
+                        this.y9 = b;
                     }
                     else {
-                        this.y4 = this.y2;
-                        this.y2 = b;
+                        this.y7 = this.y5;
+                        this.y5 = b;
                     }
-                    this.abh(this.y2, this.yz);
-                    this.r9();
+                    this.abk(this.y5, this.y2);
+                    this.sb();
                 }
                 else {
-                    if (!this.gr) {
-                        this.abh(this.y2, this.yz);
+                    if (!this.gs) {
+                        this.abk(this.y5, this.y2);
                     }
-                    this.abs(this.y2, this.yz);
+                    this.abv(this.y5, this.y2);
                 }
             }
             finally {
-                this.abt();
+                this.abw();
             }
         }
-        sj() {
-            super.sj();
+        sl() {
+            super.sl();
             if (this.index < 0) {
                 return;
             }
-            this.yz.dj();
+            this.y2.dt();
         }
-        ru(a, b) {
-            super.ru(a, b);
-            if (!this.g0) {
-                this.cw.a7(b);
+        rw(a, b) {
+            super.rw(a, b);
+            if (!this.g1) {
+                this.cw.be(b);
                 return;
             }
-            this.cw.a7(b);
-            if (this.d6(this.cv)) {
+            this.cw.be(b);
+            if (this.d7(this.cv)) {
                 return;
             }
             let c = typeCast(ScatterBaseView.$, this.cv);
-            this.rv();
-            this.g0 = false;
+            this.rx();
+            this.g1 = false;
         }
-        rv() {
-            super.rv();
+        rx() {
+            super.rx();
             let a = typeCast(ScatterBaseView.$, this.cv);
-            if (!this.gs) {
-                this.y5 = new ScatterFrame();
-                this.abh(this.y5, a);
+            if (!this.gt) {
+                this.y8 = new ScatterFrame();
+                this.abk(this.y8, a);
             }
-            this.gs = false;
-            this.abs(this.y5, a);
+            this.gt = false;
+            this.abv(this.y8, a);
         }
-        rr(a, b, c, d, e) {
-            super.rr(a, b, c, d, e);
+        rt(a, b, c, d, e) {
+            super.rt(a, b, c, d, e);
             let f = this.ba.a$j.item(d);
             let g = f;
-            f.a6(c);
-            if (this.d6(g)) {
+            f.bd(c);
+            if (this.d7(g)) {
                 return;
             }
-            if (this.y1 == null) {
-                this.y1 = new ScatterFrame();
+            if (this.y4 == null) {
+                this.y4 = new ScatterFrame();
             }
-            this.abh(this.y1, g);
-            this.abs(this.y1, g);
+            this.abk(this.y4, g);
+            this.abv(this.y4, g);
         }
-        abo(a, b) {
+        abr(a, b) {
             let c = new List$1(Base.$, 0);
             for (let d of fromEnum(b.c)) {
                 if (!a.containsKey(d)) {
@@ -1730,10 +1735,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 b.h(e);
             }
         }
-        yq(a, b, c, d, e) {
-            if (c == null || c.length != this.yy.c.count) {
-                c = new Array(this.yy.c.count);
-                for (let f = 0; f < this.yy.c.count; f++) {
+        yt(a, b, c, d, e) {
+            if (c == null || c.length != this.y1.c.count) {
+                c = new Array(this.y1.c.count);
+                for (let f = 0; f < this.y1.c.count; f++) {
                     c[f] = PointUtil.create();
                 }
             }
@@ -1746,37 +1751,37 @@ 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.iz();
                 return $ret;
             })());
-            let j = this.wl(a);
-            let k = this.yy.a.eo(j.left, h);
-            let l = this.yy.a.eo(j.right, h);
-            let m = this.yy.b.eo(j.bottom, i);
-            let n = this.yy.b.eo(j.top, i);
-            if (this.yy.d) {
+            let j = this.wo(a);
+            let k = this.y1.a.eo(j.left, h);
+            let l = this.y1.a.eo(j.right, h);
+            let m = this.y1.b.eo(j.bottom, i);
+            let n = this.y1.b.eo(j.top, i);
+            if (this.y1.d) {
                 let o = k;
                 k = l;
                 l = o;
             }
-            if (this.yy.e) {
+            if (this.y1.e) {
                 let p = m;
                 m = n;
                 n = p;
             }
-            let q = this.yy;
+            let q = this.y1;
             let r = q.a;
             let s = q.b;
             let t;
             let u;
-            let v = this.zj;
-            let w = this.zk;
+            let v = this.zm;
+            let w = this.zn;
             let x = false;
             let y = 0;
             let z = 0;
             if (this.dc != null) {
-                if (this.dc.f3()) {
-                    let aa = this.dc.m5(d, h);
+                if (this.dc.f4()) {
+                    let aa = this.dc.nd(d, h);
                     x = aa.c;
                     y = aa.d;
                     z = r.eo(0 + y, h);
@@ -1784,7 +1789,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     z -= ab;
                 }
             }
-            for (let ac = 0; ac < this.yy.c.count; ac++) {
+            for (let ac = 0; ac < this.y1.c.count; ac++) {
                 t = v.item(ac);
                 u = w.item(ac);
                 let ad = 1E-10;
@@ -1817,7 +1822,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        zz(a, b) {
+        z2(a, b) {
             if (b == null) {
                 b = new List$1(Number_$type, 2, a.e);
             }
@@ -1831,32 +1836,32 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        pz(a) {
-            super.pz(a);
-            this.bc.exportTrendlineData(this, a, this.yz.c6.g$n);
+        p1(a) {
+            super.p1(a);
+            this.bc.exportTrendlineData(this, a, this.y2.df.g$n);
         }
-        iy() {
-            return Series.iz(this.zk, null);
+        iz() {
+            return Series.i0(this.zn, 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.ko(c);
+            let e = d == null ? NaN : this.iy(d, "XMemberPath");
+            let f = d == null ? NaN : this.iy(d, "YMemberPath");
             let g = new DataLegendSeriesValueInfo();
             g.l = e;
             g.a = 13;
             g.q = "X";
-            g.r = this.aav != null ? this.aav : "X";
-            g.s = this.aar != null ? this.aar : "X:";
-            g.t = this.aat != null ? this.aat : "";
+            g.r = this.aay != null ? this.aay : "X";
+            g.s = this.aau != null ? this.aau : "X:";
+            g.t = this.aaw != null ? this.aaw : "";
             let h = new DataLegendSeriesValueInfo();
             h.l = f;
             h.a = 14;
             h.q = "Y";
-            h.r = this.aa3 != null ? this.aa3 : "Y";
-            h.s = this.aaz != null ? this.aaz : "Y:";
-            h.t = this.aa1 != null ? this.aa1 : "";
+            h.r = this.aa6 != null ? this.aa6 : "Y";
+            h.s = this.aa2 != null ? this.aa2 : "Y:";
+            h.t = this.aa4 != null ? this.aa4 : "";
             let i = new DataLegendSeriesContext();
             i.e = ((() => {
                 let $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -1864,23 +1869,23 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.add(h);
                 return $ret;
             })());
-            i.h = this.mc();
+            i.h = this.me();
             return i;
         }
-        abu() {
-            if (this.zl) {
-                this.z0 = 0;
-                this.z1 = 0;
-                for (let a = 0; a < this.zj.count; a++) {
-                    this.z0 += this.zj.item(a);
-                    this.z1 += this.zk.item(a);
+        abx() {
+            if (this.zo) {
+                this.z3 = 0;
+                this.z4 = 0;
+                for (let a = 0; a < this.zm.count; a++) {
+                    this.z3 += this.zm.item(a);
+                    this.z4 += this.zn.item(a);
                 }
-                this.z2 = this.z0 / this.zj.count;
-                this.z3 = this.z1 / this.zk.count;
-                this.zl = false;
+                this.z5 = this.z3 / this.zm.count;
+                this.z6 = this.z4 / this.zn.count;
+                this.zo = false;
             }
         }
-        i8(a, b) {
+        i9(a, b) {
             if (b == null || !b.cj) {
                 return NaN;
             }
@@ -1901,47 +1906,47 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             switch (a) {
                 case 5:
                 case 2:
-                    b = this.zj.maximum;
-                    c = this.zk.maximum;
+                    b = this.zm.maximum;
+                    c = this.zn.maximum;
                     break;
                 case 4:
                 case 1:
-                    b = this.zj.minimum;
-                    c = this.zk.minimum;
+                    b = this.zm.minimum;
+                    c = this.zn.minimum;
                     break;
                 case 6:
                 case 3:
-                    if (this.zl) {
-                        this.abu();
+                    if (this.zo) {
+                        this.abx();
                     }
-                    b = this.z2;
-                    c = this.z3;
+                    b = this.z5;
+                    c = this.z6;
                     break;
             }
             return [b, c];
         }
-        wi(a) {
+        wl(a) {
             let b = this.getEffectiveViewport1(this.cw);
-            let c = new ScalerParams(0, this.cw.b2, this.cw.b1, this.xAxis.ch, b);
+            let c = new ScalerParams(0, this.cw.ca, this.cw.b9, this.xAxis.ch, b);
             c.c = b;
             let d = isNaN_(a[0]) ? NaN : this.xAxis.el(a[0], c);
-            c = new ScalerParams(0, this.cw.b2, this.cw.b1, this.yAxis.ch, b);
-            c.b = this.iy();
+            c = new ScalerParams(0, this.cw.ca, this.cw.b9, this.yAxis.ch, b);
+            c.b = this.iz();
             c.c = b;
             let e = isNaN_(a[1]) ? NaN : this.yAxis.el(a[1], c);
             return { $type: Point_$type, x: d, y: e };
         }
-        wh(a) {
+        wk(a) {
             let b = this.aq(a);
-            return this.wi(b);
+            return this.wl(b);
         }
         bd() {
             return new ScatterTrendLineManager();
         }
     }
     ScatterBase.$t = /*@__PURE__*/ markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.abv = /*@__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:y0:abw', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aaf:abx', [2, null], 'HighlightedYMemberPath:aah:aby', [2, null], 'IsCustomScatterMarkerStyleAllowed:zq:abz', [0, false], 'IsCustomScatterStyleAllowed:zr:ab0', [0, false], 'ItemSearchMode:za:ab1', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:aaa:ab2', [1, 10000], 'MarkerCollisionAvoidance:yv:ab3', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:aab:ab4', [1, 400], 'XAxis::acc', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aar:acd', [2, null], 'XMemberAsLegendUnit:aat:ace', [2, null], 'XMemberPath:aav:acf', [2, null], 'YAxis::acg', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aaz:ach', [2, null], 'YMemberAsLegendUnit:aa1:aci', [2, null], 'YMemberPath:aa3:acj', [2, null], 'TrendLineType::aca', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::ab9', [1, 1.5], 'TrendLinePeriod::ab8', [1, 7], 'TrendLineBrush::ab5', [Brush.$, null], 'TrendLineZIndex:aac:acb', [1, 1001], 'TrendLineDashArray:acl:ab6', [DoubleCollection.$], 'TrendLineDashCap:acm:ab7', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.aby = /*@__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:y3:abz', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aai:ab0', [2, null], 'HighlightedYMemberPath:aak:ab1', [2, null], 'IsCustomScatterMarkerStyleAllowed:zt:ab2', [0, false], 'IsCustomScatterStyleAllowed:zu:ab3', [0, false], 'ItemSearchMode:zd:ab4', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:aad:ab5', [1, 10000], 'MarkerCollisionAvoidance:yy:ab6', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:aae:ab7', [1, 400], 'XAxis::acf', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aau:acg', [2, null], 'XMemberAsLegendUnit:aaw:ach', [2, null], 'XMemberPath:aay:aci', [2, null], 'YAxis::acj', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aa2:ack', [2, null], 'YMemberAsLegendUnit:aa4:acl', [2, null], 'YMemberPath:aa6:acm', [2, null], 'TrendLineType::acd', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::acc', [1, 1.5], 'TrendLinePeriod::acb', [1, 7], 'TrendLineBrush::ab8', [Brush.$, null], 'TrendLineZIndex:aaf:ace', [1, 1001], 'TrendLineDashArray:aco:ab9', [DoubleCollection.$], 'TrendLineDashCap:acp:aca', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 })();
 /**
@@ -1997,109 +2002,109 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
     class ScatterBaseView extends MarkerSeriesView {
         constructor(a) {
             super(a);
-            this.c4 = null;
-            this.c2 = null;
-            this.c5 = null;
-            this.da = null;
-            this.dl = null;
-            this.dm = null;
-            this.c6 = null;
-            this.dk = null;
-            this.c7 = null;
-            this.c5 = a;
-            this.c7 = new HashPool$2(Base.$, Marker.$);
-            this.cq(this.c7);
-            this.c6 = new ScatterTrendLineManager();
-        }
-        ax() {
-            super.ax();
-            this.c4 = this.c3();
-            this.dl = new Path();
-            this.dm = new Path();
-            if (!this.r) {
-                this.c5.aab = 2000;
-            }
-        }
-        dn(a) {
-            if (this.dk == null) {
-                this.dk = new DataTemplateMeasureInfo();
-                this.dk.context = this.l.h();
-            }
-            this.dk.width = a.width;
-            this.dk.height = a.height;
-            this.dk.data = a.content;
+            this.dd = null;
+            this.db = null;
+            this.de = null;
+            this.dj = null;
+            this.dv = null;
+            this.dw = null;
+            this.df = null;
+            this.du = null;
+            this.dg = null;
+            this.de = a;
+            this.dg = new HashPool$2(Base.$, Marker.$);
+            this.cz(this.dg);
+            this.df = new ScatterTrendLineManager();
+        }
+        a4() {
+            super.a4();
+            this.dd = this.dc();
+            this.dv = new Path();
+            this.dw = new Path();
+            if (!this.t) {
+                this.de.aae = 2000;
+            }
+        }
+        dx(a) {
+            if (this.du == null) {
+                this.du = new DataTemplateMeasureInfo();
+                this.du.context = this.m.h();
+            }
+            this.du.width = a.width;
+            this.du.height = a.height;
+            this.du.data = a.content;
             let b = a.ah;
             if (b.measure != null) {
-                b.measure(this.dk);
+                b.measure(this.du);
             }
-            return new Size(1, this.dk.width, this.dk.height);
+            return new Size(1, this.du.width, this.du.height);
         }
-        c3() {
-            let a = new NumericMarkerManager(1, (b) => this.c7.item(b), (b) => this.c5.yy.c.item(b), runOn(this, this.di), runOn(this, this.c0), runOn(this, this.c8), () => this.c5.yv);
-            a.q = runOn(this, this.dn);
+        dc() {
+            let a = new NumericMarkerManager(1, (b) => this.dg.item(b), (b) => this.de.y1.c.item(b), runOn(this, this.ds), runOn(this, this.c9), runOn(this, this.dh), () => this.de.yy);
+            a.q = runOn(this, this.dx);
             return a;
         }
-        di(a) {
-            this.c5.abo(a, this.c7);
+        ds(a) {
+            this.de.abr(a, this.dg);
         }
-        c9() {
-            return this.cc;
+        di() {
+            return this.cl;
         }
-        c1() {
-            return this.c2;
+        da() {
+            return this.db;
         }
-        c0() {
-            this.c2 = this.c5.yq(this, this.c7, this.c2, this.b2, this.b1);
-            return this.c2;
+        c9() {
+            this.db = this.de.yt(this, this.dg, this.db, this.ca, this.b9);
+            return this.db;
         }
-        c8() {
-            this.da = this.c5.zz(this.c7, this.da);
-            return this.da;
+        dh() {
+            this.dj = this.de.z2(this.dg, this.dj);
+            return this.dj;
         }
-        db() {
+        dk() {
         }
-        dg(a) {
+        dq(a) {
         }
-        dc() {
+        dl() {
         }
-        dh(a) {
+        dr(a) {
         }
-        dj() {
-            if (this.c5.trendLineBrush != null) {
-                this.c5.ack = this.c5.trendLineBrush;
+        dt() {
+            if (this.de.trendLineBrush != null) {
+                this.de.acn = this.de.trendLineBrush;
             }
             else {
-                this.c5.ack = this.c5.vb;
+                this.de.acn = this.de.ve;
             }
         }
-        cn(a) {
-            this.c7.f(a);
+        cw(a) {
+            this.dg.f(a);
         }
-        de(a) {
-            this.c7.g(a);
+        dn(a) {
+            this.dg.g(a);
         }
-        df() {
+        dp() {
         }
-        bb(a, b) {
-            super.bb(a, b);
+        bi(a, b) {
+            super.bi(a, b);
             if (a.d) {
-                if (this.c5.trendLineType != 0 && !b) {
-                    let c = this.c6.g$n;
-                    c.ad = this.c5.trendLineThickness;
-                    c._stroke = this.c5.ack;
-                    c.ai = this.c5.acl;
-                    c.aj = this.c5.acm;
+                if (this.de.trendLineType != 0 && !b) {
+                    let c = this.df.g$n;
+                    c.ad = this.de.trendLineThickness;
+                    c._stroke = this.de.acn;
+                    c.ai = this.de.aco;
+                    c.aj = this.de.acp;
                     a.v(c);
                 }
             }
         }
-        dd(a) {
+        dm(a) {
             if (a) {
-                this.df();
-                this.c7.clear();
+                this.dp();
+                this.dg.clear();
             }
-            this.c6.g$h();
-            this.av();
+            this.df.g$h();
+            this.a2();
         }
         getDefaultTooltipTemplate() {
             let a = "<div class='ui-chart-default-tooltip-content'><span";
@@ -2107,7 +2112,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             if (!stringIsNullOrEmpty(b)) {
                 a += " style='color:" + b + "'";
             }
-            a += ">" + this.c5.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.c5.aav + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.c5.aa3 + "}</span></div>";
+            a += ">" + this.de.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.de.aay + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.de.aa6 + "}</span></div>";
             return a;
         }
     }