igniteui-webcomponents-charts 5.2.0 → 5.3.0

package/esm2015/lib/ShapeSeriesBase_combined.js

@@ -61,81 +61,81 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
     class ShapeSeriesBase extends Series {
         constructor() {
             super();
-            this.xt = null;
-            this.xy = false;
+            this.xs = null;
             this.xx = false;
+            this.xw = false;
+            this.xq = null;
             this.xr = null;
-            this.xs = null;
-            this.xh = 1;
+            this.xg = 1;
+            this.w1 = null;
             this.w2 = null;
-            this.w3 = null;
             this.assigningShapeStyle = null;
             this.assigningShapeMarkerStyle = null;
-            this.xl = null;
-            this.xu = null;
-            this.xd = null;
-            this.xf = null;
-            this.yk = 0;
-            this.yg = null;
-            this.wz = null;
-            this.w1 = null;
-            this.w0 = null;
+            this.xk = null;
+            this.xt = null;
+            this.xc = null;
+            this.xe = null;
+            this.yj = 0;
+            this.yf = null;
             this.wy = null;
-            this.z4 = null;
-            this.xb = null;
-            this.xn = null;
-            this.w6 = null;
-            this.yn = 0;
+            this.w0 = null;
+            this.wz = null;
+            this.wx = null;
+            this.z3 = null;
+            this.xa = null;
+            this.xm = null;
+            this.w5 = null;
+            this.ym = 0;
             this.styleShape = null;
-            this.xl = new ShapeSeriesRenderManager();
+            this.xk = new ShapeSeriesRenderManager();
             FastItemObjectColumn.m();
-            this.yn = this.ym;
-            this.z4 = Rect.empty;
+            this.ym = this.yl;
+            this.z3 = Rect.empty;
         }
-        o2() {
-            super.o2();
-            this.xe = null;
-            this.xg = null;
+        o1() {
+            super.o1();
+            this.xd = null;
+            this.xf = null;
         }
         ai() {
-            return [this.xe, this.xg];
+            return [this.xd, this.xf];
         }
-        kq(a, b) {
-            let c = this.nd(b);
+        kp(a, b) {
+            let c = this.nc(b);
             if (c == ShapeSeriesBase.$$p[9]) {
-                return this.kr(a, b, this.y7);
+                return this.kq(a, b, this.y6);
             }
             return null;
         }
-        md(a) {
-            let b = this.nd(a);
+        mc(a) {
+            let b = this.nc(a);
             if (b == ShapeSeriesBase.$$p[9]) {
-                return this.y7;
+                return this.y6;
             }
-            return super.md(a);
+            return super.mc(a);
         }
-        get xv() {
-            return this.xt;
+        get xu() {
+            return this.xs;
         }
-        set xv(a) {
-            if (this.xt != a) {
-                let b = this.xv;
-                this.xt = a;
-                this.raisePropertyChanged("FillColumn", b, this.xv);
+        set xu(a) {
+            if (this.xs != a) {
+                let b = this.xu;
+                this.xs = a;
+                this.raisePropertyChanged("FillColumn", b, this.xu);
             }
         }
-        get_fe() {
+        get_fd() {
             return true;
         }
         get_ed() {
             return true;
         }
-        xp(a, b, c) {
+        xo(a, b, c) {
             if (this.dn == null) {
                 return null;
             }
-            let d = this.v7(b);
-            let e = this.xm.c2(d, false);
+            let d = this.v6(b);
+            let e = this.xl.c2(d, false);
             let f = -1;
             if (e == null) {
                 if (a != null) {
@@ -161,11 +161,11 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return g;
         }
-        xq(a, b, c) {
+        xp(a, b, c) {
             if (this.dn == null) {
                 return null;
             }
-            let d = this.xm.b4(this.v7(b));
+            let d = this.xl.b4(this.v6(b));
             let e = -1;
             if (d == null) {
                 if (a != null) {
@@ -192,48 +192,48 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return f;
         }
-        get xi() {
-            return this.xh;
+        get xh() {
+            return this.xg;
         }
-        set xi(a) {
-            let b = this.xh;
-            this.xh = a;
-            if (b != this.xh) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.xh));
+        set xh(a) {
+            let b = this.xg;
+            this.xg = a;
+            if (b != this.xg) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.xg));
             }
         }
-        xj() {
-            if (this.xk != 0) {
-                return this.xk;
+        xi() {
+            if (this.xj != 0) {
+                return this.xj;
             }
             return 1;
         }
-        ir(a) {
-            switch (this.xi) {
-                case 1: return this.zd(a).c;
-                case 2: return this.yl(a);
-                case 3: return this.yl(a);
+        iq(a) {
+            switch (this.xh) {
+                case 1: return this.zc(a).c;
+                case 2: return this.yk(a);
+                case 3: return this.yk(a);
             }
             return -1;
         }
-        zd(a) {
-            let b = this.v7(a);
+        zc(a) {
+            let b = this.v6(a);
             let c = { $type: Point_$type, x: NaN, y: NaN };
-            let d = this.xm.ce;
+            let d = this.xl.ce;
             if (d == null) {
                 return new Tuple$2(Number_$type, Point_$type, -1, c);
             }
-            let e = this.xm.b5(b, false, !this.x0);
+            let e = this.xl.b5(b, false, !this.xz);
             if (e != null) {
                 c = RectUtil.l(e.d);
                 return new Tuple$2(Number_$type, Point_$type, e.b, c);
             }
             let f = b.x;
             let g = b.y;
-            if (this.dn == null || this.xe == null || this.xg == null || this.yg == null) {
+            if (this.dn == null || this.xd == null || this.xf == null || this.yf == null) {
                 return new Tuple$2(Number_$type, Point_$type, -1, c);
             }
-            if (this.dn.count > this.yq) {
+            if (this.dn.count > this.yp) {
                 return new Tuple$2(Number_$type, Point_$type, -1, c);
             }
             let h = 1.7976931348623157E+308;
@@ -249,26 +249,26 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return new Tuple$2(Number_$type, Point_$type, i, c);
         }
-        zc(a) {
-            let b = this.v7(a);
+        zb(a) {
+            let b = this.v6(a);
             let c = b.x;
             let d = b.y;
             let e = { $type: Point_$type, x: NaN, y: NaN };
-            if (this.dn == null || this.xe == null || this.xg == null || this.yg == null) {
+            if (this.dn == null || this.xd == null || this.xf == null || this.yf == null) {
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
             }
-            if (this.dn.count > this.yq) {
+            if (this.dn.count > this.yp) {
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
             }
             let f = 1.7976931348623157E+308;
-            let g = this.xm.ce;
+            let g = this.xl.ce;
             if (g == null) {
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
             }
-            let h = this.xm.b5(b, false, !this.x0);
+            let h = this.xl.b5(b, false, !this.xz);
             if (h != null) {
                 let i = RectUtil.l(h.d);
-                let j = this.zb(b, h.a, this.x0);
+                let j = this.za(b, h.a, this.xz);
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, h.b, j.d, i);
             }
             for (let k = 0; k < g.count; k++) {
@@ -285,7 +285,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 let r = g._inner[q].d;
                 let s = RectUtil.g(r, b);
                 if (s < f) {
-                    let t = this.zb(b, g._inner[q].a, this.x0);
+                    let t = this.za(b, g._inner[q].a, this.xz);
                     if (t.c < o) {
                         o = t.c;
                         e = t.d;
@@ -298,13 +298,13 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
-        get_x0() {
+        get_xz() {
             return true;
         }
-        get x0() {
-            return this.get_x0();
+        get xz() {
+            return this.get_xz();
         }
-        zb(a, b, c) {
+        za(a, b, c) {
             let d = { $type: Point_$type, x: NaN, y: NaN };
             let e = 1.7976931348623157E+308;
             let f = { $type: Point_$type, x: NaN, y: NaN };
@@ -340,34 +340,34 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return new Tuple$2(Number_$type, Point_$type, e, f);
         }
-        yl(a) {
-            return this.zc(a).c;
+        yk(a) {
+            return this.zb(a).c;
         }
-        wc(a, b, c) {
-            if (this.xe == null || this.xg == null || this.yg == null) {
+        wb(a, b, c) {
+            if (this.xd == null || this.xf == null || this.yf == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            switch (this.xi) {
+            switch (this.xh) {
                 case 1:
-                    let d = this.zd(a);
+                    let d = this.zc(a);
                     return d.d;
                 case 2:
-                    let e = this.zc(a);
+                    let e = this.zb(a);
                     return e.e;
                 case 3:
-                    let f = this.zc(a);
+                    let f = this.zb(a);
                     return f.d;
             }
             return { $type: Point_$type, x: NaN, y: NaN };
         }
-        kn(a) {
-            let b = this.j3(a);
+        km(a) {
+            let b = this.j2(a);
             if (this.dn != null && b >= 0 && b < this.dn.count) {
                 return this.dn.item(b);
             }
             return null;
         }
-        xo(a, b, c) {
+        xn(a, b, c) {
             let d = new HighlightingInfo();
             d.i = this;
             d.g = 0;
@@ -379,47 +379,47 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             return d;
         }
         dg(a, b, c) {
-            if (this.ed && this.fz(this.bx) && !c) {
-                let d = this.xp(a, b, this.xr);
-                this.xr = d;
+            if (this.ed && this.fy(this.bx) && !c) {
+                let d = this.xo(a, b, this.xq);
+                this.xq = d;
                 return d;
             }
             else {
-                let e = this.xo(a, b, this.xr);
-                this.xr = e;
+                let e = this.xn(a, b, this.xq);
+                this.xq = e;
                 return e;
             }
         }
         dh(a, b, c) {
-            if (this.fz(this.bx) && !c) {
-                let d = this.xq(a, b, this.xs);
-                this.xs = d;
+            if (this.fy(this.bx) && !c) {
+                let d = this.xp(a, b, this.xr);
+                this.xr = d;
                 return d;
             }
             else {
-                let e = this.xo(a, b, this.xs);
+                let e = this.xn(a, b, this.xr);
                 e.d = true;
-                this.xs = e;
+                this.xr = e;
                 return e;
             }
         }
-        ye() {
-            return (this.assigningShapeStyle != null && this.xy) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1) || (this.xv != null && this.xa != null);
-        }
         yd() {
-            return (this.assigningShapeMarkerStyle != null && this.xx) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
+            return (this.assigningShapeStyle != null && this.xx) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1) || (this.xu != null && this.w9 != null);
         }
-        get yy() {
-            return this.c(ShapeSeriesBase.zu);
+        yc() {
+            return (this.assigningShapeMarkerStyle != null && this.xw) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
+        }
+        get yx() {
+            return this.c(ShapeSeriesBase.zt);
         }
-        set yy(a) {
-            this.h(ShapeSeriesBase.zu, a);
+        set yx(a) {
+            this.h(ShapeSeriesBase.zt, a);
         }
-        gb() {
-            return this.highlightedItemsSource != null || this.yy != null;
+        ga() {
+            return this.highlightedItemsSource != null || this.yx != null;
         }
-        ht() {
-            let a = super.ht();
+        hs() {
+            let a = super.hs();
             {
                 let b = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
@@ -429,7 +429,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.zg));
+                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.zf));
                 a.add(b);
             }
             {
@@ -442,7 +442,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.r0));
+                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.rz));
                 a.add(c);
             }
             {
@@ -455,34 +455,34 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.r0));
+                d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.rz));
                 a.add(d);
             }
             return a;
         }
-        zg(a, b) {
-            if (this.yy != null) {
-                b.value = this.yy;
+        zf(a, b) {
+            if (this.yx != null) {
+                b.value = this.yx;
                 return;
             }
-            b.value = this.y7;
+            b.value = this.y6;
         }
-        get xw() {
-            return this.xu;
+        get xv() {
+            return this.xt;
         }
-        set xw(a) {
-            let b = this.xw != a;
+        set xv(a) {
+            let b = this.xv != a;
             if (b) {
-                let c = this.xw;
-                this.xu = a;
-                this.raisePropertyChanged("ShapeColumn", c, this.xw);
+                let c = this.xv;
+                this.xt = a;
+                this.raisePropertyChanged("ShapeColumn", c, this.xv);
             }
         }
-        x5(array_) {
+        x4(array_) {
             let a = (Array.isArray(array_));
             return a;
         }
-        static x9(a) {
+        static x8(a) {
             if (a == null) {
                 return true;
             }
@@ -517,10 +517,10 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                         e = (curr_.y);
                     }
                     if (!g) {
-                        if ((isNaN_(d) || ShapeSeriesBase.x9(d)) && (isNaN_(e) || ShapeSeriesBase.x9(e))) {
+                        if ((isNaN_(d) || ShapeSeriesBase.x8(d)) && (isNaN_(e) || ShapeSeriesBase.x8(e))) {
                             d = (curr_.X);
                             e = (curr_.Y);
-                            if (!isNaN_(d) && !ShapeSeriesBase.x9(d) && !isNaN_(e) && !ShapeSeriesBase.x9(e)) {
+                            if (!isNaN_(d) && !ShapeSeriesBase.x8(d) && !isNaN_(e) && !ShapeSeriesBase.x8(e)) {
                                 g = true;
                                 f = true;
                             }
@@ -536,7 +536,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             return b;
         }
         dm(a) {
-            if (this.dn != null && this.x5(this.itemsSource) && a != null && a.split('!').length != 2) {
+            if (this.dn != null && this.x4(this.itemsSource) && a != null && a.split('!').length != 2) {
                 if (this.coercionMethods == null) {
                     this.coercionMethods = {};
                 }
@@ -546,153 +546,153 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return super.dm(a);
         }
-        q9(a, b, c, d) {
-            super.q9(a, b, c, d);
+        q8(a, b, c, d) {
+            super.q8(a, b, c, d);
             let e = false;
             let f = false;
             switch (b) {
                 case ShapeSeriesBase.$$p[5]:
-                    this.xi = this.xj();
+                    this.xh = this.xi();
                     break;
                 case "FastItemsSource":
                     let g = typeCast(IFastItemsSource_$type, c);
                     if (g != null) {
+                        if (this.xu != null) {
+                            g.deregisterColumn(this.xu);
+                        }
                         if (this.xv != null) {
                             g.deregisterColumn(this.xv);
                         }
-                        if (this.xw != null) {
-                            g.deregisterColumn(this.xw);
-                        }
-                        this.xw = null;
+                        this.xv = null;
                     }
                     let h = typeCast(IFastItemsSource_$type, d);
                     if (h != null) {
-                        if (this.y7 != null) {
-                            this.xw = this.dm(this.y7);
+                        if (this.y6 != null) {
+                            this.xv = this.dm(this.y6);
                         }
-                        if (this.yu != null) {
-                            this.xv = this.dk(this.yu);
+                        if (this.yt != null) {
+                            this.xu = this.dk(this.yt);
                         }
                     }
-                    e = this.xe != null && !this.xe.c1();
-                    f = this.xg != null && !this.xg.c1();
+                    e = this.xd != null && !this.xd.c1();
+                    f = this.xf != null && !this.xf.c1();
                     if (e || f) {
-                        this.rr(this.gg && c != null);
+                        this.rq(this.gf && c != null);
                     }
                     break;
                 case ShapeSeriesBase.$$p[9]:
                     if (this.dn != null) {
-                        this.dn.deregisterColumn(this.xw);
-                        this.xw = this.dm(this.y7);
+                        this.dn.deregisterColumn(this.xv);
+                        this.xv = this.dm(this.y6);
                     }
                     break;
                 case "ShapeColumn":
-                    this.zo();
-                    e = this.xe != null && !this.xe.c1();
-                    f = this.xg != null && !this.xg.c1();
+                    this.zn();
+                    e = this.xd != null && !this.xd.c1();
+                    f = this.xf != null && !this.xf.c1();
                     if (e || f) {
-                        this.rr(this.gg && this.d7);
+                        this.rq(this.gf && this.d7);
                     }
-                    this.ql();
+                    this.qk();
                     break;
                 case ShapeSeriesBase.$$p[10]:
                 case ShapeSeriesBase.$$p[11]:
-                    this.xd = this.xe;
-                    this.xf = this.xg;
+                    this.xc = this.xd;
+                    this.xe = this.xf;
                     let i = c;
                     let j = d;
-                    this.zp(i);
-                    this.zh(j);
+                    this.zo(i);
+                    this.zg(j);
                     if ((j != null && !j.c1()) || (j == null && i != null)) {
-                        this.rr(false);
+                        this.rq(false);
                     }
-                    this.ql();
+                    this.qk();
                     break;
                 case "ActualResolution":
-                    this.yk = this.id;
-                    this.ql();
+                    this.yj = this.ic;
+                    this.qk();
                     break;
                 case "ActualBrush":
-                    this.rr(false);
+                    this.rq(false);
                     break;
                 case ShapeSeriesBase.$$p[8]:
-                    this.yn = this.ym;
-                    this.rr(false);
-                    this.ql();
+                    this.ym = this.yl;
+                    this.rq(false);
+                    this.qk();
                     break;
                 case ShapeSeriesBase.$$p[2]:
                 case "ActualThickness":
-                    this.rr(false);
-                    this.ql();
+                    this.rq(false);
+                    this.qk();
                     break;
                 case ShapeSeriesBase.$$p[4]:
-                    this.xy = this.yc();
-                    this.rr(false);
+                    this.xx = this.yb();
+                    this.rq(false);
                     break;
                 case ShapeSeriesBase.$$p[3]:
-                    this.xx = this.yb();
-                    this.rr(false);
+                    this.xw = this.ya();
+                    this.rq(false);
                     break;
                 case ShapeSeriesBase.$$p[1]:
                     if (c != null) {
                         c.o.remove(this);
                         c.x();
-                        this.xb = null;
-                        this.xn = null;
+                        this.xa = null;
+                        this.xm = null;
                     }
                     if (d != null) {
                         d.o.add(this);
                         d.x();
-                        this.xb = typeCast(CustomPaletteBrushScale.$, d);
-                        this.xn = typeCast(ValueBrushScale.$, d);
+                        this.xa = typeCast(CustomPaletteBrushScale.$, d);
+                        this.xm = typeCast(ValueBrushScale.$, d);
                     }
-                    this.rr(false);
-                    this.ql();
+                    this.rq(false);
+                    this.qk();
                     break;
                 case "FillColumn":
-                    this.rr(this.gg && this.d7);
-                    this.ql();
+                    this.rq(this.gf && this.d7);
+                    this.qk();
                     break;
                 case ShapeSeriesBase.$$p[0]:
-                    if (this.xa != null) {
-                        this.xa.x();
+                    if (this.w9 != null) {
+                        this.w9.x();
                     }
                     if (this.dn != null) {
-                        this.dn.deregisterColumn(this.xv);
-                        this.xv = this.dk(this.yu);
+                        this.dn.deregisterColumn(this.xu);
+                        this.xu = this.dk(this.yt);
                     }
                     break;
             }
         }
-        yc() {
-            return this.x8;
-        }
         yb() {
             return this.x7;
         }
-        x2(a) {
+        ya() {
+            return this.x6;
+        }
+        x1(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        x1(a) {
+        x0(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        zo() {
-            this.yg = null;
-            if (this.xw == null) {
+        zn() {
+            this.yf = null;
+            if (this.xv == null) {
                 return;
             }
-            this.yg = new List$1(Rect.$, 2, this.xw.count);
-            for (let a = 0; a < this.xw.count; a++) {
-                this.yg.add(PointCollectionUtil.j(this.xw.item(a)));
+            this.yf = new List$1(Rect.$, 2, this.xv.count);
+            for (let a = 0; a < this.xv.count; a++) {
+                this.yf.add(PointCollectionUtil.j(this.xv.item(a)));
             }
         }
-        z5(a) {
+        z4(a) {
             if (typeCast(IEnumerable$1_$type.specialize(IEnumerable$1_$type.specialize(Point_$type)), a) !== null) {
                 return PointCollectionUtil.h(a);
             }
@@ -701,17 +701,17 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return Rect.empty;
         }
-        yi(a, b, c, d, e, f, g) {
-            return this.yj(a, b, c, d, e, f, g);
+        yh(a, b, c, d, e, f, g) {
+            return this.yi(a, b, c, d, e, f, g);
             if (typeCast(List$1.$.specialize(List$1.$.specialize(Point_$type)), c) !== null) {
-                return this.yj(a, b, c, d, e, f, g);
+                return this.yi(a, b, c, d, e, f, g);
             }
             else if (typeCast(IEnumerable$1_$type.specialize(IEnumerable$1_$type.specialize(Point_$type)), c) !== null) {
                 let h = c;
                 let i = new List$1(FlattenedShape.$, 0);
                 let j = null;
                 for (let k of fromEnum(h)) {
-                    j = this.xc(a, b, PointCollectionUtil.b(k), d, e, f, g);
+                    j = this.xb(a, b, PointCollectionUtil.b(k), d, e, f, g);
                     if (j == null) {
                         continue;
                     }
@@ -721,7 +721,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             else if (typeCast(IEnumerable$1_$type.specialize(Point_$type), c) !== null) {
                 let l = c;
-                let m = this.xc(a, b, PointCollectionUtil.b(l), d, e, f, g);
+                let m = this.xb(a, b, PointCollectionUtil.b(l), d, e, f, g);
                 let n = new List$1(FlattenedShape.$, 0);
                 if (m != null) {
                     n.add(m);
@@ -732,46 +732,46 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 throw new InvalidOperationException(1, "Unrecognized data in ShapeColumn");
             }
         }
-        get_x6() {
+        get_x5() {
             return true;
         }
-        get x6() {
-            return this.get_x6();
+        get x5() {
+            return this.get_x5();
         }
-        yf() {
+        ye() {
             return false;
         }
-        rs(a) {
-            this.zn(this.cv);
+        rr(a) {
+            this.zm(this.cv);
         }
-        rq(a, b, c, d, e) {
-            super.rq(a, b, c, d, e);
+        rp(a, b, c, d, e) {
+            super.rp(a, b, c, d, e);
             let f = this.ba.a$j.item(d);
             let g = f;
             f.a3(c);
             if (this.d5(f)) {
                 return;
             }
-            this.zn(f);
+            this.zm(f);
         }
         updateFillScaleGlobals() {
             let a = new ActualRange();
             a.b = NaN;
             a.a = NaN;
-            if (this.xv != null) {
-                a.b = this.xv.minimum;
-                a.a = this.xv.maximum;
+            if (this.xu != null) {
+                a.b = this.xu.minimum;
+                a.a = this.xu.maximum;
             }
-            if (this.xa != null) {
-                this.xa.z(a.b, a.a);
+            if (this.w9 != null) {
+                this.w9.z(a.b, a.a);
             }
         }
-        zn(a) {
+        zm(a) {
             if (this.d5(a)) {
                 return;
             }
-            if (this.xa != null) {
-                this.w6 = this.w7();
+            if (this.w9 != null) {
+                this.w5 = this.w6();
             }
             let b;
             let c;
@@ -779,62 +779,62 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             let e = a.getViewInfo(c, b);
             c = e.p0;
             b = e.p1;
-            if (c.width < 1 || c.height < 1 || this.xw == null) {
+            if (c.width < 1 || c.height < 1 || this.xv == null) {
                 return;
             }
-            let f = this.xe;
-            let g = this.xg;
+            let f = this.xd;
+            let g = this.xf;
             let h = this.getEffectiveViewport1(a);
             let i = new ScalerParams(1, b, c, f.ch);
             i.c = h;
             let j = new ScalerParams(1, b, c, g.ch);
             j.c = h;
-            if (!this.gr) {
+            if (!this.gq) {
                 d.cu();
                 let k = new Rect(0, 0, 0, 0, 0);
                 let l;
                 let m;
                 let n;
                 let o;
-                let p = this.xw.count;
-                if (this.w1 == null || this.w1.length != p) {
-                    this.w1 = new Array(p);
-                    this.wz = new Array(p);
+                let p = this.xv.count;
+                if (this.w0 == null || this.w0.length != p) {
                     this.w0 = new Array(p);
                     this.wy = new Array(p);
+                    this.wz = new Array(p);
+                    this.wx = new Array(p);
                 }
-                let q = this.w1;
-                let r = this.wz;
-                let s = this.w0;
-                let t = this.wy;
+                let q = this.w0;
+                let r = this.wy;
+                let s = this.wz;
+                let t = this.wx;
                 let u;
                 for (let v = 0; v < p; v++) {
-                    u = this.yg._inner[v];
+                    u = this.yf._inner[v];
                     q[v] = u.top;
                     r[v] = u.left;
                     s[v] = u.right;
                     t[v] = u.bottom;
                 }
-                this.xd.hq(boxArray$1(r), 0, r.length, i);
-                this.xd.hq(boxArray$1(s), 0, s.length, i);
-                this.xf.hq(boxArray$1(q), 0, q.length, j);
-                this.xf.hq(boxArray$1(t), 0, t.length, j);
+                this.xc.hq(boxArray$1(r), 0, r.length, i);
+                this.xc.hq(boxArray$1(s), 0, s.length, i);
+                this.xe.hq(boxArray$1(q), 0, q.length, j);
+                this.xe.hq(boxArray$1(t), 0, t.length, j);
                 d.cv(r, q, s, t);
-                let w = this.xw;
+                let w = this.xv;
                 let x = this.dn;
-                this.zq(d);
+                this.zp(d);
                 let y = c.left;
                 let z = c.right;
                 let aa = c.top;
                 let ab = c.bottom;
                 let ac = null;
-                if (this.z4.isEmpty) {
+                if (this.z3.isEmpty) {
                     ac = null;
                 }
                 else {
-                    ac = new Clipper(1, this.z4.left, this.z4.bottom, this.z4.right, this.z4.top, this.x6);
+                    ac = new Clipper(1, this.z3.left, this.z3.bottom, this.z3.right, this.z3.top, this.x5);
                 }
-                let ad = this.yf();
+                let ad = this.ye();
                 if (ad) {
                     d.cc.clear();
                 }
@@ -865,9 +865,9 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                         else {
                             ai = null;
                         }
-                        let ak = this.yi(a, ai, w.item(aj), i, j, 0, ag);
+                        let ak = this.yh(a, ai, w.item(aj), i, j, 0, ag);
                         if (ad) {
-                            ShapeSeriesBase.zm(d, aj, ak);
+                            ShapeSeriesBase.zl(d, aj, ak);
                         }
                         d.ci(aj, x.item(aj), k, ak);
                     }
@@ -880,9 +880,9 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                             else {
                                 ai = null;
                             }
-                            let al = this.yi(a, ai, w.item(aj), i, j, ag, ag);
+                            let al = this.yh(a, ai, w.item(aj), i, j, ag, ag);
                             if (ad) {
-                                ShapeSeriesBase.zm(d, aj, al);
+                                ShapeSeriesBase.zl(d, aj, al);
                             }
                             d.ci(aj, x.item(aj), k, al);
                         }
@@ -890,82 +890,82 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 }
                 d.ct();
             }
-            let am = this.ye();
-            this.xl.az(this, this.ye(), runOn(this, this.w4));
+            let am = this.yd();
+            this.xk.az(this, this.yd(), runOn(this, this.w3));
             let an = false;
-            let ao = this.xl.b;
+            let ao = this.xk.b;
             if (ao != null) {
                 an = true;
             }
             let ap = a.q;
-            let aq = this.fy;
+            let aq = this.fx;
             let ar = d.ca;
             d.cp((as) => {
                 let at = as.dataContext != null ? as.dataContext.item : null;
                 let au = as.dataContext != null ? as.dataContext.c : -1;
                 d.cm(as, at, am);
                 if (an) {
-                    this.zj(as, aq, au, this.xw.count, ap, ar);
+                    this.zi(as, aq, au, this.xv.count, ap, ar);
                 }
                 else {
                     if (ar) {
                         {
-                            this.xl.a1(as, this.ib, ar);
+                            this.xk.a1(as, this.ia, ar);
                         }
                     }
                 }
                 {
-                    this.xl.ad(as, false, false, false, false);
+                    this.xk.ad(as, false, false, false, false);
                 }
             });
         }
-        w7() {
+        w6() {
             let a = new ActualRange();
             a.b = NaN;
             a.a = NaN;
-            if (this.xv != null) {
-                a.b = this.xv.minimum;
-                a.a = this.xv.maximum;
+            if (this.xu != null) {
+                a.b = this.xu.minimum;
+                a.a = this.xu.maximum;
             }
-            let b = typeCast(ValueBrushScale.$, this.xa);
+            let b = typeCast(ValueBrushScale.$, this.w9);
             if (b != null) {
                 b.s();
-                if (this.x3 && this.xa.o.count > 1) {
+                if (this.x2 && this.w9.o.count > 1) {
                     a.b = b.q;
                     a.a = b.p;
                 }
             }
             return a;
         }
-        zj(a, b, c, d, e, f) {
+        zi(a, b, c, d, e, f) {
             let g = this.bx != 1;
             let h = this.cp != 1;
             let i = this.co != 1;
-            this.xl.a0(this.xl.b, c, d, false);
+            this.xk.a0(this.xk.b, c, d, false);
             {
-                this.xl.a1(a, this.ib, f);
+                this.xk.a1(a, this.ia, f);
             }
-            let j = this.xl.ax;
+            let j = this.xk.ax;
             let k = null;
             let l = null;
             let m = null;
             let n = this.dn;
-            if (this.xv != null && this.xa != null) {
-                if (j.z >= 0 && j.z < this.xv.count) {
-                    let o = this.xv.item(j.z);
-                    let p = this.w6;
+            if (this.xu != null && this.w9 != null) {
+                if (j.z >= 0 && j.z < this.xu.count) {
+                    let o = this.xu.item(j.z);
+                    let p = this.w5;
                     let q = p.b;
                     let r = p.a;
                     let s = j.aa;
-                    if (this.xb != null) {
-                        s = this.xb.getBrush1(j.z, this.xv.count);
+                    if (this.xa != null) {
+                        s = this.xa.getBrush1(j.z, this.xu.count);
                     }
-                    else if (this.xn != null && this.xv != null) {
-                        let t = this.xv.item(j.z);
-                        s = this.xn.getBrushByRange(t, q, r);
+                    else if (this.xm != null && this.xu != null) {
+                        let t = this.xu.item(j.z);
+                        s = this.xm.getBrushByRange(t, q, r);
                     }
-                    else if (this.xa != null) {
-                        s = this.xa.getBrush(j.z);
+                    else if (this.w9 != null) {
+                        s = this.w9.getBrush(j.z);
                     }
                     j.aa = s;
                 }
@@ -989,16 +989,16 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 j.b = m;
             }
             j.h = e;
-            this.zl(j);
-            this.xl.z(this, k, l, m, e, g, h, i, false);
+            this.zk(j);
+            this.xk.z(this, k, l, m, e, g, h, i, false);
         }
-        zi(a, b, c) {
+        zh(a, b, c) {
             let d = this.bx != 1;
             let e = this.cp != 1;
             let f = this.co != 1;
-            this.xl.a0(this.xl.d, a, b, true);
-            this.xl.aa(this.ib);
-            let g = this.xl.aw;
+            this.xk.a0(this.xk.d, a, b, true);
+            this.xk.aa(this.ia);
+            let g = this.xk.aw;
             let h = null;
             let i = null;
             let j = null;
@@ -1031,24 +1031,24 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 g.b = i;
             }
             g.h = c;
-            this.zk(g);
-            this.xl.y(this, h, i, j, c, d, e, f, g.v, this.db.dl.totalHighWaterMark, g.x, this.db.dm.totalHighWaterMark, g.t, this.db.dk.totalHighWaterMark);
+            this.zj(g);
+            this.xk.y(this, h, i, j, c, d, e, f, g.v, this.db.dl.totalHighWaterMark, g.x, this.db.dm.totalHighWaterMark, g.t, this.db.dk.totalHighWaterMark);
         }
-        zl(a) {
-            if (this.assigningShapeStyle != null && this.xy) {
+        zk(a) {
+            if (this.assigningShapeStyle != null && this.xx) {
                 this.assigningShapeStyle(this, a);
             }
         }
-        zk(a) {
-            if (this.assigningShapeMarkerStyle != null && this.xx) {
+        zj(a) {
+            if (this.assigningShapeMarkerStyle != null && this.xw) {
                 this.assigningShapeMarkerStyle(this, a);
             }
         }
-        w4(a, b) {
-            return this.w5(a, b);
+        w3(a, b) {
+            return this.w4(a, b);
         }
-        w5(a, b) {
-            if (b < a || a < 0 || a > this.xw.count || b < 0 || b > this.xw.count) {
+        w4(a, b) {
+            if (b < a || a < 0 || a > this.xv.count || b < 0 || b > this.xv.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
@@ -1058,7 +1058,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        static zm(a, b, c) {
+        static zl(a, b, c) {
             let d = 0;
             let e = null;
             for (let f = 0; f < c.count; f++) {
@@ -1071,72 +1071,72 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             a.cc.addItem(b, e);
         }
-        qb() {
-            super.qb();
-            if (this.xe != null) {
-                this.xe.ia();
+        qa() {
+            super.qa();
+            if (this.xd != null) {
+                this.xd.ia();
             }
-            if (this.xg != null) {
-                this.xg.ia();
+            if (this.xf != null) {
+                this.xf.ia();
             }
         }
-        sr(a, b) {
-            this.rr(false);
-        }
         sq(a, b) {
-            this.rr(false);
+            this.rq(false);
         }
-        pb(a, b, c, d) {
-            super.pb(a, b, c, d);
+        sp(a, b) {
+            this.rq(false);
+        }
+        pa(a, b, c, d) {
+            super.pa(a, b, c, d);
             switch (a) {
                 case 3:
-                    if (d == this.y7) {
-                        this.yg._inner[b] = this.z5(this.xw.item(b));
+                    if (d == this.y6) {
+                        this.yf._inner[b] = this.z4(this.xv.item(b));
                     }
                     break;
                 case 1:
                     for (let e = b; e < b + c; e++) {
-                        this.yg.insert(e, this.z5(this.xw.item(e)));
+                        this.yf.insert(e, this.z4(this.xv.item(e)));
                     }
                     break;
                 case 0:
-                    this.yg.v(b, c);
+                    this.yf.v(b, c);
                     break;
                 case 2:
                     for (let f = b; f < b + c; f++) {
-                        this.yg._inner[f] = this.z5(this.xw.item(f));
+                        this.yf._inner[f] = this.z4(this.xv.item(f));
                     }
                     break;
                 case 4:
-                    this.zo();
+                    this.zn();
                     break;
             }
-            this.rr(false);
+            this.rq(false);
         }
-        he(a, b, c) {
+        hd(a, b, c) {
             let d = true;
-            if (!super.he(a, b, c) || (this.ya && this.xw == null) || b.isEmpty || a.isEmpty || this.xe == null || this.xg == null || this.xe.bi == null || this.xg.bi == null || this.xe.l4 == this.xe.l3 || this.xg.l4 == this.xg.l3 || this.xw == null || this.xw.count == 0 || this.yg == null || this.yg.count == 0 || this.yg.count != this.xw.count) {
+            if (!super.hd(a, b, c) || (this.x9 && this.xv == null) || b.isEmpty || a.isEmpty || this.xd == null || this.xf == null || this.xd.bi == null || this.xf.bi == null || this.xd.l4 == this.xd.l3 || this.xf.l4 == this.xf.l3 || this.xv == null || this.xv.count == 0 || this.yf == null || this.yf.count == 0 || this.yf.count != this.xv.count) {
                 d = false;
             }
             return d;
         }
-        get_ya() {
+        get_x9() {
             return true;
         }
-        get ya() {
-            return this.get_ya();
+        get x9() {
+            return this.get_x9();
         }
-        q1(a) {
-            super.q1(a);
-            this.xm = typeCast(ShapeSeriesViewBase.$, a);
+        q0(a) {
+            super.q0(a);
+            this.xl = typeCast(ShapeSeriesViewBase.$, a);
         }
-        yj(a, b, c, d, e, f, g) {
+        yi(a, b, c, d, e, f, g) {
             let h = new List$1(FlattenedShape.$, 0);
             let i;
             let j = c.count;
             for (let k = 0; k < j; k++) {
                 i = c._inner[k];
-                let l = this.xc(a, b, i, d, e, f, g);
+                let l = this.xb(a, b, i, d, e, f, g);
                 if (l == null) {
                     continue;
                 }
@@ -1144,8 +1144,8 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        xc(a, b, c, d, e, f, g) {
-            let h = this.ze(c, d, e);
+        xb(a, b, c, d, e, f, g) {
+            let h = this.zd(c, d, e);
             let i = h.c;
             let j = h.d;
             let k = i.length;
@@ -1168,7 +1168,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 n = p > n ? p : n;
                 o = q > o ? q : o;
             }
-            let t = !(l > this.z4.right || n < this.z4.left || m > this.z4.bottom || o < this.z4.top);
+            let t = !(l > this.z3.right || n < this.z3.left || m > this.z3.bottom || o < this.z3.top);
             if (!t && f == 0 && g != 0) {
                 if (g != 0) {
                     for (let u = 0; u < k; u++) {
@@ -1183,22 +1183,22 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     n = p > n ? p : n;
                     o = q > o ? q : o;
                 }
-                t = !(l > this.z4.right || n < this.z4.left || m > this.z4.bottom || o < this.z4.top);
+                t = !(l > this.z3.right || n < this.z3.left || m > this.z3.bottom || o < this.z3.top);
             }
             if (!t) {
                 return null;
             }
-            let w = b != null && (l < this.z4.left || m < this.z4.top || n > this.z4.right || o > this.z4.bottom);
+            let w = b != null && (l < this.z3.left || m < this.z3.top || n > this.z3.right || o > this.z3.bottom);
             let x = new Rect(0, l, m, n - l, o - m);
             if (!a.cb(x)) {
                 return null;
             }
-            l = l < this.z4.left ? this.z4.left : l;
-            n = n > this.z4.right ? this.z4.right : n;
-            m = m < this.z4.top ? this.z4.top : m;
-            o = o > this.z4.bottom ? this.z4.bottom : o;
-            let y = PolySimplification.b(h, this.id);
-            let z = new DefaultFlattener().c(h.c, h.d, y, this.yk);
+            l = l < this.z3.left ? this.z3.left : l;
+            n = n > this.z3.right ? this.z3.right : n;
+            m = m < this.z3.top ? this.z3.top : m;
+            o = o > this.z3.bottom ? this.z3.bottom : o;
+            let y = PolySimplification.b(h, this.ic);
+            let z = new DefaultFlattener().c(h.c, h.d, y, this.yj);
             let aa = z.count;
             if (w) {
                 let ab = new List$1(Point_$type, 0);
@@ -1218,9 +1218,9 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             ad.c = x;
             return ad;
         }
-        ze(a, b, c) {
-            let d = this.xd;
-            let e = this.xf;
+        zd(a, b, c) {
+            let d = this.xc;
+            let e = this.xe;
             let f = a.count;
             let g = new Array(f);
             let h = new Array(f);
@@ -1232,57 +1232,57 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             e.hq(boxArray$1(h), 0, h.length, c);
             return new Tuple$2(Array_$type, Array_$type, g, h);
         }
-        zq(a) {
+        zp(a) {
             a.c0();
         }
-        o5(a, b) {
-            super.o5(a, b);
+        o4(a, b) {
+            super.o4(a, b);
             let c = b;
             c.cn();
         }
-        zh(a) {
+        zg(a) {
             if (a != null) {
                 a.ct(this);
             }
         }
-        zp(a) {
+        zo(a) {
             if (a != null) {
                 a.b0(this);
             }
         }
-        zf(a, b, c) {
+        ze(a, b, c) {
             let d = this.cv;
             let e = d.bx;
-            let f = this.wr(a);
-            if (e.width < 1 || e.height < 1 || this.xw == null) {
+            let f = this.wq(a);
+            if (e.width < 1 || e.height < 1 || this.xv == null) {
                 return;
             }
             let g = this.getEffectiveViewport1(d);
-            let h = new ScalerParams(0, f, e, this.xe.ch, g);
-            let i = new ScalerParams(0, f, e, this.xg.ch, g);
+            let h = new ScalerParams(0, f, e, this.xd.ch, g);
+            let i = new ScalerParams(0, f, e, this.xf.ch, g);
             d.cu();
-            let j = this.xw.count;
+            let j = this.xv.count;
             let k = new Array(j);
             let l = new Array(j);
             let m = new Array(j);
             let n = new Array(j);
             let o;
             for (let p = 0; p < j; p++) {
-                o = this.yg._inner[p];
+                o = this.yf._inner[p];
                 k[p] = o.top;
                 l[p] = o.left;
                 m[p] = o.right;
                 n[p] = o.bottom;
             }
-            this.xe.hq(boxArray$1(l), 0, l.length, h);
-            this.xe.hq(boxArray$1(m), 0, m.length, h);
-            this.xg.hq(boxArray$1(k), 0, k.length, i);
-            this.xg.hq(boxArray$1(n), 0, n.length, i);
+            this.xd.hq(boxArray$1(l), 0, l.length, h);
+            this.xd.hq(boxArray$1(m), 0, m.length, h);
+            this.xf.hq(boxArray$1(k), 0, k.length, i);
+            this.xf.hq(boxArray$1(n), 0, n.length, i);
             d.cv(l, k, m, n);
             d.c0();
             let q = null;
-            if (!this.z4.isEmpty) {
-                q = new Clipper(1, this.z4.left, this.z4.bottom, this.z4.right, this.z4.top, this.x6);
+            if (!this.z3.isEmpty) {
+                q = new Clipper(1, this.z3.left, this.z3.bottom, this.z3.right, this.z3.top, this.x5);
             }
             let r = false;
             let s = 0;
@@ -1310,14 +1310,14 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 if (!y.intersectsWith(e)) {
                     continue;
                 }
-                let aa = this.yi(d, q, this.xw.item(z), h, i, s, s);
+                let aa = this.yh(d, q, this.xv.item(z), h, i, s, s);
                 if (aa.count <= 0) {
                     continue;
                 }
-                this.xz(b, c, z);
+                this.xy(b, c, z);
             }
         }
-        xz(a, b, c) {
+        xy(a, b, c) {
             if (b == 7 || b == 6) {
                 a.add(((() => {
                     let $ret = new ChartSelection();
@@ -1345,7 +1345,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
         }
         a2(a, b) {
-            let c = this.xm.c2(a, b);
+            let c = this.xl.c2(a, b);
             let d = null;
             if (c != null) {
                 d = c.dataContext;
@@ -1355,29 +1355,29 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return super.a2(a, b);
         }
-        yr(a) {
+        yq(a) {
             return this.dn.item(a);
         }
-        get_g7() {
+        get_g6() {
             return true;
         }
-        set_g7(a) {
-            super.set_g7(a);
+        set_g6(a) {
+            super.set_g6(a);
         }
         ay(a) {
-            if (typeCast(NumericXAxis.$, a) !== null && this.yg != null) {
+            if (typeCast(NumericXAxis.$, a) !== null && this.yf != null) {
                 let b = 1.7976931348623157E+308;
                 let c = -1.7976931348623157E+308;
-                for (let d of fromEnum(this.yg)) {
+                for (let d of fromEnum(this.yf)) {
                     b = Math.min(b, d.left);
                     c = Math.max(c, d.right);
                 }
                 return new AxisRange(b, c);
             }
-            if (typeCast(NumericYAxis.$, a) !== null && this.yg != null) {
+            if (typeCast(NumericYAxis.$, a) !== null && this.yf != null) {
                 let e = 1.7976931348623157E+308;
                 let f = -1.7976931348623157E+308;
-                for (let g of fromEnum(this.yg)) {
+                for (let g of fromEnum(this.yf)) {
                     e = Math.min(e, g.top);
                     f = Math.max(f, g.bottom);
                 }
@@ -1385,20 +1385,20 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        get_fx() {
+        get_fw() {
             return true;
         }
-        get_fl() {
+        get_fk() {
             return true;
         }
-        get x4() {
+        get x3() {
             return this.styleShape != null;
         }
-        z6(a, b, c) {
+        z5(a, b, c) {
             if (this.styleShape != null) {
-                if (this.xm.c9 != null && c == this.xm.c9) {
+                if (this.xl.c9 != null && c == this.xl.c9) {
                     c = new Style();
-                    let d = this.xm.c9;
+                    let d = this.xl.c9;
                     c.fill = d.fill;
                     c.opacity = d.opacity;
                     c.stroke = d.stroke;
@@ -1425,8 +1425,8 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
         }
     }
     ShapeSeriesBase.$t = /*@__PURE__*/ markType(ShapeSeriesBase, 'ShapeSeriesBase', Series.$, [ISupportsFillScale_$type]);
-    ShapeSeriesBase.zu = /*@__PURE__*/ DependencyProperty.i("HighlightedValueMemberPath", String_$type, ShapeSeriesBase.$, /*@__PURE__*/ new PropertyMetadata(2, null, (a, b) => a.raisePropertyChanged("HighlightedValueMemberPath", b.oldValue, b.newValue)));
-    ShapeSeriesBase.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, ShapeSeriesBase, 'raisePropertyChanged', ['FillMemberPath:yu:zr', [2], 'FillScale:xa:zs', [BrushScale.$], 'FillScaleUseGlobalValues:x3:zt', [0, false], 'IsCustomShapeMarkerStyleAllowed:x7:zv', [0, false], 'IsCustomShapeStyleAllowed:x8:zw', [0, false], 'ItemSearchMode:xk:zx', [ShapeItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:yp:zy', [1, 10000], 'ItemSearchThreshold:yq:zz', [1, 10000], 'ShapeFilterResolution:ym:z0', [1, 2], 'ShapeMemberPath:y7:z1', [2, null], 'XAxis:xe:z2', [NumericXAxis.$, null], 'YAxis:xg:z3', [NumericYAxis.$, null]]);
+    ShapeSeriesBase.zt = /*@__PURE__*/ DependencyProperty.i("HighlightedValueMemberPath", String_$type, ShapeSeriesBase.$, /*@__PURE__*/ new PropertyMetadata(2, null, (a, b) => a.raisePropertyChanged("HighlightedValueMemberPath", b.oldValue, b.newValue)));
+    ShapeSeriesBase.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, ShapeSeriesBase, 'raisePropertyChanged', ['FillMemberPath:yt:zq', [2], 'FillScale:w9:zr', [BrushScale.$], 'FillScaleUseGlobalValues:x2:zs', [0, false], 'IsCustomShapeMarkerStyleAllowed:x6:zu', [0, false], 'IsCustomShapeStyleAllowed:x7:zv', [0, false], 'ItemSearchMode:xj:zw', [ShapeItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:yo:zx', [1, 10000], 'ItemSearchThreshold:yp:zy', [1, 10000], 'ShapeFilterResolution:yl:zz', [1, 2], 'ShapeMemberPath:y6:z0', [2, null], 'XAxis:xd:z1', [NumericXAxis.$, null], 'YAxis:xf:z2', [NumericYAxis.$, null]]);
     return ShapeSeriesBase;
 })();
 /**
@@ -1552,7 +1552,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             })());
         }
         cb(a) {
-            return a.width >= this.b6.yn && a.height >= this.b6.yn;
+            return a.width >= this.b6.ym && a.height >= this.b6.ym;
         }
         static cf(a) {
             let b = new List$1(PointCollection.$, 0);
@@ -1566,7 +1566,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             return b;
         }
         get ca() {
-            return this.c8 != null || this.b7 != null || this.b6.x4;
+            return this.c8 != null || this.b7 != null || this.b6.x3;
         }
         ci(a, b, c, d) {
             if (d != null && d.count > 0) {
@@ -1602,13 +1602,13 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
         }
         static cl(a, b, c) {
             if (b._fill == null) {
-                b._fill = a.e.u9;
+                b._fill = a.e.u8;
             }
             if (b._stroke == null) {
-                b._stroke = a.e.vd;
+                b._stroke = a.e.vc;
             }
             if (b.y == null) {
-                b.ad = a.e.ie;
+                b.ad = a.e.id;
             }
         }
         cp(a) {
@@ -1639,7 +1639,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
                     this.k.j(a, a.y);
                 }
             }
-            let f = this.b6.z6(b, a, a.y);
+            let f = this.b6.z5(b, a, a.y);
             if (a.y != f) {
                 a.y = f;
                 this.k.j(a, a.y);
@@ -1730,7 +1730,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             let c = this.bs(a);
             this.c7._fill = c;
             this.c7._stroke = c;
-            this.c7.ad = this.e.ie + 3;
+            this.c7.ad = this.e.id + 3;
             return this.c7;
         }
         a8(a, b) {
@@ -1777,7 +1777,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
                 }
                 if (d >= h.d.left && d <= h.d.right && e >= h.d.top && e <= h.d.bottom) {
                     if (c) {
-                        let j = this.b6.ie / 2 + this.b6.iu(b);
+                        let j = this.b6.id / 2 + this.b6.it(b);
                         if (GeometryUtil.e(a, h.a._inner[0], h.a, j)) {
                             return h;
                         }
@@ -1809,7 +1809,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             if (this.k != null) {
                 this.k.j(b, b.y);
             }
-            this.b6.z4 = RectUtil.r(a, b.ad);
+            this.b6.z3 = RectUtil.r(a, b.ad);
         }
         an(a) {
             super.an(a);