igniteui-webcomponents-charts 4.7.2-beta.0 → 4.7.2-beta.2

package/esm2015/lib/ShapeSeriesBase_combined.js

@@ -6,7 +6,7 @@ GOVERNS THE LICENSING, INSTALLATION AND USE OF INFRAGISTICS SOFTWARE. BY DOWNLOA
 */
 import { Series } from "./Series";
 import { DependencyProperty } from "igniteui-webcomponents-core";
-import { HighlightingInfo } from "./HighlightingInfo";
+import { HighlightingInfo } from "igniteui-webcomponents-core";
 import { ShapeItemSearchMode_$type } from "./ShapeItemSearchMode";
 import { IEnumerable$1_$type, enumGetBox, Number_$type, Point_$type, String_$type, typeCast, runOn, delegateCombine, fromEnum, Array_$type, markType, markDep } from "igniteui-webcomponents-core";
 import { NumericXAxis } from "./NumericXAxis";
@@ -55,45 +55,45 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
     class ShapeSeriesBase extends Series {
         constructor() {
             super();
+            this.uw = false;
             this.uv = false;
-            this.uu = false;
-            this.ug = null;
-            this.uh = null;
-            this.um = 1;
-            this.t6 = null;
+            this.ur = null;
+            this.us = null;
+            this.ui = 1;
             this.t7 = null;
+            this.t8 = null;
             this.assigningShapeStyle = null;
             this.assigningShapeMarkerStyle = null;
-            this.uq = null;
-            this.us = null;
-            this.ui = null;
-            this.uk = null;
-            this.vf = 0;
-            this.vb = null;
-            this.t3 = null;
-            this.t5 = null;
+            this.um = null;
+            this.ut = null;
+            this.ue = null;
+            this.ug = null;
+            this.vg = 0;
+            this.vc = null;
             this.t4 = null;
-            this.t2 = null;
-            this.wq = null;
-            this.vi = 0;
+            this.t6 = null;
+            this.t5 = null;
+            this.t3 = null;
+            this.wr = null;
+            this.vj = 0;
             this.styleShape = null;
-            this.uq = new ShapeSeriesRenderManager();
+            this.um = new ShapeSeriesRenderManager();
             FastItemObjectColumn.m();
-            this.vi = this.vh;
-            this.wq = Rect.empty;
+            this.vj = this.vi;
+            this.wr = Rect.empty;
         }
         nh() {
             super.nh();
-            this.uj = null;
-            this.ul = null;
+            this.uf = null;
+            this.uh = null;
         }
         ag() {
-            return [this.uj, this.ul];
+            return [this.uf, this.uh];
         }
         jv(a, b) {
             let c = this.lw(b);
             if (c == ShapeSeriesBase.$$p[6]) {
-                return this.jw(a, b, this.vx);
+                return this.jw(a, b, this.vy);
             }
             return null;
         }
@@ -103,9 +103,9 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
         get_dv() {
             return true;
         }
-        ue(a, b, c) {
-            let d = this.td(b);
-            let e = this.ur.c2(d, false);
+        up(a, b, c) {
+            let d = this.te(b);
+            let e = this.un.c2(d, false);
             let f = -1;
             if (e == null) {
                 if (a != null) {
@@ -122,17 +122,17 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 return null;
             }
             let g = new HighlightingInfo();
-            g.b = this;
-            g.h = f;
+            g.i = this;
             g.g = f;
-            g.d = false;
-            if (c != null && c.h == g.h && c.g == g.g) {
+            g.f = f;
+            g.c = false;
+            if (c != null && c.g == g.g && c.f == g.f) {
                 return c;
             }
             return g;
         }
-        uf(a, b, c) {
-            let d = this.ur.b4(this.td(b));
+        uq(a, b, c) {
+            let d = this.un.b4(this.te(b));
             let e = -1;
             if (d == null) {
                 if (a != null) {
@@ -149,58 +149,58 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 return null;
             }
             let f = new HighlightingInfo();
-            f.b = this;
-            f.h = e;
+            f.i = this;
             f.g = e;
-            f.d = false;
-            f.e = true;
-            if (c != null && c.h == f.h && c.g == f.g) {
+            f.f = e;
+            f.c = false;
+            f.d = true;
+            if (c != null && c.g == f.g && c.f == f.f) {
                 return c;
             }
             return f;
         }
-        get un() {
-            return this.um;
+        get uj() {
+            return this.ui;
         }
-        set un(a) {
-            let b = this.um;
-            this.um = a;
-            if (b != this.um) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.um));
+        set uj(a) {
+            let b = this.ui;
+            this.ui = a;
+            if (b != this.ui) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.ui));
             }
         }
-        uo() {
-            if (this.up != 0) {
-                return this.up;
+        uk() {
+            if (this.ul != 0) {
+                return this.ul;
             }
             return 1;
         }
         hw(a) {
-            switch (this.un) {
-                case 1: return this.v3(a).c;
-                case 2: return this.vg(a);
-                case 3: return this.vg(a);
+            switch (this.uj) {
+                case 1: return this.v4(a).c;
+                case 2: return this.vh(a);
+                case 3: return this.vh(a);
             }
             return -1;
         }
-        v3(a) {
-            let b = this.td(a);
+        v4(a) {
+            let b = this.te(a);
             let c = { $type: Point_$type, x: NaN, y: NaN };
-            let d = this.ur.ce;
+            let d = this.un.ce;
             if (d == null) {
                 return new Tuple$2(Number_$type, Point_$type, -1, c);
             }
-            let e = this.ur.b5(b, false, !this.uw);
+            let e = this.un.b5(b, false, !this.ux);
             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.c7 == null || this.uj == null || this.ul == null || this.vb == null) {
+            if (this.c7 == null || this.uf == null || this.uh == null || this.vc == null) {
                 return new Tuple$2(Number_$type, Point_$type, -1, c);
             }
-            if (this.c7.count > this.vl) {
+            if (this.c7.count > this.vm) {
                 return new Tuple$2(Number_$type, Point_$type, -1, c);
             }
             let h = 1.7976931348623157E+308;
@@ -216,26 +216,26 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return new Tuple$2(Number_$type, Point_$type, i, c);
         }
-        v2(a) {
-            let b = this.td(a);
+        v3(a) {
+            let b = this.te(a);
             let c = b.x;
             let d = b.y;
             let e = { $type: Point_$type, x: NaN, y: NaN };
-            if (this.c7 == null || this.uj == null || this.ul == null || this.vb == null) {
+            if (this.c7 == null || this.uf == null || this.uh == null || this.vc == null) {
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
             }
-            if (this.c7.count > this.vl) {
+            if (this.c7.count > this.vm) {
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
             }
             let f = 1.7976931348623157E+308;
-            let g = this.ur.ce;
+            let g = this.un.ce;
             if (g == null) {
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
             }
-            let h = this.ur.b5(b, false, !this.uw);
+            let h = this.un.b5(b, false, !this.ux);
             if (h != null) {
                 let i = RectUtil.l(h.d);
-                let j = this.v1(b, h.a, this.uw);
+                let j = this.v2(b, h.a, this.ux);
                 return new Tuple$3(Number_$type, Point_$type, Point_$type, h.b, j.d, i);
             }
             for (let k = 0; k < g.count; k++) {
@@ -252,7 +252,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 let r = g._inner[q].d;
                 let s = RectUtil.g(r, b);
                 if (s < f) {
-                    let t = this.v1(b, g._inner[q].a, this.uw);
+                    let t = this.v2(b, g._inner[q].a, this.ux);
                     if (t.c < o) {
                         o = t.c;
                         e = t.d;
@@ -265,13 +265,13 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
-        get_uw() {
+        get_ux() {
             return true;
         }
-        get uw() {
-            return this.get_uw();
+        get ux() {
+            return this.get_ux();
         }
-        v1(a, b, c) {
+        v2(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 };
@@ -307,22 +307,22 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return new Tuple$2(Number_$type, Point_$type, e, f);
         }
-        vg(a) {
-            return this.v2(a).c;
+        vh(a) {
+            return this.v3(a).c;
         }
-        ti(a, b, c) {
-            if (this.uj == null || this.ul == null || this.vb == null) {
+        tj(a, b, c) {
+            if (this.uf == null || this.uh == null || this.vc == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            switch (this.un) {
+            switch (this.uj) {
                 case 1:
-                    let d = this.v3(a);
+                    let d = this.v4(a);
                     return d.d;
                 case 2:
-                    let e = this.v2(a);
+                    let e = this.v3(a);
                     return e.e;
                 case 3:
-                    let f = this.v2(a);
+                    let f = this.v3(a);
                     return f.d;
             }
             return { $type: Point_$type, x: NaN, y: NaN };
@@ -334,56 +334,56 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        ud(a, b, c) {
+        uo(a, b, c) {
             let d = new HighlightingInfo();
-            d.b = this;
-            d.h = 0;
-            d.g = this.c7.count - 1;
-            d.d = true;
-            if (c != null && c.h == d.h && c.g == d.g) {
+            d.i = this;
+            d.g = 0;
+            d.f = this.c7.count - 1;
+            d.c = true;
+            if (c != null && c.g == d.g && c.f == d.f) {
                 return c;
             }
             return d;
         }
-        ax(a, b, c) {
-            if (this.dv && this.fd(this.bt) && !c) {
-                let d = this.ue(a, b, this.ug);
-                this.ug = d;
+        c0(a, b, c) {
+            if (this.dv && this.fd(this.bp) && !c) {
+                let d = this.up(a, b, this.ur);
+                this.ur = d;
                 return d;
             }
             else {
-                let e = this.ud(a, b, this.ug);
-                this.ug = e;
+                let e = this.uo(a, b, this.ur);
+                this.ur = e;
                 return e;
             }
         }
-        ay(a, b, c) {
-            if (this.fd(this.bt) && !c) {
-                let d = this.uf(a, b, this.uh);
-                this.uh = d;
+        c1(a, b, c) {
+            if (this.fd(this.bp) && !c) {
+                let d = this.uq(a, b, this.us);
+                this.us = d;
                 return d;
             }
             else {
-                let e = this.ud(a, b, this.uh);
-                e.e = true;
-                this.uh = e;
+                let e = this.uo(a, b, this.us);
+                e.d = true;
+                this.us = e;
                 return e;
             }
         }
-        u9() {
-            return (this.assigningShapeStyle != null && this.uv) || (this.bt != 1);
+        va() {
+            return (this.assigningShapeStyle != null && this.uw) || (this.bp != 1);
         }
-        u8() {
-            return (this.assigningShapeMarkerStyle != null && this.uu) || (this.bt != 1);
+        u9() {
+            return (this.assigningShapeMarkerStyle != null && this.uv) || (this.bp != 1);
         }
-        get vo() {
-            return this.c(ShapeSeriesBase.wg);
+        get vp() {
+            return this.c(ShapeSeriesBase.wh);
         }
-        set vo(a) {
-            this.h(ShapeSeriesBase.wg, a);
+        set vp(a) {
+            this.h(ShapeSeriesBase.wh, a);
         }
         fo() {
-            return this.highlightedItemsSource != null || this.vo != null;
+            return this.highlightedItemsSource != null || this.vp != null;
         }
         g1() {
             let a = super.g1();
@@ -396,7 +396,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.v5));
+                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.v6));
                 a.add(b);
             }
             {
@@ -409,7 +409,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.py));
+                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.pz));
                 a.add(c);
             }
             {
@@ -422,34 +422,34 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.py));
+                d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.pz));
                 a.add(d);
             }
             return a;
         }
-        v5(a, b) {
-            if (this.vo != null) {
-                b.value = this.vo;
+        v6(a, b) {
+            if (this.vp != null) {
+                b.value = this.vp;
                 return;
             }
-            b.value = this.vx;
+            b.value = this.vy;
         }
-        get ut() {
-            return this.us;
+        get uu() {
+            return this.ut;
         }
-        set ut(a) {
-            let b = this.ut != a;
+        set uu(a) {
+            let b = this.uu != a;
             if (b) {
-                let c = this.ut;
-                this.us = a;
-                this.raisePropertyChanged("ShapeColumn", c, this.ut);
+                let c = this.uu;
+                this.ut = a;
+                this.raisePropertyChanged("ShapeColumn", c, this.uu);
             }
         }
-        u0(array_) {
+        u1(array_) {
             let a = (Array.isArray(array_));
             return a;
         }
-        static u4(a) {
+        static u5(a) {
             if (a == null) {
                 return true;
             }
@@ -484,10 +484,10 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                         e = (curr_.y);
                     }
                     if (!g) {
-                        if ((isNaN_(d) || ShapeSeriesBase.u4(d)) && (isNaN_(e) || ShapeSeriesBase.u4(e))) {
+                        if ((isNaN_(d) || ShapeSeriesBase.u5(d)) && (isNaN_(e) || ShapeSeriesBase.u5(e))) {
                             d = (curr_.X);
                             e = (curr_.Y);
-                            if (!isNaN_(d) && !ShapeSeriesBase.u4(d) && !isNaN_(e) && !ShapeSeriesBase.u4(e)) {
+                            if (!isNaN_(d) && !ShapeSeriesBase.u5(d) && !isNaN_(e) && !ShapeSeriesBase.u5(e)) {
                                 g = true;
                                 f = true;
                             }
@@ -503,7 +503,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             return b;
         }
         c6(a) {
-            if (this.c7 != null && this.u0(this.itemsSource) && a != null && a.split('!').length != 2) {
+            if (this.c7 != null && this.u1(this.itemsSource) && a != null && a.split('!').length != 2) {
                 if (this.coercionMethods == null) {
                     this.coercionMethods = {};
                 }
@@ -513,113 +513,113 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return super.c6(a);
         }
-        o9(a, b, c, d) {
-            super.o9(a, b, c, d);
+        pa(a, b, c, d) {
+            super.pa(a, b, c, d);
             let e = false;
             let f = false;
             switch (b) {
                 case ShapeSeriesBase.$$p[2]:
-                    this.un = this.uo();
+                    this.uj = this.uk();
                     break;
                 case "FastItemsSource":
                     let g = typeCast(IFastItemsSource_$type, c);
                     if (g != null) {
-                        g.deregisterColumn(this.ut);
-                        this.ut = null;
+                        g.deregisterColumn(this.uu);
+                        this.uu = null;
                     }
                     let h = typeCast(IFastItemsSource_$type, d);
                     if (h != null) {
-                        this.ut = this.c6(this.vx);
+                        this.uu = this.c6(this.vy);
                     }
-                    e = this.uj != null && !this.uj.c1();
-                    f = this.ul != null && !this.ul.c1();
+                    e = this.uf != null && !this.uf.c1();
+                    f = this.uh != null && !this.uh.c1();
                     if (e || f) {
-                        this.pq(this.fr && c != null);
+                        this.pr(this.fr && c != null);
                     }
                     break;
                 case ShapeSeriesBase.$$p[6]:
                     if (this.c7 != null) {
-                        this.c7.deregisterColumn(this.ut);
-                        this.ut = this.c6(this.vx);
+                        this.c7.deregisterColumn(this.uu);
+                        this.uu = this.c6(this.vy);
                     }
                     break;
                 case "ShapeColumn":
-                    this.wd();
-                    e = this.uj != null && !this.uj.c1();
-                    f = this.ul != null && !this.ul.c1();
+                    this.we();
+                    e = this.uf != null && !this.uf.c1();
+                    f = this.uh != null && !this.uh.c1();
                     if (e || f) {
-                        this.pq(this.fr && this.dp);
+                        this.pr(this.fr && this.dp);
                     }
                     this.om();
                     break;
                 case ShapeSeriesBase.$$p[7]:
                 case ShapeSeriesBase.$$p[8]:
-                    this.ui = this.uj;
-                    this.uk = this.ul;
+                    this.ue = this.uf;
+                    this.ug = this.uh;
                     let i = c;
                     let j = d;
-                    this.we(i);
-                    this.v6(j);
+                    this.wf(i);
+                    this.v7(j);
                     if ((j != null && !j.c1()) || (j == null && i != null)) {
-                        this.pq(false);
+                        this.pr(false);
                     }
                     this.om();
                     break;
                 case "ActualResolution":
-                    this.vf = this.hk;
+                    this.vg = this.hk;
                     this.om();
                     break;
                 case "ActualBrush":
-                    this.pq(false);
+                    this.pr(false);
                     break;
                 case ShapeSeriesBase.$$p[5]:
-                    this.vi = this.vh;
-                    this.pq(false);
+                    this.vj = this.vi;
+                    this.pr(false);
                     this.om();
                     break;
                 case "ActualThickness":
-                    this.pq(false);
+                    this.pr(false);
                     this.om();
                     break;
                 case ShapeSeriesBase.$$p[1]:
-                    this.uv = this.u7();
-                    this.pq(false);
+                    this.uw = this.u8();
+                    this.pr(false);
                     break;
                 case ShapeSeriesBase.$$p[0]:
-                    this.uu = this.u6();
-                    this.pq(false);
+                    this.uv = this.u7();
+                    this.pr(false);
                     break;
             }
         }
+        u8() {
+            return this.u4;
+        }
         u7() {
             return this.u3;
         }
-        u6() {
-            return this.u2;
-        }
-        uy(a) {
+        uz(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        ux(a) {
+        uy(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        wd() {
-            this.vb = null;
-            if (this.ut == null) {
+        we() {
+            this.vc = null;
+            if (this.uu == null) {
                 return;
             }
-            this.vb = new List$1(Rect.$, 2, this.ut.count);
-            for (let a = 0; a < this.ut.count; a++) {
-                this.vb.add(PointCollectionUtil.j(this.ut.item(a)));
+            this.vc = new List$1(Rect.$, 2, this.uu.count);
+            for (let a = 0; a < this.uu.count; a++) {
+                this.vc.add(PointCollectionUtil.j(this.uu.item(a)));
             }
         }
-        wr(a) {
+        ws(a) {
             if (typeCast(IEnumerable$1_$type.specialize(IEnumerable$1_$type.specialize(Point_$type)), a) !== null) {
                 return PointCollectionUtil.h(a);
             }
@@ -628,17 +628,17 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return Rect.empty;
         }
-        vd(a, b, c, d, e, f, g) {
-            return this.ve(a, b, c, d, e, f, g);
+        ve(a, b, c, d, e, f, g) {
+            return this.vf(a, b, c, d, e, f, g);
             if (typeCast(List$1.$.specialize(List$1.$.specialize(Point_$type)), c) !== null) {
-                return this.ve(a, b, c, d, e, f, g);
+                return this.vf(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.uc(a, b, PointCollectionUtil.b(k), d, e, f, g);
+                    j = this.ud(a, b, PointCollectionUtil.b(k), d, e, f, g);
                     if (j == null) {
                         continue;
                     }
@@ -648,7 +648,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             else if (typeCast(IEnumerable$1_$type.specialize(Point_$type), c) !== null) {
                 let l = c;
-                let m = this.uc(a, b, PointCollectionUtil.b(l), d, e, f, g);
+                let m = this.ud(a, b, PointCollectionUtil.b(l), d, e, f, g);
                 let n = new List$1(FlattenedShape.$, 0);
                 if (m != null) {
                     n.add(m);
@@ -659,29 +659,29 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 throw new InvalidOperationException(1, "Unrecognized data in ShapeColumn");
             }
         }
-        get_u1() {
+        get_u2() {
             return true;
         }
-        get u1() {
-            return this.get_u1();
+        get u2() {
+            return this.get_u2();
         }
-        va() {
+        vb() {
             return false;
         }
-        pr(a) {
-            this.wc(this.ck);
+        ps(a) {
+            this.wd(this.cg);
         }
-        pp(a, b, c, d, e) {
-            super.pp(a, b, c, d, e);
-            let f = this.a7.a$h.item(d);
+        pq(a, b, c, d, e) {
+            super.pq(a, b, c, d, e);
+            let f = this.a3.a$h.item(d);
             let g = f;
             f.a3(c);
             if (this.dm(f)) {
                 return;
             }
-            this.wc(f);
+            this.wd(f);
         }
-        wc(a) {
+        wd(a) {
             if (this.dm(a)) {
                 return;
             }
@@ -691,11 +691,11 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             let e = a.getViewInfo(c, b);
             c = e.p0;
             b = e.p1;
-            if (c.width < 1 || c.height < 1 || this.ut == null) {
+            if (c.width < 1 || c.height < 1 || this.uu == null) {
                 return;
             }
-            let f = this.uj;
-            let g = this.ul;
+            let f = this.uf;
+            let g = this.uh;
             let h = this.getEffectiveViewport1(a);
             let i = new ScalerParams(1, b, c, f.ch);
             i.c = h;
@@ -708,54 +708,54 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 let m;
                 let n;
                 let o;
-                let p = this.ut.count;
-                if (this.t5 == null || this.t5.length != p) {
+                let p = this.uu.count;
+                if (this.t6 == null || this.t6.length != p) {
+                    this.t6 = new Array(p);
+                    this.t4 = new Array(p);
                     this.t5 = new Array(p);
                     this.t3 = new Array(p);
-                    this.t4 = new Array(p);
-                    this.t2 = new Array(p);
                 }
-                let q = this.t5;
-                let r = this.t3;
-                let s = this.t4;
-                let t = this.t2;
+                let q = this.t6;
+                let r = this.t4;
+                let s = this.t5;
+                let t = this.t3;
                 let u;
                 for (let v = 0; v < p; v++) {
-                    u = this.vb._inner[v];
+                    u = this.vc._inner[v];
                     q[v] = u.top;
                     r[v] = u.left;
                     s[v] = u.right;
                     t[v] = u.bottom;
                 }
-                this.ui.hn(boxArray$1(r), 0, r.length, i);
-                this.ui.hn(boxArray$1(s), 0, s.length, i);
-                this.uk.hn(boxArray$1(q), 0, q.length, j);
-                this.uk.hn(boxArray$1(t), 0, t.length, j);
+                this.ue.hn(boxArray$1(r), 0, r.length, i);
+                this.ue.hn(boxArray$1(s), 0, s.length, i);
+                this.ug.hn(boxArray$1(q), 0, q.length, j);
+                this.ug.hn(boxArray$1(t), 0, t.length, j);
                 d.cv(r, q, s, t);
-                let w = this.ut;
+                let w = this.uu;
                 let x = this.c7;
-                this.wf(d);
+                this.wg(d);
                 let y = c.left;
                 let z = c.right;
                 let aa = c.top;
                 let ab = c.bottom;
                 let ac = null;
-                if (this.wq.isEmpty) {
+                if (this.wr.isEmpty) {
                     ac = null;
                 }
                 else {
-                    ac = new Clipper(1, this.wq.left, this.wq.bottom, this.wq.right, this.wq.top, this.u1);
+                    ac = new Clipper(1, this.wr.left, this.wr.bottom, this.wr.right, this.wr.top, this.u2);
                 }
-                let ad = this.va();
+                let ad = this.vb();
                 if (ad) {
                     d.cc.clear();
                 }
                 let ae = false;
                 let af = true;
                 let ag = 0;
-                if (this.cz != null) {
-                    if (this.cz.fb()) {
-                        let ah = this.cz.lo(b, i);
+                if (this.cv != null) {
+                    if (this.cv.fc()) {
+                        let ah = this.cv.lp(b, i);
                         ae = ah.c;
                         ag = ah.d;
                     }
@@ -777,9 +777,9 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                         else {
                             ai = null;
                         }
-                        let ak = this.vd(a, ai, w.item(aj), i, j, 0, ag);
+                        let ak = this.ve(a, ai, w.item(aj), i, j, 0, ag);
                         if (ad) {
-                            ShapeSeriesBase.wb(d, aj, ak);
+                            ShapeSeriesBase.wc(d, aj, ak);
                         }
                         d.ci(aj, x.item(aj), k, ak);
                     }
@@ -792,9 +792,9 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                             else {
                                 ai = null;
                             }
-                            let al = this.vd(a, ai, w.item(aj), i, j, ag, ag);
+                            let al = this.ve(a, ai, w.item(aj), i, j, ag, ag);
                             if (ad) {
-                                ShapeSeriesBase.wb(d, aj, al);
+                                ShapeSeriesBase.wc(d, aj, al);
                             }
                             d.ci(aj, x.item(aj), k, al);
                         }
@@ -802,10 +802,10 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 }
                 d.ct();
             }
-            let am = this.u9();
-            this.uq.az(this, this.u9(), runOn(this, this.t8));
+            let am = this.va();
+            this.um.az(this, this.va(), runOn(this, this.t9));
             let an = false;
-            let ao = this.uq.b;
+            let ao = this.um.b;
             if (ao != null) {
                 an = true;
             }
@@ -817,71 +817,71 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 let au = as.dataContext != null ? as.dataContext.c : -1;
                 d.cm(as, at, am);
                 if (an) {
-                    this.v8(as, aq, au, this.ut.count, ap, ar);
+                    this.v9(as, aq, au, this.uu.count, ap, ar);
                 }
                 else {
                     if (ar) {
                         {
-                            this.uq.a1(as, this.hi, ar);
+                            this.um.a1(as, this.hi, ar);
                         }
                     }
                 }
                 {
-                    this.uq.ad(as, false, false, false, false);
+                    this.um.ad(as, false, false, false, false);
                 }
             });
         }
-        v8(a, b, c, d, e, f) {
-            let g = this.bt != 1;
-            this.uq.a0(this.uq.b, c, d, false);
+        v9(a, b, c, d, e, f) {
+            let g = this.bp != 1;
+            this.um.a0(this.um.b, c, d, false);
             {
-                this.uq.a1(a, this.hi, f);
+                this.um.a1(a, this.hi, f);
             }
-            let h = this.uq.ax;
+            let h = this.um.ax;
             let i = null;
             let j = this.c7;
-            if (g && this.cz != null) {
-                i = this.cz.a7.getHighlightingInfo(this, j, h.o, h.n, false);
+            if (g && this.cv != null) {
+                i = this.cv.c2.getHighlightingInfo(this, j, h.o, h.n, false);
                 h.b = i;
             }
             h.f = e;
-            this.wa(h);
-            this.uq.z(this, i, e, g, false);
-        }
-        v7(a, b, c) {
-            let d = this.bt != 1;
-            this.uq.a0(this.uq.d, a, b, true);
-            this.uq.aa(this.hi);
-            let e = this.uq.aw;
+            this.wb(h);
+            this.um.z(this, i, e, g, false);
+        }
+        v8(a, b, c) {
+            let d = this.bp != 1;
+            this.um.a0(this.um.d, a, b, true);
+            this.um.aa(this.hi);
+            let e = this.um.aw;
             let f = null;
             let g = this.c7;
             let h = null;
-            if (d && this.cz != null) {
-                f = this.cz.a7.getHighlightingInfo(this, g, e.o, e.n, true);
-                if (this.cz.a7.isCrossSeriesHighlight(this)) {
-                    h = this.cz.a7.getHighlightingInfo(this, g, e.o, e.n, true);
+            if (d && this.cv != null) {
+                f = this.cv.c2.getHighlightingInfo(this, g, e.o, e.n, true);
+                if (this.cv.c2.isCrossContextHighlight(this)) {
+                    h = this.cv.c2.getHighlightingInfo(this, g, e.o, e.n, true);
                 }
                 e.b = f;
             }
             e.f = c;
-            this.v9(e);
-            this.uq.y(this, f, c, d, e.l, this.cz.a7.sumHighlightingProgress);
+            this.wa(e);
+            this.um.y(this, f, c, d, e.l, this.cv.c2.sumHighlightingProgress);
         }
-        wa(a) {
-            if (this.assigningShapeStyle != null && this.uv) {
+        wb(a) {
+            if (this.assigningShapeStyle != null && this.uw) {
                 this.assigningShapeStyle(this, a);
             }
         }
-        v9(a) {
-            if (this.assigningShapeMarkerStyle != null && this.uu) {
+        wa(a) {
+            if (this.assigningShapeMarkerStyle != null && this.uv) {
                 this.assigningShapeMarkerStyle(this, a);
             }
         }
-        t8(a, b) {
-            return this.t9(a, b);
-        }
         t9(a, b) {
-            if (b < a || a < 0 || a > this.ut.count || b < 0 || b > this.ut.count) {
+            return this.ua(a, b);
+        }
+        ua(a, b) {
+            if (b < a || a < 0 || a > this.uu.count || b < 0 || b > this.uu.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
@@ -891,7 +891,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        static wb(a, b, c) {
+        static wc(a, b, c) {
             let d = 0;
             let e = null;
             for (let f = 0; f < c.count; f++) {
@@ -906,70 +906,70 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
         }
         oc() {
             super.oc();
-            if (this.uj != null) {
-                this.uj.h7();
+            if (this.uf != null) {
+                this.uf.h7();
             }
-            if (this.ul != null) {
-                this.ul.h7();
+            if (this.uh != null) {
+                this.uh.h7();
             }
         }
-        qo(a, b) {
-            this.pq(false);
+        qp(a, b) {
+            this.pr(false);
         }
-        qn(a, b) {
-            this.pq(false);
+        qo(a, b) {
+            this.pr(false);
         }
         np(a, b, c, d) {
             super.np(a, b, c, d);
             switch (a) {
                 case 3:
-                    if (d == this.vx) {
-                        this.vb._inner[b] = this.wr(this.ut.item(b));
+                    if (d == this.vy) {
+                        this.vc._inner[b] = this.ws(this.uu.item(b));
                     }
                     break;
                 case 1:
                     for (let e = b; e < b + c; e++) {
-                        this.vb.insert(e, this.wr(this.ut.item(e)));
+                        this.vc.insert(e, this.ws(this.uu.item(e)));
                     }
                     break;
                 case 0:
-                    this.vb.v(b, c);
+                    this.vc.v(b, c);
                     break;
                 case 2:
                     for (let f = b; f < b + c; f++) {
-                        this.vb._inner[f] = this.wr(this.ut.item(f));
+                        this.vc._inner[f] = this.ws(this.uu.item(f));
                     }
                     break;
                 case 4:
-                    this.wd();
+                    this.we();
                     break;
             }
-            this.pq(false);
+            this.pr(false);
         }
         gm(a, b, c) {
             let d = true;
-            if (!super.gm(a, b, c) || (this.u5 && this.ut == null) || b.isEmpty || a.isEmpty || this.uj == null || this.ul == null || this.uj.bi == null || this.ul.bi == null || this.uj.lx == this.uj.lw || this.ul.lx == this.ul.lw || this.ut == null || this.ut.count == 0 || this.vb == null || this.vb.count == 0 || this.vb.count != this.ut.count) {
+            if (!super.gm(a, b, c) || (this.u6 && this.uu == null) || b.isEmpty || a.isEmpty || this.uf == null || this.uh == null || this.uf.bi == null || this.uh.bi == null || this.uf.lx == this.uf.lw || this.uh.lx == this.uh.lw || this.uu == null || this.uu.count == 0 || this.vc == null || this.vc.count == 0 || this.vc.count != this.uu.count) {
                 d = false;
             }
             return d;
         }
-        get_u5() {
+        get_u6() {
             return true;
         }
-        get u5() {
-            return this.get_u5();
+        get u6() {
+            return this.get_u6();
         }
-        o1(a) {
-            super.o1(a);
-            this.ur = typeCast(ShapeSeriesViewBase.$, a);
+        o2(a) {
+            super.o2(a);
+            this.un = typeCast(ShapeSeriesViewBase.$, a);
         }
-        ve(a, b, c, d, e, f, g) {
+        vf(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.uc(a, b, i, d, e, f, g);
+                let l = this.ud(a, b, i, d, e, f, g);
                 if (l == null) {
                     continue;
                 }
@@ -977,8 +977,8 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        uc(a, b, c, d, e, f, g) {
-            let h = this.v4(c, d, e);
+        ud(a, b, c, d, e, f, g) {
+            let h = this.v5(c, d, e);
             let i = h.c;
             let j = h.d;
             let k = i.length;
@@ -1001,7 +1001,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                 n = p > n ? p : n;
                 o = q > o ? q : o;
             }
-            let t = !(l > this.wq.right || n < this.wq.left || m > this.wq.bottom || o < this.wq.top);
+            let t = !(l > this.wr.right || n < this.wr.left || m > this.wr.bottom || o < this.wr.top);
             if (!t && f == 0 && g != 0) {
                 if (g != 0) {
                     for (let u = 0; u < k; u++) {
@@ -1016,22 +1016,22 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
                     n = p > n ? p : n;
                     o = q > o ? q : o;
                 }
-                t = !(l > this.wq.right || n < this.wq.left || m > this.wq.bottom || o < this.wq.top);
+                t = !(l > this.wr.right || n < this.wr.left || m > this.wr.bottom || o < this.wr.top);
             }
             if (!t) {
                 return null;
             }
-            let w = b != null && (l < this.wq.left || m < this.wq.top || n > this.wq.right || o > this.wq.bottom);
+            let w = b != null && (l < this.wr.left || m < this.wr.top || n > this.wr.right || o > this.wr.bottom);
             let x = new Rect(0, l, m, n - l, o - m);
             if (!a.cb(x)) {
                 return null;
             }
-            l = l < this.wq.left ? this.wq.left : l;
-            n = n > this.wq.right ? this.wq.right : n;
-            m = m < this.wq.top ? this.wq.top : m;
-            o = o > this.wq.bottom ? this.wq.bottom : o;
+            l = l < this.wr.left ? this.wr.left : l;
+            n = n > this.wr.right ? this.wr.right : n;
+            m = m < this.wr.top ? this.wr.top : m;
+            o = o > this.wr.bottom ? this.wr.bottom : o;
             let y = PolySimplification.b(h, this.hk);
-            let z = new DefaultFlattener().c(h.c, h.d, y, this.vf);
+            let z = new DefaultFlattener().c(h.c, h.d, y, this.vg);
             let aa = z.count;
             if (w) {
                 let ab = new List$1(Point_$type, 0);
@@ -1051,9 +1051,9 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             ad.c = x;
             return ad;
         }
-        v4(a, b, c) {
-            let d = this.ui;
-            let e = this.uk;
+        v5(a, b, c) {
+            let d = this.ue;
+            let e = this.ug;
             let f = a.count;
             let g = new Array(f);
             let h = new Array(f);
@@ -1065,7 +1065,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             e.hn(boxArray$1(h), 0, h.length, c);
             return new Tuple$2(Array_$type, Array_$type, g, h);
         }
-        wf(a) {
+        wg(a) {
             a.c0();
         }
         nk(a, b) {
@@ -1073,18 +1073,18 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             let c = b;
             c.cn();
         }
-        v6(a) {
+        v7(a) {
             if (a != null) {
                 a.ct(this);
             }
         }
-        we(a) {
+        wf(a) {
             if (a != null) {
                 a.b0(this);
             }
         }
         au(a, b) {
-            let c = this.ur.c2(a, b);
+            let c = this.un.c2(a, b);
             let d = null;
             if (c != null) {
                 d = c.dataContext;
@@ -1094,7 +1094,7 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             }
             return super.au(a, b);
         }
-        vm(a) {
+        vn(a) {
             return this.c7.item(a);
         }
         get_gg() {
@@ -1104,19 +1104,19 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
             super.set_gg(a);
         }
         aq(a) {
-            if (typeCast(NumericXAxis.$, a) !== null && this.vb != null) {
+            if (typeCast(NumericXAxis.$, a) !== null && this.vc != null) {
                 let b = 1.7976931348623157E+308;
                 let c = -1.7976931348623157E+308;
-                for (let d of fromEnum(this.vb)) {
+                for (let d of fromEnum(this.vc)) {
                     b = Math.min(b, d.left);
                     c = Math.max(c, d.right);
                 }
                 return new AxisRange(b, c);
             }
-            if (typeCast(NumericYAxis.$, a) !== null && this.vb != null) {
+            if (typeCast(NumericYAxis.$, a) !== null && this.vc != null) {
                 let e = 1.7976931348623157E+308;
                 let f = -1.7976931348623157E+308;
-                for (let g of fromEnum(this.vb)) {
+                for (let g of fromEnum(this.vc)) {
                     e = Math.min(e, g.top);
                     f = Math.max(f, g.bottom);
                 }
@@ -1130,14 +1130,14 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
         get_ez() {
             return true;
         }
-        get uz() {
+        get u0() {
             return this.styleShape != null;
         }
-        ws(a, b, c) {
+        wt(a, b, c) {
             if (this.styleShape != null) {
-                if (this.ur.c9 != null && c == this.ur.c9) {
+                if (this.un.c9 != null && c == this.un.c9) {
                     c = new Style();
-                    let d = this.ur.c9;
+                    let d = this.un.c9;
                     c.fill = d.fill;
                     c.opacity = d.opacity;
                     c.stroke = d.stroke;
@@ -1164,8 +1164,8 @@ export let ShapeSeriesBase = /*@__PURE__*/ (() => {
         }
     }
     ShapeSeriesBase.$t = /*@__PURE__*/ markType(ShapeSeriesBase, 'ShapeSeriesBase', Series.$);
-    ShapeSeriesBase.wg = /*@__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', ['IsCustomShapeMarkerStyleAllowed:u2:wh', [0, false], 'IsCustomShapeStyleAllowed:u3:wi', [0, false], 'ItemSearchMode:up:wj', [ShapeItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:vk:wk', [1, 10000], 'ItemSearchThreshold:vl:wl', [1, 10000], 'ShapeFilterResolution:vh:wm', [1, 2], 'ShapeMemberPath:vx:wn', [2, null], 'XAxis:uj:wo', [NumericXAxis.$, null], 'YAxis:ul:wp', [NumericYAxis.$, null]]);
+    ShapeSeriesBase.wh = /*@__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', ['IsCustomShapeMarkerStyleAllowed:u3:wi', [0, false], 'IsCustomShapeStyleAllowed:u4:wj', [0, false], 'ItemSearchMode:ul:wk', [ShapeItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:vl:wl', [1, 10000], 'ItemSearchThreshold:vm:wm', [1, 10000], 'ShapeFilterResolution:vi:wn', [1, 2], 'ShapeMemberPath:vy:wo', [2, null], 'XAxis:uf:wp', [NumericXAxis.$, null], 'YAxis:uh:wq', [NumericYAxis.$, null]]);
     return ShapeSeriesBase;
 })();
 /**
@@ -1291,7 +1291,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             })());
         }
         cb(a) {
-            return a.width >= this.b6.vi && a.height >= this.b6.vi;
+            return a.width >= this.b6.vj && a.height >= this.b6.vj;
         }
         static cf(a) {
             let b = new List$1(PointCollection.$, 0);
@@ -1305,7 +1305,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             return b;
         }
         get ca() {
-            return this.c8 != null || this.b7 != null || this.b6.uz;
+            return this.c8 != null || this.b7 != null || this.b6.u0;
         }
         ci(a, b, c, d) {
             if (d != null && d.count > 0) {
@@ -1341,10 +1341,10 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
         }
         static cl(a, b, c) {
             if (b._fill == null) {
-                b._fill = a.e.st;
+                b._fill = a.e.su;
             }
             if (b._stroke == null) {
-                b._stroke = a.e.sw;
+                b._stroke = a.e.sx;
             }
             if (b.y == null) {
                 b.ad = a.e.hl;
@@ -1378,7 +1378,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
                     this.k.j(a, a.y);
                 }
             }
-            let f = this.b6.ws(b, a, a.y);
+            let f = this.b6.wt(b, a, a.y);
             if (a.y != f) {
                 a.y = f;
                 this.k.j(a, a.y);
@@ -1548,7 +1548,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             if (this.k != null) {
                 this.k.j(b, b.y);
             }
-            this.b6.wq = RectUtil.r(a, b.ad);
+            this.b6.wr = RectUtil.r(a, b.ad);
         }
         an(a) {
             super.an(a);
@@ -1558,7 +1558,7 @@ export let ShapeSeriesViewBase = /*@__PURE__*/ (() => {
             for (let b = 0; b < this.b9.a.count; b++) {
                 let c = typeCast(Path.$, this.b9.a._inner[b]);
                 if (c._visibility != 1) {
-                    this.e.a9.exportPathData(a, c, "shape" + b, ["Main "]);
+                    this.e.a5.exportPathData(a, c, "shape" + b, ["Main "]);
                 }
             }
         }