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

package/esm5/lib/ShapeSeriesBase_combined.js

@@ -7,7 +7,7 @@ GOVERNS THE LICENSING, INSTALLATION AND USE OF INFRAGISTICS SOFTWARE. BY DOWNLOA
 import { __extends, __values } from "tslib";
 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";
@@ -56,46 +56,46 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ShapeSeriesBase, _super);
     function ShapeSeriesBase() {
         var _this = _super.call(this) || this;
+        _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;
         return _this;
     }
     ShapeSeriesBase.prototype.nh = function () {
         _super.prototype.nh.call(this);
-        this.uj = null;
-        this.ul = null;
+        this.uf = null;
+        this.uh = null;
     };
     ShapeSeriesBase.prototype.ag = function () {
-        return [this.uj, this.ul];
+        return [this.uf, this.uh];
     };
     ShapeSeriesBase.prototype.jv = function (a, b) {
         var 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;
     };
@@ -105,9 +105,9 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
     ShapeSeriesBase.prototype.get_dv = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.ue = function (a, b, c) {
-        var d = this.td(b);
-        var e = this.ur.c2(d, false);
+    ShapeSeriesBase.prototype.up = function (a, b, c) {
+        var d = this.te(b);
+        var e = this.un.c2(d, false);
         var f = -1;
         if (e == null) {
             if (a != null) {
@@ -124,17 +124,17 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return null;
         }
         var 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;
     };
-    ShapeSeriesBase.prototype.uf = function (a, b, c) {
-        var d = this.ur.b4(this.td(b));
+    ShapeSeriesBase.prototype.uq = function (a, b, c) {
+        var d = this.un.b4(this.te(b));
         var e = -1;
         if (d == null) {
             if (a != null) {
@@ -151,62 +151,62 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return null;
         }
         var 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;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "un", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "uj", {
         get: function () {
-            return this.um;
+            return this.ui;
         },
         set: function (a) {
-            var b = this.um;
-            this.um = a;
-            if (b != this.um) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.um));
+            var b = this.ui;
+            this.ui = a;
+            if (b != this.ui) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.ui));
             }
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.uo = function () {
-        if (this.up != 0) {
-            return this.up;
+    ShapeSeriesBase.prototype.uk = function () {
+        if (this.ul != 0) {
+            return this.ul;
         }
         return 1;
     };
     ShapeSeriesBase.prototype.hw = function (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;
     };
-    ShapeSeriesBase.prototype.v3 = function (a) {
-        var b = this.td(a);
+    ShapeSeriesBase.prototype.v4 = function (a) {
+        var b = this.te(a);
         var c = { $type: Point_$type, x: NaN, y: NaN };
-        var d = this.ur.ce;
+        var d = this.un.ce;
         if (d == null) {
             return new Tuple$2(Number_$type, Point_$type, -1, c);
         }
-        var e = this.ur.b5(b, false, !this.uw);
+        var 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);
         }
         var f = b.x;
         var 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);
         }
         var h = 1.7976931348623157E+308;
@@ -222,26 +222,26 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$2(Number_$type, Point_$type, i, c);
     };
-    ShapeSeriesBase.prototype.v2 = function (a) {
-        var b = this.td(a);
+    ShapeSeriesBase.prototype.v3 = function (a) {
+        var b = this.te(a);
         var c = b.x;
         var d = b.y;
         var 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);
         }
         var f = 1.7976931348623157E+308;
-        var g = this.ur.ce;
+        var g = this.un.ce;
         if (g == null) {
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
-        var h = this.ur.b5(b, false, !this.uw);
+        var h = this.un.b5(b, false, !this.ux);
         if (h != null) {
             var i = RectUtil.l(h.d);
-            var j = this.v1(b, h.a, this.uw);
+            var j = this.v2(b, h.a, this.ux);
             return new Tuple$3(Number_$type, Point_$type, Point_$type, h.b, j.d, i);
         }
         for (var k = 0; k < g.count; k++) {
@@ -258,7 +258,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             var r = g._inner[q].d;
             var s = RectUtil.g(r, b);
             if (s < f) {
-                var t = this.v1(b, g._inner[q].a, this.uw);
+                var t = this.v2(b, g._inner[q].a, this.ux);
                 if (t.c < o) {
                     o = t.c;
                     e = t.d;
@@ -271,17 +271,17 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
     };
-    ShapeSeriesBase.prototype.get_uw = function () {
+    ShapeSeriesBase.prototype.get_ux = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "uw", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "ux", {
         get: function () {
-            return this.get_uw();
+            return this.get_ux();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.v1 = function (a, b, c) {
+    ShapeSeriesBase.prototype.v2 = function (a, b, c) {
         var d = { $type: Point_$type, x: NaN, y: NaN };
         var e = 1.7976931348623157E+308;
         var f = { $type: Point_$type, x: NaN, y: NaN };
@@ -317,22 +317,22 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$2(Number_$type, Point_$type, e, f);
     };
-    ShapeSeriesBase.prototype.vg = function (a) {
-        return this.v2(a).c;
+    ShapeSeriesBase.prototype.vh = function (a) {
+        return this.v3(a).c;
     };
-    ShapeSeriesBase.prototype.ti = function (a, b, c) {
-        if (this.uj == null || this.ul == null || this.vb == null) {
+    ShapeSeriesBase.prototype.tj = function (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:
-                var d = this.v3(a);
+                var d = this.v4(a);
                 return d.d;
             case 2:
-                var e = this.v2(a);
+                var e = this.v3(a);
                 return e.e;
             case 3:
-                var f = this.v2(a);
+                var f = this.v3(a);
                 return f.d;
         }
         return { $type: Point_$type, x: NaN, y: NaN };
@@ -344,60 +344,60 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return null;
     };
-    ShapeSeriesBase.prototype.ud = function (a, b, c) {
+    ShapeSeriesBase.prototype.uo = function (a, b, c) {
         var 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;
     };
-    ShapeSeriesBase.prototype.ax = function (a, b, c) {
-        if (this.dv && this.fd(this.bt) && !c) {
-            var d = this.ue(a, b, this.ug);
-            this.ug = d;
+    ShapeSeriesBase.prototype.c0 = function (a, b, c) {
+        if (this.dv && this.fd(this.bp) && !c) {
+            var d = this.up(a, b, this.ur);
+            this.ur = d;
             return d;
         }
         else {
-            var e = this.ud(a, b, this.ug);
-            this.ug = e;
+            var e = this.uo(a, b, this.ur);
+            this.ur = e;
             return e;
         }
     };
-    ShapeSeriesBase.prototype.ay = function (a, b, c) {
-        if (this.fd(this.bt) && !c) {
-            var d = this.uf(a, b, this.uh);
-            this.uh = d;
+    ShapeSeriesBase.prototype.c1 = function (a, b, c) {
+        if (this.fd(this.bp) && !c) {
+            var d = this.uq(a, b, this.us);
+            this.us = d;
             return d;
         }
         else {
-            var e = this.ud(a, b, this.uh);
-            e.e = true;
-            this.uh = e;
+            var e = this.uo(a, b, this.us);
+            e.d = true;
+            this.us = e;
             return e;
         }
     };
-    ShapeSeriesBase.prototype.u9 = function () {
-        return (this.assigningShapeStyle != null && this.uv) || (this.bt != 1);
+    ShapeSeriesBase.prototype.va = function () {
+        return (this.assigningShapeStyle != null && this.uw) || (this.bp != 1);
     };
-    ShapeSeriesBase.prototype.u8 = function () {
-        return (this.assigningShapeMarkerStyle != null && this.uu) || (this.bt != 1);
+    ShapeSeriesBase.prototype.u9 = function () {
+        return (this.assigningShapeMarkerStyle != null && this.uv) || (this.bp != 1);
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "vo", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "vp", {
         get: function () {
-            return this.c(ShapeSeriesBase.wg);
+            return this.c(ShapeSeriesBase.wh);
         },
         set: function (a) {
-            this.h(ShapeSeriesBase.wg, a);
+            this.h(ShapeSeriesBase.wh, a);
         },
         enumerable: false,
         configurable: true
     });
     ShapeSeriesBase.prototype.fo = function () {
-        return this.highlightedItemsSource != null || this.vo != null;
+        return this.highlightedItemsSource != null || this.vp != null;
     };
     ShapeSeriesBase.prototype.g1 = function () {
         var a = _super.prototype.g1.call(this);
@@ -410,7 +410,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $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);
         }
         {
@@ -423,7 +423,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $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);
         }
         {
@@ -436,38 +436,38 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $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;
     };
-    ShapeSeriesBase.prototype.v5 = function (a, b) {
-        if (this.vo != null) {
-            b.value = this.vo;
+    ShapeSeriesBase.prototype.v6 = function (a, b) {
+        if (this.vp != null) {
+            b.value = this.vp;
             return;
         }
-        b.value = this.vx;
+        b.value = this.vy;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "ut", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "uu", {
         get: function () {
-            return this.us;
+            return this.ut;
         },
         set: function (a) {
-            var b = this.ut != a;
+            var b = this.uu != a;
             if (b) {
-                var c = this.ut;
-                this.us = a;
-                this.raisePropertyChanged("ShapeColumn", c, this.ut);
+                var c = this.uu;
+                this.ut = a;
+                this.raisePropertyChanged("ShapeColumn", c, this.uu);
             }
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.u0 = function (array_) {
+    ShapeSeriesBase.prototype.u1 = function (array_) {
         var a = (Array.isArray(array_));
         return a;
     };
-    ShapeSeriesBase.u4 = function (a) {
+    ShapeSeriesBase.u5 = function (a) {
         if (a == null) {
             return true;
         }
@@ -502,10 +502,10 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     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;
                         }
@@ -521,7 +521,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return b;
     };
     ShapeSeriesBase.prototype.c6 = function (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 = {};
             }
@@ -531,113 +531,113 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return _super.prototype.c6.call(this, a);
     };
-    ShapeSeriesBase.prototype.o9 = function (a, b, c, d) {
-        _super.prototype.o9.call(this, a, b, c, d);
+    ShapeSeriesBase.prototype.pa = function (a, b, c, d) {
+        _super.prototype.pa.call(this, a, b, c, d);
         var e = false;
         var f = false;
         switch (b) {
             case ShapeSeriesBase.$$p[2]:
-                this.un = this.uo();
+                this.uj = this.uk();
                 break;
             case "FastItemsSource":
                 var g = typeCast(IFastItemsSource_$type, c);
                 if (g != null) {
-                    g.deregisterColumn(this.ut);
-                    this.ut = null;
+                    g.deregisterColumn(this.uu);
+                    this.uu = null;
                 }
                 var 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;
                 var i = c;
                 var 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;
         }
     };
+    ShapeSeriesBase.prototype.u8 = function () {
+        return this.u4;
+    };
     ShapeSeriesBase.prototype.u7 = function () {
         return this.u3;
     };
-    ShapeSeriesBase.prototype.u6 = function () {
-        return this.u2;
-    };
-    ShapeSeriesBase.prototype.uy = function (a) {
+    ShapeSeriesBase.prototype.uz = function (a) {
         if (typeCast(NumericYAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ShapeSeriesBase.prototype.ux = function (a) {
+    ShapeSeriesBase.prototype.uy = function (a) {
         if (typeCast(NumericXAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ShapeSeriesBase.prototype.wd = function () {
-        this.vb = null;
-        if (this.ut == null) {
+    ShapeSeriesBase.prototype.we = function () {
+        this.vc = null;
+        if (this.uu == null) {
             return;
         }
-        this.vb = new List$1(Rect.$, 2, this.ut.count);
-        for (var 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 (var a = 0; a < this.uu.count; a++) {
+            this.vc.add(PointCollectionUtil.j(this.uu.item(a)));
         }
     };
-    ShapeSeriesBase.prototype.wr = function (a) {
+    ShapeSeriesBase.prototype.ws = function (a) {
         if (typeCast(IEnumerable$1_$type.specialize(IEnumerable$1_$type.specialize(Point_$type)), a) !== null) {
             return PointCollectionUtil.h(a);
         }
@@ -646,11 +646,11 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return Rect.empty;
     };
-    ShapeSeriesBase.prototype.vd = function (a, b, c, d, e, f, g) {
+    ShapeSeriesBase.prototype.ve = function (a, b, c, d, e, f, g) {
         var e_1, _a;
-        return this.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) {
             var h = c;
@@ -659,7 +659,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             try {
                 for (var _b = __values(fromEnum(h)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var k = _c.value;
-                    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;
                     }
@@ -683,7 +683,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         else if (typeCast(IEnumerable$1_$type.specialize(Point_$type), c) !== null) {
             var l = c;
-            var m = this.uc(a, b, PointCollectionUtil.b(l), d, e, f, g);
+            var m = this.ud(a, b, PointCollectionUtil.b(l), d, e, f, g);
             var n = new List$1(FlattenedShape.$, 0);
             if (m != null) {
                 n.add(m);
@@ -694,33 +694,33 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             throw new InvalidOperationException(1, "Unrecognized data in ShapeColumn");
         }
     };
-    ShapeSeriesBase.prototype.get_u1 = function () {
+    ShapeSeriesBase.prototype.get_u2 = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "u1", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "u2", {
         get: function () {
-            return this.get_u1();
+            return this.get_u2();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.va = function () {
+    ShapeSeriesBase.prototype.vb = function () {
         return false;
     };
-    ShapeSeriesBase.prototype.pr = function (a) {
-        this.wc(this.ck);
+    ShapeSeriesBase.prototype.ps = function (a) {
+        this.wd(this.cg);
     };
-    ShapeSeriesBase.prototype.pp = function (a, b, c, d, e) {
-        _super.prototype.pp.call(this, a, b, c, d, e);
-        var f = this.a7.a$h.item(d);
+    ShapeSeriesBase.prototype.pq = function (a, b, c, d, e) {
+        _super.prototype.pq.call(this, a, b, c, d, e);
+        var f = this.a3.a$h.item(d);
         var g = f;
         f.a3(c);
         if (this.dm(f)) {
             return;
         }
-        this.wc(f);
+        this.wd(f);
     };
-    ShapeSeriesBase.prototype.wc = function (a) {
+    ShapeSeriesBase.prototype.wd = function (a) {
         var _this = this;
         if (this.dm(a)) {
             return;
@@ -731,11 +731,11 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var 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;
         }
-        var f = this.uj;
-        var g = this.ul;
+        var f = this.uf;
+        var g = this.uh;
         var h = this.getEffectiveViewport1(a);
         var i = new ScalerParams(1, b, c, f.ch);
         i.c = h;
@@ -748,54 +748,54 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             var m = void 0;
             var n = void 0;
             var o = void 0;
-            var p = this.ut.count;
-            if (this.t5 == null || this.t5.length != p) {
+            var 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);
             }
-            var q = this.t5;
-            var r = this.t3;
-            var s = this.t4;
-            var t = this.t2;
+            var q = this.t6;
+            var r = this.t4;
+            var s = this.t5;
+            var t = this.t3;
             var u = void 0;
             for (var 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);
-            var w = this.ut;
+            var w = this.uu;
             var x = this.c7;
-            this.wf(d);
+            this.wg(d);
             var y = c.left;
             var z = c.right;
             var aa = c.top;
             var ab = c.bottom;
             var 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);
             }
-            var ad = this.va();
+            var ad = this.vb();
             if (ad) {
                 d.cc.clear();
             }
             var ae = false;
             var af = true;
             var ag = 0;
-            if (this.cz != null) {
-                if (this.cz.fb()) {
-                    var ah = this.cz.lo(b, i);
+            if (this.cv != null) {
+                if (this.cv.fc()) {
+                    var ah = this.cv.lp(b, i);
                     ae = ah.c;
                     ag = ah.d;
                 }
@@ -817,9 +817,9 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     else {
                         ai = null;
                     }
-                    var ak = this.vd(a, ai, w.item(aj), i, j, 0, ag);
+                    var 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);
                 }
@@ -832,9 +832,9 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                         else {
                             ai = null;
                         }
-                        var al = this.vd(a, ai, w.item(aj), i, j, ag, ag);
+                        var 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);
                     }
@@ -842,10 +842,10 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             d.ct();
         }
-        var am = this.u9();
-        this.uq.az(this, this.u9(), runOn(this, this.t8));
+        var am = this.va();
+        this.um.az(this, this.va(), runOn(this, this.t9));
         var an = false;
-        var ao = this.uq.b;
+        var ao = this.um.b;
         if (ao != null) {
             an = true;
         }
@@ -857,71 +857,71 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             var 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);
             }
         });
     };
-    ShapeSeriesBase.prototype.v8 = function (a, b, c, d, e, f) {
-        var g = this.bt != 1;
-        this.uq.a0(this.uq.b, c, d, false);
+    ShapeSeriesBase.prototype.v9 = function (a, b, c, d, e, f) {
+        var 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);
         }
-        var h = this.uq.ax;
+        var h = this.um.ax;
         var i = null;
         var 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);
-    };
-    ShapeSeriesBase.prototype.v7 = function (a, b, c) {
-        var d = this.bt != 1;
-        this.uq.a0(this.uq.d, a, b, true);
-        this.uq.aa(this.hi);
-        var e = this.uq.aw;
+        this.wb(h);
+        this.um.z(this, i, e, g, false);
+    };
+    ShapeSeriesBase.prototype.v8 = function (a, b, c) {
+        var d = this.bp != 1;
+        this.um.a0(this.um.d, a, b, true);
+        this.um.aa(this.hi);
+        var e = this.um.aw;
         var f = null;
         var g = this.c7;
         var 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);
     };
-    ShapeSeriesBase.prototype.wa = function (a) {
-        if (this.assigningShapeStyle != null && this.uv) {
+    ShapeSeriesBase.prototype.wb = function (a) {
+        if (this.assigningShapeStyle != null && this.uw) {
             this.assigningShapeStyle(this, a);
         }
     };
-    ShapeSeriesBase.prototype.v9 = function (a) {
-        if (this.assigningShapeMarkerStyle != null && this.uu) {
+    ShapeSeriesBase.prototype.wa = function (a) {
+        if (this.assigningShapeMarkerStyle != null && this.uv) {
             this.assigningShapeMarkerStyle(this, a);
         }
     };
-    ShapeSeriesBase.prototype.t8 = function (a, b) {
-        return this.t9(a, b);
-    };
     ShapeSeriesBase.prototype.t9 = function (a, b) {
-        if (b < a || a < 0 || a > this.ut.count || b < 0 || b > this.ut.count) {
+        return this.ua(a, b);
+    };
+    ShapeSeriesBase.prototype.ua = function (a, b) {
+        if (b < a || a < 0 || a > this.uu.count || b < 0 || b > this.uu.count) {
             return null;
         }
         var c = new Array((b - a) + 1);
@@ -931,7 +931,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ShapeSeriesBase.wb = function (a, b, c) {
+    ShapeSeriesBase.wc = function (a, b, c) {
         var d = 0;
         var e = null;
         for (var f = 0; f < c.count; f++) {
@@ -946,74 +946,74 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ShapeSeriesBase.prototype.oc = function () {
         _super.prototype.oc.call(this);
-        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();
         }
     };
-    ShapeSeriesBase.prototype.qo = function (a, b) {
-        this.pq(false);
+    ShapeSeriesBase.prototype.qp = function (a, b) {
+        this.pr(false);
     };
-    ShapeSeriesBase.prototype.qn = function (a, b) {
-        this.pq(false);
+    ShapeSeriesBase.prototype.qo = function (a, b) {
+        this.pr(false);
     };
     ShapeSeriesBase.prototype.np = function (a, b, c, d) {
         _super.prototype.np.call(this, 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 (var 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 (var 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);
     };
     ShapeSeriesBase.prototype.gm = function (a, b, c) {
         var d = true;
-        if (!_super.prototype.gm.call(this, 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.prototype.gm.call(this, 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;
     };
-    ShapeSeriesBase.prototype.get_u5 = function () {
+    ShapeSeriesBase.prototype.get_u6 = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "u5", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "u6", {
         get: function () {
-            return this.get_u5();
+            return this.get_u6();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.o1 = function (a) {
-        _super.prototype.o1.call(this, a);
-        this.ur = typeCast(ShapeSeriesViewBase.$, a);
+    ShapeSeriesBase.prototype.o2 = function (a) {
+        _super.prototype.o2.call(this, a);
+        this.un = typeCast(ShapeSeriesViewBase.$, a);
     };
-    ShapeSeriesBase.prototype.ve = function (a, b, c, d, e, f, g) {
+    ShapeSeriesBase.prototype.vf = function (a, b, c, d, e, f, g) {
         var h = new List$1(FlattenedShape.$, 0);
         var i;
         var j = c.count;
         for (var k = 0; k < j; k++) {
             i = c._inner[k];
-            var l = this.uc(a, b, i, d, e, f, g);
+            var l = this.ud(a, b, i, d, e, f, g);
             if (l == null) {
                 continue;
             }
@@ -1021,8 +1021,8 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h;
     };
-    ShapeSeriesBase.prototype.uc = function (a, b, c, d, e, f, g) {
-        var h = this.v4(c, d, e);
+    ShapeSeriesBase.prototype.ud = function (a, b, c, d, e, f, g) {
+        var h = this.v5(c, d, e);
         var i = h.c;
         var j = h.d;
         var k = i.length;
@@ -1045,7 +1045,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             n = p > n ? p : n;
             o = q > o ? q : o;
         }
-        var t = !(l > this.wq.right || n < this.wq.left || m > this.wq.bottom || o < this.wq.top);
+        var 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 (var u = 0; u < k; u++) {
@@ -1060,22 +1060,22 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 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;
         }
-        var w = b != null && (l < this.wq.left || m < this.wq.top || n > this.wq.right || o > this.wq.bottom);
+        var w = b != null && (l < this.wr.left || m < this.wr.top || n > this.wr.right || o > this.wr.bottom);
         var 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;
         var y = PolySimplification.b(h, this.hk);
-        var z = new DefaultFlattener().c(h.c, h.d, y, this.vf);
+        var z = new DefaultFlattener().c(h.c, h.d, y, this.vg);
         var aa = z.count;
         if (w) {
             var ab = new List$1(Point_$type, 0);
@@ -1095,9 +1095,9 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         ad.c = x;
         return ad;
     };
-    ShapeSeriesBase.prototype.v4 = function (a, b, c) {
-        var d = this.ui;
-        var e = this.uk;
+    ShapeSeriesBase.prototype.v5 = function (a, b, c) {
+        var d = this.ue;
+        var e = this.ug;
         var f = a.count;
         var g = new Array(f);
         var h = new Array(f);
@@ -1109,7 +1109,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         e.hn(boxArray$1(h), 0, h.length, c);
         return new Tuple$2(Array_$type, Array_$type, g, h);
     };
-    ShapeSeriesBase.prototype.wf = function (a) {
+    ShapeSeriesBase.prototype.wg = function (a) {
         a.c0();
     };
     ShapeSeriesBase.prototype.nk = function (a, b) {
@@ -1117,18 +1117,18 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var c = b;
         c.cn();
     };
-    ShapeSeriesBase.prototype.v6 = function (a) {
+    ShapeSeriesBase.prototype.v7 = function (a) {
         if (a != null) {
             a.ct(this);
         }
     };
-    ShapeSeriesBase.prototype.we = function (a) {
+    ShapeSeriesBase.prototype.wf = function (a) {
         if (a != null) {
             a.b0(this);
         }
     };
     ShapeSeriesBase.prototype.au = function (a, b) {
-        var c = this.ur.c2(a, b);
+        var c = this.un.c2(a, b);
         var d = null;
         if (c != null) {
             d = c.dataContext;
@@ -1138,7 +1138,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return _super.prototype.au.call(this, a, b);
     };
-    ShapeSeriesBase.prototype.vm = function (a) {
+    ShapeSeriesBase.prototype.vn = function (a) {
         return this.c7.item(a);
     };
     ShapeSeriesBase.prototype.get_gg = function () {
@@ -1149,11 +1149,11 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ShapeSeriesBase.prototype.aq = function (a) {
         var e_2, _a, e_3, _b;
-        if (typeCast(NumericXAxis.$, a) !== null && this.vb != null) {
+        if (typeCast(NumericXAxis.$, a) !== null && this.vc != null) {
             var b = 1.7976931348623157E+308;
             var c = -1.7976931348623157E+308;
             try {
-                for (var _c = __values(fromEnum(this.vb)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                for (var _c = __values(fromEnum(this.vc)), _d = _c.next(); !_d.done; _d = _c.next()) {
                     var d = _d.value;
                     b = Math.min(b, d.left);
                     c = Math.max(c, d.right);
@@ -1174,11 +1174,11 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             return new AxisRange(b, c);
         }
-        if (typeCast(NumericYAxis.$, a) !== null && this.vb != null) {
+        if (typeCast(NumericYAxis.$, a) !== null && this.vc != null) {
             var e = 1.7976931348623157E+308;
             var f = -1.7976931348623157E+308;
             try {
-                for (var _e = __values(fromEnum(this.vb)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                for (var _e = __values(fromEnum(this.vc)), _f = _e.next(); !_f.done; _f = _e.next()) {
                     var g = _f.value;
                     e = Math.min(e, g.top);
                     f = Math.max(f, g.bottom);
@@ -1207,18 +1207,18 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
     ShapeSeriesBase.prototype.get_ez = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "uz", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "u0", {
         get: function () {
             return this.styleShape != null;
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.ws = function (a, b, c) {
+    ShapeSeriesBase.prototype.wt = function (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();
-                var d = this.ur.c9;
+                var d = this.un.c9;
                 c.fill = d.fill;
                 c.opacity = d.opacity;
                 c.stroke = d.stroke;
@@ -1244,8 +1244,8 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return c;
     };
     ShapeSeriesBase.$t = markType(ShapeSeriesBase, 'ShapeSeriesBase', Series.$);
-    ShapeSeriesBase.wg = DependencyProperty.i("HighlightedValueMemberPath", String_$type, ShapeSeriesBase.$, new PropertyMetadata(2, null, function (a, b) { return a.raisePropertyChanged("HighlightedValueMemberPath", b.oldValue, b.newValue); }));
-    ShapeSeriesBase.$$p = markDep(DependencyProperty, PropertyMetadata, ShapeSeriesBase, 'raisePropertyChanged', ['IsCustomShapeMarkerStyleAllowed:u2:wh', [0, false], 'IsCustomShapeStyleAllowed:u3:wi', [0, false], 'ItemSearchMode:up:wj', [ShapeItemSearchMode_$type, 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 = DependencyProperty.i("HighlightedValueMemberPath", String_$type, ShapeSeriesBase.$, new PropertyMetadata(2, null, function (a, b) { return a.raisePropertyChanged("HighlightedValueMemberPath", b.oldValue, b.newValue); }));
+    ShapeSeriesBase.$$p = markDep(DependencyProperty, PropertyMetadata, ShapeSeriesBase, 'raisePropertyChanged', ['IsCustomShapeMarkerStyleAllowed:u3:wi', [0, false], 'IsCustomShapeStyleAllowed:u4:wj', [0, false], 'ItemSearchMode:ul:wk', [ShapeItemSearchMode_$type, 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;
 }(Series));
 export { ShapeSeriesBase };
@@ -1379,7 +1379,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
         })());
     };
     ShapeSeriesViewBase.prototype.cb = function (a) {
-        return a.width >= this.b6.vi && a.height >= this.b6.vi;
+        return a.width >= this.b6.vj && a.height >= this.b6.vj;
     };
     ShapeSeriesViewBase.cf = function (a) {
         var b = new List$1(PointCollection.$, 0);
@@ -1394,7 +1394,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     Object.defineProperty(ShapeSeriesViewBase.prototype, "ca", {
         get: function () {
-            return this.c8 != null || this.b7 != null || this.b6.uz;
+            return this.c8 != null || this.b7 != null || this.b6.u0;
         },
         enumerable: false,
         configurable: true
@@ -1433,10 +1433,10 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ShapeSeriesViewBase.cl = function (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;
@@ -1470,7 +1470,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.k.j(a, a.y);
             }
         }
-        var f = this.b6.ws(b, a, a.y);
+        var f = this.b6.wt(b, a, a.y);
         if (a.y != f) {
             a.y = f;
             this.k.j(a, a.y);
@@ -1645,7 +1645,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
         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);
     };
     ShapeSeriesViewBase.prototype.an = function (a) {
         _super.prototype.an.call(this, a);
@@ -1655,7 +1655,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
         for (var b = 0; b < this.b9.a.count; b++) {
             var 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 "]);
             }
         }
     };