igniteui-webcomponents-charts 3.2.1 → 3.2.2

package/esm2015/lib/ScatterBase_combined.js

@@ -61,31 +61,31 @@ export let ScatterBase = /*@__PURE__*/ (() => {
     class ScatterBase extends MarkerSeries {
         constructor() {
             super();
-            this.rw = null;
-            this.sa = null;
+            this.rx = null;
             this.sb = null;
-            this.uz = null;
+            this.sc = null;
             this.u0 = null;
-            this.r5 = 1;
-            this.rh = null;
+            this.u1 = null;
+            this.r6 = 1;
             this.ri = null;
-            this.r2 = null;
-            this.r4 = null;
-            this.r0 = null;
+            this.rj = null;
+            this.r3 = null;
+            this.r5 = null;
+            this.r1 = null;
+            this.sg = false;
             this.sf = false;
-            this.se = false;
-            this.rs = null;
             this.rt = null;
+            this.ru = null;
             this.assigningScatterStyle = null;
             this.assigningScatterMarkerStyle = null;
-            this.r9 = null;
-            this.r3 = null;
-            this.rz = null;
-            this.r6 = this.r7();
-            this.r9 = new ScatterSeriesRenderManager();
-            this.r3 = new ScatterFrame();
+            this.sa = null;
+            this.r4 = null;
+            this.r0 = null;
+            this.r7 = this.r8();
+            this.sa = new ScatterSeriesRenderManager();
+            this.r4 = new ScatterFrame();
+            this.u1 = Rect.empty;
             this.u0 = Rect.empty;
-            this.uz = Rect.empty;
         }
         bx() {
             return new ScatterBaseView(this);
@@ -95,9 +95,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             this.xAxis = null;
             this.yAxis = null;
         }
-        ly(a) {
-            super.ly(a);
-            this.rx = a;
+        lz(a) {
+            super.lz(a);
+            this.ry = a;
         }
         get_ec() {
             return true;
@@ -108,10 +108,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         hw(a, b) {
             let c = this.jq(b);
             if (c == ScatterBase.$$p[10]) {
-                return this.hx(a, b, this.td);
+                return this.hx(a, b, this.te);
             }
             if (c == ScatterBase.$$p[14]) {
-                return this.hx(a, b, this.tl);
+                return this.hx(a, b, this.tm);
             }
             return null;
         }
@@ -120,18 +120,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return false;
             }
             let e = this.xAxis;
-            let f = new ScalerParams(1, this.cd.sf, this.py, e.cg);
+            let f = new ScalerParams(1, this.cd.sf, this.pz, e.cg);
             f.c = this.getEffectiveViewport1(this.b0);
             let g = this.yAxis;
-            let h = new ScalerParams(1, this.cd.sf, this.py, g.cg);
+            let h = new ScalerParams(1, this.cd.sf, this.pz, g.cg);
             h.c = this.getEffectiveViewport1(this.b0);
             a.clear();
-            this.qb.cf((i) => {
+            this.qc.cf((i) => {
                 if (i._visibility == 0) {
                     let j = new SeriesPointOfInterest();
                     let k = i.n;
                     let l = i.o;
-                    if (k < this.py.left || k > this.py.right || l < this.py.top || l > this.py.bottom) {
+                    if (k < this.pz.left || k > this.pz.right || l < this.pz.top || l > this.pz.bottom) {
                         return;
                     }
                     j.b = e.el(k, f);
@@ -144,7 +144,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         bp() {
             if (this.bq == 0) {
-                if (this.sx <= 2000) {
+                if (this.sy <= 2000) {
                     return 1;
                 }
                 else {
@@ -155,32 +155,22 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return super.bp();
             }
         }
-        pw(a) {
-            if (!this.hasMarkers || !this.qe()) {
+        px(a) {
+            if (!this.hasMarkers || !this.qf()) {
                 return Rect.empty;
             }
-            let b = this.qb.by(this.pg(a));
+            let b = this.qc.by(this.ph(a));
             if (b != null) {
-                return this.qb.cp(b);
+                return this.qc.cp(b);
             }
             return Rect.empty;
         }
         ev(a, b) {
-            if (this.qf(a, b)) {
+            if (this.qg(a, b)) {
                 return true;
             }
             return false;
         }
-        get sc() {
-            return this.sa;
-        }
-        set sc(a) {
-            if (this.sa != a) {
-                let b = this.sc;
-                this.sa = a;
-                this.raisePropertyChanged("XColumn", b, this.sc);
-            }
-        }
         get sd() {
             return this.sb;
         }
@@ -188,14 +178,24 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             if (this.sb != a) {
                 let b = this.sd;
                 this.sb = a;
-                this.raisePropertyChanged("YColumn", b, this.sd);
+                this.raisePropertyChanged("XColumn", b, this.sd);
+            }
+        }
+        get se() {
+            return this.sc;
+        }
+        set se(a) {
+            if (this.sc != a) {
+                let b = this.se;
+                this.sc = a;
+                this.raisePropertyChanged("YColumn", b, this.se);
             }
         }
-        get uw() {
-            return this.c(ScatterBase.t9);
+        get ux() {
+            return this.c(ScatterBase.ua);
         }
-        set uw(a) {
-            this.h(ScatterBase.t9, a);
+        set ux(a) {
+            this.h(ScatterBase.ua, a);
         }
         get GetErrorBarsXAxis() {
             return this.xAxis;
@@ -203,8 +203,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         get GetErrorBarsYAxis() {
             return this.yAxis;
         }
-        le() {
-            super.le();
+        lf() {
+            super.lf();
             if (this.xAxis != null) {
                 this.xAxis.h7(false);
             }
@@ -212,26 +212,26 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 this.yAxis.h7(false);
             }
         }
-        l3(a, b, c, d) {
-            super.l3(a, b, c, d);
-            if (this.rx.cx.g$b(a, b, c, d)) {
-                this.mh(false);
-                this.lo();
+        l4(a, b, c, d) {
+            super.l4(a, b, c, d);
+            if (this.ry.cx.g$b(a, b, c, d)) {
+                this.mi(false);
+                this.lp();
             }
             switch (b) {
                 case "FastItemsSource":
                     if (typeCast(IFastItemsSource_$type, c) != null) {
-                        c.deregisterColumn(this.sc);
                         c.deregisterColumn(this.sd);
-                        this.sc = null;
+                        c.deregisterColumn(this.se);
                         this.sd = null;
+                        this.se = null;
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.sc = this.ch(this.td);
-                        this.sd = this.ch(this.tl);
+                        this.sd = this.ch(this.te);
+                        this.se = this.ch(this.tm);
                     }
                     if ((this.yAxis != null && !this.yAxis.c0()) || (this.xAxis != null && !this.xAxis.c0())) {
-                        this.mh(false);
+                        this.mi(false);
                     }
                     break;
                 case ScatterBase.$$p[7]:
@@ -242,9 +242,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.cs(this);
                     }
                     if ((this.xAxis != null && !this.xAxis.c0()) || (d == null && c != null)) {
-                        this.mh(false);
+                        this.mi(false);
                     }
-                    this.lo();
+                    this.lp();
                     break;
                 case ScatterBase.$$p[11]:
                     if (c != null) {
@@ -254,134 +254,134 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.cs(this);
                     }
                     if ((this.yAxis != null && !this.yAxis.c0()) || (d == null && c != null)) {
-                        this.mh(false);
+                        this.mi(false);
                     }
-                    this.lo();
+                    this.lp();
                     break;
                 case ScatterBase.$$p[10]:
                     if (this.ck != null) {
-                        this.ck.deregisterColumn(this.sc);
-                        this.sc = this.ch(this.td);
+                        this.ck.deregisterColumn(this.sd);
+                        this.sd = this.ch(this.te);
                     }
                     break;
                 case "XColumn":
-                    this.rx.cx.g$i();
+                    this.ry.cx.g$i();
                     if (this.xAxis != null && !this.xAxis.c0()) {
-                        this.mh(false);
+                        this.mi(false);
                     }
                     break;
                 case ScatterBase.$$p[14]:
                     if (this.ck != null) {
-                        this.ck.deregisterColumn(this.sd);
-                        this.sd = this.ch(this.tl);
+                        this.ck.deregisterColumn(this.se);
+                        this.se = this.ch(this.tm);
                     }
                     break;
                 case "YColumn":
-                    this.rx.cx.g$i();
+                    this.ry.cx.g$i();
                     if (this.yAxis != null && !this.yAxis.c0()) {
-                        this.mh(false);
+                        this.mi(false);
                     }
                     break;
                 case ScatterBase.$$p[5]:
-                    this.mh(false);
-                    this.lo();
+                    this.mi(false);
+                    this.lp();
                     break;
                 case ScatterBase.$$p[6]:
-                    this.mh(false);
-                    this.lo();
+                    this.mi(false);
+                    this.lp();
                     break;
                 case "TransitionProgress":
-                    this.r4.c(this.g0, this.r2, this.r0);
-                    this.tn();
+                    this.r5.c(this.g0, this.r3, this.r1);
+                    this.to();
                     try {
                         if (this.cx(this.b0)) {
                             return;
                         }
                         if ((Math.round(this.g0 * 100000) / 100000) == 1) {
-                            this.t7(this.r0, this.rx);
+                            this.t8(this.r1, this.ry);
                         }
                         else {
-                            this.t7(this.r4, this.rx);
+                            this.t8(this.r5, this.ry);
                         }
                         if (this.cd != null) {
                             this.cd.nn(this);
                         }
                     }
                     finally {
-                        this.t8();
+                        this.t9();
                     }
                     break;
                 case "TrendLineBrush":
-                    this.mv();
+                    this.mw();
                     break;
                 case ScatterBase.$$p[0]:
-                    if (this.ry != null) {
-                        this.ry.r = this;
+                    if (this.rz != null) {
+                        this.rz.r = this;
                     }
-                    this.mh(false);
-                    this.lo();
+                    this.mi(false);
+                    this.lp();
                     break;
                 case "TrendLineType":
-                    this.lo();
+                    this.lp();
                     break;
                 case ScatterBase.$$p[2]:
-                    this.sf = this.sn();
-                    this.mh(false);
+                    this.sg = this.so();
+                    this.mi(false);
                     break;
                 case ScatterBase.$$p[1]:
-                    this.se = this.sm();
-                    this.mh(false);
+                    this.sf = this.sn();
+                    this.mi(false);
                     break;
                 case ScatterBase.$$p[3]:
-                    this.r6 = this.r7();
+                    this.r7 = this.r8();
                     break;
             }
         }
+        so() {
+            return this.sk;
+        }
         sn() {
             return this.sj;
         }
-        sm() {
-            return this.si;
-        }
-        sh(a) {
+        si(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        sg(a) {
+        sh(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        t8() {
-            this.uz = Rect.empty;
+        t9() {
             this.u0 = Rect.empty;
+            this.u1 = Rect.empty;
         }
-        tn() {
-            let a = this.getViewInfo(this.uz, this.u0);
-            this.uz = a.p0;
-            this.u0 = a.p1;
+        to() {
+            let a = this.getViewInfo(this.u0, this.u1);
+            this.u0 = a.p0;
+            this.u1 = a.p1;
         }
-        sl(a, b) {
+        sm(a, b) {
             if (b != 3) {
                 return true;
             }
             if (a == null) {
                 return true;
             }
-            if (this.td == a || this.tl == a) {
+            if (this.te == a || this.tm == a) {
                 return true;
             }
             return false;
         }
         k0(a, b, c, d) {
             let e = false;
-            if (!this.sl(d, a)) {
+            if (!this.sm(d, a)) {
                 return;
             }
-            this.rx.cx.g$e(a, b, c, d);
+            this.ry.cx.g$e(a, b, c, d);
             if (this.xAxis != null && !this.xAxis.c0()) {
                 e = true;
             }
@@ -389,17 +389,17 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 e = true;
             }
             if (e) {
-                this.mh(true);
+                this.mi(true);
             }
         }
-        tz(a) {
-            this.t0(a, null);
+        t0(a) {
+            this.t1(a, null);
         }
-        t0(a, b) {
-            let c = this.sc != null ? this.sc.count : 0;
-            let d = this.sd != null ? this.sd.count : 0;
+        t1(a, b) {
+            let c = this.sd != null ? this.sd.count : 0;
+            let d = this.se != null ? this.se.count : 0;
             let e = Math.min(c, d);
-            if (e <= this.sx) {
+            if (e <= this.sy) {
                 a.m.clear();
                 let f = new List$1(OwnedPoint.$, 0);
                 for (let g of fromEnum(a.u.values)) {
@@ -433,12 +433,12 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
         }
         ap(a) {
-            if (a != null && a == this.xAxis && this.sc != null) {
-                return new AxisRange(this.sc.minimum, this.sc.maximum);
-            }
-            if (a != null && a == this.yAxis && this.sd != null) {
+            if (a != null && a == this.xAxis && this.sd != null) {
                 return new AxisRange(this.sd.minimum, this.sd.maximum);
             }
+            if (a != null && a == this.yAxis && this.se != null) {
+                return new AxisRange(this.se.minimum, this.se.maximum);
+            }
             return null;
         }
         ht(a) {
@@ -448,57 +448,57 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        get r6() {
-            return this.r5;
+        get r7() {
+            return this.r6;
         }
-        set r6(a) {
-            let b = this.r5;
-            this.r5 = a;
-            if (b != this.r5) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.r5));
+        set r7(a) {
+            let b = this.r6;
+            this.r6 = a;
+            if (b != this.r6) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.r6));
             }
         }
-        r7() {
-            if (this.r8 != 0) {
-                return this.r8;
+        r8() {
+            if (this.r9 != 0) {
+                return this.r9;
             }
-            return this.sk ? 4 : 1;
+            return this.sl ? 4 : 1;
         }
         hd(a) {
             let b = truncate(Math.round(this.f5(a)));
             return b;
         }
         f5(a) {
-            switch (this.r6) {
-                case 1: return this.st(a);
-                case 3: return this.su(a);
-                case 2: return this.sr(a);
-                case 4: return this.ss(a);
+            switch (this.r7) {
+                case 1: return this.su(a);
+                case 3: return this.sv(a);
+                case 2: return this.ss(a);
+                case 4: return this.st(a);
             }
             return -1;
         }
-        ss(a) {
-            return this.sv(a, false);
+        st(a) {
+            return this.sw(a, false);
         }
-        sr(a) {
-            let b = this.pg(a);
+        ss(a) {
+            let b = this.ph(a);
             let c = b.x;
             let d = b.y;
-            if (this.ck == null || this.xAxis == null || this.yAxis == null || this.sc == null || this.sd == null) {
+            if (this.ck == null || this.xAxis == null || this.yAxis == null || this.sd == null || this.se == null) {
                 return -1;
             }
-            if (this.ck.count > this.sw) {
+            if (this.ck.count > this.sx) {
                 return -1;
             }
-            this.tq();
-            let e = this.rh;
-            let f = this.ri;
+            this.tr();
+            let e = this.ri;
+            let f = this.rj;
             if (e == null || f == null) {
                 return -1;
             }
             let g = 1.7976931348623157E+308;
             let h = -1;
-            for (let i = 0; i < this.sc.count; i++) {
+            for (let i = 0; i < this.sd.count; i++) {
                 let j = e[i];
                 let k = f[i];
                 let l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -509,61 +509,61 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        tq() {
+        tr() {
             let a = this.b0.bv;
             let b = this.b0.bu;
             let c = this.getEffectiveViewport();
-            if (this.rw == null) {
+            if (this.rx == null) {
                 return;
             }
-            let d = new ScalerParams(0, a, b, this.rw.d, c);
+            let d = new ScalerParams(0, a, b, this.rx.d, c);
             let e = ((() => {
-                let $ret = new ScalerParams(0, a, b, this.rw.e, c);
+                let $ret = new ScalerParams(0, a, b, this.rx.e, c);
                 $ret.b = this.gc();
                 return $ret;
             })());
-            if (this.rh == null || this.ri == null) {
-                let f = arrayShallowClone(this.sc.asArray());
-                let g = arrayShallowClone(this.sd.asArray());
+            if (this.ri == null || this.rj == null) {
+                let f = arrayShallowClone(this.sd.asArray());
+                let g = arrayShallowClone(this.se.asArray());
                 this.xAxis.hm(boxArray$1(f), 0, f.length, d);
                 this.yAxis.hm(boxArray$1(g), 0, g.length, e);
-                this.rh = f;
-                this.ri = g;
+                this.ri = f;
+                this.rj = g;
             }
         }
-        get_sk() {
+        get_sl() {
             return false;
         }
-        get sk() {
-            return this.get_sk();
+        get sl() {
+            return this.get_sl();
         }
-        sv(a, b) {
-            if (!this.sk) {
+        sw(a, b) {
+            if (!this.sl) {
                 return -1;
             }
             let c = { $type: Point_$type, x: 0, y: 0 };
             let d = true;
-            let e = this.r1();
+            let e = this.r2();
             if (e == null) {
                 return -1;
             }
             if (e.m == null) {
                 return -1;
             }
-            if (this.ck == null || this.ck.count > this.sw) {
+            if (this.ck == null || this.ck.count > this.sx) {
                 return -1;
             }
-            this.tq();
-            let f = this.rh;
-            let g = this.ri;
+            this.tr();
+            let f = this.ri;
+            let g = this.rj;
             if (f == null || g == null) {
                 return -1;
             }
-            let h = this.pg(a);
+            let h = this.ph(a);
             let i = 1.7976931348623157E+308;
             let j = -1;
-            for (let k = 0; k < this.rh.length; k++) {
-                let l = { $type: Point_$type, x: this.rh[k], y: this.ri[k] };
+            for (let k = 0; k < this.ri.length; k++) {
+                let l = { $type: Point_$type, x: this.ri[k], y: this.rj[k] };
                 if (k > 0) {
                     if (!b || e.j.containsKey(this.ck.item(k)) || e.j.containsKey(this.ck.item(k - 1))) {
                         let m = GeometryUtil.d(h, c, l);
@@ -576,8 +576,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 c = l;
             }
             if (j >= 0) {
-                let n = { $type: Point_$type, x: this.rh[j], y: this.ri[j] };
-                let o = { $type: Point_$type, x: this.rh[j - 1], y: this.ri[j - 1] };
+                let n = { $type: Point_$type, x: this.ri[j], y: this.rj[j] };
+                let o = { $type: Point_$type, x: this.ri[j - 1], y: this.rj[j - 1] };
                 if (!b || (e.j.containsKey(this.ck.item(j)) && e.j.containsKey(this.ck.item(j - 1)))) {
                     let p = GeometryUtil.h(h, o, n);
                     return (j - 1) + p;
@@ -591,21 +591,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        su(a) {
-            return this.sv(a, true);
+        sv(a) {
+            return this.sw(a, true);
         }
-        st(a) {
+        su(a) {
             let b = null;
             let c = 1.7976931348623157E+308;
-            let d = this.pg(a);
+            let d = this.ph(a);
             let e = d.x;
             let f = d.y;
-            if (this.rx.cy.e > this.sw) {
+            if (this.ry.cy.e > this.sx) {
                 return -1;
             }
-            this.rx.c5((g) => {
+            this.ry.c5((g) => {
                 if (g._visibility == 0) {
-                    let h = this.rx.cp(g);
+                    let h = this.ry.cp(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);
@@ -620,8 +620,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        pl(a, b, c) {
-            if (this.xAxis == null || this.yAxis == null || this.sc == null || this.sd == null) {
+        pm(a, b, c) {
+            if (this.xAxis == null || this.yAxis == null || this.sd == null || this.se == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
             let d = this.b0.bv;
@@ -653,15 +653,15 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     j = this.ck.count - 1;
                 }
                 if (k == j) {
-                    let l = this.xAxis.ei(this.sc.item(j), g);
-                    let m = this.yAxis.ei(this.sd.item(j), h);
+                    let l = this.xAxis.ei(this.sd.item(j), g);
+                    let m = this.yAxis.ei(this.se.item(j), h);
                     return { $type: Point_$type, x: l, y: m };
                 }
                 let n = i - Math.floor(i);
-                let o = this.xAxis.ei(this.sc.item(j), g);
-                let p = this.yAxis.ei(this.sd.item(j), h);
-                let q = this.xAxis.ei(this.sc.item(k), g);
-                let r = this.yAxis.ei(this.sd.item(k), h);
+                let o = this.xAxis.ei(this.sd.item(j), g);
+                let p = this.yAxis.ei(this.se.item(j), h);
+                let q = this.xAxis.ei(this.sd.item(k), g);
+                let r = this.yAxis.ei(this.se.item(k), h);
                 let s = q - o;
                 let t = r - p;
                 return { $type: Point_$type, x: o + s * n, y: p + t * n };
@@ -671,8 +671,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (u == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
-                let v = this.xAxis.ei(this.sc.item(u), g);
-                let w = this.yAxis.ei(this.sd.item(u), h);
+                let v = this.xAxis.ei(this.sd.item(u), g);
+                let w = this.yAxis.ei(this.se.item(u), h);
                 return { $type: Point_$type, x: v, y: w };
             }
         }
@@ -681,7 +681,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             b = b.copy();
             let c = this.cd != null ? this.cd.su : Rect.empty;
             let d = new Rect(0, 0, 0, 1, 1);
-            let e = this.ps(this.b0);
+            let e = this.pt(this.b0);
             let f = new ScalerParams(0, d, d, this.xAxis.cg, e);
             let g = ((() => {
                 let $ret = new ScalerParams(0, d, d, this.yAxis.cg, e);
@@ -689,8 +689,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             let h = !b.isEmpty && !c.isEmpty && this.ck != null ? this.ck.indexOf(a) : -1;
-            let i = this.xAxis != null && this.sc != null && h < this.sc.count ? this.xAxis.ei(this.sc.item(h), f) : NaN;
-            let j = this.yAxis != null && this.sd != null && h < this.sd.count ? this.yAxis.ei(this.sd.item(h), g) : NaN;
+            let i = this.xAxis != null && this.sd != null && h < this.sd.count ? this.xAxis.ei(this.sd.item(h), f) : NaN;
+            let j = this.yAxis != null && this.se != null && h < this.se.count ? this.yAxis.ei(this.se.item(h), g) : NaN;
             if (!isNaN_(i)) {
                 if (i < b.left + 0.1 * b.width) {
                     i = i + 0.4 * b.width;
@@ -716,35 +716,35 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h >= 0;
         }
-        m4(a, b) {
-            this.mh(false);
-        }
         m5(a, b) {
-            this.mh(false);
+            this.mi(false);
+        }
+        m6(a, b) {
+            this.mi(false);
         }
-        r1() {
-            let a = this.r0;
+        r2() {
+            let a = this.r1;
             if (this.cv()) {
                 if (this.ce.g) {
                     this.ce.t();
                 }
-                a = this.r4;
+                a = this.r5;
             }
             return a;
         }
-        to(a, b, c, d, e) {
+        tp(a, b, c, d, e) {
             b.g = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
             let f = this.getEffectiveViewport1(a);
             let g = this.ck;
             let h;
             let i;
             let j = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.rw.d, f);
+                let $ret = new ScalerParams(0, d, e, this.rx.d, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 return $ret;
             })());
             let k = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.rw.e, f);
+                let $ret = new ScalerParams(0, d, e, this.rx.e, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 $ret.b = this.gc();
                 return $ret;
@@ -759,9 +759,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
             for (let o = 0; o < c; o++) {
-                h = this.sc.item(o);
-                i = this.sd.item(o);
-                let p = { $type: Point_$type, x: this.rw.a.ei(h, j), y: this.rw.b.ei(i, k) };
+                h = this.sd.item(o);
+                i = this.se.item(o);
+                let p = { $type: Point_$type, x: this.rx.a.ei(h, j), y: this.rx.b.ei(i, k) };
                 if (l) {
                     if (p.x < e.left || p.x > e.right) {
                         if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -785,16 +785,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        tw(a, b) {
-            this.rh = null;
+        tx(a, b) {
             this.ri = null;
+            this.rj = null;
             a.j.clear();
             a.n.clear();
             a.h.clear();
             a.l.clear();
             a.i.clear();
             a.k.clear();
-            let c = Math.min(this.sc != null ? this.sc.count : 0, this.sd != null ? this.sd.count : 0);
+            let c = Math.min(this.sd != null ? this.sd.count : 0, this.se != null ? this.se.count : 0);
             let d = b.bv;
             let e = b.bu;
             let f = this.getEffectiveViewport1(b);
@@ -809,7 +809,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             if (c < 1) {
                 return;
             }
-            this.rw = ((() => {
+            this.rx = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -819,28 +819,28 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             let i = b;
-            if (c <= this.sx) {
-                this.to(i, a, c, d, e);
+            if (c <= this.sy) {
+                this.tp(i, a, c, d, e);
             }
-            if (this.qe()) {
-                b.cv.l(a.j, this.sx, d, e, this.ft);
+            if (this.qf()) {
+                b.cv.l(a.j, this.sy, d, e, this.ft);
             }
             let j = ((() => {
                 let $ret = new Clipper(0, e, false);
                 $ret.i = a.n;
                 return $ret;
             })());
-            let k = this.pq(b);
+            let k = this.pr(b);
             let l = this.xAxis.el(k.left, g);
             let m = this.xAxis.el(k.right, g);
-            b.cx.h(a.n, this.trendLineType, this.sc, this.sd, this.trendLinePeriod, (n) => this.xAxis.ei(n, g), (n) => this.yAxis.ei(n, h), ((() => {
+            b.cx.h(a.n, this.trendLineType, this.sd, this.se, this.trendLinePeriod, (n) => this.xAxis.ei(n, g), (n) => this.yAxis.ei(n, h), ((() => {
                 let $ret = new TrendResolutionParams();
                 $ret.b = this.ft;
                 $ret.f = e;
                 $ret.g = d;
                 return $ret;
             })()), j, l, m);
-            this.tu(a, b);
+            this.tv(a, b);
         }
         kx(a, b) {
             super.kx(a, b);
@@ -850,12 +850,12 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         get_dx() {
             return true;
         }
-        rq(a, b, c) {
+        rr(a, b, c) {
             return null;
         }
-        rr(a, b, c) {
-            let d = this.r1();
-            let e = this.rx.by(this.pg(b));
+        rs(a, b, c) {
+            let d = this.r2();
+            let e = this.ry.by(this.ph(b));
             let f = -1;
             if (e == null) {
                 if (a != null) {
@@ -882,11 +882,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return g;
         }
-        p0(a, b) {
-            if (this.qc != 1 && this.qc != 13) {
-                let c = this.qb.cq();
-                let d = (c.width / 2) + (this.qh / 2);
-                let e = (c.height / 2) + (this.qh / 2);
+        p1(a, b) {
+            if (this.qd != 1 && this.qd != 13) {
+                let c = this.qc.cq();
+                let d = (c.width / 2) + (this.qi / 2);
+                let e = (c.height / 2) + (this.qi / 2);
                 let f = d;
                 let g = d;
                 let h = e;
@@ -907,7 +907,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return new Thickness(1, 0, 0, 0, 0);
         }
-        rp(a, b, c) {
+        rq(a, b, c) {
             let d = new HighlightingInfo();
             d.b = this;
             d.h = 0;
@@ -920,38 +920,38 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         aw(a, b, c) {
             if (this.c2 && this.ef(this.bk) && !c) {
-                let d = this.rq(a, b, this.rs);
-                this.rs = d;
+                let d = this.rr(a, b, this.rt);
+                this.rt = d;
                 return d;
             }
             else {
-                let e = this.rp(a, b, this.rs);
-                this.rs = e;
+                let e = this.rq(a, b, this.rt);
+                this.rt = e;
                 return e;
             }
         }
         ax(a, b, c) {
             if (this.ef(this.bk) && !c) {
-                let d = this.rr(a, b, this.rt);
-                this.rt = d;
+                let d = this.rs(a, b, this.ru);
+                this.ru = d;
                 return d;
             }
             else {
-                let e = this.rp(a, b, this.rt);
+                let e = this.rq(a, b, this.ru);
                 e.e = true;
-                this.rt = e;
+                this.ru = e;
                 return e;
             }
         }
-        sp() {
-            return (this.assigningScatterStyle != null && this.sf) || (this.bk != 1);
+        sq() {
+            return (this.assigningScatterStyle != null && this.sg) || (this.bk != 1);
         }
-        so() {
-            return (this.assigningScatterMarkerStyle != null && this.se) || (this.bk != 1);
+        sp() {
+            return (this.assigningScatterMarkerStyle != null && this.sf) || (this.bk != 1);
         }
-        t7(a, b) {
+        t8(a, b) {
             let c = b.bu;
-            this.rw = ((() => {
+            this.rx = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -959,10 +959,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.e = this.yAxis.cg;
                 return $ret;
             })());
-            if (this.qe()) {
-                b.cv.j(a.j, this.qg);
-                if (this.so()) {
-                    this.tp(b, a);
+            if (this.qf()) {
+                b.cv.j(a.j, this.qh);
+                if (this.sp()) {
+                    this.tq(b, a);
                 }
             }
             b.cm();
@@ -972,13 +972,13 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             b.cx.g$h(a.n, d);
-            this.t4(a, b);
-        }
-        rk(a, b) {
-            return this.rl(a, b);
+            this.t5(a, b);
         }
         rl(a, b) {
-            if (b < a || a < 0 || a > this.sc.count || b < 0 || b > this.sc.count) {
+            return this.rm(a, b);
+        }
+        rm(a, b) {
+            if (b < a || a < 0 || a > this.sd.count || b < 0 || b > this.sd.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
@@ -988,14 +988,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        tp(a, b) {
+        tq(a, b) {
             a.b3 = true;
-            this.r9.aw(this, this.so(), runOn(this, this.rk));
-            let c = this.r9.d;
+            this.sa.aw(this, this.sp(), runOn(this, this.rl));
+            let c = this.sa.d;
             let d = c != null;
             let e = this.getEffectiveViewport1(a);
             let f = this.ck == null ? 0 : this.ck.count;
-            this.rx.cf((g) => {
+            this.ry.cf((g) => {
                 if (g._visibility == 0) {
                     let h = g.ak;
                     let i = g.content;
@@ -1004,17 +1004,17 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         g.content = i;
                     }
                     if (d) {
-                        this.tr(h, f, a.q);
+                        this.ts(h, f, a.q);
                     }
-                    this.r9.ac(g, i);
+                    this.sa.ac(g, i);
                 }
             });
         }
-        ts(a, b, c) {
+        tt(a, b, c) {
             let d = this.bk != 1;
-            this.r9.ay(this.r9.b, a, b, false);
-            this.r9.ab(this.fr);
-            let e = this.r9.av;
+            this.sa.ay(this.sa.b, a, b, false);
+            this.sa.ab(this.fr);
+            let e = this.sa.av;
             let f = null;
             let g = this.ck;
             if (d && this.cd != null) {
@@ -1022,14 +1022,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 e.b = f;
             }
             e.f = c;
-            this.t2(e);
-            this.r9.z(this, f, c, d, a < 0);
+            this.t3(e);
+            this.sa.z(this, f, c, d, a < 0);
         }
-        tr(a, b, c) {
+        ts(a, b, c) {
             let d = this.bk != 1;
-            this.r9.ay(this.r9.d, a, b, true);
-            this.r9.aa(this.fr);
-            let e = this.r9.au;
+            this.sa.ay(this.sa.d, a, b, true);
+            this.sa.aa(this.fr);
+            let e = this.sa.au;
             let f = null;
             let g = this.ck;
             let h = null;
@@ -1041,26 +1041,26 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 e.b = f;
             }
             e.f = c;
-            this.t1(e);
-            this.r9.y(this, f, c, d, e.m, this.cd.a3.totalHighlightingProgress);
+            this.t2(e);
+            this.sa.y(this, f, c, d, e.m, this.cd.a3.totalHighlightingProgress);
         }
-        t2(a) {
-            if (this.assigningScatterStyle != null && this.sf) {
+        t3(a) {
+            if (this.assigningScatterStyle != null && this.sg) {
                 this.assigningScatterStyle(this, a);
             }
         }
-        t1(a) {
-            if (this.assigningScatterMarkerStyle != null && this.se) {
+        t2(a) {
+            if (this.assigningScatterMarkerStyle != null && this.sf) {
                 this.assigningScatterMarkerStyle(this, a);
             }
         }
-        tu(a, b) {
+        tv(a, b) {
             let c = new ErrorBarsHelper(this, b);
-            if (this.ry == null) {
+            if (this.rz == null) {
                 return;
             }
-            let d = this.ry.u;
-            let e = this.ry.v;
+            let d = this.rz.u;
+            let e = this.rz.v;
             let f = 0;
             let g = 0;
             let h = 0;
@@ -1070,35 +1070,35 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            let l = this.tx(k, c, d, h, i, true);
+                            let l = this.ty(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            let m = this.tv(k, c, d, h, i, true);
+                            let m = this.tw(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            let n = this.tt(k, c, d, j, h, i, true);
+                            let n = this.tu(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            let o = this.ty(c, d, f, h, i, true);
+                            let o = this.tz(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            let p = this.tv(k, c, d, h, i, true);
+                            let p = this.tw(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     let q = new OwnedPoint();
-                    q.c = c.l(d, this.rw.a, k.c, f);
+                    q.c = c.l(d, this.rx.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1106,53 +1106,53 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            let r = this.tx(k, c, e, h, i, false);
+                            let r = this.ty(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            let s = this.tv(k, c, e, h, i, false);
+                            let s = this.tw(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            let t = this.tt(k, c, e, j, h, i, false);
+                            let t = this.tu(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            let u = this.ty(c, e, g, h, i, false);
+                            let u = this.tz(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            let v = this.tv(k, c, e, h, i, false);
+                            let v = this.tw(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     let w = new OwnedPoint();
-                    w.c = c.m(e, this.rw.b, k.c, g);
+                    w.c = c.m(e, this.rx.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
                 }
             }
         }
-        tx(a, b, c, d, e, f) {
+        ty(a, b, c, d, e, f) {
             if (f) {
                 let g;
                 let h, i;
-                i = this.rw.a;
-                if (this.ry.s == 0) {
+                i = this.rx.a;
+                if (this.rz.s == 0) {
                     g = a.c.x;
-                    h = this.rw.a;
+                    h = this.rx.a;
                 }
                 else {
                     g = a.c.y;
-                    h = this.rw.b;
+                    h = this.rx.b;
                 }
                 let j = b.f(g, c, h, i, d, e);
                 d = j.p4;
@@ -1161,14 +1161,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             else {
                 let k;
                 let l, m;
-                m = this.rw.b;
-                if (this.ry.t == 0) {
+                m = this.rx.b;
+                if (this.rz.t == 0) {
                     k = a.c.x;
-                    l = this.rw.a;
+                    l = this.rx.a;
                 }
                 else {
                     k = a.c.y;
-                    l = this.rw.b;
+                    l = this.rx.b;
                 }
                 let n = b.f(k, c, l, m, d, e);
                 d = n.p4;
@@ -1179,14 +1179,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        tv(a, b, c, d, e, f) {
+        tw(a, b, c, d, e, f) {
             if (f) {
-                let g = b.j(a.c.x, c, this.rw.a, d, e);
+                let g = b.j(a.c.x, c, this.rx.a, d, e);
                 d = g.p3;
                 e = g.p4;
             }
             else {
-                let h = b.j(a.c.y, c, this.rw.b, d, e);
+                let h = b.j(a.c.y, c, this.rx.b, d, e);
                 d = h.p3;
                 e = h.p4;
             }
@@ -1195,18 +1195,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        tt(a, b, c, d, e, f, g) {
+        tu(a, b, c, d, e, f, g) {
             let h = c.getItemColumn();
             let i = this.ck.indexOf(d);
             if (h != null && i < h.count) {
                 let j = h.item(i);
                 if (g) {
-                    let k = b.h(a.c.x, j, this.rw.a, e, f);
+                    let k = b.h(a.c.x, j, this.rx.a, e, f);
                     e = k.p3;
                     f = k.p4;
                 }
                 else {
-                    let l = b.h(a.c.y, j, this.rw.b, e, f);
+                    let l = b.h(a.c.y, j, this.rx.b, e, f);
                     e = l.p3;
                     f = l.p4;
                 }
@@ -1220,16 +1220,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        ty(a, b, c, d, e, f) {
+        tz(a, b, c, d, e, f) {
             let g = a.i(b, c);
             c = g.p1;
             if (f) {
-                let h = a.k(c, b, this.rw.a, d, e);
+                let h = a.k(c, b, this.rx.a, d, e);
                 d = h.p3;
                 e = h.p4;
             }
             else {
-                let i = a.k(c, b, this.rw.b, d, e);
+                let i = a.k(c, b, this.rx.b, d, e);
                 d = i.p3;
                 e = i.p4;
             }
@@ -1239,29 +1239,29 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        t4(a, b) {
-            if (!b.o() || this.ry == null) {
+        t5(a, b) {
+            if (!b.o() || this.rz == null) {
                 b.c6();
                 return;
             }
-            this.t5(a, b);
             this.t6(a, b);
+            this.t7(a, b);
         }
-        t5(a, b) {
+        t6(a, b) {
             b.c2();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.ry.u;
+            let e = this.rz.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.ry.o == 1 || this.ry.o == 2) {
+                        if (this.rz.o == 1 || this.rz.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.ry.o == 1 || this.ry.o == 3) {
+                        if (this.rz.o == 1 || this.rz.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1269,21 +1269,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             b.c7(d);
         }
-        t6(a, b) {
+        t7(a, b) {
             b.c3();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.ry.v;
+            let e = this.rz.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.ry.p == 1 || this.ry.p == 2) {
+                        if (this.rz.p == 1 || this.rz.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.ry.p == 1 || this.ry.p == 3) {
+                        if (this.rz.p == 1 || this.rz.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
@@ -1292,15 +1292,15 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         e9(a, b, c) {
             let d = true;
-            if (!super.e9(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bh == null || this.yAxis.bh == null || this.sc == null || this.sd == null || this.sc.count == 0 || this.sd.count == 0 || this.ck == null || this.ck.count != this.sc.count || this.ck.count != this.sd.count || this.xAxis.bh == null || this.yAxis.bh == null || this.xAxis.lv == this.xAxis.lu || this.yAxis.lv == this.yAxis.lu) {
+            if (!super.e9(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bh == null || this.yAxis.bh == null || this.sd == null || this.se == null || this.sd.count == 0 || this.se.count == 0 || this.ck == null || this.ck.count != this.sd.count || this.ck.count != this.se.count || this.xAxis.bh == null || this.yAxis.bh == null || this.xAxis.lv == this.xAxis.lu || this.yAxis.lv == this.yAxis.lu) {
                 d = false;
             }
             return d;
         }
         getViewInfo(a, b) {
-            if (!this.uz.isEmpty && !this.u0.isEmpty) {
-                a = this.uz;
-                b = this.u0;
+            if (!this.u0.isEmpty && !this.u1.isEmpty) {
+                a = this.u0;
+                b = this.u1;
                 return {
                     p0: a,
                     p1: b
@@ -1313,51 +1313,51 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        mi(a) {
-            this.tn();
+        mj(a) {
+            this.to();
             try {
                 if (this.cx(this.b0)) {
                     return;
                 }
-                if (this.ck != null && this.ck.count > this.sx) {
+                if (this.ck != null && this.ck.count > this.sy) {
                     a = false;
                 }
                 if (this.eo(a) && !this.es) {
-                    let b = this.r2;
+                    let b = this.r3;
                     if (this.cv()) {
                         if (this.ce.g) {
                             this.ce.t();
                         }
-                        this.r2 = this.r4;
-                        this.r4 = b;
+                        this.r3 = this.r5;
+                        this.r5 = b;
                     }
                     else {
-                        this.r2 = this.r0;
-                        this.r0 = b;
+                        this.r3 = this.r1;
+                        this.r1 = b;
                     }
-                    this.tw(this.r0, this.rx);
-                    this.mq();
+                    this.tx(this.r1, this.ry);
+                    this.mr();
                 }
                 else {
                     if (!this.es) {
-                        this.tw(this.r0, this.rx);
+                        this.tx(this.r1, this.ry);
                     }
-                    this.t7(this.r0, this.rx);
+                    this.t8(this.r1, this.ry);
                 }
             }
             finally {
-                this.t8();
+                this.t9();
             }
         }
-        mv() {
-            super.mv();
+        mw() {
+            super.mw();
             if (this.index < 0) {
                 return;
             }
-            this.rx.da();
+            this.ry.da();
         }
-        mj(a, b) {
-            super.mj(a, b);
+        mk(a, b) {
+            super.mk(a, b);
             if (!this.ez) {
                 this.b0.a2(b);
                 return;
@@ -1368,28 +1368,28 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             let c = typeCast(ScatterBaseView.$, this.bz);
             if (!this.et) {
-                this.r3 = new ScatterFrame();
-                this.tw(this.r3, c);
+                this.r4 = new ScatterFrame();
+                this.tx(this.r4, c);
             }
             this.et = false;
-            this.t7(this.r3, c);
+            this.t8(this.r4, c);
             this.ez = false;
         }
-        mg(a, b, c, d, e) {
-            super.mg(a, b, c, d, e);
+        mh(a, b, c, d, e) {
+            super.mh(a, b, c, d, e);
             let f = this.a6.a$h.item(d);
             let g = f;
             f.a1(c);
             if (this.cx(g)) {
                 return;
             }
-            if (this.rz == null) {
-                this.rz = new ScatterFrame();
+            if (this.r0 == null) {
+                this.r0 = new ScatterFrame();
             }
-            this.tw(this.rz, g);
-            this.t7(this.rz, g);
+            this.tx(this.r0, g);
+            this.t8(this.r0, g);
         }
-        t3(a, b) {
+        t4(a, b) {
             let c = new List$1(Base.$, 0);
             for (let d of fromEnum(b.c)) {
                 if (!a.containsKey(d)) {
@@ -1400,10 +1400,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 b.h(e);
             }
         }
-        rj(a, b, c, d, e) {
-            if (c == null || c.length != this.rw.c.count) {
-                c = new Array(this.rw.c.count);
-                for (let f = 0; f < this.rw.c.count; f++) {
+        rk(a, b, c, d, e) {
+            if (c == null || c.length != this.rx.c.count) {
+                c = new Array(this.rx.c.count);
+                for (let f = 0; f < this.rx.c.count; f++) {
                     c[f] = PointUtil.create();
                 }
             }
@@ -1419,28 +1419,28 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.b = this.gc();
                 return $ret;
             })());
-            let j = this.pq(a);
-            let k = this.rw.a.el(j.left, h);
-            let l = this.rw.a.el(j.right, h);
-            let m = this.rw.b.el(j.bottom, i);
-            let n = this.rw.b.el(j.top, i);
-            if (this.rw.d) {
+            let j = this.pr(a);
+            let k = this.rx.a.el(j.left, h);
+            let l = this.rx.a.el(j.right, h);
+            let m = this.rx.b.el(j.bottom, i);
+            let n = this.rx.b.el(j.top, i);
+            if (this.rx.d) {
                 let o = k;
                 k = l;
                 l = o;
             }
-            if (this.rw.e) {
+            if (this.rx.e) {
                 let p = m;
                 m = n;
                 n = p;
             }
-            let q = this.rw;
+            let q = this.rx;
             let r = q.a;
             let s = q.b;
             let t;
             let u;
-            let v = this.sc;
-            let w = this.sd;
+            let v = this.sd;
+            let w = this.se;
             let x = false;
             let y = 0;
             let z = 0;
@@ -1454,7 +1454,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     z -= ab;
                 }
             }
-            for (let ac = 0; ac < this.rw.c.count; ac++) {
+            for (let ac = 0; ac < this.rx.c.count; ac++) {
                 t = v.item(ac);
                 u = w.item(ac);
                 if (x) {
@@ -1486,7 +1486,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        sq(a, b) {
+        sr(a, b) {
             if (b == null) {
                 b = new List$1(Number_$type, 2, a.e);
             }
@@ -1502,10 +1502,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         k7(a) {
             super.k7(a);
-            this.a8.exportTrendlineData(this, a, this.rx.cx.g$j);
+            this.a8.exportTrendlineData(this, a, this.ry.cx.g$j);
         }
         gc() {
-            return Series.gd(this.sd, null);
+            return Series.gd(this.se, null);
         }
         getDataLegendSeriesContextAt(a, b) {
             let c = { $type: Point_$type, x: a, y: b };
@@ -1515,15 +1515,15 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             let g = new DataLegendSeriesValueInfo();
             g.l = e;
             g.a = 13;
-            g.p = this.td != null ? this.td : "X:";
-            g.q = this.s9 != null ? this.s9 : "X:";
-            g.r = this.tb != null ? this.tb : "";
+            g.p = this.te != null ? this.te : "X:";
+            g.q = this.ta != null ? this.ta : "X:";
+            g.r = this.tc != null ? this.tc : "";
             let h = new DataLegendSeriesValueInfo();
             h.l = f;
             h.a = 14;
-            h.p = this.tl != null ? this.tl : "Y:";
-            h.q = this.th != null ? this.th : "Y:";
-            h.r = this.tj != null ? this.tj : "";
+            h.p = this.tm != null ? this.tm : "Y:";
+            h.q = this.ti != null ? this.ti : "Y:";
+            h.r = this.tk != null ? this.tk : "";
             let i = new DataLegendSeriesContext();
             i.f = ((() => {
                 let $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -1536,8 +1536,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
     }
     ScatterBase.$t = /*@__PURE__*/ markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.t9 = /*@__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:ry:ua', [ScatterErrorBarSettings.$, null], 'IsCustomScatterMarkerStyleAllowed:si:ub', [0, false], 'IsCustomScatterStyleAllowed:sj:uc', [0, false], 'ItemSearchMode:r8:ud', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:sw:ue', [1, 10000], 'MarkerCollisionAvoidance:ro:uf', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:sx:ug', [1, 400], 'XAxis::uo', [NumericXAxis.$, null], 'XMemberAsLegendLabel:s9:up', [2, null], 'XMemberAsLegendUnit:tb:uq', [2, null], 'XMemberPath:td:ur', [2, null], 'YAxis::us', [NumericYAxis.$, null], 'YMemberAsLegendLabel:th:ut', [2, null], 'YMemberAsLegendUnit:tj:uu', [2, null], 'YMemberPath:tl:uv', [2, null], 'TrendLineType::um', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::ul', [1, 1.5], 'TrendLinePeriod::uk', [1, 7], 'TrendLineBrush::uh', [Brush.$, null], 'TrendLineZIndex:sy:un', [1, 1001], 'TrendLineDashArray:ux:ui', [DoubleCollection.$], 'TrendLineDashCap:uy:uj', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.ua = /*@__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:rz:ub', [ScatterErrorBarSettings.$, null], 'IsCustomScatterMarkerStyleAllowed:sj:uc', [0, false], 'IsCustomScatterStyleAllowed:sk:ud', [0, false], 'ItemSearchMode:r9:ue', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:sx:uf', [1, 10000], 'MarkerCollisionAvoidance:rp:ug', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:sy:uh', [1, 400], 'XAxis::up', [NumericXAxis.$, null], 'XMemberAsLegendLabel:ta:uq', [2, null], 'XMemberAsLegendUnit:tc:ur', [2, null], 'XMemberPath:te:us', [2, null], 'YAxis::ut', [NumericYAxis.$, null], 'YMemberAsLegendLabel:ti:uu', [2, null], 'YMemberAsLegendUnit:tk:uv', [2, null], 'YMemberPath:tm:uw', [2, null], 'TrendLineType::un', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::um', [1, 1.5], 'TrendLinePeriod::ul', [1, 7], 'TrendLineBrush::ui', [Brush.$, null], 'TrendLineZIndex:sz:uo', [1, 1001], 'TrendLineDashArray:uy:uj', [DoubleCollection.$], 'TrendLineDashCap:uz:uk', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 })();
 /**
@@ -1613,7 +1613,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             this.dc = new Path();
             this.dd = new Path();
             if (!this.q) {
-                this.cw.sx = 2000;
+                this.cw.sy = 2000;
             }
         }
         de(a) {
@@ -1631,12 +1631,12 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return new Size(1, this.db.width, this.db.height);
         }
         cu() {
-            let a = new NumericMarkerManager(1, (b) => this.cy.item(b), (b) => this.cw.rw.c.item(b), runOn(this, this.c9), runOn(this, this.cr), runOn(this, this.cz), () => this.cw.ro);
+            let a = new NumericMarkerManager(1, (b) => this.cy.item(b), (b) => this.cw.rx.c.item(b), runOn(this, this.c9), runOn(this, this.cr), runOn(this, this.cz), () => this.cw.rp);
             a.q = runOn(this, this.de);
             return a;
         }
         c9(a) {
-            this.cw.t3(a, this.cy);
+            this.cw.t4(a, this.cy);
         }
         c0() {
             return this.b4;
@@ -1645,11 +1645,11 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return this.ct;
         }
         cr() {
-            this.ct = this.cw.rj(this, this.cy, this.ct, this.bv, this.bu);
+            this.ct = this.cw.rk(this, this.cy, this.ct, this.bv, this.bu);
             return this.ct;
         }
         cz() {
-            this.c1 = this.cw.sq(this.cy, this.c1);
+            this.c1 = this.cw.sr(this.cy, this.c1);
             return this.c1;
         }
         c2() {
@@ -1662,10 +1662,10 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
         }
         da() {
             if (this.cw.trendLineBrush != null) {
-                this.cw.uw = this.cw.trendLineBrush;
+                this.cw.ux = this.cw.trendLineBrush;
             }
             else {
-                this.cw.uw = this.cw.oy;
+                this.cw.ux = this.cw.oz;
             }
         }
         cf(a) {
@@ -1682,9 +1682,9 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
                 if (this.cw.trendLineType != 0 && !b) {
                     let c = this.cx.g$j;
                     c.ac = this.cw.trendLineThickness;
-                    c._stroke = this.cw.uw;
-                    c.ai = this.cw.ux;
-                    c.ad = this.cw.uy;
+                    c._stroke = this.cw.ux;
+                    c.ai = this.cw.uy;
+                    c.ad = this.cw.uz;
                     a.u(c);
                 }
             }
@@ -1703,7 +1703,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             if (!stringIsNullOrEmpty(b)) {
                 a += " style='color:" + b + "'";
             }
-            a += ">" + this.cw.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.cw.td + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.cw.tl + "}</span></div>";
+            a += ">" + this.cw.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.cw.te + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.cw.tm + "}</span></div>";
             return a;
         }
     }