igniteui-webcomponents-charts 6.3.1 → 7.0.0

package/esm2015/lib/ScatterBase_combined.js

@@ -62,79 +62,79 @@ let ScatterBase = /*@__PURE__*/ (() => {
         ct() {
             return new ScatterBaseView(this);
         }
-        pf() {
-            super.pf();
+        pg() {
+            super.pg();
             this.xAxis = null;
             this.yAxis = null;
         }
-        rh(a) {
-            super.rh(a);
-            this.zi = a;
+        ri(a) {
+            super.ri(a);
+            this.zj = a;
         }
-        get_fz() {
+        get_f0() {
             return true;
         }
         ai() {
             return [this.xAxis, this.yAxis];
         }
-        kz(a, b) {
-            let c = this.no(b);
+        k0(a, b) {
+            let c = this.np(b);
             if (c == ScatterBase.$$p[12]) {
-                return this.k0(a, b, this.abe);
+                return this.k1(a, b, this.abf);
             }
             if (c == ScatterBase.$$p[16]) {
-                return this.k0(a, b, this.abm);
+                return this.k1(a, b, this.abn);
             }
             if (c == ScatterBase.$$p[1]) {
-                return this.k0(a, b, this.aay);
+                return this.k1(a, b, this.aaz);
             }
             if (c == ScatterBase.$$p[2]) {
-                return this.k0(a, b, this.aa0);
+                return this.k1(a, b, this.aa1);
             }
             return null;
         }
-        mo(a) {
-            let b = this.no(a);
+        mp(a) {
+            let b = this.np(a);
             if (b == ScatterBase.$$p[12]) {
-                return this.abe;
+                return this.abf;
             }
             if (b == ScatterBase.$$p[16]) {
-                return this.abm;
+                return this.abn;
             }
             if (b == ScatterBase.$$p[1]) {
-                return this.aay;
+                return this.aaz;
             }
             if (b == ScatterBase.$$p[2]) {
-                return this.aa0;
+                return this.aa1;
             }
-            return super.mo(a);
+            return super.mp(a);
         }
         ed(a, b, c, d, e) {
             if (!this.hasMarkers) {
                 return false;
             }
             let f = this.xAxis;
-            let g = new ScalerParams(1, this.dc.yr, this.xd, f.dn);
+            let g = new ScalerParams(1, this.dc.yr, this.xe, f.dn);
             g.c = this.getEffectiveViewport1(this.cw);
             let h = this.yAxis;
-            let i = new ScalerParams(1, this.dc.yr, this.xd, h.dn);
+            let i = new ScalerParams(1, this.dc.yr, this.xe, h.dn);
             i.c = this.getEffectiveViewport1(this.cw);
             a.clear();
-            this.xr.cw((j) => {
+            this.xs.cw((j) => {
                 if (j._visibility == 0) {
                     let k = new SeriesPointOfInterest();
                     let l = j.n;
                     let m = j.o;
-                    if (!e && (l < this.xd.left || l > this.xd.right || m < this.xd.top || m > this.xd.bottom)) {
+                    if (!e && (l < this.xe.left || l > this.xe.right || m < this.xe.top || m > this.xe.bottom)) {
                         return;
                     }
-                    k.d = f.f9(l, g);
-                    k.e = h.f9(m, i);
+                    k.d = f.ga(l, g);
+                    k.e = h.ga(m, i);
                     k.b = j.content;
-                    k.g = this.v0;
+                    k.g = this.v1;
                     k.c = j.ak;
-                    if (this.hf) {
-                        k.g = this.v7(j.ak);
+                    if (this.hg) {
+                        k.g = this.v8(j.ak);
                     }
                     a.add(k);
                 }
@@ -151,64 +151,54 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 return super.b3();
             }
         }
-        xa(a) {
-            if (!this.hasMarkers || !this.x1()) {
+        xb(a) {
+            if (!this.hasMarkers || !this.x2()) {
                 return Rect.empty;
             }
-            let b = this.xr.ce(this.wr(a));
+            let b = this.xs.ce(this.ws(a));
             if (b != null) {
-                return this.xr.c7(b);
+                return this.xs.c7(b);
             }
             return Rect.empty;
         }
-        g2(a, b) {
-            if (this.x2(a, b)) {
+        g3(a, b) {
+            if (this.x3(a, b)) {
                 return true;
             }
             return false;
         }
         constructor() {
             super();
-            this.zh = null;
-            this.z0 = null;
+            this.zi = null;
             this.z1 = null;
-            this.ac6 = null;
+            this.z2 = null;
             this.ac7 = null;
-            this.zq = 1;
-            this.y7 = null;
+            this.ac8 = null;
+            this.zr = 1;
             this.y8 = null;
-            this.zn = null;
-            this.zp = null;
-            this.zl = null;
+            this.y9 = null;
+            this.zo = null;
+            this.zq = null;
+            this.zm = null;
+            this.z7 = false;
             this.z6 = false;
-            this.z5 = false;
-            this.zy = null;
             this.zz = null;
+            this.z0 = null;
             this.assigningScatterStyle = null;
             this.assigningScatterMarkerStyle = null;
-            this.zu = null;
-            this.zo = null;
-            this.zk = null;
-            this.z4 = true;
-            this.aaj = 0;
+            this.zv = null;
+            this.zp = null;
+            this.zl = null;
+            this.z5 = true;
             this.aak = 0;
             this.aal = 0;
             this.aam = 0;
-            this.zr = this.zs();
-            this.zu = new ScatterSeriesRenderManager();
-            this.zo = new ScatterFrame();
+            this.aan = 0;
+            this.zs = this.zt();
+            this.zv = new ScatterSeriesRenderManager();
+            this.zp = new ScatterFrame();
+            this.ac8 = Rect.empty;
             this.ac7 = Rect.empty;
-            this.ac6 = Rect.empty;
-        }
-        get z2() {
-            return this.z0;
-        }
-        set z2(a) {
-            if (this.z0 != a) {
-                let b = this.z2;
-                this.z0 = a;
-                this.raisePropertyChanged("XColumn", b, this.z2);
-            }
         }
         get z3() {
             return this.z1;
@@ -217,17 +207,27 @@ let ScatterBase = /*@__PURE__*/ (() => {
             if (this.z1 != a) {
                 let b = this.z3;
                 this.z1 = a;
-                this.raisePropertyChanged("YColumn", b, this.z3);
+                this.raisePropertyChanged("XColumn", b, this.z3);
             }
         }
-        gh() {
-            return this.highlightedItemsSource != null || (this.aay != null && this.aa0 != null);
+        get z4() {
+            return this.z2;
         }
-        aah() {
+        set z4(a) {
+            if (this.z2 != a) {
+                let b = this.z4;
+                this.z2 = a;
+                this.raisePropertyChanged("YColumn", b, this.z4);
+            }
+        }
+        gi() {
+            return this.highlightedItemsSource != null || (this.aaz != null && this.aa1 != null);
+        }
+        aai() {
             return false;
         }
-        hz() {
-            let a = super.hz();
+        h0() {
+            let a = super.h0();
             {
                 let b = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
@@ -237,7 +237,7 @@ let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.abu));
+                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.abv));
                 a.add(b);
             }
             {
@@ -249,10 +249,10 @@ let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.abt));
+                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.abu));
                 a.add(c);
             }
-            if (this.aah()) {
+            if (this.aai()) {
                 let d = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -269,7 +269,7 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 })());
                 a.add(d);
             }
-            if (!this.aah()) {
+            if (!this.aai()) {
                 let e = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -279,10 +279,10 @@ let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.si));
+                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.sj));
                 a.add(e);
             }
-            if (!this.aah()) {
+            if (!this.aai()) {
                 let f = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -292,30 +292,30 @@ let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.si));
+                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.sj));
                 a.add(f);
             }
             return a;
         }
-        abt(a, b) {
-            if (this.aay != null) {
-                b.value = this.aay;
+        abu(a, b) {
+            if (this.aaz != null) {
+                b.value = this.aaz;
                 return;
             }
-            b.value = this.abe;
+            b.value = this.abf;
         }
-        abu(a, b) {
-            if (this.aa0 != null) {
-                b.value = this.aa0;
+        abv(a, b) {
+            if (this.aa1 != null) {
+                b.value = this.aa1;
                 return;
             }
-            b.value = this.abm;
+            b.value = this.abn;
         }
-        get ac3() {
-            return this.c(ScatterBase.ace);
+        get ac4() {
+            return this.c(ScatterBase.acf);
         }
-        set ac3(a) {
-            this.h(ScatterBase.ace, a);
+        set ac4(a) {
+            this.h(ScatterBase.acf, a);
         }
         get GetErrorBarsXAxis() {
             return this.xAxis;
@@ -323,41 +323,41 @@ let ScatterBase = /*@__PURE__*/ (() => {
         get GetErrorBarsYAxis() {
             return this.yAxis;
         }
-        qp() {
-            super.qp();
+        qq() {
+            super.qq();
             if (this.xAxis != null) {
-                this.xAxis.ly(false);
+                this.xAxis.l0(false);
             }
             if (this.yAxis != null) {
-                this.yAxis.ly(false);
+                this.yAxis.l0(false);
             }
         }
-        rq(a, b, c, d) {
-            super.rq(a, b, c, d);
-            if (this.zi.df.g$e(a, b, c, d)) {
-                this.r8(false);
-                this.q0();
+        rr(a, b, c, d) {
+            super.rr(a, b, c, d);
+            if (this.zj.df.g$e(a, b, c, d)) {
+                this.r9(false);
+                this.q1();
             }
             switch (b) {
                 case ScatterBase.$$p[10]:
                 case ScatterBase.$$p[14]:
                 case ScatterBase.$$p[11]:
                 case ScatterBase.$$p[15]:
-                    this.qu();
+                    this.qv();
                     break;
                 case "FastItemsSource":
                     if (typeCast(IFastItemsSource_$type, c) != null) {
-                        c.deregisterColumn(this.z2);
                         c.deregisterColumn(this.z3);
-                        this.z2 = null;
+                        c.deregisterColumn(this.z4);
                         this.z3 = null;
+                        this.z4 = null;
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.z2 = this.dl(this.abe);
-                        this.z3 = this.dl(this.abm);
+                        this.z3 = this.dl(this.abf);
+                        this.z4 = this.dl(this.abn);
                     }
-                    if ((this.yAxis != null && !this.yAxis.ed()) || (this.xAxis != null && !this.xAxis.ed())) {
-                        this.r8(this.gm && c != null);
+                    if ((this.yAxis != null && !this.yAxis.ee()) || (this.xAxis != null && !this.xAxis.ee())) {
+                        this.r9(this.gn && c != null);
                     }
                     break;
                 case ScatterBase.$$p[9]:
@@ -365,183 +365,183 @@ let ScatterBase = /*@__PURE__*/ (() => {
                         c.cx(this);
                     }
                     if (d != null) {
-                        d.d3(this);
+                        d.d4(this);
                     }
-                    if ((this.xAxis != null && !this.xAxis.ed()) || (d == null && c != null)) {
-                        this.r8(false);
+                    if ((this.xAxis != null && !this.xAxis.ee()) || (d == null && c != null)) {
+                        this.r9(false);
                     }
-                    this.q0();
+                    this.q1();
                     break;
                 case ScatterBase.$$p[13]:
                     if (c != null) {
                         c.cx(this);
                     }
                     if (d != null) {
-                        d.d3(this);
+                        d.d4(this);
                     }
-                    if ((this.yAxis != null && !this.yAxis.ed()) || (d == null && c != null)) {
-                        this.r8(false);
+                    if ((this.yAxis != null && !this.yAxis.ee()) || (d == null && c != null)) {
+                        this.r9(false);
                     }
-                    this.q0();
+                    this.q1();
                     break;
                 case ScatterBase.$$p[12]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.z2);
-                        this.z2 = this.dl(this.abe);
+                        this.dp.deregisterColumn(this.z3);
+                        this.z3 = this.dl(this.abf);
                     }
                     break;
                 case "XColumn":
-                    this.zi.df.g$m();
-                    if (this.xAxis != null && !this.xAxis.ed()) {
-                        this.r8(this.gm && this.d9);
+                    this.zj.df.g$m();
+                    if (this.xAxis != null && !this.xAxis.ee()) {
+                        this.r9(this.gn && this.d9);
                     }
                     break;
                 case ScatterBase.$$p[16]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.z3);
-                        this.z3 = this.dl(this.abm);
+                        this.dp.deregisterColumn(this.z4);
+                        this.z4 = this.dl(this.abn);
                     }
                     break;
                 case "YColumn":
-                    this.zi.df.g$m();
-                    if (this.yAxis != null && !this.yAxis.ed()) {
-                        this.r8(this.gm && this.d9);
+                    this.zj.df.g$m();
+                    if (this.yAxis != null && !this.yAxis.ee()) {
+                        this.r9(this.gn && this.d9);
                     }
                     break;
                 case ScatterBase.$$p[7]:
-                    this.r8(false);
-                    this.q0();
+                    this.r9(false);
+                    this.q1();
                     break;
                 case ScatterBase.$$p[8]:
-                    this.r8(false);
-                    this.q0();
+                    this.r9(false);
+                    this.q1();
                     break;
                 case "TransitionProgress":
-                    this.zp.d(this.jz, this.zn, this.zl);
-                    this.abo();
+                    this.zq.d(this.j0, this.zo, this.zm);
+                    this.abp();
                     try {
                         if (this.d7(this.cw)) {
                             return;
                         }
-                        if ((Math.round(this.jz * 100000) / 100000) == 1) {
-                            this.acb(this.zl, this.zi);
+                        if ((Math.round(this.j0 * 100000) / 100000) == 1) {
+                            this.acc(this.zm, this.zj);
                         }
                         else {
-                            this.acb(this.zp, this.zi);
+                            this.acc(this.zq, this.zj);
                         }
                         if (this.dc != null) {
                             this.dc.st(this);
                         }
                     }
                     finally {
-                        this.acc();
+                        this.acd();
                     }
                     break;
                 case "TrendLineBrush":
-                    this.rw(b);
+                    this.rx(b);
                     break;
                 case ScatterBase.$$p[0]:
-                    if (this.zj != null) {
-                        this.zj.r = this;
+                    if (this.zk != null) {
+                        this.zk.r = this;
                     }
-                    this.r8(false);
-                    this.q0();
+                    this.r9(false);
+                    this.q1();
                     break;
                 case "TrendLineType":
-                    this.q0();
+                    this.q1();
                     break;
                 case ScatterBase.$$p[4]:
-                    this.z6 = this.aae();
-                    this.r8(false);
+                    this.z7 = this.aaf();
+                    this.r9(false);
                     break;
                 case ScatterBase.$$p[3]:
-                    this.z5 = this.aad();
-                    this.r8(false);
+                    this.z6 = this.aae();
+                    this.r9(false);
                     break;
                 case ScatterBase.$$p[5]:
-                    this.zr = this.zs();
+                    this.zs = this.zt();
                     break;
             }
         }
+        aaf() {
+            return this.aab;
+        }
         aae() {
             return this.aaa;
         }
-        aad() {
-            return this.z9;
-        }
-        z8(a) {
+        z9(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        z7(a) {
+        z8(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        acc() {
-            this.ac6 = Rect.empty;
+        acd() {
             this.ac7 = Rect.empty;
+            this.ac8 = Rect.empty;
         }
-        abo() {
-            let a = this.getViewInfo(this.ac6, this.ac7);
-            this.ac6 = a.p0;
-            this.ac7 = a.p1;
+        abp() {
+            let a = this.getViewInfo(this.ac7, this.ac8);
+            this.ac7 = a.p0;
+            this.ac8 = a.p1;
         }
-        aac(a, b) {
+        aad(a, b) {
             if (b != 3) {
                 return true;
             }
             if (a == null) {
                 return true;
             }
-            if (this.abe == a || this.abm == a) {
+            if (this.abf == a || this.abn == a) {
                 return true;
             }
             return false;
         }
-        po(a, b, c, d) {
+        pp(a, b, c, d) {
             let e = false;
-            if (!this.aac(d, a)) {
+            if (!this.aad(d, a)) {
                 return;
             }
-            this.zi.df.g$i(a, b, c, d);
-            if (this.zi.aa.count > 0) {
-                for (let f of fromEnum(this.zi.aa)) {
+            this.zj.df.g$i(a, b, c, d);
+            if (this.zj.aa.count > 0) {
+                for (let f of fromEnum(this.zj.aa)) {
                     f.g$i(a, b, c, d);
                 }
             }
-            if (this.xAxis != null && !this.xAxis.ed()) {
+            if (this.xAxis != null && !this.xAxis.ee()) {
                 e = true;
             }
-            if (this.yAxis != null && !this.yAxis.ed()) {
+            if (this.yAxis != null && !this.yAxis.ee()) {
                 e = true;
             }
             if (a == 0 || a == 2 || a == 3 || a == 4) {
-                this.z4 = true;
+                this.z5 = true;
             }
             else if (a == 1) {
                 for (let g = b; g < b + c; g++) {
-                    this.aaj += this.z2.item(g);
                     this.aak += this.z3.item(g);
+                    this.aal += this.z4.item(g);
                 }
-                this.aal = this.aaj / this.z2.count;
                 this.aam = this.aak / this.z3.count;
+                this.aan = this.aal / this.z4.count;
             }
             if (e) {
-                this.r8(true);
+                this.r9(true);
             }
         }
-        ab3(a) {
-            this.ab4(a, null);
+        ab4(a) {
+            this.ab5(a, null);
         }
-        ab4(a, b) {
-            let c = this.z2 != null ? this.z2.count : 0;
-            let d = this.z3 != null ? this.z3.count : 0;
+        ab5(a, b) {
+            let c = this.z3 != null ? this.z3.count : 0;
+            let d = this.z4 != null ? this.z4.count : 0;
             let e = Math.min(c, d);
-            if (e <= this.aau) {
+            if (e <= this.aav) {
                 a.q.clear();
                 let f = new List$1(OwnedPoint.$, 0);
                 for (let g of fromEnum(a.y.values)) {
@@ -575,73 +575,73 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
         }
         ay(a) {
-            if (a != null && a == this.xAxis && this.z2 != null) {
-                return new AxisRange(this.z2.minimum, this.z2.maximum);
-            }
-            if (a != null && a == this.yAxis && this.z3 != null) {
+            if (a != null && a == this.xAxis && this.z3 != null) {
                 return new AxisRange(this.z3.minimum, this.z3.maximum);
             }
+            if (a != null && a == this.yAxis && this.z4 != null) {
+                return new AxisRange(this.z4.minimum, this.z4.maximum);
+            }
             return null;
         }
-        kw(a) {
-            let b = this.kc(a);
+        kx(a) {
+            let b = this.kd(a);
             if (this.dp != null && b >= 0 && b < this.dp.count) {
                 return this.dp.item(b);
             }
             return null;
         }
-        get zr() {
-            return this.zq;
+        get zs() {
+            return this.zr;
         }
-        set zr(a) {
-            let b = this.zq;
-            this.zq = a;
-            if (b != this.zq) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.zq));
+        set zs(a) {
+            let b = this.zr;
+            this.zr = a;
+            if (b != this.zr) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.zr));
             }
         }
-        zs() {
-            if (this.zt != 0) {
-                return this.zt;
+        zt() {
+            if (this.zu != 0) {
+                return this.zu;
             }
-            return this.aab ? 4 : 1;
+            return this.aac ? 4 : 1;
         }
-        kc(a) {
-            let b = truncate(Math.round(this.iy(a)));
+        kd(a) {
+            let b = truncate(Math.round(this.iz(a)));
             return b;
         }
-        iy(a) {
-            switch (this.zr) {
-                case 1: return this.aaq(a);
-                case 3: return this.aar(a);
-                case 2: return this.aao(a);
-                case 4: return this.aap(a);
-                case 5: return this.aan(a);
+        iz(a) {
+            switch (this.zs) {
+                case 1: return this.aar(a);
+                case 3: return this.aas(a);
+                case 2: return this.aap(a);
+                case 4: return this.aaq(a);
+                case 5: return this.aao(a);
             }
             return -1;
         }
-        aap(a) {
-            return this.aas(a, false);
+        aaq(a) {
+            return this.aat(a, false);
         }
-        aao(a) {
-            let b = this.wr(a);
+        aap(a) {
+            let b = this.ws(a);
             let c = b.x;
             let d = b.y;
-            if (this.dp == null || this.xAxis == null || this.yAxis == null || this.z2 == null || this.z3 == null) {
+            if (this.dp == null || this.xAxis == null || this.yAxis == null || this.z3 == null || this.z4 == null) {
                 return -1;
             }
-            if (this.dp.count > this.aat) {
+            if (this.dp.count > this.aau) {
                 return -1;
             }
-            this.abr();
-            let e = this.y7;
-            let f = this.y8;
+            this.abs();
+            let e = this.y8;
+            let f = this.y9;
             if (e == null || f == null) {
                 return -1;
             }
             let g = 1.7976931348623157E+308;
             let h = -1;
-            for (let i = 0; i < this.z2.count; i++) {
+            for (let i = 0; i < this.z3.count; i++) {
                 let j = e[i];
                 let k = f[i];
                 let l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -652,61 +652,61 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        abr() {
+        abs() {
             let a = this.cw.ca;
             let b = this.cw.b9;
             let c = this.getEffectiveViewport();
-            if (this.zh == null) {
+            if (this.zi == null) {
                 return;
             }
-            let d = new ScalerParams(0, a, b, this.zh.d, c);
+            let d = new ScalerParams(0, a, b, this.zi.d, c);
             let e = ((() => {
-                let $ret = new ScalerParams(0, a, b, this.zh.e, c);
-                $ret.b = this.i5();
+                let $ret = new ScalerParams(0, a, b, this.zi.e, c);
+                $ret.b = this.i6();
                 return $ret;
             })());
-            if (this.y7 == null || this.y8 == null) {
-                let f = arrayShallowClone(this.z2.asArray());
-                let g = arrayShallowClone(this.z3.asArray());
-                this.xAxis.k1(boxArray$1(f), 0, f.length, d);
-                this.yAxis.k1(boxArray$1(g), 0, g.length, e);
-                this.y7 = f;
-                this.y8 = g;
+            if (this.y8 == null || this.y9 == null) {
+                let f = arrayShallowClone(this.z3.asArray());
+                let g = arrayShallowClone(this.z4.asArray());
+                this.xAxis.k3(boxArray$1(f), 0, f.length, d);
+                this.yAxis.k3(boxArray$1(g), 0, g.length, e);
+                this.y8 = f;
+                this.y9 = g;
             }
         }
-        get_aab() {
+        get_aac() {
             return false;
         }
-        get aab() {
-            return this.get_aab();
+        get aac() {
+            return this.get_aac();
         }
-        aas(a, b) {
-            if (!this.aab) {
+        aat(a, b) {
+            if (!this.aac) {
                 return -1;
             }
             let c = { $type: Point_$type, x: 0, y: 0 };
             let d = true;
-            let e = this.zm();
+            let e = this.zn();
             if (e == null) {
                 return -1;
             }
             if (e.q == null) {
                 return -1;
             }
-            if (this.dp == null || this.dp.count > this.aat) {
+            if (this.dp == null || this.dp.count > this.aau) {
                 return -1;
             }
-            this.abr();
-            let f = this.y7;
-            let g = this.y8;
+            this.abs();
+            let f = this.y8;
+            let g = this.y9;
             if (f == null || g == null) {
                 return -1;
             }
-            let h = this.wr(a);
+            let h = this.ws(a);
             let i = 1.7976931348623157E+308;
             let j = -1;
-            for (let k = 0; k < this.y7.length; k++) {
-                let l = { $type: Point_$type, x: this.y7[k], y: this.y8[k] };
+            for (let k = 0; k < this.y8.length; k++) {
+                let l = { $type: Point_$type, x: this.y8[k], y: this.y9[k] };
                 if (k > 0) {
                     if (!b || e.m.containsKey(this.dp.item(k)) || e.m.containsKey(this.dp.item(k - 1))) {
                         let m = CoreGeometryUtil.q(h, c, l);
@@ -719,8 +719,8 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 c = l;
             }
             if (j >= 0) {
-                let n = { $type: Point_$type, x: this.y7[j], y: this.y8[j] };
-                let o = { $type: Point_$type, x: this.y7[j - 1], y: this.y8[j - 1] };
+                let n = { $type: Point_$type, x: this.y8[j], y: this.y9[j] };
+                let o = { $type: Point_$type, x: this.y8[j - 1], y: this.y9[j - 1] };
                 if (!b || (e.m.containsKey(this.dp.item(j)) && e.m.containsKey(this.dp.item(j - 1)))) {
                     let p = GeometryUtil.j(h, o, n);
                     return (j - 1) + p;
@@ -734,24 +734,24 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        aar(a) {
-            return this.aas(a, true);
+        aas(a) {
+            return this.aat(a, true);
         }
-        aan(a) {
-            let b = this.wr(a);
+        aao(a) {
+            let b = this.ws(a);
             let c = b.x;
             let d = b.y;
-            if (this.zi.dg.e > this.aat) {
+            if (this.zj.dg.e > this.aau) {
                 return -1;
             }
             let e = -1;
-            this.xr.cx((f) => {
-                let g = this.zi.c7(f);
+            this.xs.cx((f) => {
+                let g = this.zj.c7(f);
                 let h = g.left;
                 let i = g.top;
                 let j = g.width;
                 let k = g.height;
-                if (this.xy) {
+                if (this.xz) {
                     let l = h + j / 2;
                     let m = i + k / 2;
                     let n = (j / 2) * (j / 2);
@@ -772,18 +772,18 @@ let ScatterBase = /*@__PURE__*/ (() => {
             });
             return e;
         }
-        aaq(a) {
+        aar(a) {
             let b = null;
             let c = 1.7976931348623157E+308;
-            let d = this.wr(a);
+            let d = this.ws(a);
             let e = d.x;
             let f = d.y;
-            if (this.zi.dg.e > this.aat) {
+            if (this.zj.dg.e > this.aau) {
                 return -1;
             }
-            this.zi.dn((g) => {
+            this.zj.dn((g) => {
                 if (g._visibility == 0) {
-                    let h = this.zi.c7(g);
+                    let h = this.zj.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,8 +798,8 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        ww(a, b, c) {
-            if (this.xAxis == null || this.yAxis == null || this.z2 == null || this.z3 == null) {
+        wx(a, b, c) {
+            if (this.xAxis == null || this.yAxis == null || this.z3 == null || this.z4 == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
             let d = this.cw.ca;
@@ -808,11 +808,11 @@ let ScatterBase = /*@__PURE__*/ (() => {
             let g = new ScalerParams(0, d, e, this.xAxis.dn, f);
             let h = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.dn, f);
-                $ret.b = this.i5();
+                $ret.b = this.i6();
                 return $ret;
             })());
             if (b) {
-                let i = this.iy(a);
+                let i = this.iz(a);
                 if (i == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
@@ -831,44 +831,44 @@ let ScatterBase = /*@__PURE__*/ (() => {
                     j = this.dp.count - 1;
                 }
                 if (k == j) {
-                    let l = this.xAxis.f6(this.z2.item(j), g);
-                    let m = this.yAxis.f6(this.z3.item(j), h);
+                    let l = this.xAxis.f7(this.z3.item(j), g);
+                    let m = this.yAxis.f7(this.z4.item(j), h);
                     return { $type: Point_$type, x: l, y: m };
                 }
                 let n = i - Math.floor(i);
-                let o = this.xAxis.f6(this.z2.item(j), g);
-                let p = this.yAxis.f6(this.z3.item(j), h);
-                let q = this.xAxis.f6(this.z2.item(k), g);
-                let r = this.yAxis.f6(this.z3.item(k), h);
+                let o = this.xAxis.f7(this.z3.item(j), g);
+                let p = this.yAxis.f7(this.z4.item(j), h);
+                let q = this.xAxis.f7(this.z3.item(k), g);
+                let r = this.yAxis.f7(this.z4.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.kc(a);
+                let u = this.kd(a);
                 if (u == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
-                let v = this.xAxis.f6(this.z2.item(u), g);
-                let w = this.yAxis.f6(this.z3.item(u), h);
+                let v = this.xAxis.f7(this.z3.item(u), g);
+                let w = this.yAxis.f7(this.z4.item(u), h);
                 return { $type: Point_$type, x: v, y: w };
             }
         }
-        gj(a) {
+        gk(a) {
             let b = this.dc != null ? this.dc.yr : Rect.empty;
             b = b.copy();
             let c = this.dc != null ? this.dc.y9 : Rect.empty;
             let d = new Rect(0, 0, 0, 1, 1);
-            let e = this.w6(this.cw);
+            let e = this.w7(this.cw);
             let f = new ScalerParams(0, d, d, this.xAxis.dn, e);
             let g = ((() => {
                 let $ret = new ScalerParams(0, d, d, this.yAxis.dn, e);
-                $ret.b = this.i5();
+                $ret.b = this.i6();
                 return $ret;
             })());
             let h = !b.isEmpty && !c.isEmpty && this.dp != null ? this.dp.indexOf(a) : -1;
-            let i = this.xAxis != null && this.z2 != null && h < this.z2.count ? this.xAxis.f6(this.z2.item(h), f) : NaN;
-            let j = this.yAxis != null && this.z3 != null && h < this.z3.count ? this.yAxis.f6(this.z3.item(h), g) : NaN;
+            let i = this.xAxis != null && this.z3 != null && h < this.z3.count ? this.xAxis.f7(this.z3.item(h), f) : NaN;
+            let j = this.yAxis != null && this.z4 != null && h < this.z4.count ? this.yAxis.f7(this.z4.item(h), g) : NaN;
             if (!isNaN_(i)) {
                 if (i < b.left + 0.1 * b.width) {
                     i = i + 0.4 * b.width;
@@ -894,37 +894,37 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h >= 0;
         }
-        s8(a, b) {
-            this.r8(false);
-        }
         s9(a, b) {
-            this.r8(false);
+            this.r9(false);
         }
-        zm() {
-            let a = this.zl;
+        ta(a, b) {
+            this.r9(false);
+        }
+        zn() {
+            let a = this.zm;
             if (this.d4()) {
                 if (this.dd.g) {
                     this.dd.t();
                 }
-                a = this.zp;
+                a = this.zq;
             }
             return a;
         }
-        abp(a, b, c, d, e) {
+        abq(a, b, c, d, e) {
             b.j = 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.zh.d, f);
+                let $ret = new ScalerParams(0, d, e, this.zi.d, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 return $ret;
             })());
             let k = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.zh.e, f);
+                let $ret = new ScalerParams(0, d, e, this.zi.e, f);
                 $ret.c = this.getEffectiveViewport1(a);
-                $ret.b = this.i5();
+                $ret.b = this.i6();
                 return $ret;
             })());
             let l = false;
@@ -937,9 +937,9 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
             for (let o = 0; o < c; o++) {
-                h = this.z2.item(o);
-                i = this.z3.item(o);
-                let p = { $type: Point_$type, x: this.zh.a.f6(h, j), y: this.zh.b.f6(i, k) };
+                h = this.z3.item(o);
+                i = this.z4.item(o);
+                let p = { $type: Point_$type, x: this.zi.a.f7(h, j), y: this.zi.b.f7(i, k) };
                 if (l) {
                     if (p.x < e.left || p.x > e.right) {
                         if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -963,16 +963,16 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        ab0(a, b) {
-            this.y7 = null;
+        ab1(a, b) {
             this.y8 = null;
+            this.y9 = null;
             a.m.clear();
             a.r.clear();
             a.k.clear();
             a.o.clear();
             a.l.clear();
             a.n.clear();
-            let c = Math.min(this.z2 != null ? this.z2.count : 0, this.z3 != null ? this.z3.count : 0);
+            let c = Math.min(this.z3 != null ? this.z3.count : 0, this.z4 != null ? this.z4.count : 0);
             let d = b.ca;
             let e = b.b9;
             let f = this.getEffectiveViewport1(b);
@@ -980,14 +980,14 @@ let ScatterBase = /*@__PURE__*/ (() => {
             g.c = this.getEffectiveViewport1(b);
             let h = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.dn, f);
-                $ret.b = this.i5();
+                $ret.b = this.i6();
                 return $ret;
             })());
             h.c = this.getEffectiveViewport1(b);
             if (c < 1) {
                 return;
             }
-            this.zh = ((() => {
+            this.zi = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -997,23 +997,23 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             let i = b;
-            if (c <= this.aau) {
-                this.abp(i, a, c, d, e);
+            if (c <= this.aav) {
+                this.abq(i, a, c, d, e);
             }
-            if (this.x1()) {
-                b.dd.l(a.m, this.aau, d, e, this.ik);
+            if (this.x2()) {
+                b.dd.l(a.m, this.aav, d, e, this.il);
             }
             let j = ((() => {
                 let $ret = new Clipper(0, e, false);
                 $ret.i = a.r;
                 return $ret;
             })());
-            let k = this.w4(b);
-            let l = this.xAxis.f9(k.left, g);
-            let m = this.xAxis.f9(k.right, g);
-            b.df.j(a.r, this.trendLineType, this.z2, this.z3, this.trendLinePeriod, (n) => this.xAxis.f6(n, g), (n) => this.yAxis.f6(n, h), ((() => {
+            let k = this.w5(b);
+            let l = this.xAxis.ga(k.left, g);
+            let m = this.xAxis.ga(k.right, g);
+            b.df.j(a.r, this.trendLineType, this.z3, this.z4, this.trendLinePeriod, (n) => this.xAxis.f7(n, g), (n) => this.yAxis.f7(n, h), ((() => {
                 let $ret = new TrendResolutionParams();
-                $ret.d = this.ik;
+                $ret.d = this.il;
                 $ret.i = e;
                 $ret.h = f;
                 $ret.j = d;
@@ -1024,9 +1024,9 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 for (let n = 0; n < b.aa.count; n++) {
                     a.p.add(new List$1(Point_$type, 0));
                     let o = b.aa._inner[n];
-                    o.j(a.p._inner[n], o.g$b, this.z2, this.z3, o.g$f, (p) => this.xAxis.f6(p, g), (p) => this.yAxis.f6(p, h), ((() => {
+                    o.j(a.p._inner[n], o.g$b, this.z3, this.z4, o.g$f, (p) => this.xAxis.f7(p, g), (p) => this.yAxis.f7(p, h), ((() => {
                         let $ret = new TrendResolutionParams();
-                        $ret.d = this.ik;
+                        $ret.d = this.il;
                         $ret.i = e;
                         $ret.h = f;
                         $ret.j = d;
@@ -1034,25 +1034,25 @@ let ScatterBase = /*@__PURE__*/ (() => {
                     })()), j, l, m);
                 }
             }
-            this.aby(a, b);
+            this.abz(a, b);
         }
-        pi(a, b) {
-            super.pi(a, b);
+        pj(a, b) {
+            super.pj(a, b);
             let c = b;
             c.dm(a);
         }
         get_fh() {
             return true;
         }
-        zw(a, b, c) {
+        zx(a, b, c) {
             return null;
         }
-        zx(a, b, c) {
+        zy(a, b, c) {
             if (this.dp == null) {
                 return null;
             }
-            let d = this.zm();
-            let e = this.zi.ce(this.wr(b));
+            let d = this.zn();
+            let e = this.zj.ce(this.ws(b));
             let f = -1;
             if (e == null) {
                 if (a != null) {
@@ -1079,11 +1079,11 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             return g;
         }
-        xg(a, b) {
-            if (this.xt != 1 && this.xt != 13) {
-                let c = this.xr.c8();
-                let d = (c.width / 2) + (this.x4 / 2);
-                let e = (c.height / 2) + (this.x4 / 2);
+        xh(a, b) {
+            if (this.xu != 1 && this.xu != 13) {
+                let c = this.xs.c8();
+                let d = (c.width / 2) + (this.x5 / 2);
+                let e = (c.height / 2) + (this.x5 / 2);
                 let f = d;
                 let g = d;
                 let h = e;
@@ -1104,7 +1104,7 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             return new Thickness(1, 0, 0, 0, 0);
         }
-        zv(a, b, c) {
+        zw(a, b, c) {
             let d = new HighlightingInfo();
             d.i = this;
             d.g = 0;
@@ -1116,40 +1116,40 @@ let ScatterBase = /*@__PURE__*/ (() => {
             return d;
         }
         dh(a, b, c) {
-            if (this.ef && this.f2(this.by) && !c) {
-                let d = this.zw(a, b, this.zy);
-                this.zy = d;
+            if (this.ef && this.f3(this.by) && !c) {
+                let d = this.zx(a, b, this.zz);
+                this.zz = d;
                 return d;
             }
             else {
-                let e = this.zv(a, b, this.zy);
-                this.zy = e;
+                let e = this.zw(a, b, this.zz);
+                this.zz = e;
                 return e;
             }
         }
         di(a, b, c) {
-            if (this.f2(this.by) && !c) {
-                let d = this.zx(a, b, this.zz);
-                this.zz = d;
+            if (this.f3(this.by) && !c) {
+                let d = this.zy(a, b, this.z0);
+                this.z0 = d;
                 return d;
             }
             else {
-                let e = this.zv(a, b, this.zz);
+                let e = this.zw(a, b, this.z0);
                 e.d = true;
-                this.zz = e;
+                this.z0 = e;
                 return e;
             }
         }
-        aag() {
-            return (this.assigningScatterStyle != null && this.z6) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
+        aah() {
+            return (this.assigningScatterStyle != null && this.z7) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
         }
-        aaf() {
-            return (this.assigningScatterMarkerStyle != null && this.z5) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
+        aag() {
+            return (this.assigningScatterMarkerStyle != null && this.z6) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
         }
-        acb(a, b) {
-            this.rd();
+        acc(a, b) {
+            this.re();
             let c = b.b9;
-            this.zh = ((() => {
+            this.zi = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -1157,10 +1157,10 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.e = this.yAxis.dn;
                 return $ret;
             })());
-            if (this.x1()) {
-                b.dd.j(a.m, this.x3);
-                if (this.aaf()) {
-                    this.abq(b, a);
+            if (this.x2()) {
+                b.dd.j(a.m, this.x4);
+                if (this.aag()) {
+                    this.abr(b, a);
                 }
             }
             b.c4();
@@ -1176,28 +1176,28 @@ let ScatterBase = /*@__PURE__*/ (() => {
                     f.g$l(a.p._inner[e], d);
                 }
             }
-            this.ab8(a, b);
+            this.ab9(a, b);
         }
         ak(a, b) {
             let c = new List$1(ChartSelection.$, 0);
-            this.qi(a, c, b);
+            this.qj(a, c, b);
             return c.toArray();
         }
-        qi(a, b, c) {
-            this.abs(a, b, c, 0, null);
+        qj(a, b, c) {
+            this.abt(a, b, c, 0, null);
         }
-        abs(a, b, c, d, e) {
+        abt(a, b, c, d, e) {
             let f = this.dc.y6(this.dc.yw(a));
             let g = this.dp.count;
-            let h = this.zh.a;
-            let i = this.zh.b;
-            let j = this.dc.yz(this.xd, this.getEffectiveViewport(), f);
+            let h = this.zi.a;
+            let i = this.zi.b;
+            let j = this.dc.yz(this.xe, this.getEffectiveViewport(), f);
             let k = new ScalerParams(0, f, this.dc.y9, h.dn, this.getEffectiveViewport());
             let l = new ScalerParams(0, f, this.dc.y9, i.dn, this.getEffectiveViewport());
             if (d == 0) {
                 for (let m = 0; m < g; m++) {
-                    let n = h.f6(this.z2.item(m), k);
-                    let o = i.f6(this.z3.item(m), l);
+                    let n = h.f7(this.z3.item(m), k);
+                    let o = i.f7(this.z4.item(m), l);
                     if (n < j.width && n > 0 && o < j.height && o > 0) {
                         if (c == 7 || c == 6) {
                             b.add(((() => {
@@ -1227,8 +1227,8 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             else {
                 for (let p = 0; p < g; p++) {
-                    let q = h.f6(this.z2.item(p), k);
-                    let r = i.f6(this.z3.item(p), l);
+                    let q = h.f7(this.z3.item(p), k);
+                    let r = i.f7(this.z4.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 +1260,11 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        za(a, b) {
-            return this.zb(a, b);
-        }
         zb(a, b) {
-            if (b < a || a < 0 || a > this.z2.count || b < 0 || b > this.z2.count) {
+            return this.zc(a, b);
+        }
+        zc(a, b) {
+            if (b < a || a < 0 || a > this.z3.count || b < 0 || b > this.z3.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
@@ -1274,14 +1274,14 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        abq(a, b) {
+        abr(a, b) {
             a.ck = true;
-            this.zu.ay(this, this.aaf(), runOn(this, this.za));
-            let c = this.zu.d;
+            this.zv.ay(this, this.aag(), runOn(this, this.zb));
+            let c = this.zv.d;
             let d = c != null;
             let e = this.getEffectiveViewport1(a);
             let f = this.dp == null ? 0 : this.dp.count;
-            this.zi.cw((g) => {
+            this.zj.cw((g) => {
                 if (g._visibility == 0) {
                     let h = g.ak;
                     let i = g.content;
@@ -1290,19 +1290,19 @@ let ScatterBase = /*@__PURE__*/ (() => {
                         g.content = i;
                     }
                     if (d) {
-                        this.abv(h, f, a.t);
+                        this.abw(h, f, a.t);
                     }
-                    this.zu.ac(g, i);
+                    this.zv.ac(g, i);
                 }
             });
         }
-        abw(a, b, c) {
+        abx(a, b, c) {
             let d = this.by != 1;
             let e = this.cq != 1;
             let f = this.cp != 1;
-            this.zu.a0(this.zu.b, a, b, false);
-            this.zu.ab(this.ii);
-            let g = this.zu.ax;
+            this.zv.a0(this.zv.b, a, b, false);
+            this.zv.ab(this.ij);
+            let g = this.zv.ax;
             let h = null;
             let i = null;
             let j = null;
@@ -1320,16 +1320,16 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 g.b = h;
             }
             g.h = c;
-            this.ab6(g);
-            this.zu.z(this, h, i, j, c, d, e, f, a < 0);
+            this.ab7(g);
+            this.zv.z(this, h, i, j, c, d, e, f, a < 0);
         }
-        abv(a, b, c) {
+        abw(a, b, c) {
             let d = this.by != 1;
             let e = this.cq != 1;
             let f = this.cp != 1;
-            this.zu.a0(this.zu.d, a, b, true);
-            this.zu.aa(this.ii);
-            let g = this.zu.aw;
+            this.zv.a0(this.zv.d, a, b, true);
+            this.zv.aa(this.ij);
+            let g = this.zv.aw;
             let h = null;
             let i = null;
             let j = null;
@@ -1365,26 +1365,26 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 g.d = i;
             }
             g.h = c;
-            this.ab5(g);
-            this.zu.y(this, h, i, j, c, d, e, f, g.v, this.dc.d7.totalHighWaterMark, g.x, this.dc.d8.totalHighWaterMark, g.t, this.dc.d6.totalHighWaterMark);
+            this.ab6(g);
+            this.zv.y(this, h, i, j, c, d, e, f, g.v, this.dc.d7.totalHighWaterMark, g.x, this.dc.d8.totalHighWaterMark, g.t, this.dc.d6.totalHighWaterMark);
         }
-        ab6(a) {
-            if (this.assigningScatterStyle != null && this.z6) {
+        ab7(a) {
+            if (this.assigningScatterStyle != null && this.z7) {
                 this.assigningScatterStyle(this, a);
             }
         }
-        ab5(a) {
-            if (this.assigningScatterMarkerStyle != null && this.z5) {
+        ab6(a) {
+            if (this.assigningScatterMarkerStyle != null && this.z6) {
                 this.assigningScatterMarkerStyle(this, a);
             }
         }
-        aby(a, b) {
+        abz(a, b) {
             let c = new ErrorBarsHelper(this, b);
-            if (this.zj == null) {
+            if (this.zk == null) {
                 return;
             }
-            let d = this.zj.u;
-            let e = this.zj.v;
+            let d = this.zk.u;
+            let e = this.zk.v;
             let f = 0;
             let g = 0;
             let h = 0;
@@ -1394,35 +1394,35 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            let l = this.ab1(k, c, d, h, i, true);
+                            let l = this.ab2(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            let m = this.abz(k, c, d, h, i, true);
+                            let m = this.ab0(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            let n = this.abx(k, c, d, j, h, i, true);
+                            let n = this.aby(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            let o = this.ab2(c, d, f, h, i, true);
+                            let o = this.ab3(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            let p = this.abz(k, c, d, h, i, true);
+                            let p = this.ab0(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     let q = new OwnedPoint();
-                    q.c = c.l(d, this.zh.a, k.c, f);
+                    q.c = c.l(d, this.zi.a, k.c, f);
                     q.a = k.a;
                     a.k.addItem(j, q);
                     a.l.addItem(j, [h, i]);
@@ -1430,53 +1430,53 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            let r = this.ab1(k, c, e, h, i, false);
+                            let r = this.ab2(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            let s = this.abz(k, c, e, h, i, false);
+                            let s = this.ab0(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            let t = this.abx(k, c, e, j, h, i, false);
+                            let t = this.aby(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            let u = this.ab2(c, e, g, h, i, false);
+                            let u = this.ab3(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            let v = this.abz(k, c, e, h, i, false);
+                            let v = this.ab0(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     let w = new OwnedPoint();
-                    w.c = c.m(e, this.zh.b, k.c, g);
+                    w.c = c.m(e, this.zi.b, k.c, g);
                     w.a = k.a;
                     a.o.addItem(j, w);
                     a.n.addItem(j, [h, i]);
                 }
             }
         }
-        ab1(a, b, c, d, e, f) {
+        ab2(a, b, c, d, e, f) {
             if (f) {
                 let g;
                 let h, i;
-                i = this.zh.a;
-                if (this.zj.s == 0) {
+                i = this.zi.a;
+                if (this.zk.s == 0) {
                     g = a.c.x;
-                    h = this.zh.a;
+                    h = this.zi.a;
                 }
                 else {
                     g = a.c.y;
-                    h = this.zh.b;
+                    h = this.zi.b;
                 }
                 let j = b.f(g, c, h, i, d, e);
                 d = j.p4;
@@ -1485,14 +1485,14 @@ let ScatterBase = /*@__PURE__*/ (() => {
             else {
                 let k;
                 let l, m;
-                m = this.zh.b;
-                if (this.zj.t == 0) {
+                m = this.zi.b;
+                if (this.zk.t == 0) {
                     k = a.c.x;
-                    l = this.zh.a;
+                    l = this.zi.a;
                 }
                 else {
                     k = a.c.y;
-                    l = this.zh.b;
+                    l = this.zi.b;
                 }
                 let n = b.f(k, c, l, m, d, e);
                 d = n.p4;
@@ -1503,14 +1503,14 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abz(a, b, c, d, e, f) {
+        ab0(a, b, c, d, e, f) {
             if (f) {
-                let g = b.j(a.c.x, c, this.zh.a, d, e);
+                let g = b.j(a.c.x, c, this.zi.a, d, e);
                 d = g.p3;
                 e = g.p4;
             }
             else {
-                let h = b.j(a.c.y, c, this.zh.b, d, e);
+                let h = b.j(a.c.y, c, this.zi.b, d, e);
                 d = h.p3;
                 e = h.p4;
             }
@@ -1519,18 +1519,18 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abx(a, b, c, d, e, f, g) {
+        aby(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.zh.a, e, f);
+                    let k = b.h(a.c.x, j, this.zi.a, e, f);
                     e = k.p3;
                     f = k.p4;
                 }
                 else {
-                    let l = b.h(a.c.y, j, this.zh.b, e, f);
+                    let l = b.h(a.c.y, j, this.zi.b, e, f);
                     e = l.p3;
                     f = l.p4;
                 }
@@ -1544,16 +1544,16 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        ab2(a, b, c, d, e, f) {
+        ab3(a, b, c, d, e, f) {
             let g = a.i(b, c);
             c = g.p1;
             if (f) {
-                let h = a.k(c, b, this.zh.a, d, e);
+                let h = a.k(c, b, this.zi.a, d, e);
                 d = h.p3;
                 e = h.p4;
             }
             else {
-                let i = a.k(c, b, this.zh.b, d, e);
+                let i = a.k(c, b, this.zi.b, d, e);
                 d = i.p3;
                 e = i.p4;
             }
@@ -1563,29 +1563,29 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        ab8(a, b) {
-            if (!b.r() || this.zj == null) {
+        ab9(a, b) {
+            if (!b.r() || this.zk == null) {
                 b.dp();
                 return;
             }
-            this.ab9(a, b);
             this.aca(a, b);
+            this.acb(a, b);
         }
-        ab9(a, b) {
+        aca(a, b) {
             b.dk();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.zj.u;
+            let e = this.zk.u;
             for (let f of fromEnum(a.m.keys)) {
                 if (e != null && a.l.containsKey(f)) {
                     let g = a.l.item(f)[0];
                     let h = a.l.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         let i = a.k.item(f).c;
-                        if (this.zj.o == 1 || this.zj.o == 2) {
+                        if (this.zk.o == 1 || this.zk.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.zj.o == 1 || this.zj.o == 3) {
+                        if (this.zk.o == 1 || this.zk.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1593,38 +1593,38 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             b.dq(d);
         }
-        aca(a, b) {
+        acb(a, b) {
             b.dl();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.zj.v;
+            let e = this.zk.v;
             for (let f of fromEnum(a.m.keys)) {
                 if (e != null && a.n.containsKey(f)) {
                     let g = a.n.item(f)[0];
                     let h = a.n.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         let i = a.o.item(f).c;
-                        if (this.zj.p == 1 || this.zj.p == 2) {
+                        if (this.zk.p == 1 || this.zk.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.zj.p == 1 || this.zj.p == 3) {
+                        if (this.zk.p == 1 || this.zk.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
                 }
             }
         }
-        hk(a, b, c) {
+        hl(a, b, c) {
             let d = true;
-            if (!super.hk(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.b7 == null || this.yAxis.b7 == null || this.z2 == null || this.z3 == null || this.z2.count == 0 || this.z3.count == 0 || this.dp == null || this.dp.count != this.z2.count || this.dp.count != this.z3.count || this.xAxis.b7 == null || this.yAxis.b7 == null || this.xAxis.qw == this.xAxis.qv || this.yAxis.qw == this.yAxis.qv) {
+            if (!super.hl(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.b7 == null || this.yAxis.b7 == null || this.z3 == null || this.z4 == null || this.z3.count == 0 || this.z4.count == 0 || this.dp == null || this.dp.count != this.z3.count || this.dp.count != this.z4.count || this.xAxis.b7 == null || this.yAxis.b7 == null || this.xAxis.qy == this.xAxis.qx || this.yAxis.qy == this.yAxis.qx) {
                 d = false;
             }
             return d;
         }
         getViewInfo(a, b) {
-            if (!this.ac6.isEmpty && !this.ac7.isEmpty) {
-                a = this.ac6;
-                b = this.ac7;
+            if (!this.ac7.isEmpty && !this.ac8.isEmpty) {
+                a = this.ac7;
+                b = this.ac8;
                 return {
                     p0: a,
                     p1: b
@@ -1637,53 +1637,53 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        r9(a) {
-            super.r9(a);
-            this.abo();
+        sa(a) {
+            super.sa(a);
+            this.abp();
             try {
                 if (this.d7(this.cw)) {
                     return;
                 }
-                if (this.dp != null && this.dp.count > this.aau) {
+                if (this.dp != null && this.dp.count > this.aav) {
                     a = false;
                 }
-                if (this.gl(a) && !this.gx) {
-                    let b = this.zn;
+                if (this.gm(a) && !this.gy) {
+                    let b = this.zo;
                     if (this.d4()) {
                         if (this.dd.g) {
                             this.dd.t();
                         }
-                        this.zn = this.zp;
-                        this.zp = b;
+                        this.zo = this.zq;
+                        this.zq = b;
                     }
                     else {
-                        this.zn = this.zl;
-                        this.zl = b;
+                        this.zo = this.zm;
+                        this.zm = b;
                     }
-                    this.ab0(this.zl, this.zi);
-                    this.sp();
+                    this.ab1(this.zm, this.zj);
+                    this.sq();
                 }
                 else {
-                    if (!this.gx) {
-                        this.ab0(this.zl, this.zi);
+                    if (!this.gy) {
+                        this.ab1(this.zm, this.zj);
                     }
-                    this.acb(this.zl, this.zi);
+                    this.acc(this.zm, this.zj);
                 }
             }
             finally {
-                this.acc();
+                this.acd();
             }
         }
-        sz() {
-            super.sz();
+        s0() {
+            super.s0();
             if (this.index < 0) {
                 return;
             }
-            this.zi.dt();
+            this.zj.dt();
         }
-        sa(a, b) {
-            super.sa(a, b);
-            if (!this.g6) {
+        sb(a, b) {
+            super.sb(a, b);
+            if (!this.g7) {
                 this.cw.be(b);
                 return;
             }
@@ -1692,34 +1692,34 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 return;
             }
             let c = typeCast(ScatterBaseView.$, this.cv);
-            this.sb();
-            this.g6 = false;
+            this.sc();
+            this.g7 = false;
         }
-        sb() {
-            super.sb();
+        sc() {
+            super.sc();
             let a = typeCast(ScatterBaseView.$, this.cv);
-            if (!this.gy) {
-                this.zo = new ScatterFrame();
-                this.ab0(this.zo, a);
+            if (!this.gz) {
+                this.zp = new ScatterFrame();
+                this.ab1(this.zp, a);
             }
-            this.gy = false;
-            this.acb(this.zo, a);
+            this.gz = false;
+            this.acc(this.zp, a);
         }
-        r7(a, b, c, d, e) {
-            super.r7(a, b, c, d, e);
+        r8(a, b, c, d, e) {
+            super.r8(a, b, c, d, e);
             let f = this.ba.a$k.item(d);
             let g = f;
             f.bd(c);
             if (this.d7(g)) {
                 return;
             }
-            if (this.zk == null) {
-                this.zk = new ScatterFrame();
+            if (this.zl == null) {
+                this.zl = new ScatterFrame();
             }
-            this.ab0(this.zk, g);
-            this.acb(this.zk, g);
+            this.ab1(this.zl, g);
+            this.acc(this.zl, g);
         }
-        ab7(a, b) {
+        ab8(a, b) {
             let c = new List$1(Base.$, 0);
             for (let d of fromEnum(b.c)) {
                 if (!a.containsKey(d)) {
@@ -1730,10 +1730,10 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 b.h(e);
             }
         }
-        y9(a, b, c, d, e) {
-            if (c == null || c.length != this.zh.c.count) {
-                c = new Array(this.zh.c.count);
-                for (let f = 0; f < this.zh.c.count; f++) {
+        za(a, b, c, d, e) {
+            if (c == null || c.length != this.zi.c.count) {
+                c = new Array(this.zi.c.count);
+                for (let f = 0; f < this.zi.c.count; f++) {
                     c[f] = PointUtil.create();
                 }
             }
@@ -1746,31 +1746,31 @@ let ScatterBase = /*@__PURE__*/ (() => {
             let i = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.dn, g);
                 $ret.c = this.getEffectiveViewport1(a);
-                $ret.b = this.i5();
+                $ret.b = this.i6();
                 return $ret;
             })());
-            let j = this.w4(a);
-            let k = this.zh.a.f9(j.left, h);
-            let l = this.zh.a.f9(j.right, h);
-            let m = this.zh.b.f9(j.bottom, i);
-            let n = this.zh.b.f9(j.top, i);
-            if (this.zh.d) {
+            let j = this.w5(a);
+            let k = this.zi.a.ga(j.left, h);
+            let l = this.zi.a.ga(j.right, h);
+            let m = this.zi.b.ga(j.bottom, i);
+            let n = this.zi.b.ga(j.top, i);
+            if (this.zi.d) {
                 let o = k;
                 k = l;
                 l = o;
             }
-            if (this.zh.e) {
+            if (this.zi.e) {
                 let p = m;
                 m = n;
                 n = p;
             }
-            let q = this.zh;
+            let q = this.zi;
             let r = q.a;
             let s = q.b;
             let t;
             let u;
-            let v = this.z2;
-            let w = this.z3;
+            let v = this.z3;
+            let w = this.z4;
             let x = false;
             let y = 0;
             let z = 0;
@@ -1779,24 +1779,24 @@ let ScatterBase = /*@__PURE__*/ (() => {
                     let aa = this.dc.oj(d, h);
                     x = aa.c;
                     y = aa.d;
-                    z = r.f9(0 + y, h);
-                    let ab = r.f9(0, h);
+                    z = r.ga(0 + y, h);
+                    let ab = r.ga(0, h);
                     z -= ab;
                 }
             }
-            for (let ac = 0; ac < this.zh.c.count; ac++) {
+            for (let ac = 0; ac < this.zi.c.count; ac++) {
                 t = v.item(ac);
                 u = w.item(ac);
                 let ad = 1E-10;
                 if (x) {
                     if (t >= k - ad && t <= l + ad && u >= m - ad && u <= n + ad) {
-                        c[ac].x = r.f6(t, h);
-                        c[ac].y = s.f6(u, i);
+                        c[ac].x = r.f7(t, h);
+                        c[ac].y = s.f7(u, i);
                     }
                     else {
                         if ((t + z) >= k && (t + z) <= l && u >= m && u <= n) {
-                            c[ac].x = r.f6(t, h) + y;
-                            c[ac].y = s.f6(u, i);
+                            c[ac].x = r.f7(t, h) + y;
+                            c[ac].y = s.f7(u, i);
                         }
                         else {
                             c[ac].x = NaN;
@@ -1806,8 +1806,8 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 }
                 else {
                     if (t >= k - ad && t <= l + ad && u >= m - ad && u <= n + ad) {
-                        c[ac].x = r.f6(t, h);
-                        c[ac].y = s.f6(u, i);
+                        c[ac].x = r.f7(t, h);
+                        c[ac].y = s.f7(u, i);
                     }
                     else {
                         c[ac].x = NaN;
@@ -1817,7 +1817,7 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        aai(a, b) {
+        aaj(a, b) {
             if (b == null) {
                 b = new List$1(Number_$type, 2, a.e);
             }
@@ -1831,32 +1831,32 @@ let ScatterBase = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        qd(a) {
-            super.qd(a);
-            this.bc.exportTrendlineData(this, a, this.zi.df.g$n);
+        qe(a) {
+            super.qe(a);
+            this.bc.exportTrendlineData(this, a, this.zj.df.g$n);
         }
-        i5() {
-            return Series.i6(this.z3, null);
+        i6() {
+            return Series.i7(this.z4, null);
         }
         getDataLegendSeriesContextAt(a, b) {
             let c = { $type: Point_$type, x: a, y: b };
-            let d = this.kw(c);
-            let e = d == null ? NaN : this.i4(d, "XMemberPath");
-            let f = d == null ? NaN : this.i4(d, "YMemberPath");
+            let d = this.kx(c);
+            let e = d == null ? NaN : this.i5(d, "XMemberPath");
+            let f = d == null ? NaN : this.i5(d, "YMemberPath");
             let g = new DataLegendSeriesValueInfo();
             g.l = e;
             g.a = 13;
             g.q = "X";
-            g.r = this.abe != null ? this.abe : "X";
-            g.s = this.aba != null ? this.aba : "X:";
-            g.t = this.abc != null ? this.abc : "";
+            g.r = this.abf != null ? this.abf : "X";
+            g.s = this.abb != null ? this.abb : "X:";
+            g.t = this.abd != null ? this.abd : "";
             let h = new DataLegendSeriesValueInfo();
             h.l = f;
             h.a = 14;
             h.q = "Y";
-            h.r = this.abm != null ? this.abm : "Y";
-            h.s = this.abi != null ? this.abi : "Y:";
-            h.t = this.abk != null ? this.abk : "";
+            h.r = this.abn != null ? this.abn : "Y";
+            h.s = this.abj != null ? this.abj : "Y:";
+            h.t = this.abl != null ? this.abl : "";
             let i = new DataLegendSeriesContext();
             i.e = ((() => {
                 let $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -1864,23 +1864,23 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.add(h);
                 return $ret;
             })());
-            i.h = this.mn();
+            i.h = this.mo();
             return i;
         }
-        acd() {
-            if (this.z4) {
-                this.aaj = 0;
+        ace() {
+            if (this.z5) {
                 this.aak = 0;
-                for (let a = 0; a < this.z2.count; a++) {
-                    this.aaj += this.z2.item(a);
+                this.aal = 0;
+                for (let a = 0; a < this.z3.count; a++) {
                     this.aak += this.z3.item(a);
+                    this.aal += this.z4.item(a);
                 }
-                this.aal = this.aaj / this.z2.count;
                 this.aam = this.aak / this.z3.count;
-                this.z4 = false;
+                this.aan = this.aal / this.z4.count;
+                this.z5 = false;
             }
         }
-        jg(a, b) {
+        jh(a, b) {
             if (b == null || !b.dq) {
                 return NaN;
             }
@@ -1888,7 +1888,7 @@ let ScatterBase = /*@__PURE__*/ (() => {
                 return NaN;
             }
             let c = this.aq(a);
-            if (b.dy) {
+            if (b.dz) {
                 return c[1];
             }
             else {
@@ -1901,51 +1901,51 @@ let ScatterBase = /*@__PURE__*/ (() => {
             switch (a) {
                 case 5:
                 case 2:
-                    b = this.z2.maximum;
-                    c = this.z3.maximum;
+                    b = this.z3.maximum;
+                    c = this.z4.maximum;
                     break;
                 case 4:
                 case 1:
-                    b = this.z2.minimum;
-                    c = this.z3.minimum;
+                    b = this.z3.minimum;
+                    c = this.z4.minimum;
                     break;
                 case 6:
                 case 3:
-                    if (this.z4) {
-                        this.acd();
+                    if (this.z5) {
+                        this.ace();
                     }
-                    b = this.aal;
-                    c = this.aam;
+                    b = this.aam;
+                    c = this.aan;
                     break;
             }
             return [b, c];
         }
-        w0(a) {
+        w1(a) {
             let b = this.getEffectiveViewport1(this.cw);
             let c = new ScalerParams(0, this.cw.ca, this.cw.b9, this.xAxis.dn, b);
             c.c = b;
-            let d = isNaN_(a[0]) ? NaN : this.xAxis.f6(a[0], c);
+            let d = isNaN_(a[0]) ? NaN : this.xAxis.f7(a[0], c);
             c = new ScalerParams(0, this.cw.ca, this.cw.b9, this.yAxis.dn, b);
-            c.b = this.i5();
+            c.b = this.i6();
             c.c = b;
-            let e = isNaN_(a[1]) ? NaN : this.yAxis.f6(a[1], c);
+            let e = isNaN_(a[1]) ? NaN : this.yAxis.f7(a[1], c);
             return { $type: Point_$type, x: d, y: e };
         }
-        wz(a) {
+        w0(a) {
             let b = this.aq(a);
-            return this.w0(b);
+            return this.w1(b);
         }
         bd() {
             return new ScatterTrendLineManager();
         }
-        qr() {
-            super.qr();
-            this.zi.df.g$m();
+        qs() {
+            super.qs();
+            this.zj.df.g$m();
         }
     }
     ScatterBase.$t = /*@__PURE__*/ markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.ace = /*@__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:zj:acf', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aay:acg', [2, null], 'HighlightedYMemberPath:aa0:ach', [2, null], 'IsCustomScatterMarkerStyleAllowed:z9:aci', [0, false], 'IsCustomScatterStyleAllowed:aaa:acj', [0, false], 'ItemSearchMode:zt:ack', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:aat:acl', [1, 10000], 'MarkerCollisionAvoidance:ze:acm', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:aau:acn', [1, 400], 'XAxis::acv', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aba:acw', [2, null], 'XMemberAsLegendUnit:abc:acx', [2, null], 'XMemberPath:abe:acy', [2, null], 'YAxis::acz', [NumericYAxis.$, null], 'YMemberAsLegendLabel:abi:ac0', [2, null], 'YMemberAsLegendUnit:abk:ac1', [2, null], 'YMemberPath:abm:ac2', [2, null], 'TrendLineType::act', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::acs', [1, 1.5], 'TrendLinePeriod::acr', [1, 7], 'TrendLineBrush::aco', [Brush.$, null], 'TrendLineZIndex:aav:acu', [1, 1001], 'TrendLineDashArray:ac4:acp', [DoubleCollection.$], 'TrendLineDashCap:ac5:acq', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.acf = /*@__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:zk:acg', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aaz:ach', [2, null], 'HighlightedYMemberPath:aa1:aci', [2, null], 'IsCustomScatterMarkerStyleAllowed:aaa:acj', [0, false], 'IsCustomScatterStyleAllowed:aab:ack', [0, false], 'ItemSearchMode:zu:acl', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:aau:acm', [1, 10000], 'MarkerCollisionAvoidance:zf:acn', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:aav:aco', [1, 400], 'XAxis::acw', [NumericXAxis.$, null], 'XMemberAsLegendLabel:abb:acx', [2, null], 'XMemberAsLegendUnit:abd:acy', [2, null], 'XMemberPath:abf:acz', [2, null], 'YAxis::ac0', [NumericYAxis.$, null], 'YMemberAsLegendLabel:abj:ac1', [2, null], 'YMemberAsLegendUnit:abl:ac2', [2, null], 'YMemberPath:abn:ac3', [2, null], 'TrendLineType::acu', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::act', [1, 1.5], 'TrendLinePeriod::acs', [1, 7], 'TrendLineBrush::acp', [Brush.$, null], 'TrendLineZIndex:aaw:acv', [1, 1001], 'TrendLineDashArray:ac5:acq', [DoubleCollection.$], 'TrendLineDashCap:ac6:acr', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 })();
 export { ScatterBase };
@@ -2017,7 +2017,7 @@ let ScatterBaseView = /*@__PURE__*/ (() => {
             this.dv = new Path();
             this.dw = new Path();
             if (!this.t) {
-                this.de.aau = 2000;
+                this.de.aav = 2000;
             }
         }
         dx(a) {
@@ -2035,12 +2035,12 @@ 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.zh.c.item(b), runOn(this, this.ds), runOn(this, this.c9), runOn(this, this.dh), () => this.de.ze);
+            let a = new NumericMarkerManager(1, (b) => this.dg.item(b), (b) => this.de.zi.c.item(b), runOn(this, this.ds), runOn(this, this.c9), runOn(this, this.dh), () => this.de.zf);
             a.q = runOn(this, this.dx);
             return a;
         }
         ds(a) {
-            this.de.ab7(a, this.dg);
+            this.de.ab8(a, this.dg);
         }
         di() {
             return this.cl;
@@ -2049,11 +2049,11 @@ let ScatterBaseView = /*@__PURE__*/ (() => {
             return this.db;
         }
         c9() {
-            this.db = this.de.y9(this, this.dg, this.db, this.ca, this.b9);
+            this.db = this.de.za(this, this.dg, this.db, this.ca, this.b9);
             return this.db;
         }
         dh() {
-            this.dj = this.de.aai(this.dg, this.dj);
+            this.dj = this.de.aaj(this.dg, this.dj);
             return this.dj;
         }
         dk() {
@@ -2066,10 +2066,10 @@ let ScatterBaseView = /*@__PURE__*/ (() => {
         }
         dt() {
             if (this.de.trendLineBrush != null) {
-                this.de.ac3 = this.de.trendLineBrush;
+                this.de.ac4 = this.de.trendLineBrush;
             }
             else {
-                this.de.ac3 = this.de.vt;
+                this.de.ac4 = this.de.vu;
             }
         }
         cw(a) {
@@ -2086,9 +2086,9 @@ let ScatterBaseView = /*@__PURE__*/ (() => {
                 if (this.de.trendLineType != 0 && !b) {
                     let c = this.df.g$n;
                     c.ad = this.de.trendLineThickness;
-                    c._stroke = this.de.ac3;
-                    c.ai = this.de.ac4;
-                    c.aj = this.de.ac5;
+                    c._stroke = this.de.ac4;
+                    c.ai = this.de.ac5;
+                    c.aj = this.de.ac6;
                     a.v(c);
                 }
             }
@@ -2107,7 +2107,7 @@ 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.abe + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.de.abm + "}</span></div>";
+            a += ">" + this.de.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.de.abf + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.de.abn + "}</span></div>";
             return a;
         }
     }