igniteui-webcomponents-charts 5.0.0-beta.2 → 5.0.0

package/esm2015/lib/ScatterBase_combined.js

@@ -63,14 +63,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         cq() {
             return new ScatterBaseView(this);
         }
-        oz() {
-            super.oz();
+        o0() {
+            super.o0();
             this.xAxis = null;
             this.yAxis = null;
         }
-        qw(a) {
-            super.qw(a);
-            this.yo = a;
+        qx(a) {
+            super.qx(a);
+            this.yp = a;
         }
         get_fu() {
             return true;
@@ -79,63 +79,63 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             return [this.xAxis, this.yAxis];
         }
         ko(a, b) {
-            let c = this.na(b);
+            let c = this.nb(b);
             if (c == ScatterBase.$$p[12]) {
-                return this.kp(a, b, this.aak);
+                return this.kp(a, b, this.aal);
             }
             if (c == ScatterBase.$$p[16]) {
-                return this.kp(a, b, this.aas);
+                return this.kp(a, b, this.aat);
             }
             if (c == ScatterBase.$$p[1]) {
-                return this.kp(a, b, this.z4);
+                return this.kp(a, b, this.z5);
             }
             if (c == ScatterBase.$$p[2]) {
-                return this.kp(a, b, this.z6);
+                return this.kp(a, b, this.z7);
             }
             return null;
         }
-        ma(a) {
-            let b = this.na(a);
+        mb(a) {
+            let b = this.nb(a);
             if (b == ScatterBase.$$p[12]) {
-                return this.aak;
+                return this.aal;
             }
             if (b == ScatterBase.$$p[16]) {
-                return this.aas;
+                return this.aat;
             }
             if (b == ScatterBase.$$p[1]) {
-                return this.z4;
+                return this.z5;
             }
             if (b == ScatterBase.$$p[2]) {
-                return this.z6;
+                return this.z7;
             }
-            return super.ma(a);
+            return super.mb(a);
         }
         d9(a, b, c, d) {
             if (!this.hasMarkers) {
                 return false;
             }
             let e = this.xAxis;
-            let f = new ScalerParams(1, this.c9.vl, this.wk, e.ch);
+            let f = new ScalerParams(1, this.c9.vl, this.wl, e.ch);
             f.c = this.getEffectiveViewport1(this.ct);
             let g = this.yAxis;
-            let h = new ScalerParams(1, this.c9.vl, this.wk, g.ch);
+            let h = new ScalerParams(1, this.c9.vl, this.wl, g.ch);
             h.c = this.getEffectiveViewport1(this.ct);
             a.clear();
-            this.wx.cj((i) => {
+            this.wy.cj((i) => {
                 if (i._visibility == 0) {
                     let j = new SeriesPointOfInterest();
                     let k = i.n;
                     let l = i.o;
-                    if (k < this.wk.left || k > this.wk.right || l < this.wk.top || l > this.wk.bottom) {
+                    if (k < this.wl.left || k > this.wl.right || l < this.wl.top || l > this.wl.bottom) {
                         return;
                     }
                     j.d = e.en(k, f);
                     j.e = g.en(l, h);
                     j.b = i.content;
-                    j.g = this.u9;
+                    j.g = this.va;
                     j.c = i.ak;
                     if (this.g7) {
-                        j.g = this.vg(i.ak);
+                        j.g = this.vh(i.ak);
                     }
                     a.add(j);
                 }
@@ -144,7 +144,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         b0() {
             if (this.b1 == 0) {
-                if (this.z0 <= 2000) {
+                if (this.z1 <= 2000) {
                     return 1;
                 }
                 else {
@@ -155,64 +155,54 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return super.b0();
             }
         }
-        wi(a) {
-            if (!this.hasMarkers || !this.w7()) {
+        wj(a) {
+            if (!this.hasMarkers || !this.w8()) {
                 return Rect.empty;
             }
-            let b = this.wx.b1(this.v0(a));
+            let b = this.wy.b1(this.v1(a));
             if (b != null) {
-                return this.wx.cu(b);
+                return this.wy.cu(b);
             }
             return Rect.empty;
         }
         gu(a, b) {
-            if (this.w8(a, b)) {
+            if (this.w9(a, b)) {
                 return true;
             }
             return false;
         }
         constructor() {
             super();
-            this.yn = null;
-            this.y6 = null;
+            this.yo = null;
             this.y7 = null;
-            this.acb = null;
+            this.y8 = null;
             this.acc = null;
-            this.yw = 1;
-            this.yd = null;
+            this.acd = null;
+            this.yx = 1;
             this.ye = null;
-            this.yt = null;
-            this.yv = null;
-            this.yr = null;
+            this.yf = null;
+            this.yu = null;
+            this.yw = null;
+            this.ys = null;
+            this.zd = false;
             this.zc = false;
-            this.zb = false;
-            this.y4 = null;
             this.y5 = null;
+            this.y6 = null;
             this.assigningScatterStyle = null;
             this.assigningScatterMarkerStyle = null;
-            this.y0 = null;
-            this.yu = null;
-            this.yq = null;
-            this.za = true;
-            this.zp = 0;
+            this.y1 = null;
+            this.yv = null;
+            this.yr = null;
+            this.zb = true;
             this.zq = 0;
             this.zr = 0;
             this.zs = 0;
-            this.yx = this.yy();
-            this.y0 = new ScatterSeriesRenderManager();
-            this.yu = new ScatterFrame();
+            this.zt = 0;
+            this.yy = this.yz();
+            this.y1 = new ScatterSeriesRenderManager();
+            this.yv = new ScatterFrame();
+            this.acd = Rect.empty;
             this.acc = Rect.empty;
-            this.acb = Rect.empty;
-        }
-        get y8() {
-            return this.y6;
-        }
-        set y8(a) {
-            if (this.y6 != a) {
-                let b = this.y8;
-                this.y6 = a;
-                this.raisePropertyChanged("XColumn", b, this.y8);
-            }
         }
         get y9() {
             return this.y7;
@@ -221,13 +211,23 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             if (this.y7 != a) {
                 let b = this.y9;
                 this.y7 = a;
-                this.raisePropertyChanged("YColumn", b, this.y9);
+                this.raisePropertyChanged("XColumn", b, this.y9);
+            }
+        }
+        get za() {
+            return this.y8;
+        }
+        set za(a) {
+            if (this.y8 != a) {
+                let b = this.za;
+                this.y8 = a;
+                this.raisePropertyChanged("YColumn", b, this.za);
             }
         }
         f9() {
-            return this.highlightedItemsSource != null || (this.z4 != null && this.z6 != null);
+            return this.highlightedItemsSource != null || (this.z5 != null && this.z7 != null);
         }
-        zn() {
+        zo() {
             return false;
         }
         hr() {
@@ -241,7 +241,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.aaz));
+                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.aa0));
                 a.add(b);
             }
             {
@@ -253,10 +253,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aay));
+                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.aaz));
                 a.add(c);
             }
-            if (this.zn()) {
+            if (this.zo()) {
                 let d = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -273,7 +273,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 })());
                 a.add(d);
             }
-            if (!this.zn()) {
+            if (!this.zo()) {
                 let e = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -283,10 +283,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.ru));
+                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.rv));
                 a.add(e);
             }
-            if (!this.zn()) {
+            if (!this.zo()) {
                 let f = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -296,30 +296,30 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.ru));
+                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.rv));
                 a.add(f);
             }
             return a;
         }
-        aay(a, b) {
-            if (this.z4 != null) {
-                b.value = this.z4;
+        aaz(a, b) {
+            if (this.z5 != null) {
+                b.value = this.z5;
                 return;
             }
-            b.value = this.aak;
+            b.value = this.aal;
         }
-        aaz(a, b) {
-            if (this.z6 != null) {
-                b.value = this.z6;
+        aa0(a, b) {
+            if (this.z7 != null) {
+                b.value = this.z7;
                 return;
             }
-            b.value = this.aas;
+            b.value = this.aat;
         }
-        get ab8() {
-            return this.c(ScatterBase.abj);
+        get ab9() {
+            return this.c(ScatterBase.abk);
         }
-        set ab8(a) {
-            this.h(ScatterBase.abj, a);
+        set ab9(a) {
+            this.h(ScatterBase.abk, a);
         }
         get GetErrorBarsXAxis() {
             return this.xAxis;
@@ -327,8 +327,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         get GetErrorBarsYAxis() {
             return this.yAxis;
         }
-        p5() {
-            super.p5();
+        p6() {
+            super.p6();
             if (this.xAxis != null) {
                 this.xAxis.h9(false);
             }
@@ -336,32 +336,32 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 this.yAxis.h9(false);
             }
         }
-        q4(a, b, c, d) {
-            super.q4(a, b, c, d);
-            if (this.yo.c2.g$b(a, b, c, d)) {
-                this.rm(false);
-                this.qg();
+        q5(a, b, c, d) {
+            super.q5(a, b, c, d);
+            if (this.yp.c2.g$b(a, b, c, d)) {
+                this.rn(false);
+                this.qh();
             }
             switch (b) {
                 case ScatterBase.$$p[10]:
                 case ScatterBase.$$p[14]:
                 case ScatterBase.$$p[11]:
                 case ScatterBase.$$p[15]:
-                    this.qa();
+                    this.qb();
                     break;
                 case "FastItemsSource":
                     if (typeCast(IFastItemsSource_$type, c) != null) {
-                        c.deregisterColumn(this.y8);
                         c.deregisterColumn(this.y9);
-                        this.y8 = null;
+                        c.deregisterColumn(this.za);
                         this.y9 = null;
+                        this.za = null;
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.y8 = this.di(this.aak);
-                        this.y9 = this.di(this.aas);
+                        this.y9 = this.di(this.aal);
+                        this.za = this.di(this.aat);
                     }
                     if ((this.yAxis != null && !this.yAxis.c1()) || (this.xAxis != null && !this.xAxis.c1())) {
-                        this.rm(this.ge && c != null);
+                        this.rn(this.ge && c != null);
                     }
                     break;
                 case ScatterBase.$$p[9]:
@@ -372,9 +372,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.ct(this);
                     }
                     if ((this.xAxis != null && !this.xAxis.c1()) || (d == null && c != null)) {
-                        this.rm(false);
+                        this.rn(false);
                     }
-                    this.qg();
+                    this.qh();
                     break;
                 case ScatterBase.$$p[13]:
                     if (c != null) {
@@ -384,134 +384,134 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.ct(this);
                     }
                     if ((this.yAxis != null && !this.yAxis.c1()) || (d == null && c != null)) {
-                        this.rm(false);
+                        this.rn(false);
                     }
-                    this.qg();
+                    this.qh();
                     break;
                 case ScatterBase.$$p[12]:
                     if (this.dl != null) {
-                        this.dl.deregisterColumn(this.y8);
-                        this.y8 = this.di(this.aak);
+                        this.dl.deregisterColumn(this.y9);
+                        this.y9 = this.di(this.aal);
                     }
                     break;
                 case "XColumn":
-                    this.yo.c2.g$i();
+                    this.yp.c2.g$i();
                     if (this.xAxis != null && !this.xAxis.c1()) {
-                        this.rm(this.ge && this.d5);
+                        this.rn(this.ge && this.d5);
                     }
                     break;
                 case ScatterBase.$$p[16]:
                     if (this.dl != null) {
-                        this.dl.deregisterColumn(this.y9);
-                        this.y9 = this.di(this.aas);
+                        this.dl.deregisterColumn(this.za);
+                        this.za = this.di(this.aat);
                     }
                     break;
                 case "YColumn":
-                    this.yo.c2.g$i();
+                    this.yp.c2.g$i();
                     if (this.yAxis != null && !this.yAxis.c1()) {
-                        this.rm(this.ge && this.d5);
+                        this.rn(this.ge && this.d5);
                     }
                     break;
                 case ScatterBase.$$p[7]:
-                    this.rm(false);
-                    this.qg();
+                    this.rn(false);
+                    this.qh();
                     break;
                 case ScatterBase.$$p[8]:
-                    this.rm(false);
-                    this.qg();
+                    this.rn(false);
+                    this.qh();
                     break;
                 case "TransitionProgress":
-                    this.yv.c(this.jo, this.yt, this.yr);
-                    this.aau();
+                    this.yw.c(this.jo, this.yu, this.ys);
+                    this.aav();
                     try {
                         if (this.d3(this.ct)) {
                             return;
                         }
                         if ((Math.round(this.jo * 100000) / 100000) == 1) {
-                            this.abg(this.yr, this.yo);
+                            this.abh(this.ys, this.yp);
                         }
                         else {
-                            this.abg(this.yv, this.yo);
+                            this.abh(this.yw, this.yp);
                         }
                         if (this.c9 != null) {
                             this.c9.qa(this);
                         }
                     }
                     finally {
-                        this.abh();
+                        this.abi();
                     }
                     break;
                 case "TrendLineBrush":
-                    this.ra(b);
+                    this.rb(b);
                     break;
                 case ScatterBase.$$p[0]:
-                    if (this.yp != null) {
-                        this.yp.r = this;
+                    if (this.yq != null) {
+                        this.yq.r = this;
                     }
-                    this.rm(false);
-                    this.qg();
+                    this.rn(false);
+                    this.qh();
                     break;
                 case "TrendLineType":
-                    this.qg();
+                    this.qh();
                     break;
                 case ScatterBase.$$p[4]:
-                    this.zc = this.zk();
-                    this.rm(false);
+                    this.zd = this.zl();
+                    this.rn(false);
                     break;
                 case ScatterBase.$$p[3]:
-                    this.zb = this.zj();
-                    this.rm(false);
+                    this.zc = this.zk();
+                    this.rn(false);
                     break;
                 case ScatterBase.$$p[5]:
-                    this.yx = this.yy();
+                    this.yy = this.yz();
                     break;
             }
         }
+        zl() {
+            return this.zh;
+        }
         zk() {
             return this.zg;
         }
-        zj() {
-            return this.zf;
-        }
-        ze(a) {
+        zf(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        zd(a) {
+        ze(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        abh() {
-            this.acb = Rect.empty;
+        abi() {
             this.acc = Rect.empty;
+            this.acd = Rect.empty;
         }
-        aau() {
-            let a = this.getViewInfo(this.acb, this.acc);
-            this.acb = a.p0;
-            this.acc = a.p1;
+        aav() {
+            let a = this.getViewInfo(this.acc, this.acd);
+            this.acc = a.p0;
+            this.acd = a.p1;
         }
-        zi(a, b) {
+        zj(a, b) {
             if (b != 3) {
                 return true;
             }
             if (a == null) {
                 return true;
             }
-            if (this.aak == a || this.aas == a) {
+            if (this.aal == a || this.aat == a) {
                 return true;
             }
             return false;
         }
-        o8(a, b, c, d) {
+        o9(a, b, c, d) {
             let e = false;
-            if (!this.zi(d, a)) {
+            if (!this.zj(d, a)) {
                 return;
             }
-            this.yo.c2.g$e(a, b, c, d);
+            this.yp.c2.g$e(a, b, c, d);
             if (this.xAxis != null && !this.xAxis.c1()) {
                 e = true;
             }
@@ -519,28 +519,28 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 e = true;
             }
             if (a == 0 || a == 2 || a == 3 || a == 4) {
-                this.za = true;
+                this.zb = true;
             }
             else if (a == 1) {
                 for (let f = b; f < b + c; f++) {
-                    this.zp += this.y8.item(f);
                     this.zq += this.y9.item(f);
+                    this.zr += this.za.item(f);
                 }
-                this.zr = this.zp / this.y8.count;
                 this.zs = this.zq / this.y9.count;
+                this.zt = this.zr / this.za.count;
             }
             if (e) {
-                this.rm(true);
+                this.rn(true);
             }
         }
-        aa8(a) {
-            this.aa9(a, null);
+        aa9(a) {
+            this.aba(a, null);
         }
-        aa9(a, b) {
-            let c = this.y8 != null ? this.y8.count : 0;
-            let d = this.y9 != null ? this.y9.count : 0;
+        aba(a, b) {
+            let c = this.y9 != null ? this.y9.count : 0;
+            let d = this.za != null ? this.za.count : 0;
             let e = Math.min(c, d);
-            if (e <= this.z0) {
+            if (e <= this.z1) {
                 a.m.clear();
                 let f = new List$1(OwnedPoint.$, 0);
                 for (let g of fromEnum(a.u.values)) {
@@ -574,12 +574,12 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
         }
         ax(a) {
-            if (a != null && a == this.xAxis && this.y8 != null) {
-                return new AxisRange(this.y8.minimum, this.y8.maximum);
-            }
-            if (a != null && a == this.yAxis && this.y9 != null) {
+            if (a != null && a == this.xAxis && this.y9 != null) {
                 return new AxisRange(this.y9.minimum, this.y9.maximum);
             }
+            if (a != null && a == this.yAxis && this.za != null) {
+                return new AxisRange(this.za.minimum, this.za.maximum);
+            }
             return null;
         }
         kl(a) {
@@ -589,58 +589,58 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        get yx() {
-            return this.yw;
+        get yy() {
+            return this.yx;
         }
-        set yx(a) {
-            let b = this.yw;
-            this.yw = a;
-            if (b != this.yw) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.yw));
+        set yy(a) {
+            let b = this.yx;
+            this.yx = a;
+            if (b != this.yx) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.yx));
             }
         }
-        yy() {
-            if (this.yz != 0) {
-                return this.yz;
+        yz() {
+            if (this.y0 != 0) {
+                return this.y0;
             }
-            return this.zh ? 4 : 1;
+            return this.zi ? 4 : 1;
         }
         j1(a) {
             let b = truncate(Math.round(this.ip(a)));
             return b;
         }
         ip(a) {
-            switch (this.yx) {
-                case 1: return this.zw(a);
-                case 3: return this.zx(a);
-                case 2: return this.zu(a);
-                case 4: return this.zv(a);
-                case 5: return this.zt(a);
+            switch (this.yy) {
+                case 1: return this.zx(a);
+                case 3: return this.zy(a);
+                case 2: return this.zv(a);
+                case 4: return this.zw(a);
+                case 5: return this.zu(a);
             }
             return -1;
         }
-        zv(a) {
-            return this.zy(a, false);
+        zw(a) {
+            return this.zz(a, false);
         }
-        zu(a) {
-            let b = this.v0(a);
+        zv(a) {
+            let b = this.v1(a);
             let c = b.x;
             let d = b.y;
-            if (this.dl == null || this.xAxis == null || this.yAxis == null || this.y8 == null || this.y9 == null) {
+            if (this.dl == null || this.xAxis == null || this.yAxis == null || this.y9 == null || this.za == null) {
                 return -1;
             }
-            if (this.dl.count > this.zz) {
+            if (this.dl.count > this.z0) {
                 return -1;
             }
-            this.aax();
-            let e = this.yd;
-            let f = this.ye;
+            this.aay();
+            let e = this.ye;
+            let f = this.yf;
             if (e == null || f == null) {
                 return -1;
             }
             let g = 1.7976931348623157E+308;
             let h = -1;
-            for (let i = 0; i < this.y8.count; i++) {
+            for (let i = 0; i < this.y9.count; i++) {
                 let j = e[i];
                 let k = f[i];
                 let l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -651,61 +651,61 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        aax() {
+        aay() {
             let a = this.ct.by;
             let b = this.ct.bx;
             let c = this.getEffectiveViewport();
-            if (this.yn == null) {
+            if (this.yo == null) {
                 return;
             }
-            let d = new ScalerParams(0, a, b, this.yn.d, c);
+            let d = new ScalerParams(0, a, b, this.yo.d, c);
             let e = ((() => {
-                let $ret = new ScalerParams(0, a, b, this.yn.e, c);
+                let $ret = new ScalerParams(0, a, b, this.yo.e, c);
                 $ret.b = this.iw();
                 return $ret;
             })());
-            if (this.yd == null || this.ye == null) {
-                let f = arrayShallowClone(this.y8.asArray());
-                let g = arrayShallowClone(this.y9.asArray());
+            if (this.ye == null || this.yf == null) {
+                let f = arrayShallowClone(this.y9.asArray());
+                let g = arrayShallowClone(this.za.asArray());
                 this.xAxis.ho(boxArray$1(f), 0, f.length, d);
                 this.yAxis.ho(boxArray$1(g), 0, g.length, e);
-                this.yd = f;
-                this.ye = g;
+                this.ye = f;
+                this.yf = g;
             }
         }
-        get_zh() {
+        get_zi() {
             return false;
         }
-        get zh() {
-            return this.get_zh();
+        get zi() {
+            return this.get_zi();
         }
-        zy(a, b) {
-            if (!this.zh) {
+        zz(a, b) {
+            if (!this.zi) {
                 return -1;
             }
             let c = { $type: Point_$type, x: 0, y: 0 };
             let d = true;
-            let e = this.ys();
+            let e = this.yt();
             if (e == null) {
                 return -1;
             }
             if (e.m == null) {
                 return -1;
             }
-            if (this.dl == null || this.dl.count > this.zz) {
+            if (this.dl == null || this.dl.count > this.z0) {
                 return -1;
             }
-            this.aax();
-            let f = this.yd;
-            let g = this.ye;
+            this.aay();
+            let f = this.ye;
+            let g = this.yf;
             if (f == null || g == null) {
                 return -1;
             }
-            let h = this.v0(a);
+            let h = this.v1(a);
             let i = 1.7976931348623157E+308;
             let j = -1;
-            for (let k = 0; k < this.yd.length; k++) {
-                let l = { $type: Point_$type, x: this.yd[k], y: this.ye[k] };
+            for (let k = 0; k < this.ye.length; k++) {
+                let l = { $type: Point_$type, x: this.ye[k], y: this.yf[k] };
                 if (k > 0) {
                     if (!b || e.j.containsKey(this.dl.item(k)) || e.j.containsKey(this.dl.item(k - 1))) {
                         let m = GeometryUtil.g(h, c, l);
@@ -718,8 +718,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 c = l;
             }
             if (j >= 0) {
-                let n = { $type: Point_$type, x: this.yd[j], y: this.ye[j] };
-                let o = { $type: Point_$type, x: this.yd[j - 1], y: this.ye[j - 1] };
+                let n = { $type: Point_$type, x: this.ye[j], y: this.yf[j] };
+                let o = { $type: Point_$type, x: this.ye[j - 1], y: this.yf[j - 1] };
                 if (!b || (e.j.containsKey(this.dl.item(j)) && e.j.containsKey(this.dl.item(j - 1)))) {
                     let p = GeometryUtil.l(h, o, n);
                     return (j - 1) + p;
@@ -733,24 +733,24 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        zx(a) {
-            return this.zy(a, true);
+        zy(a) {
+            return this.zz(a, true);
         }
-        zt(a) {
-            let b = this.v0(a);
+        zu(a) {
+            let b = this.v1(a);
             let c = b.x;
             let d = b.y;
-            if (this.yo.c3.e > this.zz) {
+            if (this.yp.c3.e > this.z0) {
                 return -1;
             }
             let e = -1;
-            this.wx.ck((f) => {
-                let g = this.yo.cu(f);
+            this.wy.ck((f) => {
+                let g = this.yp.cu(f);
                 let h = g.left;
                 let i = g.top;
                 let j = g.width;
                 let k = g.height;
-                if (this.w4) {
+                if (this.w5) {
                     let l = h + j / 2;
                     let m = i + k / 2;
                     let n = (j / 2) * (j / 2);
@@ -771,18 +771,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             });
             return e;
         }
-        zw(a) {
+        zx(a) {
             let b = null;
             let c = 1.7976931348623157E+308;
-            let d = this.v0(a);
+            let d = this.v1(a);
             let e = d.x;
             let f = d.y;
-            if (this.yo.c3.e > this.zz) {
+            if (this.yp.c3.e > this.z0) {
                 return -1;
             }
-            this.yo.da((g) => {
+            this.yp.da((g) => {
                 if (g._visibility == 0) {
-                    let h = this.yo.cu(g);
+                    let h = this.yp.cu(g);
                     let i = h.left + h.width / 2;
                     let j = h.top + h.height / 2;
                     let k = (e - i) * (e - i) + (f - j) * (f - j);
@@ -797,8 +797,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        v5(a, b, c) {
-            if (this.xAxis == null || this.yAxis == null || this.y8 == null || this.y9 == null) {
+        v6(a, b, c) {
+            if (this.xAxis == null || this.yAxis == null || this.y9 == null || this.za == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
             let d = this.ct.by;
@@ -830,15 +830,15 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     j = this.dl.count - 1;
                 }
                 if (k == j) {
-                    let l = this.xAxis.ek(this.y8.item(j), g);
-                    let m = this.yAxis.ek(this.y9.item(j), h);
+                    let l = this.xAxis.ek(this.y9.item(j), g);
+                    let m = this.yAxis.ek(this.za.item(j), h);
                     return { $type: Point_$type, x: l, y: m };
                 }
                 let n = i - Math.floor(i);
-                let o = this.xAxis.ek(this.y8.item(j), g);
-                let p = this.yAxis.ek(this.y9.item(j), h);
-                let q = this.xAxis.ek(this.y8.item(k), g);
-                let r = this.yAxis.ek(this.y9.item(k), h);
+                let o = this.xAxis.ek(this.y9.item(j), g);
+                let p = this.yAxis.ek(this.za.item(j), h);
+                let q = this.xAxis.ek(this.y9.item(k), g);
+                let r = this.yAxis.ek(this.za.item(k), h);
                 let s = q - o;
                 let t = r - p;
                 return { $type: Point_$type, x: o + s * n, y: p + t * n };
@@ -848,8 +848,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (u == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
-                let v = this.xAxis.ek(this.y8.item(u), g);
-                let w = this.yAxis.ek(this.y9.item(u), h);
+                let v = this.xAxis.ek(this.y9.item(u), g);
+                let w = this.yAxis.ek(this.za.item(u), h);
                 return { $type: Point_$type, x: v, y: w };
             }
         }
@@ -858,7 +858,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             b = b.copy();
             let c = this.c9 != null ? this.c9.v0 : Rect.empty;
             let d = new Rect(0, 0, 0, 1, 1);
-            let e = this.we(this.ct);
+            let e = this.wf(this.ct);
             let f = new ScalerParams(0, d, d, this.xAxis.ch, e);
             let g = ((() => {
                 let $ret = new ScalerParams(0, d, d, this.yAxis.ch, e);
@@ -866,8 +866,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             let h = !b.isEmpty && !c.isEmpty && this.dl != null ? this.dl.indexOf(a) : -1;
-            let i = this.xAxis != null && this.y8 != null && h < this.y8.count ? this.xAxis.ek(this.y8.item(h), f) : NaN;
-            let j = this.yAxis != null && this.y9 != null && h < this.y9.count ? this.yAxis.ek(this.y9.item(h), g) : NaN;
+            let i = this.xAxis != null && this.y9 != null && h < this.y9.count ? this.xAxis.ek(this.y9.item(h), f) : NaN;
+            let j = this.yAxis != null && this.za != null && h < this.za.count ? this.yAxis.ek(this.za.item(h), g) : NaN;
             if (!isNaN_(i)) {
                 if (i < b.left + 0.1 * b.width) {
                     i = i + 0.4 * b.width;
@@ -893,35 +893,35 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h >= 0;
         }
-        sj(a, b) {
-            this.rm(false);
-        }
         sk(a, b) {
-            this.rm(false);
+            this.rn(false);
         }
-        ys() {
-            let a = this.yr;
+        sl(a, b) {
+            this.rn(false);
+        }
+        yt() {
+            let a = this.ys;
             if (this.d1()) {
                 if (this.da.g) {
                     this.da.t();
                 }
-                a = this.yv;
+                a = this.yw;
             }
             return a;
         }
-        aav(a, b, c, d, e) {
+        aaw(a, b, c, d, e) {
             b.g = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
             let f = this.getEffectiveViewport1(a);
             let g = this.dl;
             let h;
             let i;
             let j = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.yn.d, f);
+                let $ret = new ScalerParams(0, d, e, this.yo.d, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 return $ret;
             })());
             let k = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.yn.e, f);
+                let $ret = new ScalerParams(0, d, e, this.yo.e, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 $ret.b = this.iw();
                 return $ret;
@@ -936,9 +936,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
             for (let o = 0; o < c; o++) {
-                h = this.y8.item(o);
-                i = this.y9.item(o);
-                let p = { $type: Point_$type, x: this.yn.a.ek(h, j), y: this.yn.b.ek(i, k) };
+                h = this.y9.item(o);
+                i = this.za.item(o);
+                let p = { $type: Point_$type, x: this.yo.a.ek(h, j), y: this.yo.b.ek(i, k) };
                 if (l) {
                     if (p.x < e.left || p.x > e.right) {
                         if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -962,16 +962,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        aa5(a, b) {
-            this.yd = null;
+        aa6(a, b) {
             this.ye = null;
+            this.yf = null;
             a.j.clear();
             a.n.clear();
             a.h.clear();
             a.l.clear();
             a.i.clear();
             a.k.clear();
-            let c = Math.min(this.y8 != null ? this.y8.count : 0, this.y9 != null ? this.y9.count : 0);
+            let c = Math.min(this.y9 != null ? this.y9.count : 0, this.za != null ? this.za.count : 0);
             let d = b.by;
             let e = b.bx;
             let f = this.getEffectiveViewport1(b);
@@ -986,7 +986,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             if (c < 1) {
                 return;
             }
-            this.yn = ((() => {
+            this.yo = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -996,21 +996,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             let i = b;
-            if (c <= this.z0) {
-                this.aav(i, a, c, d, e);
+            if (c <= this.z1) {
+                this.aaw(i, a, c, d, e);
             }
-            if (this.w7()) {
-                b.c0.l(a.j, this.z0, d, e, this.ib);
+            if (this.w8()) {
+                b.c0.l(a.j, this.z1, d, e, this.ib);
             }
             let j = ((() => {
                 let $ret = new Clipper(0, e, false);
                 $ret.i = a.n;
                 return $ret;
             })());
-            let k = this.wc(b);
+            let k = this.wd(b);
             let l = this.xAxis.en(k.left, g);
             let m = this.xAxis.en(k.right, g);
-            b.c2.h(a.n, this.trendLineType, this.y8, this.y9, this.trendLinePeriod, (n) => this.xAxis.ek(n, g), (n) => this.yAxis.ek(n, h), ((() => {
+            b.c2.h(a.n, this.trendLineType, this.y9, this.za, this.trendLinePeriod, (n) => this.xAxis.ek(n, g), (n) => this.yAxis.ek(n, h), ((() => {
                 let $ret = new TrendResolutionParams();
                 $ret.d = this.ib;
                 $ret.i = e;
@@ -1018,25 +1018,25 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.j = d;
                 return $ret;
             })()), j, l, m);
-            this.aa3(a, b);
+            this.aa4(a, b);
         }
-        o2(a, b) {
-            super.o2(a, b);
+        o3(a, b) {
+            super.o3(a, b);
             let c = b;
             c.c9(a);
         }
         get_fc() {
             return true;
         }
-        y2(a, b, c) {
+        y3(a, b, c) {
             return null;
         }
-        y3(a, b, c) {
+        y4(a, b, c) {
             if (this.dl == null) {
                 return null;
             }
-            let d = this.ys();
-            let e = this.yo.b1(this.v0(b));
+            let d = this.yt();
+            let e = this.yp.b1(this.v1(b));
             let f = -1;
             if (e == null) {
                 if (a != null) {
@@ -1063,11 +1063,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return g;
         }
-        wm(a, b) {
-            if (this.wz != 1 && this.wz != 13) {
-                let c = this.wx.cv();
-                let d = (c.width / 2) + (this.xa / 2);
-                let e = (c.height / 2) + (this.xa / 2);
+        wn(a, b) {
+            if (this.w0 != 1 && this.w0 != 13) {
+                let c = this.wy.cv();
+                let d = (c.width / 2) + (this.xb / 2);
+                let e = (c.height / 2) + (this.xb / 2);
                 let f = d;
                 let g = d;
                 let h = e;
@@ -1088,7 +1088,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return new Thickness(1, 0, 0, 0, 0);
         }
-        y1(a, b, c) {
+        y2(a, b, c) {
             let d = new HighlightingInfo();
             d.i = this;
             d.g = 0;
@@ -1101,39 +1101,39 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         de(a, b, c) {
             if (this.eb && this.fx(this.bv) && !c) {
-                let d = this.y2(a, b, this.y4);
-                this.y4 = d;
+                let d = this.y3(a, b, this.y5);
+                this.y5 = d;
                 return d;
             }
             else {
-                let e = this.y1(a, b, this.y4);
-                this.y4 = e;
+                let e = this.y2(a, b, this.y5);
+                this.y5 = e;
                 return e;
             }
         }
         df(a, b, c) {
             if (this.fx(this.bv) && !c) {
-                let d = this.y3(a, b, this.y5);
-                this.y5 = d;
+                let d = this.y4(a, b, this.y6);
+                this.y6 = d;
                 return d;
             }
             else {
-                let e = this.y1(a, b, this.y5);
+                let e = this.y2(a, b, this.y6);
                 e.d = true;
-                this.y5 = e;
+                this.y6 = e;
                 return e;
             }
         }
-        zm() {
-            return (this.assigningScatterStyle != null && this.zc) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
+        zn() {
+            return (this.assigningScatterStyle != null && this.zd) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
         }
-        zl() {
-            return (this.assigningScatterMarkerStyle != null && this.zb) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
+        zm() {
+            return (this.assigningScatterMarkerStyle != null && this.zc) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
         }
-        abg(a, b) {
-            this.qs();
+        abh(a, b) {
+            this.qt();
             let c = b.bx;
-            this.yn = ((() => {
+            this.yo = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -1141,10 +1141,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.e = this.yAxis.ch;
                 return $ret;
             })());
-            if (this.w7()) {
-                b.c0.j(a.j, this.w9);
-                if (this.zl()) {
-                    this.aaw(b, a);
+            if (this.w8()) {
+                b.c0.j(a.j, this.xa);
+                if (this.zm()) {
+                    this.aax(b, a);
                 }
             }
             b.cr();
@@ -1154,13 +1154,13 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             b.c2.g$h(a.n, d);
-            this.abd(a, b);
-        }
-        yg(a, b) {
-            return this.yh(a, b);
+            this.abe(a, b);
         }
         yh(a, b) {
-            if (b < a || a < 0 || a > this.y8.count || b < 0 || b > this.y8.count) {
+            return this.yi(a, b);
+        }
+        yi(a, b) {
+            if (b < a || a < 0 || a > this.y9.count || b < 0 || b > this.y9.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
@@ -1170,14 +1170,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        aaw(a, b) {
+        aax(a, b) {
             a.b7 = true;
-            this.y0.ay(this, this.zl(), runOn(this, this.yg));
-            let c = this.y0.d;
+            this.y1.ay(this, this.zm(), runOn(this, this.yh));
+            let c = this.y1.d;
             let d = c != null;
             let e = this.getEffectiveViewport1(a);
             let f = this.dl == null ? 0 : this.dl.count;
-            this.yo.cj((g) => {
+            this.yp.cj((g) => {
                 if (g._visibility == 0) {
                     let h = g.ak;
                     let i = g.content;
@@ -1186,19 +1186,19 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         g.content = i;
                     }
                     if (d) {
-                        this.aa0(h, f, a.q);
+                        this.aa1(h, f, a.q);
                     }
-                    this.y0.ac(g, i);
+                    this.y1.ac(g, i);
                 }
             });
         }
-        aa1(a, b, c) {
+        aa2(a, b, c) {
             let d = this.bv != 1;
             let e = this.cn != 1;
             let f = this.cm != 1;
-            this.y0.a0(this.y0.b, a, b, false);
-            this.y0.ab(this.h9);
-            let g = this.y0.ax;
+            this.y1.a0(this.y1.b, a, b, false);
+            this.y1.ab(this.h9);
+            let g = this.y1.ax;
             let h = null;
             let i = null;
             let j = null;
@@ -1216,16 +1216,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 g.b = h;
             }
             g.h = c;
-            this.abb(g);
-            this.y0.z(this, h, i, j, c, d, e, f, a < 0);
+            this.abc(g);
+            this.y1.z(this, h, i, j, c, d, e, f, a < 0);
         }
-        aa0(a, b, c) {
+        aa1(a, b, c) {
             let d = this.bv != 1;
             let e = this.cn != 1;
             let f = this.cm != 1;
-            this.y0.a0(this.y0.d, a, b, true);
-            this.y0.aa(this.h9);
-            let g = this.y0.aw;
+            this.y1.a0(this.y1.d, a, b, true);
+            this.y1.aa(this.h9);
+            let g = this.y1.aw;
             let h = null;
             let i = null;
             let j = null;
@@ -1258,26 +1258,26 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 g.d = i;
             }
             g.h = c;
-            this.aba(g);
-            this.y0.y(this, h, i, j, c, d, e, f, g.v, this.c9.dj.totalHighWaterMark, g.x, this.c9.dk.totalHighWaterMark, g.t, this.c9.di.totalHighWaterMark);
+            this.abb(g);
+            this.y1.y(this, h, i, j, c, d, e, f, g.v, this.c9.dj.totalHighWaterMark, g.x, this.c9.dk.totalHighWaterMark, g.t, this.c9.di.totalHighWaterMark);
         }
-        abb(a) {
-            if (this.assigningScatterStyle != null && this.zc) {
+        abc(a) {
+            if (this.assigningScatterStyle != null && this.zd) {
                 this.assigningScatterStyle(this, a);
             }
         }
-        aba(a) {
-            if (this.assigningScatterMarkerStyle != null && this.zb) {
+        abb(a) {
+            if (this.assigningScatterMarkerStyle != null && this.zc) {
                 this.assigningScatterMarkerStyle(this, a);
             }
         }
-        aa3(a, b) {
+        aa4(a, b) {
             let c = new ErrorBarsHelper(this, b);
-            if (this.yp == null) {
+            if (this.yq == null) {
                 return;
             }
-            let d = this.yp.u;
-            let e = this.yp.v;
+            let d = this.yq.u;
+            let e = this.yq.v;
             let f = 0;
             let g = 0;
             let h = 0;
@@ -1287,35 +1287,35 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            let l = this.aa6(k, c, d, h, i, true);
+                            let l = this.aa7(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            let m = this.aa4(k, c, d, h, i, true);
+                            let m = this.aa5(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            let n = this.aa2(k, c, d, j, h, i, true);
+                            let n = this.aa3(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            let o = this.aa7(c, d, f, h, i, true);
+                            let o = this.aa8(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            let p = this.aa4(k, c, d, h, i, true);
+                            let p = this.aa5(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     let q = new OwnedPoint();
-                    q.c = c.l(d, this.yn.a, k.c, f);
+                    q.c = c.l(d, this.yo.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1323,53 +1323,53 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            let r = this.aa6(k, c, e, h, i, false);
+                            let r = this.aa7(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            let s = this.aa4(k, c, e, h, i, false);
+                            let s = this.aa5(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            let t = this.aa2(k, c, e, j, h, i, false);
+                            let t = this.aa3(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            let u = this.aa7(c, e, g, h, i, false);
+                            let u = this.aa8(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            let v = this.aa4(k, c, e, h, i, false);
+                            let v = this.aa5(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     let w = new OwnedPoint();
-                    w.c = c.m(e, this.yn.b, k.c, g);
+                    w.c = c.m(e, this.yo.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
                 }
             }
         }
-        aa6(a, b, c, d, e, f) {
+        aa7(a, b, c, d, e, f) {
             if (f) {
                 let g;
                 let h, i;
-                i = this.yn.a;
-                if (this.yp.s == 0) {
+                i = this.yo.a;
+                if (this.yq.s == 0) {
                     g = a.c.x;
-                    h = this.yn.a;
+                    h = this.yo.a;
                 }
                 else {
                     g = a.c.y;
-                    h = this.yn.b;
+                    h = this.yo.b;
                 }
                 let j = b.f(g, c, h, i, d, e);
                 d = j.p4;
@@ -1378,14 +1378,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             else {
                 let k;
                 let l, m;
-                m = this.yn.b;
-                if (this.yp.t == 0) {
+                m = this.yo.b;
+                if (this.yq.t == 0) {
                     k = a.c.x;
-                    l = this.yn.a;
+                    l = this.yo.a;
                 }
                 else {
                     k = a.c.y;
-                    l = this.yn.b;
+                    l = this.yo.b;
                 }
                 let n = b.f(k, c, l, m, d, e);
                 d = n.p4;
@@ -1396,14 +1396,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        aa4(a, b, c, d, e, f) {
+        aa5(a, b, c, d, e, f) {
             if (f) {
-                let g = b.j(a.c.x, c, this.yn.a, d, e);
+                let g = b.j(a.c.x, c, this.yo.a, d, e);
                 d = g.p3;
                 e = g.p4;
             }
             else {
-                let h = b.j(a.c.y, c, this.yn.b, d, e);
+                let h = b.j(a.c.y, c, this.yo.b, d, e);
                 d = h.p3;
                 e = h.p4;
             }
@@ -1412,18 +1412,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        aa2(a, b, c, d, e, f, g) {
+        aa3(a, b, c, d, e, f, g) {
             let h = c.getItemColumn();
             let i = this.dl.indexOf(d);
             if (h != null && i < h.count) {
                 let j = h.item(i);
                 if (g) {
-                    let k = b.h(a.c.x, j, this.yn.a, e, f);
+                    let k = b.h(a.c.x, j, this.yo.a, e, f);
                     e = k.p3;
                     f = k.p4;
                 }
                 else {
-                    let l = b.h(a.c.y, j, this.yn.b, e, f);
+                    let l = b.h(a.c.y, j, this.yo.b, e, f);
                     e = l.p3;
                     f = l.p4;
                 }
@@ -1437,16 +1437,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        aa7(a, b, c, d, e, f) {
+        aa8(a, b, c, d, e, f) {
             let g = a.i(b, c);
             c = g.p1;
             if (f) {
-                let h = a.k(c, b, this.yn.a, d, e);
+                let h = a.k(c, b, this.yo.a, d, e);
                 d = h.p3;
                 e = h.p4;
             }
             else {
-                let i = a.k(c, b, this.yn.b, d, e);
+                let i = a.k(c, b, this.yo.b, d, e);
                 d = i.p3;
                 e = i.p4;
             }
@@ -1456,29 +1456,29 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        abd(a, b) {
-            if (!b.o() || this.yp == null) {
+        abe(a, b) {
+            if (!b.o() || this.yq == null) {
                 b.db();
                 return;
             }
-            this.abe(a, b);
             this.abf(a, b);
+            this.abg(a, b);
         }
-        abe(a, b) {
+        abf(a, b) {
             b.c7();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.yp.u;
+            let e = this.yq.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.yp.o == 1 || this.yp.o == 2) {
+                        if (this.yq.o == 1 || this.yq.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.yp.o == 1 || this.yp.o == 3) {
+                        if (this.yq.o == 1 || this.yq.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1486,21 +1486,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             b.dc(d);
         }
-        abf(a, b) {
+        abg(a, b) {
             b.c8();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.yp.v;
+            let e = this.yq.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.yp.p == 1 || this.yp.p == 2) {
+                        if (this.yq.p == 1 || this.yq.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.yp.p == 1 || this.yp.p == 3) {
+                        if (this.yq.p == 1 || this.yq.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
@@ -1509,15 +1509,15 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         }
         hc(a, b, c) {
             let d = true;
-            if (!super.hc(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.y8 == null || this.y9 == null || this.y8.count == 0 || this.y9.count == 0 || this.dl == null || this.dl.count != this.y8.count || this.dl.count != this.y9.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.ly == this.xAxis.lx || this.yAxis.ly == this.yAxis.lx) {
+            if (!super.hc(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.y9 == null || this.za == null || this.y9.count == 0 || this.za.count == 0 || this.dl == null || this.dl.count != this.y9.count || this.dl.count != this.za.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.ly == this.xAxis.lx || this.yAxis.ly == this.yAxis.lx) {
                 d = false;
             }
             return d;
         }
         getViewInfo(a, b) {
-            if (!this.acb.isEmpty && !this.acc.isEmpty) {
-                a = this.acb;
-                b = this.acc;
+            if (!this.acc.isEmpty && !this.acd.isEmpty) {
+                a = this.acc;
+                b = this.acd;
                 return {
                     p0: a,
                     p1: b
@@ -1530,52 +1530,52 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p1: b
             };
         }
-        rn(a) {
-            super.rn(a);
-            this.aau();
+        ro(a) {
+            super.ro(a);
+            this.aav();
             try {
                 if (this.d3(this.ct)) {
                     return;
                 }
-                if (this.dl != null && this.dl.count > this.z0) {
+                if (this.dl != null && this.dl.count > this.z1) {
                     a = false;
                 }
                 if (this.gd(a) && !this.gp) {
-                    let b = this.yt;
+                    let b = this.yu;
                     if (this.d1()) {
                         if (this.da.g) {
                             this.da.t();
                         }
-                        this.yt = this.yv;
-                        this.yv = b;
+                        this.yu = this.yw;
+                        this.yw = b;
                     }
                     else {
-                        this.yt = this.yr;
-                        this.yr = b;
+                        this.yu = this.ys;
+                        this.ys = b;
                     }
-                    this.aa5(this.yr, this.yo);
-                    this.r0();
+                    this.aa6(this.ys, this.yp);
+                    this.r1();
                 }
                 else {
                     if (!this.gp) {
-                        this.aa5(this.yr, this.yo);
+                        this.aa6(this.ys, this.yp);
                     }
-                    this.abg(this.yr, this.yo);
+                    this.abh(this.ys, this.yp);
                 }
             }
             finally {
-                this.abh();
+                this.abi();
             }
         }
-        sa() {
-            super.sa();
+        sb() {
+            super.sb();
             if (this.index < 0) {
                 return;
             }
-            this.yo.df();
+            this.yp.df();
         }
-        ro(a, b) {
-            super.ro(a, b);
+        rp(a, b) {
+            super.rp(a, b);
             if (!this.gy) {
                 this.ct.a4(b);
                 return;
@@ -1586,28 +1586,28 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             let c = typeCast(ScatterBaseView.$, this.cs);
             if (!this.gq) {
-                this.yu = new ScatterFrame();
-                this.aa5(this.yu, c);
+                this.yv = new ScatterFrame();
+                this.aa6(this.yv, c);
             }
             this.gq = false;
-            this.abg(this.yu, c);
+            this.abh(this.yv, c);
             this.gy = false;
         }
-        rl(a, b, c, d, e) {
-            super.rl(a, b, c, d, e);
+        rm(a, b, c, d, e) {
+            super.rm(a, b, c, d, e);
             let f = this.a9.a$j.item(d);
             let g = f;
             f.a3(c);
             if (this.d3(g)) {
                 return;
             }
-            if (this.yq == null) {
-                this.yq = new ScatterFrame();
+            if (this.yr == null) {
+                this.yr = new ScatterFrame();
             }
-            this.aa5(this.yq, g);
-            this.abg(this.yq, g);
+            this.aa6(this.yr, g);
+            this.abh(this.yr, g);
         }
-        abc(a, b) {
+        abd(a, b) {
             let c = new List$1(Base.$, 0);
             for (let d of fromEnum(b.c)) {
                 if (!a.containsKey(d)) {
@@ -1618,10 +1618,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 b.h(e);
             }
         }
-        yf(a, b, c, d, e) {
-            if (c == null || c.length != this.yn.c.count) {
-                c = new Array(this.yn.c.count);
-                for (let f = 0; f < this.yn.c.count; f++) {
+        yg(a, b, c, d, e) {
+            if (c == null || c.length != this.yo.c.count) {
+                c = new Array(this.yo.c.count);
+                for (let f = 0; f < this.yo.c.count; f++) {
                     c[f] = PointUtil.create();
                 }
             }
@@ -1637,28 +1637,28 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.b = this.iw();
                 return $ret;
             })());
-            let j = this.wc(a);
-            let k = this.yn.a.en(j.left, h);
-            let l = this.yn.a.en(j.right, h);
-            let m = this.yn.b.en(j.bottom, i);
-            let n = this.yn.b.en(j.top, i);
-            if (this.yn.d) {
+            let j = this.wd(a);
+            let k = this.yo.a.en(j.left, h);
+            let l = this.yo.a.en(j.right, h);
+            let m = this.yo.b.en(j.bottom, i);
+            let n = this.yo.b.en(j.top, i);
+            if (this.yo.d) {
                 let o = k;
                 k = l;
                 l = o;
             }
-            if (this.yn.e) {
+            if (this.yo.e) {
                 let p = m;
                 m = n;
                 n = p;
             }
-            let q = this.yn;
+            let q = this.yo;
             let r = q.a;
             let s = q.b;
             let t;
             let u;
-            let v = this.y8;
-            let w = this.y9;
+            let v = this.y9;
+            let w = this.za;
             let x = false;
             let y = 0;
             let z = 0;
@@ -1672,7 +1672,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     z -= ab;
                 }
             }
-            for (let ac = 0; ac < this.yn.c.count; ac++) {
+            for (let ac = 0; ac < this.yo.c.count; ac++) {
                 t = v.item(ac);
                 u = w.item(ac);
                 if (x) {
@@ -1704,7 +1704,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        zo(a, b) {
+        zp(a, b) {
             if (b == null) {
                 b = new List$1(Number_$type, 2, a.e);
             }
@@ -1718,12 +1718,12 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        pu(a) {
-            super.pu(a);
-            this.bb.exportTrendlineData(this, a, this.yo.c2.g$j);
+        pv(a) {
+            super.pv(a);
+            this.bb.exportTrendlineData(this, a, this.yp.c2.g$j);
         }
         iw() {
-            return Series.ix(this.y9, null);
+            return Series.ix(this.za, null);
         }
         getDataLegendSeriesContextAt(a, b) {
             let c = { $type: Point_$type, x: a, y: b };
@@ -1734,16 +1734,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             g.l = e;
             g.a = 13;
             g.q = "X";
-            g.r = this.aak != null ? this.aak : "X";
-            g.s = this.aag != null ? this.aag : "X:";
-            g.t = this.aai != null ? this.aai : "";
+            g.r = this.aal != null ? this.aal : "X";
+            g.s = this.aah != null ? this.aah : "X:";
+            g.t = this.aaj != null ? this.aaj : "";
             let h = new DataLegendSeriesValueInfo();
             h.l = f;
             h.a = 14;
             h.q = "Y";
-            h.r = this.aas != null ? this.aas : "Y";
-            h.s = this.aao != null ? this.aao : "Y:";
-            h.t = this.aaq != null ? this.aaq : "";
+            h.r = this.aat != null ? this.aat : "Y";
+            h.s = this.aap != null ? this.aap : "Y:";
+            h.t = this.aar != null ? this.aar : "";
             let i = new DataLegendSeriesContext();
             i.e = ((() => {
                 let $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -1751,20 +1751,20 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.add(h);
                 return $ret;
             })());
-            i.h = this.l9();
+            i.h = this.ma();
             return i;
         }
-        abi() {
-            if (this.za) {
-                this.zp = 0;
+        abj() {
+            if (this.zb) {
                 this.zq = 0;
-                for (let a = 0; a < this.y8.count; a++) {
-                    this.zp += this.y8.item(a);
+                this.zr = 0;
+                for (let a = 0; a < this.y9.count; a++) {
                     this.zq += this.y9.item(a);
+                    this.zr += this.za.item(a);
                 }
-                this.zr = this.zp / this.y8.count;
                 this.zs = this.zq / this.y9.count;
-                this.za = false;
+                this.zt = this.zr / this.za.count;
+                this.zb = false;
             }
         }
         i6(a, b) {
@@ -1788,26 +1788,26 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             switch (a) {
                 case 5:
                 case 2:
-                    b = this.y8.maximum;
-                    c = this.y9.maximum;
+                    b = this.y9.maximum;
+                    c = this.za.maximum;
                     break;
                 case 4:
                 case 1:
-                    b = this.y8.minimum;
-                    c = this.y9.minimum;
+                    b = this.y9.minimum;
+                    c = this.za.minimum;
                     break;
                 case 6:
                 case 3:
-                    if (this.za) {
-                        this.abi();
+                    if (this.zb) {
+                        this.abj();
                     }
-                    b = this.zr;
-                    c = this.zs;
+                    b = this.zs;
+                    c = this.zt;
                     break;
             }
             return [b, c];
         }
-        v9(a) {
+        wa(a) {
             let b = this.getEffectiveViewport1(this.ct);
             let c = new ScalerParams(0, this.ct.by, this.ct.bx, this.xAxis.ch, b);
             c.c = b;
@@ -1818,14 +1818,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             let e = isNaN_(a[1]) ? NaN : this.yAxis.ek(a[1], c);
             return { $type: Point_$type, x: d, y: e };
         }
-        v8(a) {
+        v9(a) {
             let b = this.ap(a);
-            return this.v9(b);
+            return this.wa(b);
         }
     }
     ScatterBase.$t = /*@__PURE__*/ markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.abj = /*@__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:yp:abk', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:z4:abl', [2, null], 'HighlightedYMemberPath:z6:abm', [2, null], 'IsCustomScatterMarkerStyleAllowed:zf:abn', [0, false], 'IsCustomScatterStyleAllowed:zg:abo', [0, false], 'ItemSearchMode:yz:abp', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:zz:abq', [1, 10000], 'MarkerCollisionAvoidance:yk:abr', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:z0:abs', [1, 400], 'XAxis::ab0', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aag:ab1', [2, null], 'XMemberAsLegendUnit:aai:ab2', [2, null], 'XMemberPath:aak:ab3', [2, null], 'YAxis::ab4', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aao:ab5', [2, null], 'YMemberAsLegendUnit:aaq:ab6', [2, null], 'YMemberPath:aas:ab7', [2, null], 'TrendLineType::aby', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::abx', [1, 1.5], 'TrendLinePeriod::abw', [1, 7], 'TrendLineBrush::abt', [Brush.$, null], 'TrendLineZIndex:z1:abz', [1, 1001], 'TrendLineDashArray:ab9:abu', [DoubleCollection.$], 'TrendLineDashCap:aca:abv', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.abk = /*@__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:yq:abl', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:z5:abm', [2, null], 'HighlightedYMemberPath:z7:abn', [2, null], 'IsCustomScatterMarkerStyleAllowed:zg:abo', [0, false], 'IsCustomScatterStyleAllowed:zh:abp', [0, false], 'ItemSearchMode:y0:abq', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:z0:abr', [1, 10000], 'MarkerCollisionAvoidance:yl:abs', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:z1:abt', [1, 400], 'XAxis::ab1', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aah:ab2', [2, null], 'XMemberAsLegendUnit:aaj:ab3', [2, null], 'XMemberPath:aal:ab4', [2, null], 'YAxis::ab5', [NumericYAxis.$, null], 'YMemberAsLegendLabel:aap:ab6', [2, null], 'YMemberAsLegendUnit:aar:ab7', [2, null], 'YMemberPath:aat:ab8', [2, null], 'TrendLineType::abz', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::aby', [1, 1.5], 'TrendLinePeriod::abx', [1, 7], 'TrendLineBrush::abu', [Brush.$, null], 'TrendLineZIndex:z2:ab0', [1, 1001], 'TrendLineDashArray:aca:abv', [DoubleCollection.$], 'TrendLineDashCap:acb:abw', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 })();
 /**
@@ -1901,7 +1901,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             this.dh = new Path();
             this.di = new Path();
             if (!this.q) {
-                this.c1.z0 = 2000;
+                this.c1.z1 = 2000;
             }
         }
         dj(a) {
@@ -1919,12 +1919,12 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return new Size(1, this.dg.width, this.dg.height);
         }
         cz() {
-            let a = new NumericMarkerManager(1, (b) => this.c3.item(b), (b) => this.c1.yn.c.item(b), runOn(this, this.de), runOn(this, this.cw), runOn(this, this.c4), () => this.c1.yk);
+            let a = new NumericMarkerManager(1, (b) => this.c3.item(b), (b) => this.c1.yo.c.item(b), runOn(this, this.de), runOn(this, this.cw), runOn(this, this.c4), () => this.c1.yl);
             a.q = runOn(this, this.dj);
             return a;
         }
         de(a) {
-            this.c1.abc(a, this.c3);
+            this.c1.abd(a, this.c3);
         }
         c5() {
             return this.b8;
@@ -1933,11 +1933,11 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return this.cy;
         }
         cw() {
-            this.cy = this.c1.yf(this, this.c3, this.cy, this.by, this.bx);
+            this.cy = this.c1.yg(this, this.c3, this.cy, this.by, this.bx);
             return this.cy;
         }
         c4() {
-            this.c6 = this.c1.zo(this.c3, this.c6);
+            this.c6 = this.c1.zp(this.c3, this.c6);
             return this.c6;
         }
         c7() {
@@ -1950,10 +1950,10 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
         }
         df() {
             if (this.c1.trendLineBrush != null) {
-                this.c1.ab8 = this.c1.trendLineBrush;
+                this.c1.ab9 = this.c1.trendLineBrush;
             }
             else {
-                this.c1.ab8 = this.c1.u2;
+                this.c1.ab9 = this.c1.u3;
             }
         }
         cj(a) {
@@ -1970,9 +1970,9 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
                 if (this.c1.trendLineType != 0 && !b) {
                     let c = this.c2.g$j;
                     c.ad = this.c1.trendLineThickness;
-                    c._stroke = this.c1.ab8;
-                    c.ai = this.c1.ab9;
-                    c.aj = this.c1.aca;
+                    c._stroke = this.c1.ab9;
+                    c.ai = this.c1.aca;
+                    c.aj = this.c1.acb;
                     a.v(c);
                 }
             }
@@ -1991,7 +1991,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             if (!stringIsNullOrEmpty(b)) {
                 a += " style='color:" + b + "'";
             }
-            a += ">" + this.c1.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.c1.aak + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.c1.aas + "}</span></div>";
+            a += ">" + this.c1.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.c1.aal + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.c1.aat + "}</span></div>";
             return a;
         }
     }