igniteui-webcomponents-charts 4.7.2 → 4.8.1-alpha.0

package/esm2015/lib/ScatterBase_combined.js

@@ -60,51 +60,73 @@ import { stringIsNullOrEmpty } from "igniteui-webcomponents-core";
  */
 export let ScatterBase = /*@__PURE__*/ (() => {
     class ScatterBase extends MarkerSeries {
-        cd() {
+        ci() {
             return new ScatterBaseView(this);
         }
-        nh() {
-            super.nh();
+        n4() {
+            super.n4();
             this.xAxis = null;
             this.yAxis = null;
         }
-        o2(a) {
-            super.o2(a);
-            this.vs = a;
+        px(a) {
+            super.px(a);
+            this.w6 = a;
         }
-        get_fa() {
+        get_fh() {
             return true;
         }
         ag() {
             return [this.xAxis, this.yAxis];
         }
-        jv(a, b) {
-            let c = this.lw(b);
+        j5(a, b) {
+            let c = this.mh(b);
             if (c == ScatterBase.$$p[12]) {
-                return this.jw(a, b, this.xn);
+                return this.j6(a, b, this.y1);
             }
             if (c == ScatterBase.$$p[16]) {
-                return this.jw(a, b, this.xv);
+                return this.j6(a, b, this.y9);
+            }
+            if (c == ScatterBase.$$p[1]) {
+                return this.j6(a, b, this.yl);
+            }
+            if (c == ScatterBase.$$p[2]) {
+                return this.j6(a, b, this.yn);
             }
             return null;
         }
-        dt(a, b, c, d) {
+        li(a) {
+            let b = this.mh(a);
+            if (b == ScatterBase.$$p[12]) {
+                return this.y1;
+            }
+            if (b == ScatterBase.$$p[16]) {
+                return this.y9;
+            }
+            if (b == ScatterBase.$$p[1]) {
+                return this.yl;
+            }
+            if (b == ScatterBase.$$p[2]) {
+                return this.yn;
+            }
+            return super.li(a);
+        }
+        dz(a, b, c, d) {
             if (!this.hasMarkers) {
                 return false;
             }
             let e = this.xAxis;
-            let f = new ScalerParams(1, this.cv.tr, this.ty, e.ch);
-            f.c = this.getEffectiveViewport1(this.cg);
+            let f = new ScalerParams(1, this.c1.vh, this.u9, e.ch);
+            f.c = this.getEffectiveViewport1(this.cl);
             let g = this.yAxis;
-            let h = new ScalerParams(1, this.cv.tr, this.ty, g.ch);
-            h.c = this.getEffectiveViewport1(this.cg);
+            let h = new ScalerParams(1, this.c1.vh, this.u9, g.ch);
+            h.c = this.getEffectiveViewport1(this.cl);
             a.clear();
-            this.ub.ci((i) => {
+            this.vl.ci((i) => {
                 if (i._visibility == 0) {
                     let j = new SeriesPointOfInterest();
                     let k = i.n;
                     let l = i.o;
-                    if (k < this.ty.left || k > this.ty.right || l < this.ty.top || l > this.ty.bottom) {
+                    if (k < this.u9.left || k > this.u9.right || l < this.u9.top || l > this.u9.bottom) {
                         return;
                     }
                     j.b = e.em(k, f);
@@ -115,96 +137,96 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             });
             return true;
         }
-        bu() {
-            if (this.bv == 0) {
-                if (this.w3 <= 2000) {
+        bt() {
+            if (this.bu == 0) {
+                if (this.yh <= 2000) {
                     return 1;
                 }
                 else {
-                    return super.bu();
+                    return super.bt();
                 }
             }
             else {
-                return super.bu();
+                return super.bt();
             }
         }
-        tw(a) {
-            if (!this.hasMarkers || !this.ue()) {
+        u7(a) {
+            if (!this.hasMarkers || !this.vr()) {
                 return Rect.empty;
             }
-            let b = this.ub.b1(this.te(a));
+            let b = this.vl.b1(this.up(a));
             if (b != null) {
-                return this.ub.cs(b);
+                return this.vl.cs(b);
             }
             return Rect.empty;
         }
-        f5(a, b) {
-            if (this.uf(a, b)) {
+        gf(a, b) {
+            if (this.vs(a, b)) {
                 return true;
             }
             return false;
         }
         constructor() {
             super();
-            this.vr = null;
-            this.wa = null;
-            this.wb = null;
-            this.ze = null;
-            this.zf = null;
-            this.v0 = 1;
-            this.vh = null;
-            this.vi = null;
-            this.vx = null;
-            this.vz = null;
-            this.vv = null;
-            this.wg = false;
-            this.wf = false;
-            this.v8 = null;
-            this.v9 = null;
+            this.w5 = null;
+            this.xo = null;
+            this.xp = null;
+            this.aas = null;
+            this.aat = null;
+            this.xe = 1;
+            this.wv = null;
+            this.ww = null;
+            this.xb = null;
+            this.xd = null;
+            this.w9 = null;
+            this.xu = false;
+            this.xt = false;
+            this.xm = null;
+            this.xn = null;
             this.assigningScatterStyle = null;
             this.assigningScatterMarkerStyle = null;
-            this.v4 = null;
-            this.vy = null;
-            this.vu = null;
-            this.we = true;
-            this.wt = 0;
-            this.wu = 0;
-            this.wv = 0;
-            this.ww = 0;
-            this.v1 = this.v2();
-            this.v4 = new ScatterSeriesRenderManager();
-            this.vy = new ScatterFrame();
-            this.zf = Rect.empty;
-            this.ze = Rect.empty;
-        }
-        get wc() {
-            return this.wa;
-        }
-        set wc(a) {
-            if (this.wa != a) {
-                let b = this.wc;
-                this.wa = a;
-                this.raisePropertyChanged("XColumn", b, this.wc);
-            }
-        }
-        get wd() {
-            return this.wb;
-        }
-        set wd(a) {
-            if (this.wb != a) {
-                let b = this.wd;
-                this.wb = a;
-                this.raisePropertyChanged("YColumn", b, this.wd);
-            }
-        }
-        fo() {
-            return this.highlightedItemsSource != null || (this.w7 != null && this.w9 != null);
-        }
-        wr() {
+            this.xi = null;
+            this.xc = null;
+            this.w8 = null;
+            this.xs = true;
+            this.x7 = 0;
+            this.x8 = 0;
+            this.x9 = 0;
+            this.ya = 0;
+            this.xf = this.xg();
+            this.xi = new ScatterSeriesRenderManager();
+            this.xc = new ScatterFrame();
+            this.aat = Rect.empty;
+            this.aas = Rect.empty;
+        }
+        get xq() {
+            return this.xo;
+        }
+        set xq(a) {
+            if (this.xo != a) {
+                let b = this.xq;
+                this.xo = a;
+                this.raisePropertyChanged("XColumn", b, this.xq);
+            }
+        }
+        get xr() {
+            return this.xp;
+        }
+        set xr(a) {
+            if (this.xp != a) {
+                let b = this.xr;
+                this.xp = a;
+                this.raisePropertyChanged("YColumn", b, this.xr);
+            }
+        }
+        fv() {
+            return this.highlightedItemsSource != null || (this.yl != null && this.yn != null);
+        }
+        x5() {
             return false;
         }
-        g1() {
-            let a = super.g1();
+        hb() {
+            let a = super.hb();
             {
                 let b = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
@@ -214,7 +236,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.x2));
+                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.zg));
                 a.add(b);
             }
             {
@@ -226,10 +248,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.x1));
+                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.zf));
                 a.add(c);
             }
-            if (this.wr()) {
+            if (this.x5()) {
                 let d = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -246,7 +268,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 })());
                 a.add(d);
             }
-            if (!this.wr()) {
+            if (!this.x5()) {
                 let e = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -256,10 +278,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.pz));
+                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.qu));
                 a.add(e);
             }
-            if (!this.wr()) {
+            if (!this.x5()) {
                 let f = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -269,30 +291,30 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.pz));
+                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.qu));
                 a.add(f);
             }
             return a;
         }
-        x1(a, b) {
-            if (this.w7 != null) {
-                b.value = this.w7;
+        zf(a, b) {
+            if (this.yl != null) {
+                b.value = this.yl;
                 return;
             }
-            b.value = this.xn;
+            b.value = this.y1;
         }
-        x2(a, b) {
-            if (this.w9 != null) {
-                b.value = this.w9;
+        zg(a, b) {
+            if (this.yn != null) {
+                b.value = this.yn;
                 return;
             }
-            b.value = this.xv;
+            b.value = this.y9;
         }
-        get zb() {
-            return this.c(ScatterBase.ym);
+        get aap() {
+            return this.c(ScatterBase.z0);
         }
-        set zb(a) {
-            this.h(ScatterBase.ym, a);
+        set aap(a) {
+            this.h(ScatterBase.z0, a);
         }
         get GetErrorBarsXAxis() {
             return this.xAxis;
@@ -300,8 +322,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         get GetErrorBarsYAxis() {
             return this.yAxis;
         }
-        oc() {
-            super.oc();
+        o6() {
+            super.o6();
             if (this.xAxis != null) {
                 this.xAxis.h8(false);
             }
@@ -309,26 +331,32 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 this.yAxis.h8(false);
             }
         }
-        pa(a, b, c, d) {
-            super.pa(a, b, c, d);
-            if (this.vs.c0.g$b(a, b, c, d)) {
-                this.pr(false);
-                this.om();
+        p5(a, b, c, d) {
+            super.p5(a, b, c, d);
+            if (this.w6.c0.g$b(a, b, c, d)) {
+                this.qm(false);
+                this.ph();
             }
             switch (b) {
+                case ScatterBase.$$p[10]:
+                case ScatterBase.$$p[14]:
+                case ScatterBase.$$p[11]:
+                case ScatterBase.$$p[15]:
+                    this.pb();
+                    break;
                 case "FastItemsSource":
                     if (typeCast(IFastItemsSource_$type, c) != null) {
-                        c.deregisterColumn(this.wc);
-                        c.deregisterColumn(this.wd);
-                        this.wc = null;
-                        this.wd = null;
+                        c.deregisterColumn(this.xq);
+                        c.deregisterColumn(this.xr);
+                        this.xq = null;
+                        this.xr = null;
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.wc = this.c4(this.xn);
-                        this.wd = this.c4(this.xv);
+                        this.xq = this.da(this.y1);
+                        this.xr = this.da(this.y9);
                     }
                     if ((this.yAxis != null && !this.yAxis.c1()) || (this.xAxis != null && !this.xAxis.c1())) {
-                        this.pr(this.fr && c != null);
+                        this.qm(this.f0 && c != null);
                     }
                     break;
                 case ScatterBase.$$p[9]:
@@ -339,9 +367,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.ct(this);
                     }
                     if ((this.xAxis != null && !this.xAxis.c1()) || (d == null && c != null)) {
-                        this.pr(false);
+                        this.qm(false);
                     }
-                    this.om();
+                    this.ph();
                     break;
                 case ScatterBase.$$p[13]:
                     if (c != null) {
@@ -351,134 +379,134 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.ct(this);
                     }
                     if ((this.yAxis != null && !this.yAxis.c1()) || (d == null && c != null)) {
-                        this.pr(false);
+                        this.qm(false);
                     }
-                    this.om();
+                    this.ph();
                     break;
                 case ScatterBase.$$p[12]:
-                    if (this.c7 != null) {
-                        this.c7.deregisterColumn(this.wc);
-                        this.wc = this.c4(this.xn);
+                    if (this.dd != null) {
+                        this.dd.deregisterColumn(this.xq);
+                        this.xq = this.da(this.y1);
                     }
                     break;
                 case "XColumn":
-                    this.vs.c0.g$i();
+                    this.w6.c0.g$i();
                     if (this.xAxis != null && !this.xAxis.c1()) {
-                        this.pr(this.fr && this.dp);
+                        this.qm(this.f0 && this.dv);
                     }
                     break;
                 case ScatterBase.$$p[16]:
-                    if (this.c7 != null) {
-                        this.c7.deregisterColumn(this.wd);
-                        this.wd = this.c4(this.xv);
+                    if (this.dd != null) {
+                        this.dd.deregisterColumn(this.xr);
+                        this.xr = this.da(this.y9);
                     }
                     break;
                 case "YColumn":
-                    this.vs.c0.g$i();
+                    this.w6.c0.g$i();
                     if (this.yAxis != null && !this.yAxis.c1()) {
-                        this.pr(this.fr && this.dp);
+                        this.qm(this.f0 && this.dv);
                     }
                     break;
                 case ScatterBase.$$p[7]:
-                    this.pr(false);
-                    this.om();
+                    this.qm(false);
+                    this.ph();
                     break;
                 case ScatterBase.$$p[8]:
-                    this.pr(false);
-                    this.om();
+                    this.qm(false);
+                    this.ph();
                     break;
                 case "TransitionProgress":
-                    this.vz.c(this.iw, this.vx, this.vv);
-                    this.xx();
+                    this.xd.c(this.i6, this.xb, this.w9);
+                    this.zb();
                     try {
-                        if (this.dm(this.cg)) {
+                        if (this.dt(this.cl)) {
                             return;
                         }
-                        if ((Math.round(this.iw * 100000) / 100000) == 1) {
-                            this.yj(this.vv, this.vs);
+                        if ((Math.round(this.i6 * 100000) / 100000) == 1) {
+                            this.zx(this.w9, this.w6);
                         }
                         else {
-                            this.yj(this.vz, this.vs);
+                            this.zx(this.xd, this.w6);
                         }
-                        if (this.cv != null) {
-                            this.cv.or(this);
+                        if (this.c1 != null) {
+                            this.c1.p6(this);
                         }
                     }
                     finally {
-                        this.yk();
+                        this.zy();
                     }
                     break;
                 case "TrendLineBrush":
-                    this.pg(b);
+                    this.qb(b);
                     break;
                 case ScatterBase.$$p[0]:
-                    if (this.vt != null) {
-                        this.vt.r = this;
+                    if (this.w7 != null) {
+                        this.w7.r = this;
                     }
-                    this.pr(false);
-                    this.om();
+                    this.qm(false);
+                    this.ph();
                     break;
                 case "TrendLineType":
-                    this.om();
+                    this.ph();
                     break;
                 case ScatterBase.$$p[4]:
-                    this.wg = this.wo();
-                    this.pr(false);
+                    this.xu = this.x2();
+                    this.qm(false);
                     break;
                 case ScatterBase.$$p[3]:
-                    this.wf = this.wn();
-                    this.pr(false);
+                    this.xt = this.x1();
+                    this.qm(false);
                     break;
                 case ScatterBase.$$p[5]:
-                    this.v1 = this.v2();
+                    this.xf = this.xg();
                     break;
             }
         }
-        wo() {
-            return this.wk;
+        x2() {
+            return this.xy;
         }
-        wn() {
-            return this.wj;
+        x1() {
+            return this.xx;
         }
-        wi(a) {
+        xw(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        wh(a) {
+        xv(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        yk() {
-            this.ze = Rect.empty;
-            this.zf = Rect.empty;
+        zy() {
+            this.aas = Rect.empty;
+            this.aat = Rect.empty;
         }
-        xx() {
-            let a = this.getViewInfo(this.ze, this.zf);
-            this.ze = a.p0;
-            this.zf = a.p1;
+        zb() {
+            let a = this.getViewInfo(this.aas, this.aat);
+            this.aas = a.p0;
+            this.aat = a.p1;
         }
-        wm(a, b) {
+        x0(a, b) {
             if (b != 3) {
                 return true;
             }
             if (a == null) {
                 return true;
             }
-            if (this.xn == a || this.xv == a) {
+            if (this.y1 == a || this.y9 == a) {
                 return true;
             }
             return false;
         }
-        np(a, b, c, d) {
+        oc(a, b, c, d) {
             let e = false;
-            if (!this.wm(d, a)) {
+            if (!this.x0(d, a)) {
                 return;
             }
-            this.vs.c0.g$e(a, b, c, d);
+            this.w6.c0.g$e(a, b, c, d);
             if (this.xAxis != null && !this.xAxis.c1()) {
                 e = true;
             }
@@ -486,34 +514,34 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 e = true;
             }
             if (a == 0 || a == 2 || a == 3 || a == 4) {
-                this.we = true;
+                this.xs = true;
             }
             else if (a == 1) {
                 for (let f = b; f < b + c; f++) {
-                    this.wt += this.wc.item(f);
-                    this.wu += this.wd.item(f);
+                    this.x7 += this.xq.item(f);
+                    this.x8 += this.xr.item(f);
                 }
-                this.wv = this.wt / this.wc.count;
-                this.ww = this.wu / this.wd.count;
+                this.x9 = this.x7 / this.xq.count;
+                this.ya = this.x8 / this.xr.count;
             }
             if (e) {
-                this.pr(true);
+                this.qm(true);
             }
         }
-        yb(a) {
-            this.yc(a, null);
+        zp(a) {
+            this.zq(a, null);
         }
-        yc(a, b) {
-            let c = this.wc != null ? this.wc.count : 0;
-            let d = this.wd != null ? this.wd.count : 0;
+        zq(a, b) {
+            let c = this.xq != null ? this.xq.count : 0;
+            let d = this.xr != null ? this.xr.count : 0;
             let e = Math.min(c, d);
-            if (e <= this.w3) {
+            if (e <= this.yh) {
                 a.m.clear();
                 let f = new List$1(OwnedPoint.$, 0);
                 for (let g of fromEnum(a.u.values)) {
                     f.add(g);
                 }
-                let h = this.c7;
+                let h = this.dd;
                 f.aa((i, j) => {
                     let k = h.indexOf(i.a);
                     let l = h.indexOf(j.a);
@@ -541,72 +569,72 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
         }
         aq(a) {
-            if (a != null && a == this.xAxis && this.wc != null) {
-                return new AxisRange(this.wc.minimum, this.wc.maximum);
+            if (a != null && a == this.xAxis && this.xq != null) {
+                return new AxisRange(this.xq.minimum, this.xq.maximum);
             }
-            if (a != null && a == this.yAxis && this.wd != null) {
-                return new AxisRange(this.wd.minimum, this.wd.maximum);
+            if (a != null && a == this.yAxis && this.xr != null) {
+                return new AxisRange(this.xr.minimum, this.xr.maximum);
             }
             return null;
         }
-        js(a) {
-            let b = this.i9(a);
-            if (this.c7 != null && b >= 0 && b < this.c7.count) {
-                return this.c7.item(b);
+        j2(a) {
+            let b = this.jj(a);
+            if (this.dd != null && b >= 0 && b < this.dd.count) {
+                return this.dd.item(b);
             }
             return null;
         }
-        get v1() {
-            return this.v0;
+        get xf() {
+            return this.xe;
         }
-        set v1(a) {
-            let b = this.v0;
-            this.v0 = a;
-            if (b != this.v0) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.v0));
+        set xf(a) {
+            let b = this.xe;
+            this.xe = a;
+            if (b != this.xe) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.xe));
             }
         }
-        v2() {
-            if (this.v3 != 0) {
-                return this.v3;
+        xg() {
+            if (this.xh != 0) {
+                return this.xh;
             }
-            return this.wl ? 4 : 1;
+            return this.xz ? 4 : 1;
         }
-        i9(a) {
-            let b = truncate(Math.round(this.hw(a)));
+        jj(a) {
+            let b = truncate(Math.round(this.h6(a)));
             return b;
         }
-        hw(a) {
-            switch (this.v1) {
-                case 1: return this.wz(a);
-                case 3: return this.w0(a);
-                case 2: return this.wx(a);
-                case 4: return this.wy(a);
+        h6(a) {
+            switch (this.xf) {
+                case 1: return this.yd(a);
+                case 3: return this.ye(a);
+                case 2: return this.yb(a);
+                case 4: return this.yc(a);
             }
             return -1;
         }
-        wy(a) {
-            return this.w1(a, false);
+        yc(a) {
+            return this.yf(a, false);
         }
-        wx(a) {
-            let b = this.te(a);
+        yb(a) {
+            let b = this.up(a);
             let c = b.x;
             let d = b.y;
-            if (this.c7 == null || this.xAxis == null || this.yAxis == null || this.wc == null || this.wd == null) {
+            if (this.dd == null || this.xAxis == null || this.yAxis == null || this.xq == null || this.xr == null) {
                 return -1;
             }
-            if (this.c7.count > this.w2) {
+            if (this.dd.count > this.yg) {
                 return -1;
             }
-            this.x0();
-            let e = this.vh;
-            let f = this.vi;
+            this.ze();
+            let e = this.wv;
+            let f = this.ww;
             if (e == null || f == null) {
                 return -1;
             }
             let g = 1.7976931348623157E+308;
             let h = -1;
-            for (let i = 0; i < this.wc.count; i++) {
+            for (let i = 0; i < this.xq.count; i++) {
                 let j = e[i];
                 let k = f[i];
                 let l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -617,63 +645,63 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        x0() {
-            let a = this.cg.by;
-            let b = this.cg.bx;
+        ze() {
+            let a = this.cl.by;
+            let b = this.cl.bx;
             let c = this.getEffectiveViewport();
-            if (this.vr == null) {
+            if (this.w5 == null) {
                 return;
             }
-            let d = new ScalerParams(0, a, b, this.vr.d, c);
+            let d = new ScalerParams(0, a, b, this.w5.d, c);
             let e = ((() => {
-                let $ret = new ScalerParams(0, a, b, this.vr.e, c);
-                $ret.b = this.h3();
+                let $ret = new ScalerParams(0, a, b, this.w5.e, c);
+                $ret.b = this.id();
                 return $ret;
             })());
-            if (this.vh == null || this.vi == null) {
-                let f = arrayShallowClone(this.wc.asArray());
-                let g = arrayShallowClone(this.wd.asArray());
+            if (this.wv == null || this.ww == null) {
+                let f = arrayShallowClone(this.xq.asArray());
+                let g = arrayShallowClone(this.xr.asArray());
                 this.xAxis.hn(boxArray$1(f), 0, f.length, d);
                 this.yAxis.hn(boxArray$1(g), 0, g.length, e);
-                this.vh = f;
-                this.vi = g;
+                this.wv = f;
+                this.ww = g;
             }
         }
-        get_wl() {
+        get_xz() {
             return false;
         }
-        get wl() {
-            return this.get_wl();
+        get xz() {
+            return this.get_xz();
         }
-        w1(a, b) {
-            if (!this.wl) {
+        yf(a, b) {
+            if (!this.xz) {
                 return -1;
             }
             let c = { $type: Point_$type, x: 0, y: 0 };
             let d = true;
-            let e = this.vw();
+            let e = this.xa();
             if (e == null) {
                 return -1;
             }
             if (e.m == null) {
                 return -1;
             }
-            if (this.c7 == null || this.c7.count > this.w2) {
+            if (this.dd == null || this.dd.count > this.yg) {
                 return -1;
             }
-            this.x0();
-            let f = this.vh;
-            let g = this.vi;
+            this.ze();
+            let f = this.wv;
+            let g = this.ww;
             if (f == null || g == null) {
                 return -1;
             }
-            let h = this.te(a);
+            let h = this.up(a);
             let i = 1.7976931348623157E+308;
             let j = -1;
-            for (let k = 0; k < this.vh.length; k++) {
-                let l = { $type: Point_$type, x: this.vh[k], y: this.vi[k] };
+            for (let k = 0; k < this.wv.length; k++) {
+                let l = { $type: Point_$type, x: this.wv[k], y: this.ww[k] };
                 if (k > 0) {
-                    if (!b || e.j.containsKey(this.c7.item(k)) || e.j.containsKey(this.c7.item(k - 1))) {
+                    if (!b || e.j.containsKey(this.dd.item(k)) || e.j.containsKey(this.dd.item(k - 1))) {
                         let m = GeometryUtil.d(h, c, l);
                         if (m < i) {
                             i = m;
@@ -684,13 +712,13 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 c = l;
             }
             if (j >= 0) {
-                let n = { $type: Point_$type, x: this.vh[j], y: this.vi[j] };
-                let o = { $type: Point_$type, x: this.vh[j - 1], y: this.vi[j - 1] };
-                if (!b || (e.j.containsKey(this.c7.item(j)) && e.j.containsKey(this.c7.item(j - 1)))) {
+                let n = { $type: Point_$type, x: this.wv[j], y: this.ww[j] };
+                let o = { $type: Point_$type, x: this.wv[j - 1], y: this.ww[j - 1] };
+                if (!b || (e.j.containsKey(this.dd.item(j)) && e.j.containsKey(this.dd.item(j - 1)))) {
                     let p = GeometryUtil.i(h, o, n);
                     return (j - 1) + p;
                 }
-                else if (e.j.containsKey(this.c7.item(j))) {
+                else if (e.j.containsKey(this.dd.item(j))) {
                     return j;
                 }
                 else {
@@ -699,21 +727,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        w0(a) {
-            return this.w1(a, true);
+        ye(a) {
+            return this.yf(a, true);
         }
-        wz(a) {
+        yd(a) {
             let b = null;
             let c = 1.7976931348623157E+308;
-            let d = this.te(a);
+            let d = this.up(a);
             let e = d.x;
             let f = d.y;
-            if (this.vs.c1.e > this.w2) {
+            if (this.w6.c1.e > this.yg) {
                 return -1;
             }
-            this.vs.c8((g) => {
+            this.w6.c8((g) => {
                 if (g._visibility == 0) {
-                    let h = this.vs.cs(g);
+                    let h = this.w6.cs(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);
@@ -728,21 +756,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        tj(a, b, c) {
-            if (this.xAxis == null || this.yAxis == null || this.wc == null || this.wd == null) {
+        uu(a, b, c) {
+            if (this.xAxis == null || this.yAxis == null || this.xq == null || this.xr == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            let d = this.cg.by;
-            let e = this.cg.bx;
+            let d = this.cl.by;
+            let e = this.cl.bx;
             let f = this.getEffectiveViewport();
             let g = new ScalerParams(0, d, e, this.xAxis.ch, f);
             let h = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.ch, f);
-                $ret.b = this.h3();
+                $ret.b = this.id();
                 return $ret;
             })());
             if (b) {
-                let i = this.hw(a);
+                let i = this.h6(a);
                 if (i == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
@@ -754,51 +782,51 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (k < 0) {
                     k = 0;
                 }
-                if (k > this.c7.count - 1) {
-                    k = this.c7.count - 1;
+                if (k > this.dd.count - 1) {
+                    k = this.dd.count - 1;
                 }
-                if (j > this.c7.count - 1) {
-                    j = this.c7.count - 1;
+                if (j > this.dd.count - 1) {
+                    j = this.dd.count - 1;
                 }
                 if (k == j) {
-                    let l = this.xAxis.ej(this.wc.item(j), g);
-                    let m = this.yAxis.ej(this.wd.item(j), h);
+                    let l = this.xAxis.ej(this.xq.item(j), g);
+                    let m = this.yAxis.ej(this.xr.item(j), h);
                     return { $type: Point_$type, x: l, y: m };
                 }
                 let n = i - Math.floor(i);
-                let o = this.xAxis.ej(this.wc.item(j), g);
-                let p = this.yAxis.ej(this.wd.item(j), h);
-                let q = this.xAxis.ej(this.wc.item(k), g);
-                let r = this.yAxis.ej(this.wd.item(k), h);
+                let o = this.xAxis.ej(this.xq.item(j), g);
+                let p = this.yAxis.ej(this.xr.item(j), h);
+                let q = this.xAxis.ej(this.xq.item(k), g);
+                let r = this.yAxis.ej(this.xr.item(k), h);
                 let s = q - o;
                 let t = r - p;
                 return { $type: Point_$type, x: o + s * n, y: p + t * n };
             }
             else {
-                let u = this.i9(a);
+                let u = this.jj(a);
                 if (u == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
-                let v = this.xAxis.ej(this.wc.item(u), g);
-                let w = this.yAxis.ej(this.wd.item(u), h);
+                let v = this.xAxis.ej(this.xq.item(u), g);
+                let w = this.yAxis.ej(this.xr.item(u), h);
                 return { $type: Point_$type, x: v, y: w };
             }
         }
-        fp(a) {
-            let b = this.cv != null ? this.cv.tr : Rect.empty;
+        fx(a) {
+            let b = this.c1 != null ? this.c1.vh : Rect.empty;
             b = b.copy();
-            let c = this.cv != null ? this.cv.t6 : Rect.empty;
+            let c = this.c1 != null ? this.c1.vw : Rect.empty;
             let d = new Rect(0, 0, 0, 1, 1);
-            let e = this.ts(this.cg);
+            let e = this.u3(this.cl);
             let f = new ScalerParams(0, d, d, this.xAxis.ch, e);
             let g = ((() => {
                 let $ret = new ScalerParams(0, d, d, this.yAxis.ch, e);
-                $ret.b = this.h3();
+                $ret.b = this.id();
                 return $ret;
             })());
-            let h = !b.isEmpty && !c.isEmpty && this.c7 != null ? this.c7.indexOf(a) : -1;
-            let i = this.xAxis != null && this.wc != null && h < this.wc.count ? this.xAxis.ej(this.wc.item(h), f) : NaN;
-            let j = this.yAxis != null && this.wd != null && h < this.wd.count ? this.yAxis.ej(this.wd.item(h), g) : NaN;
+            let h = !b.isEmpty && !c.isEmpty && this.dd != null ? this.dd.indexOf(a) : -1;
+            let i = this.xAxis != null && this.xq != null && h < this.xq.count ? this.xAxis.ej(this.xq.item(h), f) : NaN;
+            let j = this.yAxis != null && this.xr != null && h < this.xr.count ? this.yAxis.ej(this.xr.item(h), g) : NaN;
             if (!isNaN_(i)) {
                 if (i < b.left + 0.1 * b.width) {
                     i = i + 0.4 * b.width;
@@ -819,57 +847,57 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     b.y = j - 0.5 * b.height;
                 }
             }
-            if (this.co != null) {
-                this.co.au(this.cv, b, true);
+            if (this.ct != null) {
+                this.ct.au(this.c1, b, true);
             }
             return h >= 0;
         }
-        qo(a, b) {
-            this.pr(false);
+        rj(a, b) {
+            this.qm(false);
         }
-        qp(a, b) {
-            this.pr(false);
+        rk(a, b) {
+            this.qm(false);
         }
-        vw() {
-            let a = this.vv;
-            if (this.dk()) {
-                if (this.cw.g) {
-                    this.cw.t();
+        xa() {
+            let a = this.w9;
+            if (this.dr()) {
+                if (this.c2.g) {
+                    this.c2.t();
                 }
-                a = this.vz;
+                a = this.xd;
             }
             return a;
         }
-        xy(a, b, c, d, e) {
+        zc(a, b, c, d, e) {
             b.g = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
             let f = this.getEffectiveViewport1(a);
-            let g = this.c7;
+            let g = this.dd;
             let h;
             let i;
             let j = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.vr.d, f);
+                let $ret = new ScalerParams(0, d, e, this.w5.d, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 return $ret;
             })());
             let k = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.vr.e, f);
+                let $ret = new ScalerParams(0, d, e, this.w5.e, f);
                 $ret.c = this.getEffectiveViewport1(a);
-                $ret.b = this.h3();
+                $ret.b = this.id();
                 return $ret;
             })());
             let l = false;
             let m = 0;
-            if (this.cv != null) {
-                if (this.cv.fc()) {
-                    let n = this.cv.lp(d, j);
+            if (this.c1 != null) {
+                if (this.c1.fx()) {
+                    let n = this.c1.mp(d, j);
                     l = n.c;
                     m = n.d;
                 }
             }
             for (let o = 0; o < c; o++) {
-                h = this.wc.item(o);
-                i = this.wd.item(o);
-                let p = { $type: Point_$type, x: this.vr.a.ej(h, j), y: this.vr.b.ej(i, k) };
+                h = this.xq.item(o);
+                i = this.xr.item(o);
+                let p = { $type: Point_$type, x: this.w5.a.ej(h, j), y: this.w5.b.ej(i, k) };
                 if (l) {
                     if (p.x < e.left || p.x > e.right) {
                         if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -893,16 +921,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        x8(a, b) {
-            this.vh = null;
-            this.vi = null;
+        zm(a, b) {
+            this.wv = null;
+            this.ww = null;
             a.j.clear();
             a.n.clear();
             a.h.clear();
             a.l.clear();
             a.i.clear();
             a.k.clear();
-            let c = Math.min(this.wc != null ? this.wc.count : 0, this.wd != null ? this.wd.count : 0);
+            let c = Math.min(this.xq != null ? this.xq.count : 0, this.xr != null ? this.xr.count : 0);
             let d = b.by;
             let e = b.bx;
             let f = this.getEffectiveViewport1(b);
@@ -910,64 +938,64 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             g.c = this.getEffectiveViewport1(b);
             let h = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.ch, f);
-                $ret.b = this.h3();
+                $ret.b = this.id();
                 return $ret;
             })());
             h.c = this.getEffectiveViewport1(b);
             if (c < 1) {
                 return;
             }
-            this.vr = ((() => {
+            this.w5 = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
                 $ret.d = this.xAxis.ch;
                 $ret.e = this.yAxis.ch;
-                $ret.c = this.c7;
+                $ret.c = this.dd;
                 return $ret;
             })());
             let i = b;
-            if (c <= this.w3) {
-                this.xy(i, a, c, d, e);
+            if (c <= this.yh) {
+                this.zc(i, a, c, d, e);
             }
-            if (this.ue()) {
-                b.cy.l(a.j, this.w3, d, e, this.hk);
+            if (this.vr()) {
+                b.cy.l(a.j, this.yh, d, e, this.hu);
             }
             let j = ((() => {
                 let $ret = new Clipper(0, e, false);
                 $ret.i = a.n;
                 return $ret;
             })());
-            let k = this.tq(b);
+            let k = this.u1(b);
             let l = this.xAxis.em(k.left, g);
             let m = this.xAxis.em(k.right, g);
-            b.c0.h(a.n, this.trendLineType, this.wc, this.wd, this.trendLinePeriod, (n) => this.xAxis.ej(n, g), (n) => this.yAxis.ej(n, h), ((() => {
+            b.c0.h(a.n, this.trendLineType, this.xq, this.xr, this.trendLinePeriod, (n) => this.xAxis.ej(n, g), (n) => this.yAxis.ej(n, h), ((() => {
                 let $ret = new TrendResolutionParams();
-                $ret.d = this.hk;
+                $ret.d = this.hu;
                 $ret.h = e;
                 $ret.i = d;
                 return $ret;
             })()), j, l, m);
-            this.x6(a, b);
+            this.zk(a, b);
         }
-        nk(a, b) {
-            super.nk(a, b);
+        n7(a, b) {
+            super.n7(a, b);
             let c = b;
             c.c7(a);
         }
-        get_et() {
+        get_ez() {
             return true;
         }
-        v6(a, b, c) {
+        xk(a, b, c) {
             return null;
         }
-        v7(a, b, c) {
-            let d = this.vw();
-            let e = this.vs.b1(this.te(b));
+        xl(a, b, c) {
+            let d = this.xa();
+            let e = this.w6.b1(this.up(b));
             let f = -1;
             if (e == null) {
                 if (a != null) {
-                    f = this.c7.indexOf(a);
+                    f = this.dd.indexOf(a);
                 }
                 else {
                     return null;
@@ -990,11 +1018,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return g;
         }
-        t0(a, b) {
-            if (this.uc != 1 && this.uc != 13) {
-                let c = this.ub.ct();
-                let d = (c.width / 2) + (this.uh / 2);
-                let e = (c.height / 2) + (this.uh / 2);
+        vb(a, b) {
+            if (this.vn != 1 && this.vn != 13) {
+                let c = this.vl.ct();
+                let d = (c.width / 2) + (this.vu / 2);
+                let e = (c.height / 2) + (this.vu / 2);
                 let f = d;
                 let g = d;
                 let h = e;
@@ -1015,52 +1043,52 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return new Thickness(1, 0, 0, 0, 0);
         }
-        v5(a, b, c) {
+        xj(a, b, c) {
             let d = new HighlightingInfo();
             d.i = this;
             d.g = 0;
-            d.f = this.c7.count - 1;
+            d.f = this.dd.count - 1;
             d.c = true;
             if (c != null && c.g == d.g && c.f == d.f) {
                 return c;
             }
             return d;
         }
-        c0(a, b, c) {
-            if (this.dv && this.fd(this.bp) && !c) {
-                let d = this.v6(a, b, this.v8);
-                this.v8 = d;
+        c6(a, b, c) {
+            if (this.d1 && this.fk(this.bo) && !c) {
+                let d = this.xk(a, b, this.xm);
+                this.xm = d;
                 return d;
             }
             else {
-                let e = this.v5(a, b, this.v8);
-                this.v8 = e;
+                let e = this.xj(a, b, this.xm);
+                this.xm = e;
                 return e;
             }
         }
-        c1(a, b, c) {
-            if (this.fd(this.bp) && !c) {
-                let d = this.v7(a, b, this.v9);
-                this.v9 = d;
+        c7(a, b, c) {
+            if (this.fk(this.bo) && !c) {
+                let d = this.xl(a, b, this.xn);
+                this.xn = d;
                 return d;
             }
             else {
-                let e = this.v5(a, b, this.v9);
+                let e = this.xj(a, b, this.xn);
                 e.d = true;
-                this.v9 = e;
+                this.xn = e;
                 return e;
             }
         }
-        wq() {
-            return (this.assigningScatterStyle != null && this.wg) || (this.bp != 1);
+        x4() {
+            return (this.assigningScatterStyle != null && this.xu) || (this.bo != 1) || (this.cf != 1) || (this.ce != 1);
         }
-        wp() {
-            return (this.assigningScatterMarkerStyle != null && this.wf) || (this.bp != 1);
+        x3() {
+            return (this.assigningScatterMarkerStyle != null && this.xt) || (this.bo != 1) || (this.cf != 1) || (this.ce != 1);
         }
-        yj(a, b) {
-            this.oy();
+        zx(a, b) {
+            this.pt();
             let c = b.bx;
-            this.vr = ((() => {
+            this.w5 = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -1068,10 +1096,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.e = this.yAxis.ch;
                 return $ret;
             })());
-            if (this.ue()) {
-                b.cy.j(a.j, this.ug);
-                if (this.wp()) {
-                    this.xz(b, a);
+            if (this.vr()) {
+                b.cy.j(a.j, this.vt);
+                if (this.x3()) {
+                    this.zd(b, a);
                 }
             }
             b.cp();
@@ -1081,30 +1109,30 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             b.c0.g$h(a.n, d);
-            this.yg(a, b);
+            this.zu(a, b);
         }
-        vk(a, b) {
-            return this.vl(a, b);
+        wy(a, b) {
+            return this.wz(a, b);
         }
-        vl(a, b) {
-            if (b < a || a < 0 || a > this.wc.count || b < 0 || b > this.wc.count) {
+        wz(a, b) {
+            if (b < a || a < 0 || a > this.xq.count || b < 0 || b > this.xq.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
             for (let d = a; d <= b; d++) {
                 let e = d;
-                c[d - a] = this.c7.item(d);
+                c[d - a] = this.dd.item(d);
             }
             return c;
         }
-        xz(a, b) {
+        zd(a, b) {
             a.b6 = true;
-            this.v4.ay(this, this.wp(), runOn(this, this.vk));
-            let c = this.v4.d;
+            this.xi.ay(this, this.x3(), runOn(this, this.wy));
+            let c = this.xi.d;
             let d = c != null;
             let e = this.getEffectiveViewport1(a);
-            let f = this.c7 == null ? 0 : this.c7.count;
-            this.vs.ci((g) => {
+            let f = this.dd == null ? 0 : this.dd.count;
+            this.w6.ci((g) => {
                 if (g._visibility == 0) {
                     let h = g.ak;
                     let i = g.content;
@@ -1113,63 +1141,98 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         g.content = i;
                     }
                     if (d) {
-                        this.x3(h, f, a.q);
+                        this.zh(h, f, a.q);
                     }
-                    this.v4.ac(g, i);
+                    this.xi.ac(g, i);
                 }
             });
         }
-        x4(a, b, c) {
-            let d = this.bp != 1;
-            this.v4.a0(this.v4.b, a, b, false);
-            this.v4.ab(this.hi);
-            let e = this.v4.ax;
-            let f = null;
-            let g = this.c7;
-            if (d && this.cv != null) {
-                f = this.cv.c2.getHighlightingInfo(this, g, e.o, e.n, false);
-                e.b = f;
-            }
-            e.f = c;
-            this.ye(e);
-            this.v4.z(this, f, c, d, a < 0);
-        }
-        x3(a, b, c) {
-            let d = this.bp != 1;
-            this.v4.a0(this.v4.d, a, b, true);
-            this.v4.aa(this.hi);
-            let e = this.v4.aw;
-            let f = null;
-            let g = this.c7;
+        zi(a, b, c) {
+            let d = this.bo != 1;
+            let e = this.cf != 1;
+            let f = this.ce != 1;
+            this.xi.a0(this.xi.b, a, b, false);
+            this.xi.ab(this.hs);
+            let g = this.xi.ax;
+            let h = null;
+            let i = null;
+            let j = null;
+            let k = this.dd;
+            if (d && this.c1 != null) {
+                h = this.c1.dj.getHighlightingInfo(this, k, g.z, g.y, false);
+                g.c = h;
+            }
+            if (e && this.c1 != null) {
+                h = this.c1.dk.getHighlightingInfo(this, k, g.z, g.y, false);
+                g.d = h;
+            }
+            if (f && this.c1 != null) {
+                h = this.c1.di.getHighlightingInfo(this, k, g.z, g.y, false);
+                g.b = h;
+            }
+            g.h = c;
+            this.zs(g);
+            this.xi.z(this, h, i, j, c, d, e, f, a < 0);
+        }
+        zh(a, b, c) {
+            let d = this.bo != 1;
+            let e = this.cf != 1;
+            let f = this.ce != 1;
+            this.xi.a0(this.xi.d, a, b, true);
+            this.xi.aa(this.hs);
+            let g = this.xi.aw;
             let h = null;
-            if (d && this.cv != null) {
-                f = this.cv.c2.getHighlightingInfo(this, g, e.o, e.n, true);
-                if (this.cv.c2.isCrossContextHighlight(this)) {
-                    h = this.cv.c2.getHighlightingInfo(this, g, e.o, e.n, true);
+            let i = null;
+            let j = null;
+            let k = this.dd;
+            let l = null;
+            let m = null;
+            let n = null;
+            if (d && this.c1 != null) {
+                h = this.c1.dj.getHighlightingInfo(this, k, g.z, g.y, true);
+                if (this.c1.dj.isCrossContextHighlight(this)) {
+                    l = this.c1.dj.getHighlightingInfo(this, k, g.z, g.y, true);
+                }
+                g.c = h;
+            }
+            if (e && this.c1 != null) {
+                i = this.c1.dk.getHighlightingInfo(this, k, g.z, g.y, true);
+                if (i == null && this.be != null) {
+                    i = this.c1.dk.getHighlightingInfo(this.be, this.be.dd, g.z, g.y, true);
+                }
+                if (this.c1.dk.isCrossContextHighlight(this)) {
+                    m = this.c1.dk.getHighlightingInfo(this, k, g.z, g.y, true);
+                }
+                g.d = i;
+            }
+            if (f && this.c1 != null) {
+                j = this.c1.di.getHighlightingInfo(this, k, g.z, g.y, true);
+                if (this.c1.di.isCrossContextHighlight(this)) {
+                    n = this.c1.di.getHighlightingInfo(this, k, g.z, g.y, true);
                 }
-                e.b = f;
+                g.d = i;
             }
-            e.f = c;
-            this.yd(e);
-            this.v4.y(this, f, c, d, e.m, this.cv.c2.totalHighlightingProgress);
+            g.h = c;
+            this.zr(g);
+            this.xi.y(this, h, i, j, c, d, e, f, g.v, this.c1.dj.totalHighWaterMark, g.x, this.c1.dk.totalHighWaterMark, g.t, this.c1.di.totalHighWaterMark);
         }
-        ye(a) {
-            if (this.assigningScatterStyle != null && this.wg) {
+        zs(a) {
+            if (this.assigningScatterStyle != null && this.xu) {
                 this.assigningScatterStyle(this, a);
             }
         }
-        yd(a) {
-            if (this.assigningScatterMarkerStyle != null && this.wf) {
+        zr(a) {
+            if (this.assigningScatterMarkerStyle != null && this.xt) {
                 this.assigningScatterMarkerStyle(this, a);
             }
         }
-        x6(a, b) {
+        zk(a, b) {
             let c = new ErrorBarsHelper(this, b);
-            if (this.vt == null) {
+            if (this.w7 == null) {
                 return;
             }
-            let d = this.vt.u;
-            let e = this.vt.v;
+            let d = this.w7.u;
+            let e = this.w7.v;
             let f = 0;
             let g = 0;
             let h = 0;
@@ -1179,35 +1242,35 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            let l = this.x9(k, c, d, h, i, true);
+                            let l = this.zn(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            let m = this.x7(k, c, d, h, i, true);
+                            let m = this.zl(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            let n = this.x5(k, c, d, j, h, i, true);
+                            let n = this.zj(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            let o = this.ya(c, d, f, h, i, true);
+                            let o = this.zo(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            let p = this.x7(k, c, d, h, i, true);
+                            let p = this.zl(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     let q = new OwnedPoint();
-                    q.c = c.l(d, this.vr.a, k.c, f);
+                    q.c = c.l(d, this.w5.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1215,53 +1278,53 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            let r = this.x9(k, c, e, h, i, false);
+                            let r = this.zn(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            let s = this.x7(k, c, e, h, i, false);
+                            let s = this.zl(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            let t = this.x5(k, c, e, j, h, i, false);
+                            let t = this.zj(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            let u = this.ya(c, e, g, h, i, false);
+                            let u = this.zo(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            let v = this.x7(k, c, e, h, i, false);
+                            let v = this.zl(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     let w = new OwnedPoint();
-                    w.c = c.m(e, this.vr.b, k.c, g);
+                    w.c = c.m(e, this.w5.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
                 }
             }
         }
-        x9(a, b, c, d, e, f) {
+        zn(a, b, c, d, e, f) {
             if (f) {
                 let g;
                 let h, i;
-                i = this.vr.a;
-                if (this.vt.s == 0) {
+                i = this.w5.a;
+                if (this.w7.s == 0) {
                     g = a.c.x;
-                    h = this.vr.a;
+                    h = this.w5.a;
                 }
                 else {
                     g = a.c.y;
-                    h = this.vr.b;
+                    h = this.w5.b;
                 }
                 let j = b.f(g, c, h, i, d, e);
                 d = j.p4;
@@ -1270,14 +1333,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             else {
                 let k;
                 let l, m;
-                m = this.vr.b;
-                if (this.vt.t == 0) {
+                m = this.w5.b;
+                if (this.w7.t == 0) {
                     k = a.c.x;
-                    l = this.vr.a;
+                    l = this.w5.a;
                 }
                 else {
                     k = a.c.y;
-                    l = this.vr.b;
+                    l = this.w5.b;
                 }
                 let n = b.f(k, c, l, m, d, e);
                 d = n.p4;
@@ -1288,14 +1351,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        x7(a, b, c, d, e, f) {
+        zl(a, b, c, d, e, f) {
             if (f) {
-                let g = b.j(a.c.x, c, this.vr.a, d, e);
+                let g = b.j(a.c.x, c, this.w5.a, d, e);
                 d = g.p3;
                 e = g.p4;
             }
             else {
-                let h = b.j(a.c.y, c, this.vr.b, d, e);
+                let h = b.j(a.c.y, c, this.w5.b, d, e);
                 d = h.p3;
                 e = h.p4;
             }
@@ -1304,18 +1367,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        x5(a, b, c, d, e, f, g) {
+        zj(a, b, c, d, e, f, g) {
             let h = c.getItemColumn();
-            let i = this.c7.indexOf(d);
+            let i = this.dd.indexOf(d);
             if (h != null && i < h.count) {
                 let j = h.item(i);
                 if (g) {
-                    let k = b.h(a.c.x, j, this.vr.a, e, f);
+                    let k = b.h(a.c.x, j, this.w5.a, e, f);
                     e = k.p3;
                     f = k.p4;
                 }
                 else {
-                    let l = b.h(a.c.y, j, this.vr.b, e, f);
+                    let l = b.h(a.c.y, j, this.w5.b, e, f);
                     e = l.p3;
                     f = l.p4;
                 }
@@ -1329,16 +1392,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        ya(a, b, c, d, e, f) {
+        zo(a, b, c, d, e, f) {
             let g = a.i(b, c);
             c = g.p1;
             if (f) {
-                let h = a.k(c, b, this.vr.a, d, e);
+                let h = a.k(c, b, this.w5.a, d, e);
                 d = h.p3;
                 e = h.p4;
             }
             else {
-                let i = a.k(c, b, this.vr.b, d, e);
+                let i = a.k(c, b, this.w5.b, d, e);
                 d = i.p3;
                 e = i.p4;
             }
@@ -1348,29 +1411,29 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        yg(a, b) {
-            if (!b.o() || this.vt == null) {
+        zu(a, b) {
+            if (!b.o() || this.w7 == null) {
                 b.c9();
                 return;
             }
-            this.yh(a, b);
-            this.yi(a, b);
+            this.zv(a, b);
+            this.zw(a, b);
         }
-        yh(a, b) {
+        zv(a, b) {
             b.c5();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.vt.u;
+            let e = this.w7.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.vt.o == 1 || this.vt.o == 2) {
+                        if (this.w7.o == 1 || this.w7.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.vt.o == 1 || this.vt.o == 3) {
+                        if (this.w7.o == 1 || this.w7.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1378,128 +1441,128 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             b.da(d);
         }
-        yi(a, b) {
+        zw(a, b) {
             b.c6();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.vt.v;
+            let e = this.w7.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.vt.p == 1 || this.vt.p == 2) {
+                        if (this.w7.p == 1 || this.w7.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.vt.p == 1 || this.vt.p == 3) {
+                        if (this.w7.p == 1 || this.w7.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
                 }
             }
         }
-        gm(a, b, c) {
+        gw(a, b, c) {
             let d = true;
-            if (!super.gm(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.wc == null || this.wd == null || this.wc.count == 0 || this.wd.count == 0 || this.c7 == null || this.c7.count != this.wc.count || this.c7.count != this.wd.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.lx == this.xAxis.lw || this.yAxis.lx == this.yAxis.lw) {
+            if (!super.gw(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.xq == null || this.xr == null || this.xq.count == 0 || this.xr.count == 0 || this.dd == null || this.dd.count != this.xq.count || this.dd.count != this.xr.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.lx == this.xAxis.lw || this.yAxis.lx == this.yAxis.lw) {
                 d = false;
             }
             return d;
         }
         getViewInfo(a, b) {
-            if (!this.ze.isEmpty && !this.zf.isEmpty) {
-                a = this.ze;
-                b = this.zf;
+            if (!this.aas.isEmpty && !this.aat.isEmpty) {
+                a = this.aas;
+                b = this.aat;
                 return {
                     p0: a,
                     p1: b
                 };
             }
-            a = this.cg.bx;
-            b = this.cg.by;
+            a = this.cl.bx;
+            b = this.cl.by;
             return {
                 p0: a,
                 p1: b
             };
         }
-        ps(a) {
-            super.ps(a);
-            this.xx();
+        qn(a) {
+            super.qn(a);
+            this.zb();
             try {
-                if (this.dm(this.cg)) {
+                if (this.dt(this.cl)) {
                     return;
                 }
-                if (this.c7 != null && this.c7.count > this.w3) {
+                if (this.dd != null && this.dd.count > this.yh) {
                     a = false;
                 }
-                if (this.fq(a) && !this.f1) {
-                    let b = this.vx;
-                    if (this.dk()) {
-                        if (this.cw.g) {
-                            this.cw.t();
+                if (this.fz(a) && !this.gb) {
+                    let b = this.xb;
+                    if (this.dr()) {
+                        if (this.c2.g) {
+                            this.c2.t();
                         }
-                        this.vx = this.vz;
-                        this.vz = b;
+                        this.xb = this.xd;
+                        this.xd = b;
                     }
                     else {
-                        this.vx = this.vv;
-                        this.vv = b;
+                        this.xb = this.w9;
+                        this.w9 = b;
                     }
-                    this.x8(this.vv, this.vs);
-                    this.p5();
+                    this.zm(this.w9, this.w6);
+                    this.q0();
                 }
                 else {
-                    if (!this.f1) {
-                        this.x8(this.vv, this.vs);
+                    if (!this.gb) {
+                        this.zm(this.w9, this.w6);
                     }
-                    this.yj(this.vv, this.vs);
+                    this.zx(this.w9, this.w6);
                 }
             }
             finally {
-                this.yk();
+                this.zy();
             }
         }
-        qf() {
-            super.qf();
+        ra() {
+            super.ra();
             if (this.index < 0) {
                 return;
             }
-            this.vs.dd();
+            this.w6.dd();
         }
-        pt(a, b) {
-            super.pt(a, b);
-            if (!this.f9) {
-                this.cg.a4(b);
+        qo(a, b) {
+            super.qo(a, b);
+            if (!this.gj) {
+                this.cl.a4(b);
                 return;
             }
-            this.cg.a4(b);
-            if (this.dm(this.cf)) {
+            this.cl.a4(b);
+            if (this.dt(this.ck)) {
                 return;
             }
-            let c = typeCast(ScatterBaseView.$, this.cf);
-            if (!this.f2) {
-                this.vy = new ScatterFrame();
-                this.x8(this.vy, c);
+            let c = typeCast(ScatterBaseView.$, this.ck);
+            if (!this.gc) {
+                this.xc = new ScatterFrame();
+                this.zm(this.xc, c);
             }
-            this.f2 = false;
-            this.yj(this.vy, c);
-            this.f9 = false;
+            this.gc = false;
+            this.zx(this.xc, c);
+            this.gj = false;
         }
-        pq(a, b, c, d, e) {
-            super.pq(a, b, c, d, e);
-            let f = this.a3.a$h.item(d);
+        ql(a, b, c, d, e) {
+            super.ql(a, b, c, d, e);
+            let f = this.a2.a$i.item(d);
             let g = f;
             f.a3(c);
-            if (this.dm(g)) {
+            if (this.dt(g)) {
                 return;
             }
-            if (this.vu == null) {
-                this.vu = new ScatterFrame();
+            if (this.w8 == null) {
+                this.w8 = new ScatterFrame();
             }
-            this.x8(this.vu, g);
-            this.yj(this.vu, g);
+            this.zm(this.w8, g);
+            this.zx(this.w8, g);
         }
-        yf(a, b) {
+        zt(a, b) {
             let c = new List$1(Base.$, 0);
             for (let d of fromEnum(b.c)) {
                 if (!a.containsKey(d)) {
@@ -1510,10 +1573,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 b.h(e);
             }
         }
-        vj(a, b, c, d, e) {
-            if (c == null || c.length != this.vr.c.count) {
-                c = new Array(this.vr.c.count);
-                for (let f = 0; f < this.vr.c.count; f++) {
+        wx(a, b, c, d, e) {
+            if (c == null || c.length != this.w5.c.count) {
+                c = new Array(this.w5.c.count);
+                for (let f = 0; f < this.w5.c.count; f++) {
                     c[f] = PointUtil.create();
                 }
             }
@@ -1526,37 +1589,37 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             let i = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.ch, g);
                 $ret.c = this.getEffectiveViewport1(a);
-                $ret.b = this.h3();
+                $ret.b = this.id();
                 return $ret;
             })());
-            let j = this.tq(a);
-            let k = this.vr.a.em(j.left, h);
-            let l = this.vr.a.em(j.right, h);
-            let m = this.vr.b.em(j.bottom, i);
-            let n = this.vr.b.em(j.top, i);
-            if (this.vr.d) {
+            let j = this.u1(a);
+            let k = this.w5.a.em(j.left, h);
+            let l = this.w5.a.em(j.right, h);
+            let m = this.w5.b.em(j.bottom, i);
+            let n = this.w5.b.em(j.top, i);
+            if (this.w5.d) {
                 let o = k;
                 k = l;
                 l = o;
             }
-            if (this.vr.e) {
+            if (this.w5.e) {
                 let p = m;
                 m = n;
                 n = p;
             }
-            let q = this.vr;
+            let q = this.w5;
             let r = q.a;
             let s = q.b;
             let t;
             let u;
-            let v = this.wc;
-            let w = this.wd;
+            let v = this.xq;
+            let w = this.xr;
             let x = false;
             let y = 0;
             let z = 0;
-            if (this.cv != null) {
-                if (this.cv.fc()) {
-                    let aa = this.cv.lp(d, h);
+            if (this.c1 != null) {
+                if (this.c1.fx()) {
+                    let aa = this.c1.mp(d, h);
                     x = aa.c;
                     y = aa.d;
                     z = r.em(0 + y, h);
@@ -1564,7 +1627,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     z -= ab;
                 }
             }
-            for (let ac = 0; ac < this.vr.c.count; ac++) {
+            for (let ac = 0; ac < this.w5.c.count; ac++) {
                 t = v.item(ac);
                 u = w.item(ac);
                 if (x) {
@@ -1596,7 +1659,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        ws(a, b) {
+        x6(a, b) {
             if (b == null) {
                 b = new List$1(Number_$type, 2, a.e);
             }
@@ -1604,62 +1667,62 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 b.clear();
             }
             let c = 0;
-            let d = this.c7;
+            let d = this.dd;
             for (let e of fromEnum(a.c)) {
                 b.add(d.indexOf(e));
             }
             return b;
         }
-        n2(a) {
-            super.n2(a);
-            this.a5.exportTrendlineData(this, a, this.vs.c0.g$j);
+        ow(a) {
+            super.ow(a);
+            this.a4.exportTrendlineData(this, a, this.w6.c0.g$j);
         }
-        h3() {
-            return Series.h4(this.wd, null);
+        id() {
+            return Series.ie(this.xr, null);
         }
         getDataLegendSeriesContextAt(a, b) {
             let c = { $type: Point_$type, x: a, y: b };
-            let d = this.js(c);
-            let e = d == null ? NaN : this.h2(d, "XMemberPath");
-            let f = d == null ? NaN : this.h2(d, "YMemberPath");
+            let d = this.j2(c);
+            let e = d == null ? NaN : this.ic(d, "XMemberPath");
+            let f = d == null ? NaN : this.ic(d, "YMemberPath");
             let g = new DataLegendSeriesValueInfo();
             g.l = e;
             g.a = 13;
-            g.p = "X";
-            g.q = this.xn != null ? this.xn : "X";
-            g.r = this.xj != null ? this.xj : "X:";
-            g.s = this.xl != null ? this.xl : "";
+            g.q = "X";
+            g.r = this.y1 != null ? this.y1 : "X";
+            g.s = this.yx != null ? this.yx : "X:";
+            g.t = this.yz != null ? this.yz : "";
             let h = new DataLegendSeriesValueInfo();
             h.l = f;
             h.a = 14;
-            h.p = "Y";
-            h.q = this.xv != null ? this.xv : "Y";
-            h.r = this.xr != null ? this.xr : "Y:";
-            h.s = this.xt != null ? this.xt : "";
+            h.q = "Y";
+            h.r = this.y9 != null ? this.y9 : "Y";
+            h.s = this.y5 != null ? this.y5 : "Y:";
+            h.t = this.y7 != null ? this.y7 : "";
             let i = new DataLegendSeriesContext();
-            i.f = ((() => {
+            i.e = ((() => {
                 let $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
                 $ret.add(g);
                 $ret.add(h);
                 return $ret;
             })());
-            i.b = this.aw();
+            i.h = this.lh();
             return i;
         }
-        yl() {
-            if (this.we) {
-                this.wt = 0;
-                this.wu = 0;
-                for (let a = 0; a < this.wc.count; a++) {
-                    this.wt += this.wc.item(a);
-                    this.wu += this.wd.item(a);
+        zz() {
+            if (this.xs) {
+                this.x7 = 0;
+                this.x8 = 0;
+                for (let a = 0; a < this.xq.count; a++) {
+                    this.x7 += this.xq.item(a);
+                    this.x8 += this.xr.item(a);
                 }
-                this.wv = this.wt / this.wc.count;
-                this.ww = this.wu / this.wd.count;
-                this.we = false;
+                this.x9 = this.x7 / this.xq.count;
+                this.ya = this.x8 / this.xr.count;
+                this.xs = false;
             }
         }
-        id(a, b) {
+        ip(a, b) {
             if (b == null || !b.cj) {
                 return NaN;
             }
@@ -1680,44 +1743,44 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             switch (a) {
                 case 5:
                 case 2:
-                    b = this.wc.maximum;
-                    c = this.wd.maximum;
+                    b = this.xq.maximum;
+                    c = this.xr.maximum;
                     break;
                 case 4:
                 case 1:
-                    b = this.wc.minimum;
-                    c = this.wd.minimum;
+                    b = this.xq.minimum;
+                    c = this.xr.minimum;
                     break;
                 case 6:
                 case 3:
-                    if (this.we) {
-                        this.yl();
+                    if (this.xs) {
+                        this.zz();
                     }
-                    b = this.wv;
-                    c = this.ww;
+                    b = this.x9;
+                    c = this.ya;
                     break;
             }
             return [b, c];
         }
-        tn(a) {
-            let b = this.getEffectiveViewport1(this.cg);
-            let c = new ScalerParams(0, this.cg.by, this.cg.bx, this.xAxis.ch, b);
+        uy(a) {
+            let b = this.getEffectiveViewport1(this.cl);
+            let c = new ScalerParams(0, this.cl.by, this.cl.bx, this.xAxis.ch, b);
             c.c = b;
             let d = isNaN_(a[0]) ? NaN : this.xAxis.ej(a[0], c);
-            c = new ScalerParams(0, this.cg.by, this.cg.bx, this.yAxis.ch, b);
-            c.b = this.h3();
+            c = new ScalerParams(0, this.cl.by, this.cl.bx, this.yAxis.ch, b);
+            c.b = this.id();
             c.c = b;
             let e = isNaN_(a[1]) ? NaN : this.yAxis.ej(a[1], c);
             return { $type: Point_$type, x: d, y: e };
         }
-        tm(a) {
+        ux(a) {
             let b = this.am(a);
-            return this.tn(b);
+            return this.uy(b);
         }
     }
     ScatterBase.$t = /*@__PURE__*/ markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.ym = /*@__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:vt:yn', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:w7:yo', [2, null], 'HighlightedYMemberPath:w9:yp', [2, null], 'IsCustomScatterMarkerStyleAllowed:wj:yq', [0, false], 'IsCustomScatterStyleAllowed:wk:yr', [0, false], 'ItemSearchMode:v3:ys', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:w2:yt', [1, 10000], 'MarkerCollisionAvoidance:vo:yu', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:w3:yv', [1, 400], 'XAxis::y3', [NumericXAxis.$, null], 'XMemberAsLegendLabel:xj:y4', [2, null], 'XMemberAsLegendUnit:xl:y5', [2, null], 'XMemberPath:xn:y6', [2, null], 'YAxis::y7', [NumericYAxis.$, null], 'YMemberAsLegendLabel:xr:y8', [2, null], 'YMemberAsLegendUnit:xt:y9', [2, null], 'YMemberPath:xv:za', [2, null], 'TrendLineType::y1', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::y0', [1, 1.5], 'TrendLinePeriod::yz', [1, 7], 'TrendLineBrush::yw', [Brush.$, null], 'TrendLineZIndex:w4:y2', [1, 1001], 'TrendLineDashArray:zc:yx', [DoubleCollection.$], 'TrendLineDashCap:zd:yy', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.z0 = /*@__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:w7:z1', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:yl:z2', [2, null], 'HighlightedYMemberPath:yn:z3', [2, null], 'IsCustomScatterMarkerStyleAllowed:xx:z4', [0, false], 'IsCustomScatterStyleAllowed:xy:z5', [0, false], 'ItemSearchMode:xh:z6', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:yg:z7', [1, 10000], 'MarkerCollisionAvoidance:w2:z8', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:yh:z9', [1, 400], 'XAxis::aah', [NumericXAxis.$, null], 'XMemberAsLegendLabel:yx:aai', [2, null], 'XMemberAsLegendUnit:yz:aaj', [2, null], 'XMemberPath:y1:aak', [2, null], 'YAxis::aal', [NumericYAxis.$, null], 'YMemberAsLegendLabel:y5:aam', [2, null], 'YMemberAsLegendUnit:y7:aan', [2, null], 'YMemberPath:y9:aao', [2, null], 'TrendLineType::aaf', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::aae', [1, 1.5], 'TrendLinePeriod::aad', [1, 7], 'TrendLineBrush::aaa', [Brush.$, null], 'TrendLineZIndex:yi:aag', [1, 1001], 'TrendLineDashArray:aaq:aab', [DoubleCollection.$], 'TrendLineDashCap:aar:aac', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 })();
 /**
@@ -1746,19 +1809,19 @@ export let ScatterSeriesRenderManager = /*@__PURE__*/ (() => {
         }
         a0(a, b, c, d) {
             if (b == -1) {
-                a.c = false;
-                a.o = 0;
-                a.n = c - 1;
+                a.e = false;
+                a.z = 0;
+                a.y = c - 1;
             }
             else {
                 if (d) {
-                    a.o = b;
-                    a.n = b;
+                    a.z = b;
+                    a.y = b;
                 }
                 else {
-                    a.c = false;
-                    a.o = b;
-                    a.n = b;
+                    a.e = false;
+                    a.z = b;
+                    a.y = b;
                 }
             }
         }
@@ -1793,7 +1856,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             this.df = new Path();
             this.dg = new Path();
             if (!this.q) {
-                this.cz.w3 = 2000;
+                this.cz.yh = 2000;
             }
         }
         dh(a) {
@@ -1811,12 +1874,12 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return new Size(1, this.de.width, this.de.height);
         }
         cx() {
-            let a = new NumericMarkerManager(1, (b) => this.c1.item(b), (b) => this.cz.vr.c.item(b), runOn(this, this.dc), runOn(this, this.cu), runOn(this, this.c2), () => this.cz.vo);
+            let a = new NumericMarkerManager(1, (b) => this.c1.item(b), (b) => this.cz.w5.c.item(b), runOn(this, this.dc), runOn(this, this.cu), runOn(this, this.c2), () => this.cz.w2);
             a.q = runOn(this, this.dh);
             return a;
         }
         dc(a) {
-            this.cz.yf(a, this.c1);
+            this.cz.zt(a, this.c1);
         }
         c3() {
             return this.b7;
@@ -1825,11 +1888,11 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return this.cw;
         }
         cu() {
-            this.cw = this.cz.vj(this, this.c1, this.cw, this.by, this.bx);
+            this.cw = this.cz.wx(this, this.c1, this.cw, this.by, this.bx);
             return this.cw;
         }
         c2() {
-            this.c4 = this.cz.ws(this.c1, this.c4);
+            this.c4 = this.cz.x6(this.c1, this.c4);
             return this.c4;
         }
         c5() {
@@ -1842,10 +1905,10 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
         }
         dd() {
             if (this.cz.trendLineBrush != null) {
-                this.cz.zb = this.cz.trendLineBrush;
+                this.cz.aap = this.cz.trendLineBrush;
             }
             else {
-                this.cz.zb = this.cz.su;
+                this.cz.aap = this.cz.tw;
             }
         }
         ci(a) {
@@ -1862,9 +1925,9 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
                 if (this.cz.trendLineType != 0 && !b) {
                     let c = this.c0.g$j;
                     c.ad = this.cz.trendLineThickness;
-                    c._stroke = this.cz.zb;
-                    c.ai = this.cz.zc;
-                    c.aj = this.cz.zd;
+                    c._stroke = this.cz.aap;
+                    c.ai = this.cz.aaq;
+                    c.aj = this.cz.aar;
                     a.v(c);
                 }
             }
@@ -1879,11 +1942,11 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
         }
         getDefaultTooltipTemplate() {
             let a = "<div class='ui-chart-default-tooltip-content'><span";
-            let b = this.e.a3.a$r(this.e);
+            let b = this.e.a2.a$t(this.e);
             if (!stringIsNullOrEmpty(b)) {
                 a += " style='color:" + b + "'";
             }
-            a += ">" + this.cz.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.cz.xn + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.cz.xv + "}</span></div>";
+            a += ">" + this.cz.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.cz.y1 + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.cz.y9 + "}</span></div>";
             return a;
         }
     }