igniteui-webcomponents-charts 6.3.1 → 7.0.1-beta.0

package/esm2015/lib/ShapeSeriesBase_combined.js

@@ -59,67 +59,67 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
     class ShapeSeriesBase extends Series {
         constructor() {
             super();
-            this.ye = null;
+            this.yf = null;
+            this.yk = false;
             this.yj = false;
-            this.yi = false;
-            this.yc = null;
             this.yd = null;
-            this.x2 = 1;
-            this.xn = null;
+            this.ye = null;
+            this.x3 = 1;
             this.xo = null;
+            this.xp = null;
             this.assigningShapeStyle = null;
             this.assigningShapeMarkerStyle = null;
-            this.x6 = null;
-            this.yf = null;
-            this.xy = null;
-            this.x0 = null;
-            this.y5 = 0;
-            this.y1 = null;
-            this.xk = null;
-            this.xm = null;
+            this.x7 = null;
+            this.yg = null;
+            this.xz = null;
+            this.x1 = null;
+            this.y6 = 0;
+            this.y2 = null;
             this.xl = null;
-            this.xj = null;
-            this.aap = null;
-            this.xw = null;
-            this.x8 = null;
-            this.xr = null;
-            this.y8 = 0;
+            this.xn = null;
+            this.xm = null;
+            this.xk = null;
+            this.aaq = null;
+            this.xx = null;
+            this.x9 = null;
+            this.xs = null;
+            this.y9 = 0;
             this.styleShape = null;
-            this.x6 = new ShapeSeriesRenderManager();
+            this.x7 = new ShapeSeriesRenderManager();
             FastItemObjectColumn.m();
-            this.y8 = this.y7;
-            this.aap = Rect.empty;
+            this.y9 = this.y8;
+            this.aaq = Rect.empty;
         }
-        pf() {
-            super.pf();
-            this.xz = null;
-            this.x1 = null;
+        pg() {
+            super.pg();
+            this.x0 = null;
+            this.x2 = null;
         }
         ai() {
-            return [this.xz, this.x1];
+            return [this.x0, this.x2];
         }
-        kz(a, b) {
-            let c = this.no(b);
+        k0(a, b) {
+            let c = this.np(b);
             if (c == ShapeSeriesBase.$$p[9]) {
-                return this.k0(a, b, this.zs);
+                return this.k1(a, b, this.zt);
             }
             return null;
         }
-        mo(a) {
-            let b = this.no(a);
+        mp(a) {
+            let b = this.np(a);
             if (b == ShapeSeriesBase.$$p[9]) {
-                return this.zs;
+                return this.zt;
             }
-            return super.mo(a);
+            return super.mp(a);
         }
-        get yg() {
-            return this.ye;
+        get yh() {
+            return this.yf;
         }
-        set yg(a) {
-            if (this.ye != a) {
-                let b = this.yg;
-                this.ye = a;
-                this.raisePropertyChanged("FillColumn", b, this.yg);
+        set yh(a) {
+            if (this.yf != a) {
+                let b = this.yh;
+                this.yf = a;
+                this.raisePropertyChanged("FillColumn", b, this.yh);
             }
         }
         get_fh() {
@@ -128,12 +128,12 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
         get_ef() {
             return true;
         }
-        ya(a, b, c) {
+        yb(a, b, c) {
             if (this.dp == null) {
                 return null;
             }
-            let d = this.wr(b);
-            let e = this.x7.df(d, false);
+            let d = this.ws(b);
+            let e = this.x8.df(d, false);
             let f = -1;
             if (e == null) {
                 if (a != null) {
@@ -159,11 +159,11 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return g;
         }
-        yb(a, b, c) {
+        yc(a, b, c) {
             if (this.dp == null) {
                 return null;
             }
-            let d = this.x7.ch(this.wr(b));
+            let d = this.x8.ch(this.ws(b));
             let e = -1;
             if (d == null) {
                 if (a != null) {
@@ -190,48 +190,48 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return f;
         }
-        get x3() {
-            return this.x2;
+        get x4() {
+            return this.x3;
         }
-        set x3(a) {
-            let b = this.x2;
-            this.x2 = a;
-            if (b != this.x2) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.x2));
+        set x4(a) {
+            let b = this.x3;
+            this.x3 = a;
+            if (b != this.x3) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.x3));
             }
         }
-        x4() {
-            if (this.x5 != 0) {
-                return this.x5;
+        x5() {
+            if (this.x6 != 0) {
+                return this.x6;
             }
             return 1;
         }
-        iy(a) {
-            switch (this.x3) {
-                case 1: return this.zy(a).c;
-                case 2: return this.y6(a);
-                case 3: return this.y6(a);
+        iz(a) {
+            switch (this.x4) {
+                case 1: return this.zz(a).c;
+                case 2: return this.y7(a);
+                case 3: return this.y7(a);
             }
             return -1;
         }
-        zy(a) {
-            let b = this.wr(a);
+        zz(a) {
+            let b = this.ws(a);
             let c = { $type: Point_$type, x: NaN, y: NaN };
-            let d = this.x7.cr;
+            let d = this.x8.cr;
             if (d == null) {
                 return new Tuple$2(Number_$type, Point_$type, -1, c);
             }
-            let e = this.x7.ci(b, false, !this.yl);
+            let e = this.x8.ci(b, false, !this.ym);
             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.dp == null || this.xz == null || this.x1 == null || this.y1 == null) {
+            if (this.dp == null || this.x0 == null || this.x2 == null || this.y2 == null) {
                 return new Tuple$2(Number_$type, Point_$type, -1, c);
             }
-            if (this.dp.count > this.zb) {
+            if (this.dp.count > this.zc) {
                 return new Tuple$2(Number_$type, Point_$type, -1, c);
             }
             let h = 1.7976931348623157E+308;
@@ -247,26 +247,26 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return new Tuple$2(Number_$type, Point_$type, i, c);
         }
-        zx(a) {
-            let b = this.wr(a);
+        zy(a) {
+            let b = this.ws(a);
             let c = b.x;
             let d = b.y;
             let e = { $type: Point_$type, x: NaN, y: NaN };
-            if (this.dp == null || this.xz == null || this.x1 == null || this.y1 == null) {
+            if (this.dp == null || this.x0 == null || this.x2 == null || this.y2 == null) {
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
             }
-            if (this.dp.count > this.zb) {
+            if (this.dp.count > this.zc) {
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
             }
             let f = 1.7976931348623157E+308;
-            let g = this.x7.cr;
+            let g = this.x8.cr;
             if (g == null) {
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
             }
-            let h = this.x7.ci(b, false, !this.yl);
+            let h = this.x8.ci(b, false, !this.ym);
             if (h != null) {
                 let i = RectUtil.l(h.d);
-                let j = this.zw(b, h.a, this.yl);
+                let j = this.zx(b, h.a, this.ym);
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, h.b, j.d, i);
             }
             for (let k = 0; k < g.count; k++) {
@@ -283,7 +283,7 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 let r = g._inner[q].d;
                 let s = RectUtil.g(r, b);
                 if (s < f) {
-                    let t = this.zw(b, g._inner[q].a, this.yl);
+                    let t = this.zx(b, g._inner[q].a, this.ym);
                     if (t.c < o) {
                         o = t.c;
                         e = t.d;
@@ -296,13 +296,13 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
-        get_yl() {
+        get_ym() {
             return true;
         }
-        get yl() {
-            return this.get_yl();
+        get ym() {
+            return this.get_ym();
         }
-        zw(a, b, c) {
+        zx(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 };
@@ -338,34 +338,34 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return new Tuple$2(Number_$type, Point_$type, e, f);
         }
-        y6(a) {
-            return this.zx(a).c;
+        y7(a) {
+            return this.zy(a).c;
         }
-        ww(a, b, c) {
-            if (this.xz == null || this.x1 == null || this.y1 == null) {
+        wx(a, b, c) {
+            if (this.x0 == null || this.x2 == null || this.y2 == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            switch (this.x3) {
+            switch (this.x4) {
                 case 1:
-                    let d = this.zy(a);
+                    let d = this.zz(a);
                     return d.d;
                 case 2:
-                    let e = this.zx(a);
+                    let e = this.zy(a);
                     return e.e;
                 case 3:
-                    let f = this.zx(a);
+                    let f = this.zy(a);
                     return f.d;
             }
             return { $type: Point_$type, x: NaN, y: NaN };
         }
-        kw(a) {
-            let b = this.kc(a);
+        kx(a) {
+            let b = this.kd(a);
             if (this.dp != null && b >= 0 && b < this.dp.count) {
                 return this.dp.item(b);
             }
             return null;
         }
-        x9(a, b, c) {
+        ya(a, b, c) {
             let d = new HighlightingInfo();
             d.i = this;
             d.g = 0;
@@ -377,47 +377,47 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             return d;
         }
         dh(a, b, c) {
-            if (this.ef && this.f2(this.by) && !c) {
-                let d = this.ya(a, b, this.yc);
-                this.yc = d;
+            if (this.ef && this.f3(this.by) && !c) {
+                let d = this.yb(a, b, this.yd);
+                this.yd = d;
                 return d;
             }
             else {
-                let e = this.x9(a, b, this.yc);
-                this.yc = e;
+                let e = this.ya(a, b, this.yd);
+                this.yd = e;
                 return e;
             }
         }
         di(a, b, c) {
-            if (this.f2(this.by) && !c) {
-                let d = this.yb(a, b, this.yd);
-                this.yd = d;
+            if (this.f3(this.by) && !c) {
+                let d = this.yc(a, b, this.ye);
+                this.ye = d;
                 return d;
             }
             else {
-                let e = this.x9(a, b, this.yd);
+                let e = this.ya(a, b, this.ye);
                 e.d = true;
-                this.yd = e;
+                this.ye = e;
                 return e;
             }
         }
-        yz() {
-            return (this.assigningShapeStyle != null && this.yj) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1) || (this.yg != null && this.xv != null);
+        y0() {
+            return (this.assigningShapeStyle != null && this.yk) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1) || (this.yh != null && this.xw != null);
         }
-        yy() {
-            return (this.assigningShapeMarkerStyle != null && this.yi) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
+        yz() {
+            return (this.assigningShapeMarkerStyle != null && this.yj) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
         }
-        get zj() {
-            return this.c(ShapeSeriesBase.aaf);
+        get zk() {
+            return this.c(ShapeSeriesBase.aag);
         }
-        set zj(a) {
-            this.h(ShapeSeriesBase.aaf, a);
+        set zk(a) {
+            this.h(ShapeSeriesBase.aag, a);
         }
-        gh() {
-            return this.highlightedItemsSource != null || this.zj != null;
+        gi() {
+            return this.highlightedItemsSource != null || this.zk != null;
         }
-        hz() {
-            let a = super.hz();
+        h0() {
+            let a = super.h0();
             {
                 let b = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
@@ -427,7 +427,7 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.z1));
+                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.z2));
                 a.add(b);
             }
             {
@@ -440,7 +440,7 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.si));
+                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.sj));
                 a.add(c);
             }
             {
@@ -453,34 +453,34 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.si));
+                d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.sj));
                 a.add(d);
             }
             return a;
         }
-        z1(a, b) {
-            if (this.zj != null) {
-                b.value = this.zj;
+        z2(a, b) {
+            if (this.zk != null) {
+                b.value = this.zk;
                 return;
             }
-            b.value = this.zs;
+            b.value = this.zt;
         }
-        get yh() {
-            return this.yf;
+        get yi() {
+            return this.yg;
         }
-        set yh(a) {
-            let b = this.yh != a;
+        set yi(a) {
+            let b = this.yi != a;
             if (b) {
-                let c = this.yh;
-                this.yf = a;
-                this.raisePropertyChanged("ShapeColumn", c, this.yh);
+                let c = this.yi;
+                this.yg = a;
+                this.raisePropertyChanged("ShapeColumn", c, this.yi);
             }
         }
-        yq(array_) {
+        yr(array_) {
             let a = (Array.isArray(array_));
             return a;
         }
-        static yu(a) {
+        static yv(a) {
             if (a == null) {
                 return true;
             }
@@ -515,10 +515,10 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                         e = (curr_.y);
                     }
                     if (!g) {
-                        if ((isNaN_(d) || ShapeSeriesBase.yu(d)) && (isNaN_(e) || ShapeSeriesBase.yu(e))) {
+                        if ((isNaN_(d) || ShapeSeriesBase.yv(d)) && (isNaN_(e) || ShapeSeriesBase.yv(e))) {
                             d = (curr_.X);
                             e = (curr_.Y);
-                            if (!isNaN_(d) && !ShapeSeriesBase.yu(d) && !isNaN_(e) && !ShapeSeriesBase.yu(e)) {
+                            if (!isNaN_(d) && !ShapeSeriesBase.yv(d) && !isNaN_(e) && !ShapeSeriesBase.yv(e)) {
                                 g = true;
                                 f = true;
                             }
@@ -534,7 +534,7 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             return b;
         }
         dn(a) {
-            if (this.dp != null && this.yq(this.itemsSource) && a != null && a.split('!').length != 2) {
+            if (this.dp != null && this.yr(this.itemsSource) && a != null && a.split('!').length != 2) {
                 if (this.coercionMethods == null) {
                     this.coercionMethods = {};
                 }
@@ -544,153 +544,153 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return super.dn(a);
         }
-        rq(a, b, c, d) {
-            super.rq(a, b, c, d);
+        rr(a, b, c, d) {
+            super.rr(a, b, c, d);
             let e = false;
             let f = false;
             switch (b) {
                 case ShapeSeriesBase.$$p[5]:
-                    this.x3 = this.x4();
+                    this.x4 = this.x5();
                     break;
                 case "FastItemsSource":
                     let g = typeCast(IFastItemsSource_$type, c);
                     if (g != null) {
-                        if (this.yg != null) {
-                            g.deregisterColumn(this.yg);
-                        }
                         if (this.yh != null) {
                             g.deregisterColumn(this.yh);
                         }
-                        this.yh = null;
+                        if (this.yi != null) {
+                            g.deregisterColumn(this.yi);
+                        }
+                        this.yi = null;
                     }
                     let h = typeCast(IFastItemsSource_$type, d);
                     if (h != null) {
-                        if (this.zs != null) {
-                            this.yh = this.dn(this.zs);
+                        if (this.zt != null) {
+                            this.yi = this.dn(this.zt);
                         }
-                        if (this.zf != null) {
-                            this.yg = this.dl(this.zf);
+                        if (this.zg != null) {
+                            this.yh = this.dl(this.zg);
                         }
                     }
-                    e = this.xz != null && !this.xz.ed();
-                    f = this.x1 != null && !this.x1.ed();
+                    e = this.x0 != null && !this.x0.ee();
+                    f = this.x2 != null && !this.x2.ee();
                     if (e || f) {
-                        this.r8(this.gm && c != null);
+                        this.r9(this.gn && c != null);
                     }
                     break;
                 case ShapeSeriesBase.$$p[9]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.yh);
-                        this.yh = this.dn(this.zs);
+                        this.dp.deregisterColumn(this.yi);
+                        this.yi = this.dn(this.zt);
                     }
                     break;
                 case "ShapeColumn":
-                    this.z9();
-                    e = this.xz != null && !this.xz.ed();
-                    f = this.x1 != null && !this.x1.ed();
+                    this.aaa();
+                    e = this.x0 != null && !this.x0.ee();
+                    f = this.x2 != null && !this.x2.ee();
                     if (e || f) {
-                        this.r8(this.gm && this.d9);
+                        this.r9(this.gn && this.d9);
                     }
-                    this.q0();
+                    this.q1();
                     break;
                 case ShapeSeriesBase.$$p[10]:
                 case ShapeSeriesBase.$$p[11]:
-                    this.xy = this.xz;
-                    this.x0 = this.x1;
+                    this.xz = this.x0;
+                    this.x1 = this.x2;
                     let i = c;
                     let j = d;
-                    this.aaa(i);
-                    this.z2(j);
-                    if ((j != null && !j.ed()) || (j == null && i != null)) {
-                        this.r8(false);
+                    this.aab(i);
+                    this.z3(j);
+                    if ((j != null && !j.ee()) || (j == null && i != null)) {
+                        this.r9(false);
                     }
-                    this.q0();
+                    this.q1();
                     break;
                 case "ActualResolution":
-                    this.y5 = this.ik;
-                    this.q0();
+                    this.y6 = this.il;
+                    this.q1();
                     break;
                 case "ActualBrush":
-                    this.r8(false);
+                    this.r9(false);
                     break;
                 case ShapeSeriesBase.$$p[8]:
-                    this.y8 = this.y7;
-                    this.r8(false);
-                    this.q0();
+                    this.y9 = this.y8;
+                    this.r9(false);
+                    this.q1();
                     break;
                 case ShapeSeriesBase.$$p[2]:
                 case "ActualThickness":
-                    this.r8(false);
-                    this.q0();
+                    this.r9(false);
+                    this.q1();
                     break;
                 case ShapeSeriesBase.$$p[4]:
-                    this.yj = this.yx();
-                    this.r8(false);
+                    this.yk = this.yy();
+                    this.r9(false);
                     break;
                 case ShapeSeriesBase.$$p[3]:
-                    this.yi = this.yw();
-                    this.r8(false);
+                    this.yj = this.yx();
+                    this.r9(false);
                     break;
                 case ShapeSeriesBase.$$p[1]:
                     if (c != null) {
                         c.o.remove(this);
                         c.x();
-                        this.xw = null;
-                        this.x8 = null;
+                        this.xx = null;
+                        this.x9 = null;
                     }
                     if (d != null) {
                         d.o.add(this);
                         d.x();
-                        this.xw = typeCast(CustomPaletteBrushScale.$, d);
-                        this.x8 = typeCast(ValueBrushScale.$, d);
+                        this.xx = typeCast(CustomPaletteBrushScale.$, d);
+                        this.x9 = typeCast(ValueBrushScale.$, d);
                     }
-                    this.r8(false);
-                    this.q0();
+                    this.r9(false);
+                    this.q1();
                     break;
                 case "FillColumn":
-                    this.r8(this.gm && this.d9);
-                    this.q0();
+                    this.r9(this.gn && this.d9);
+                    this.q1();
                     break;
                 case ShapeSeriesBase.$$p[0]:
-                    if (this.xv != null) {
-                        this.xv.x();
+                    if (this.xw != null) {
+                        this.xw.x();
                     }
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.yg);
-                        this.yg = this.dl(this.zf);
+                        this.dp.deregisterColumn(this.yh);
+                        this.yh = this.dl(this.zg);
                     }
                     break;
             }
         }
+        yy() {
+            return this.yu;
+        }
         yx() {
             return this.yt;
         }
-        yw() {
-            return this.ys;
-        }
-        yn(a) {
+        yo(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        ym(a) {
+        yn(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        z9() {
-            this.y1 = null;
-            if (this.yh == null) {
+        aaa() {
+            this.y2 = null;
+            if (this.yi == null) {
                 return;
             }
-            this.y1 = new List$1(Rect.$, 2, this.yh.count);
-            for (let a = 0; a < this.yh.count; a++) {
-                this.y1.add(PointCollectionUtil.j(this.yh.item(a)));
+            this.y2 = new List$1(Rect.$, 2, this.yi.count);
+            for (let a = 0; a < this.yi.count; a++) {
+                this.y2.add(PointCollectionUtil.j(this.yi.item(a)));
             }
         }
-        aaq(a) {
+        aar(a) {
             if (typeCast(IEnumerable$1_$type.specialize(IEnumerable$1_$type.specialize(Point_$type)), a) !== null) {
                 return PointCollectionUtil.h(a);
             }
@@ -699,17 +699,17 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return Rect.empty;
         }
-        y3(a, b, c, d, e, f, g) {
-            return this.y4(a, b, c, d, e, f, g);
+        y4(a, b, c, d, e, f, g) {
+            return this.y5(a, b, c, d, e, f, g);
             if (typeCast(List$1.$.specialize(List$1.$.specialize(Point_$type)), c) !== null) {
-                return this.y4(a, b, c, d, e, f, g);
+                return this.y5(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.xx(a, b, PointCollectionUtil.b(k), d, e, f, g);
+                    j = this.xy(a, b, PointCollectionUtil.b(k), d, e, f, g);
                     if (j == null) {
                         continue;
                     }
@@ -719,7 +719,7 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             else if (typeCast(IEnumerable$1_$type.specialize(Point_$type), c) !== null) {
                 let l = c;
-                let m = this.xx(a, b, PointCollectionUtil.b(l), d, e, f, g);
+                let m = this.xy(a, b, PointCollectionUtil.b(l), d, e, f, g);
                 let n = new List$1(FlattenedShape.$, 0);
                 if (m != null) {
                     n.add(m);
@@ -730,46 +730,46 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 throw new InvalidOperationException(1, "Unrecognized data in ShapeColumn");
             }
         }
-        get_yr() {
+        get_ys() {
             return true;
         }
-        get yr() {
-            return this.get_yr();
+        get ys() {
+            return this.get_ys();
         }
-        y0() {
+        y1() {
             return false;
         }
-        r9(a) {
-            this.z8(this.cw);
+        sa(a) {
+            this.z9(this.cw);
         }
-        r7(a, b, c, d, e) {
-            super.r7(a, b, c, d, e);
+        r8(a, b, c, d, e) {
+            super.r8(a, b, c, d, e);
             let f = this.ba.a$k.item(d);
             let g = f;
             f.bd(c);
             if (this.d7(f)) {
                 return;
             }
-            this.z8(f);
+            this.z9(f);
         }
         updateFillScaleGlobals() {
             let a = new ActualRange();
             a.b = NaN;
             a.a = NaN;
-            if (this.yg != null) {
-                a.b = this.yg.minimum;
-                a.a = this.yg.maximum;
+            if (this.yh != null) {
+                a.b = this.yh.minimum;
+                a.a = this.yh.maximum;
             }
-            if (this.xv != null) {
-                this.xv.z(a.b, a.a);
+            if (this.xw != null) {
+                this.xw.z(a.b, a.a);
             }
         }
-        z8(a) {
+        z9(a) {
             if (this.d7(a)) {
                 return;
             }
-            if (this.xv != null) {
-                this.xr = this.xs();
+            if (this.xw != null) {
+                this.xs = this.xt();
             }
             let b;
             let c;
@@ -777,62 +777,62 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             let e = a.getViewInfo(c, b);
             c = e.p0;
             b = e.p1;
-            if (c.width < 1 || c.height < 1 || this.yh == null) {
+            if (c.width < 1 || c.height < 1 || this.yi == null) {
                 return;
             }
-            let f = this.xz;
-            let g = this.x1;
+            let f = this.x0;
+            let g = this.x2;
             let h = this.getEffectiveViewport1(a);
             let i = new ScalerParams(1, b, c, f.dn);
             i.c = h;
             let j = new ScalerParams(1, b, c, g.dn);
             j.c = h;
-            if (!this.gx) {
+            if (!this.gy) {
                 d.c7();
                 let k = new Rect(0, 0, 0, 0, 0);
                 let l;
                 let m;
                 let n;
                 let o;
-                let p = this.yh.count;
-                if (this.xm == null || this.xm.length != p) {
+                let p = this.yi.count;
+                if (this.xn == null || this.xn.length != p) {
+                    this.xn = new Array(p);
+                    this.xl = new Array(p);
                     this.xm = new Array(p);
                     this.xk = new Array(p);
-                    this.xl = new Array(p);
-                    this.xj = new Array(p);
                 }
-                let q = this.xm;
-                let r = this.xk;
-                let s = this.xl;
-                let t = this.xj;
+                let q = this.xn;
+                let r = this.xl;
+                let s = this.xm;
+                let t = this.xk;
                 let u;
                 for (let v = 0; v < p; v++) {
-                    u = this.y1._inner[v];
+                    u = this.y2._inner[v];
                     q[v] = u.top;
                     r[v] = u.left;
                     s[v] = u.right;
                     t[v] = u.bottom;
                 }
-                this.xy.k1(boxArray$1(r), 0, r.length, i);
-                this.xy.k1(boxArray$1(s), 0, s.length, i);
-                this.x0.k1(boxArray$1(q), 0, q.length, j);
-                this.x0.k1(boxArray$1(t), 0, t.length, j);
+                this.xz.k3(boxArray$1(r), 0, r.length, i);
+                this.xz.k3(boxArray$1(s), 0, s.length, i);
+                this.x1.k3(boxArray$1(q), 0, q.length, j);
+                this.x1.k3(boxArray$1(t), 0, t.length, j);
                 d.c8(r, q, s, t);
-                let w = this.yh;
+                let w = this.yi;
                 let x = this.dp;
-                this.aab(d);
+                this.aac(d);
                 let y = c.left;
                 let z = c.right;
                 let aa = c.top;
                 let ab = c.bottom;
                 let ac = null;
-                if (this.aap.isEmpty) {
+                if (this.aaq.isEmpty) {
                     ac = null;
                 }
                 else {
-                    ac = new Clipper(1, this.aap.left, this.aap.bottom, this.aap.right, this.aap.top, this.yr);
+                    ac = new Clipper(1, this.aaq.left, this.aaq.bottom, this.aaq.right, this.aaq.top, this.ys);
                 }
-                let ad = this.y0();
+                let ad = this.y1();
                 if (ad) {
                     d.cp.clear();
                 }
@@ -863,9 +863,9 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                         else {
                             ai = null;
                         }
-                        let ak = this.y3(a, ai, w.item(aj), i, j, 0, ag);
+                        let ak = this.y4(a, ai, w.item(aj), i, j, 0, ag);
                         if (ad) {
-                            ShapeSeriesBase.z7(d, aj, ak);
+                            ShapeSeriesBase.z8(d, aj, ak);
                         }
                         d.cv(aj, x.item(aj), k, ak);
                     }
@@ -878,9 +878,9 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                             else {
                                 ai = null;
                             }
-                            let al = this.y3(a, ai, w.item(aj), i, j, ag, ag);
+                            let al = this.y4(a, ai, w.item(aj), i, j, ag, ag);
                             if (ad) {
-                                ShapeSeriesBase.z7(d, aj, al);
+                                ShapeSeriesBase.z8(d, aj, al);
                             }
                             d.cv(aj, x.item(aj), k, al);
                         }
@@ -888,82 +888,82 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 }
                 d.c6();
             }
-            let am = this.yz();
-            this.x6.az(this, this.yz(), runOn(this, this.xp));
+            let am = this.y0();
+            this.x7.az(this, this.y0(), runOn(this, this.xq));
             let an = false;
-            let ao = this.x6.b;
+            let ao = this.x7.b;
             if (ao != null) {
                 an = true;
             }
             let ap = a.t;
-            let aq = this.f1;
+            let aq = this.f2;
             let ar = d.cn;
             d.c2((as) => {
                 let at = as.dataContext != null ? as.dataContext.item : null;
                 let au = as.dataContext != null ? as.dataContext.c : -1;
                 d.cz(as, at, am);
                 if (an) {
-                    this.z4(as, aq, au, this.yh.count, ap, ar);
+                    this.z5(as, aq, au, this.yi.count, ap, ar);
                 }
                 else {
                     if (ar) {
                         {
-                            this.x6.a1(as, this.ii, ar);
+                            this.x7.a1(as, this.ij, ar);
                         }
                     }
                 }
                 {
-                    this.x6.ad(as, false, false, false, false);
+                    this.x7.ad(as, false, false, false, false);
                 }
             });
         }
-        xs() {
+        xt() {
             let a = new ActualRange();
             a.b = NaN;
             a.a = NaN;
-            if (this.yg != null) {
-                a.b = this.yg.minimum;
-                a.a = this.yg.maximum;
+            if (this.yh != null) {
+                a.b = this.yh.minimum;
+                a.a = this.yh.maximum;
             }
-            let b = typeCast(ValueBrushScale.$, this.xv);
+            let b = typeCast(ValueBrushScale.$, this.xw);
             if (b != null) {
                 b.s();
-                if (this.yo && this.xv.o.count > 1) {
+                if (this.yp && this.xw.o.count > 1) {
                     a.b = b.q;
                     a.a = b.p;
                 }
             }
             return a;
         }
-        z4(a, b, c, d, e, f) {
+        z5(a, b, c, d, e, f) {
             let g = this.by != 1;
             let h = this.cq != 1;
             let i = this.cp != 1;
-            this.x6.a0(this.x6.b, c, d, false);
+            this.x7.a0(this.x7.b, c, d, false);
             {
-                this.x6.a1(a, this.ii, f);
+                this.x7.a1(a, this.ij, f);
             }
-            let j = this.x6.ax;
+            let j = this.x7.ax;
             let k = null;
             let l = null;
             let m = null;
             let n = this.dp;
-            if (this.yg != null && this.xv != null) {
-                if (j.z >= 0 && j.z < this.yg.count) {
-                    let o = this.yg.item(j.z);
-                    let p = this.xr;
+            if (this.yh != null && this.xw != null) {
+                if (j.z >= 0 && j.z < this.yh.count) {
+                    let o = this.yh.item(j.z);
+                    let p = this.xs;
                     let q = p.b;
                     let r = p.a;
                     let s = j.aa;
-                    if (this.xw != null) {
-                        s = this.xw.getBrush1(j.z, this.yg.count);
+                    if (this.xx != null) {
+                        s = this.xx.getBrush1(j.z, this.yh.count);
                     }
-                    else if (this.x8 != null && this.yg != null) {
-                        let t = this.yg.item(j.z);
-                        s = this.x8.getBrushByRange(t, q, r);
+                    else if (this.x9 != null && this.yh != null) {
+                        let t = this.yh.item(j.z);
+                        s = this.x9.getBrushByRange(t, q, r);
                     }
-                    else if (this.xv != null) {
-                        s = this.xv.getBrush(j.z);
+                    else if (this.xw != null) {
+                        s = this.xw.getBrush(j.z);
                     }
                     j.aa = s;
                 }
@@ -987,16 +987,16 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 j.b = m;
             }
             j.h = e;
-            this.z6(j);
-            this.x6.z(this, k, l, m, e, g, h, i, false);
+            this.z7(j);
+            this.x7.z(this, k, l, m, e, g, h, i, false);
         }
-        z3(a, b, c) {
+        z4(a, b, c) {
             let d = this.by != 1;
             let e = this.cq != 1;
             let f = this.cp != 1;
-            this.x6.a0(this.x6.d, a, b, true);
-            this.x6.aa(this.ii);
-            let g = this.x6.aw;
+            this.x7.a0(this.x7.d, a, b, true);
+            this.x7.aa(this.ij);
+            let g = this.x7.aw;
             let h = null;
             let i = null;
             let j = null;
@@ -1029,24 +1029,24 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 g.b = i;
             }
             g.h = c;
-            this.z5(g);
-            this.x6.y(this, h, i, j, c, d, e, f, g.v, this.dc.d7.totalHighWaterMark, g.x, this.dc.d8.totalHighWaterMark, g.t, this.dc.d6.totalHighWaterMark);
+            this.z6(g);
+            this.x7.y(this, h, i, j, c, d, e, f, g.v, this.dc.d7.totalHighWaterMark, g.x, this.dc.d8.totalHighWaterMark, g.t, this.dc.d6.totalHighWaterMark);
         }
-        z6(a) {
-            if (this.assigningShapeStyle != null && this.yj) {
+        z7(a) {
+            if (this.assigningShapeStyle != null && this.yk) {
                 this.assigningShapeStyle(this, a);
             }
         }
-        z5(a) {
-            if (this.assigningShapeMarkerStyle != null && this.yi) {
+        z6(a) {
+            if (this.assigningShapeMarkerStyle != null && this.yj) {
                 this.assigningShapeMarkerStyle(this, a);
             }
         }
-        xp(a, b) {
-            return this.xq(a, b);
-        }
         xq(a, b) {
-            if (b < a || a < 0 || a > this.yh.count || b < 0 || b > this.yh.count) {
+            return this.xr(a, b);
+        }
+        xr(a, b) {
+            if (b < a || a < 0 || a > this.yi.count || b < 0 || b > this.yi.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
@@ -1056,7 +1056,7 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        static z7(a, b, c) {
+        static z8(a, b, c) {
             let d = 0;
             let e = null;
             for (let f = 0; f < c.count; f++) {
@@ -1069,72 +1069,72 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             a.cp.addItem(b, e);
         }
-        qp() {
-            super.qp();
-            if (this.xz != null) {
-                this.xz.lx();
+        qq() {
+            super.qq();
+            if (this.x0 != null) {
+                this.x0.lz();
             }
-            if (this.x1 != null) {
-                this.x1.lx();
+            if (this.x2 != null) {
+                this.x2.lz();
             }
         }
-        s9(a, b) {
-            this.r8(false);
+        ta(a, b) {
+            this.r9(false);
         }
-        s8(a, b) {
-            this.r8(false);
+        s9(a, b) {
+            this.r9(false);
         }
-        po(a, b, c, d) {
-            super.po(a, b, c, d);
+        pp(a, b, c, d) {
+            super.pp(a, b, c, d);
             switch (a) {
                 case 3:
-                    if (d == this.zs) {
-                        this.y1._inner[b] = this.aaq(this.yh.item(b));
+                    if (d == this.zt) {
+                        this.y2._inner[b] = this.aar(this.yi.item(b));
                     }
                     break;
                 case 1:
                     for (let e = b; e < b + c; e++) {
-                        this.y1.insert(e, this.aaq(this.yh.item(e)));
+                        this.y2.insert(e, this.aar(this.yi.item(e)));
                     }
                     break;
                 case 0:
-                    this.y1.v(b, c);
+                    this.y2.v(b, c);
                     break;
                 case 2:
                     for (let f = b; f < b + c; f++) {
-                        this.y1._inner[f] = this.aaq(this.yh.item(f));
+                        this.y2._inner[f] = this.aar(this.yi.item(f));
                     }
                     break;
                 case 4:
-                    this.z9();
+                    this.aaa();
                     break;
             }
-            this.r8(false);
+            this.r9(false);
         }
-        hk(a, b, c) {
+        hl(a, b, c) {
             let d = true;
-            if (!super.hk(a, b, c) || (this.yv && this.yh == null) || b.isEmpty || a.isEmpty || this.xz == null || this.x1 == null || this.xz.b7 == null || this.x1.b7 == null || this.xz.qw == this.xz.qv || this.x1.qw == this.x1.qv || this.yh == null || this.yh.count == 0 || this.y1 == null || this.y1.count == 0 || this.y1.count != this.yh.count) {
+            if (!super.hl(a, b, c) || (this.yw && this.yi == null) || b.isEmpty || a.isEmpty || this.x0 == null || this.x2 == null || this.x0.b7 == null || this.x2.b7 == null || this.x0.qy == this.x0.qx || this.x2.qy == this.x2.qx || this.yi == null || this.yi.count == 0 || this.y2 == null || this.y2.count == 0 || this.y2.count != this.yi.count) {
                 d = false;
             }
             return d;
         }
-        get_yv() {
+        get_yw() {
             return true;
         }
-        get yv() {
-            return this.get_yv();
+        get yw() {
+            return this.get_yw();
         }
-        rh(a) {
-            super.rh(a);
-            this.x7 = typeCast(ShapeSeriesViewBase.$, a);
+        ri(a) {
+            super.ri(a);
+            this.x8 = typeCast(ShapeSeriesViewBase.$, a);
         }
-        y4(a, b, c, d, e, f, g) {
+        y5(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.xx(a, b, i, d, e, f, g);
+                let l = this.xy(a, b, i, d, e, f, g);
                 if (l == null) {
                     continue;
                 }
@@ -1142,8 +1142,8 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        xx(a, b, c, d, e, f, g) {
-            let h = this.zz(c, d, e);
+        xy(a, b, c, d, e, f, g) {
+            let h = this.z0(c, d, e);
             let i = h.c;
             let j = h.d;
             let k = i.length;
@@ -1166,7 +1166,7 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 n = p > n ? p : n;
                 o = q > o ? q : o;
             }
-            let t = !(l > this.aap.right || n < this.aap.left || m > this.aap.bottom || o < this.aap.top);
+            let t = !(l > this.aaq.right || n < this.aaq.left || m > this.aaq.bottom || o < this.aaq.top);
             if (!t && f == 0 && g != 0) {
                 if (g != 0) {
                     for (let u = 0; u < k; u++) {
@@ -1181,22 +1181,22 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     n = p > n ? p : n;
                     o = q > o ? q : o;
                 }
-                t = !(l > this.aap.right || n < this.aap.left || m > this.aap.bottom || o < this.aap.top);
+                t = !(l > this.aaq.right || n < this.aaq.left || m > this.aaq.bottom || o < this.aaq.top);
             }
             if (!t) {
                 return null;
             }
-            let w = b != null && (l < this.aap.left || m < this.aap.top || n > this.aap.right || o > this.aap.bottom);
+            let w = b != null && (l < this.aaq.left || m < this.aaq.top || n > this.aaq.right || o > this.aaq.bottom);
             let x = new Rect(0, l, m, n - l, o - m);
             if (!a.co(x)) {
                 return null;
             }
-            l = l < this.aap.left ? this.aap.left : l;
-            n = n > this.aap.right ? this.aap.right : n;
-            m = m < this.aap.top ? this.aap.top : m;
-            o = o > this.aap.bottom ? this.aap.bottom : o;
-            let y = PolySimplification.b(h, this.ik);
-            let z = new DefaultFlattener().c(h.c, h.d, y, this.y5);
+            l = l < this.aaq.left ? this.aaq.left : l;
+            n = n > this.aaq.right ? this.aaq.right : n;
+            m = m < this.aaq.top ? this.aaq.top : m;
+            o = o > this.aaq.bottom ? this.aaq.bottom : o;
+            let y = PolySimplification.b(h, this.il);
+            let z = new DefaultFlattener().c(h.c, h.d, y, this.y6);
             let aa = z.count;
             if (w) {
                 let ab = new List$1(Point_$type, 0);
@@ -1216,9 +1216,9 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             ad.c = x;
             return ad;
         }
-        zz(a, b, c) {
-            let d = this.xy;
-            let e = this.x0;
+        z0(a, b, c) {
+            let d = this.xz;
+            let e = this.x1;
             let f = a.count;
             let g = new Array(f);
             let h = new Array(f);
@@ -1226,61 +1226,61 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 g[i] = a._inner[i].x;
                 h[i] = a._inner[i].y;
             }
-            d.k1(boxArray$1(g), 0, g.length, b);
-            e.k1(boxArray$1(h), 0, h.length, c);
+            d.k3(boxArray$1(g), 0, g.length, b);
+            e.k3(boxArray$1(h), 0, h.length, c);
             return new Tuple$2(Array_$type, Array_$type, g, h);
         }
-        aab(a) {
+        aac(a) {
             a.dd();
         }
-        pi(a, b) {
-            super.pi(a, b);
+        pj(a, b) {
+            super.pj(a, b);
             let c = b;
             c.c0();
         }
-        z2(a) {
+        z3(a) {
             if (a != null) {
-                a.d3(this);
+                a.d4(this);
             }
         }
-        aaa(a) {
+        aab(a) {
             if (a != null) {
                 a.cx(this);
             }
         }
-        z0(a, b, c) {
+        z1(a, b, c) {
             let d = this.cw;
             let e = d.b9;
             let f = this.dc.y6(this.dc.yw(a));
-            if (e.width < 1 || e.height < 1 || this.yh == null) {
+            if (e.width < 1 || e.height < 1 || this.yi == null) {
                 return;
             }
             let g = this.getEffectiveViewport1(d);
-            let h = new ScalerParams(0, f, e, this.xz.dn, g);
-            let i = new ScalerParams(0, f, e, this.x1.dn, g);
+            let h = new ScalerParams(0, f, e, this.x0.dn, g);
+            let i = new ScalerParams(0, f, e, this.x2.dn, g);
             d.c7();
-            let j = this.yh.count;
+            let j = this.yi.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.y1._inner[p];
+                o = this.y2._inner[p];
                 k[p] = o.top;
                 l[p] = o.left;
                 m[p] = o.right;
                 n[p] = o.bottom;
             }
-            this.xz.k1(boxArray$1(l), 0, l.length, h);
-            this.xz.k1(boxArray$1(m), 0, m.length, h);
-            this.x1.k1(boxArray$1(k), 0, k.length, i);
-            this.x1.k1(boxArray$1(n), 0, n.length, i);
+            this.x0.k3(boxArray$1(l), 0, l.length, h);
+            this.x0.k3(boxArray$1(m), 0, m.length, h);
+            this.x2.k3(boxArray$1(k), 0, k.length, i);
+            this.x2.k3(boxArray$1(n), 0, n.length, i);
             d.c8(l, k, m, n);
             d.dd();
             let q = null;
-            if (!this.aap.isEmpty) {
-                q = new Clipper(1, this.aap.left, this.aap.bottom, this.aap.right, this.aap.top, this.yr);
+            if (!this.aaq.isEmpty) {
+                q = new Clipper(1, this.aaq.left, this.aaq.bottom, this.aaq.right, this.aaq.top, this.ys);
             }
             let r = false;
             let s = 0;
@@ -1308,14 +1308,14 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 if (!y.intersectsWith(e)) {
                     continue;
                 }
-                let aa = this.y3(d, q, this.yh.item(z), h, i, s, s);
+                let aa = this.y4(d, q, this.yi.item(z), h, i, s, s);
                 if (aa.count <= 0) {
                     continue;
                 }
-                this.yk(b, c, z);
+                this.yl(b, c, z);
             }
         }
-        yk(a, b, c) {
+        yl(a, b, c) {
             if (b == 7 || b == 6) {
                 a.add(((() => {
                     let $ret = new ChartSelection();
@@ -1343,7 +1343,7 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
         }
         a2(a, b) {
-            let c = this.x7.df(a, b);
+            let c = this.x8.df(a, b);
             let d = null;
             if (c != null) {
                 d = c.dataContext;
@@ -1361,41 +1361,41 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 return super.b3();
             }
         }
-        g2(a, b) {
-            if (this.g5(a, b)) {
+        g3(a, b) {
+            if (this.g6(a, b)) {
                 return true;
             }
             return false;
         }
-        g5(a, b) {
+        g6(a, b) {
             if (this.a2(a, b) != null) {
                 return true;
             }
             return false;
         }
-        zc(a) {
+        zd(a) {
             return this.dp.item(a);
         }
-        get_hd() {
+        get_he() {
             return true;
         }
-        set_hd(a) {
-            super.set_hd(a);
+        set_he(a) {
+            super.set_he(a);
         }
         ay(a) {
-            if (typeCast(NumericXAxis.$, a) !== null && this.y1 != null) {
+            if (typeCast(NumericXAxis.$, a) !== null && this.y2 != null) {
                 let b = 1.7976931348623157E+308;
                 let c = -1.7976931348623157E+308;
-                for (let d of fromEnum(this.y1)) {
+                for (let d of fromEnum(this.y2)) {
                     b = Math.min(b, d.left);
                     c = Math.max(c, d.right);
                 }
                 return new AxisRange(b, c);
             }
-            if (typeCast(NumericYAxis.$, a) !== null && this.y1 != null) {
+            if (typeCast(NumericYAxis.$, a) !== null && this.y2 != null) {
                 let e = 1.7976931348623157E+308;
                 let f = -1.7976931348623157E+308;
-                for (let g of fromEnum(this.y1)) {
+                for (let g of fromEnum(this.y2)) {
                     e = Math.min(e, g.top);
                     f = Math.max(f, g.bottom);
                 }
@@ -1403,20 +1403,20 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        get_f0() {
+        get_f1() {
             return true;
         }
-        get_fo() {
+        get_fp() {
             return true;
         }
-        get yp() {
+        get yq() {
             return this.styleShape != null;
         }
-        aar(a, b, c) {
+        aas(a, b, c) {
             if (this.styleShape != null) {
-                if (this.x7.dm != null && c == this.x7.dm) {
+                if (this.x8.dm != null && c == this.x8.dm) {
                     c = new Style();
-                    let d = this.x7.dm;
+                    let d = this.x8.dm;
                     c.fill = d.fill;
                     c.opacity = d.opacity;
                     c.stroke = d.stroke;
@@ -1443,8 +1443,8 @@ let ShapeSeriesBase = /*@__PURE__*/ (() => {
         }
     }
     ShapeSeriesBase.$t = /*@__PURE__*/ markType(ShapeSeriesBase, 'ShapeSeriesBase', Series.$, [ISupportsFillScale_$type]);
-    ShapeSeriesBase.aaf = /*@__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:zf:aac', [2], 'FillScale:xv:aad', [BrushScale.$], 'FillScaleUseGlobalValues:yo:aae', [0, false], 'IsCustomShapeMarkerStyleAllowed:ys:aag', [0, false], 'IsCustomShapeStyleAllowed:yt:aah', [0, false], 'ItemSearchMode:x5:aai', [ShapeItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:za:aaj', [1, 10000], 'ItemSearchThreshold:zb:aak', [1, 10000], 'ShapeFilterResolution:y7:aal', [1, 2], 'ShapeMemberPath:zs:aam', [2, null], 'XAxis:xz:aan', [NumericXAxis.$, null], 'YAxis:x1:aao', [NumericYAxis.$, null]]);
+    ShapeSeriesBase.aag = /*@__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:zg:aad', [2], 'FillScale:xw:aae', [BrushScale.$], 'FillScaleUseGlobalValues:yp:aaf', [0, false], 'IsCustomShapeMarkerStyleAllowed:yt:aah', [0, false], 'IsCustomShapeStyleAllowed:yu:aai', [0, false], 'ItemSearchMode:x6:aaj', [ShapeItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:zb:aak', [1, 10000], 'ItemSearchThreshold:zc:aal', [1, 10000], 'ShapeFilterResolution:y8:aam', [1, 2], 'ShapeMemberPath:zt:aan', [2, null], 'XAxis:x0:aao', [NumericXAxis.$, null], 'YAxis:x2:aap', [NumericYAxis.$, null]]);
     return ShapeSeriesBase;
 })();
 export { ShapeSeriesBase };
@@ -1566,7 +1566,7 @@ let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             })());
         }
         co(a) {
-            return a.width >= this.cj.y8 && a.height >= this.cj.y8;
+            return a.width >= this.cj.y9 && a.height >= this.cj.y9;
         }
         static cs(a) {
             let b = new List$1(PointCollection.$, 0);
@@ -1580,7 +1580,7 @@ let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             return b;
         }
         get cn() {
-            return this.dl != null || this.ck != null || this.cj.yp;
+            return this.dl != null || this.ck != null || this.cj.yq;
         }
         cv(a, b, c, d) {
             if (d != null && d.count > 0) {
@@ -1616,13 +1616,13 @@ let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
         }
         static cy(a, b, c) {
             if (b._fill == null) {
-                b._fill = a.f.vt;
+                b._fill = a.f.vu;
             }
             if (b._stroke == null) {
-                b._stroke = a.f.vx;
+                b._stroke = a.f.vy;
             }
             if (b.y == null) {
-                b.ad = a.f.il;
+                b.ad = a.f.im;
             }
         }
         c2(a) {
@@ -1653,7 +1653,7 @@ let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
                     this.m.j(a, a.y);
                 }
             }
-            let f = this.cj.aar(b, a, a.y);
+            let f = this.cj.aas(b, a, a.y);
             if (a.y != f) {
                 a.y = f;
                 this.m.j(a, a.y);
@@ -1744,7 +1744,7 @@ let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             let c = this.b4(a);
             this.dk._fill = c;
             this.dk._stroke = c;
-            this.dk.ad = this.f.il + 3;
+            this.dk.ad = this.f.im + 3;
             return this.dk;
         }
         bj(a, b) {
@@ -1791,7 +1791,7 @@ 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.cj.il / 2 + this.cj.i1(b);
+                        let j = this.cj.im / 2 + this.cj.i2(b);
                         if (CoreGeometryUtil.l(a, h.a._inner[0], h.a, j)) {
                             return h;
                         }
@@ -1823,7 +1823,7 @@ let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             if (this.m != null) {
                 this.m.j(b, b.y);
             }
-            this.cj.aap = RectUtil.r(a, b.ad);
+            this.cj.aaq = RectUtil.r(a, b.ad);
         }
         ax(a) {
             super.ax(a);