igniteui-webcomponents-charts 5.0.2 → 5.0.3-beta.0

package/esm5/lib/ShapeSeriesBase_combined.js

@@ -35,6 +35,7 @@ import { Dictionary$2 } from "igniteui-webcomponents-core";
 import { SeriesRenderManager } from "./SeriesRenderManager";
 import { PolySimplification } from "igniteui-webcomponents-core";
 import { DefaultFlattener } from "./DefaultFlattener";
+import { ChartSelection } from "./ChartSelection";
 import { AxisRange } from "./AxisRange";
 import { Style } from "igniteui-webcomponents-core";
 import { PropertyMetadata } from "igniteui-webcomponents-core";
@@ -56,72 +57,72 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ShapeSeriesBase, _super);
     function ShapeSeriesBase() {
         var _this = _super.call(this) || this;
-        _this.xj = false;
-        _this.xi = false;
-        _this.xe = null;
-        _this.xf = null;
-        _this.w5 = 1;
-        _this.wu = null;
-        _this.wv = null;
+        _this.xm = false;
+        _this.xl = false;
+        _this.xh = null;
+        _this.xi = null;
+        _this.w8 = 1;
+        _this.wx = null;
+        _this.wy = null;
         _this.assigningShapeStyle = null;
         _this.assigningShapeMarkerStyle = null;
-        _this.w9 = null;
-        _this.xg = null;
-        _this.w1 = null;
-        _this.w3 = null;
-        _this.x3 = 0;
-        _this.xz = null;
-        _this.wr = null;
+        _this.xc = null;
+        _this.xj = null;
+        _this.w4 = null;
+        _this.w6 = null;
+        _this.x7 = 0;
+        _this.x3 = null;
+        _this.wu = null;
+        _this.ww = null;
+        _this.wv = null;
         _this.wt = null;
-        _this.ws = null;
-        _this.wq = null;
-        _this.ze = null;
-        _this.x6 = 0;
+        _this.zj = null;
+        _this.ya = 0;
         _this.styleShape = null;
-        _this.w9 = new ShapeSeriesRenderManager();
+        _this.xc = new ShapeSeriesRenderManager();
         FastItemObjectColumn.m();
-        _this.x6 = _this.x5;
-        _this.ze = Rect.empty;
+        _this.ya = _this.x9;
+        _this.zj = Rect.empty;
         return _this;
     }
-    ShapeSeriesBase.prototype.o0 = function () {
-        _super.prototype.o0.call(this);
-        this.w2 = null;
-        this.w4 = null;
+    ShapeSeriesBase.prototype.o1 = function () {
+        _super.prototype.o1.call(this);
+        this.w5 = null;
+        this.w7 = null;
     };
     ShapeSeriesBase.prototype.ai = function () {
-        return [this.w2, this.w4];
+        return [this.w5, this.w7];
     };
-    ShapeSeriesBase.prototype.ko = function (a, b) {
-        var c = this.nb(b);
+    ShapeSeriesBase.prototype.kp = function (a, b) {
+        var c = this.nc(b);
         if (c == ShapeSeriesBase.$$p[6]) {
-            return this.kp(a, b, this.yl);
+            return this.kq(a, b, this.yp);
         }
         return null;
     };
-    ShapeSeriesBase.prototype.mb = function (a) {
-        var b = this.nb(a);
+    ShapeSeriesBase.prototype.mc = function (a) {
+        var b = this.nc(a);
         if (b == ShapeSeriesBase.$$p[6]) {
-            return this.yl;
+            return this.yp;
         }
-        return _super.prototype.mb.call(this, a);
+        return _super.prototype.mc.call(this, a);
     };
-    ShapeSeriesBase.prototype.get_fc = function () {
+    ShapeSeriesBase.prototype.get_fd = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.get_eb = function () {
+    ShapeSeriesBase.prototype.get_ec = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.xc = function (a, b, c) {
-        if (this.dl == null) {
+    ShapeSeriesBase.prototype.xf = function (a, b, c) {
+        if (this.dm == null) {
             return null;
         }
-        var d = this.v1(b);
-        var e = this.xa.c2(d, false);
+        var d = this.v3(b);
+        var e = this.xd.c2(d, false);
         var f = -1;
         if (e == null) {
             if (a != null) {
-                f = this.dl.indexOf(a);
+                f = this.dm.indexOf(a);
             }
             else {
                 return null;
@@ -143,15 +144,15 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return g;
     };
-    ShapeSeriesBase.prototype.xd = function (a, b, c) {
-        if (this.dl == null) {
+    ShapeSeriesBase.prototype.xg = function (a, b, c) {
+        if (this.dm == null) {
             return null;
         }
-        var d = this.xa.b4(this.v1(b));
+        var d = this.xd.b4(this.v3(b));
         var e = -1;
         if (d == null) {
             if (a != null) {
-                e = this.dl.indexOf(a);
+                e = this.dm.indexOf(a);
             }
             else {
                 return null;
@@ -174,52 +175,52 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return f;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "w6", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "w9", {
         get: function () {
-            return this.w5;
+            return this.w8;
         },
         set: function (a) {
-            var b = this.w5;
-            this.w5 = a;
-            if (b != this.w5) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.w5));
+            var b = this.w8;
+            this.w8 = a;
+            if (b != this.w8) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.w8));
             }
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.w7 = function () {
-        if (this.w8 != 0) {
-            return this.w8;
+    ShapeSeriesBase.prototype.xa = function () {
+        if (this.xb != 0) {
+            return this.xb;
         }
         return 1;
     };
-    ShapeSeriesBase.prototype.ip = function (a) {
-        switch (this.w6) {
-            case 1: return this.yr(a).c;
-            case 2: return this.x4(a);
-            case 3: return this.x4(a);
+    ShapeSeriesBase.prototype.iq = function (a) {
+        switch (this.w9) {
+            case 1: return this.yv(a).c;
+            case 2: return this.x8(a);
+            case 3: return this.x8(a);
         }
         return -1;
     };
-    ShapeSeriesBase.prototype.yr = function (a) {
-        var b = this.v1(a);
+    ShapeSeriesBase.prototype.yv = function (a) {
+        var b = this.v3(a);
         var c = { $type: Point_$type, x: NaN, y: NaN };
-        var d = this.xa.ce;
+        var d = this.xd.ce;
         if (d == null) {
             return new Tuple$2(Number_$type, Point_$type, -1, c);
         }
-        var e = this.xa.b5(b, false, !this.xk);
+        var e = this.xd.b5(b, false, !this.xo);
         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.dl == null || this.w2 == null || this.w4 == null || this.xz == null) {
+        if (this.dm == null || this.w5 == null || this.w7 == null || this.x3 == null) {
             return new Tuple$2(Number_$type, Point_$type, -1, c);
         }
-        if (this.dl.count > this.x9) {
+        if (this.dm.count > this.yd) {
             return new Tuple$2(Number_$type, Point_$type, -1, c);
         }
         var h = 1.7976931348623157E+308;
@@ -235,26 +236,26 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$2(Number_$type, Point_$type, i, c);
     };
-    ShapeSeriesBase.prototype.yq = function (a) {
-        var b = this.v1(a);
+    ShapeSeriesBase.prototype.yu = function (a) {
+        var b = this.v3(a);
         var c = b.x;
         var d = b.y;
         var e = { $type: Point_$type, x: NaN, y: NaN };
-        if (this.dl == null || this.w2 == null || this.w4 == null || this.xz == null) {
+        if (this.dm == null || this.w5 == null || this.w7 == null || this.x3 == null) {
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
-        if (this.dl.count > this.x9) {
+        if (this.dm.count > this.yd) {
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
         var f = 1.7976931348623157E+308;
-        var g = this.xa.ce;
+        var g = this.xd.ce;
         if (g == null) {
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
-        var h = this.xa.b5(b, false, !this.xk);
+        var h = this.xd.b5(b, false, !this.xo);
         if (h != null) {
             var i = RectUtil.l(h.d);
-            var j = this.yp(b, h.a, this.xk);
+            var j = this.yt(b, h.a, this.xo);
             return new Tuple$3(Number_$type, Point_$type, Point_$type, h.b, j.d, i);
         }
         for (var k = 0; k < g.count; k++) {
@@ -271,7 +272,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.yp(b, g._inner[q].a, this.xk);
+                var t = this.yt(b, g._inner[q].a, this.xo);
                 if (t.c < o) {
                     o = t.c;
                     e = t.d;
@@ -284,17 +285,17 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
     };
-    ShapeSeriesBase.prototype.get_xk = function () {
+    ShapeSeriesBase.prototype.get_xo = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "xk", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "xo", {
         get: function () {
-            return this.get_xk();
+            return this.get_xo();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.yp = function (a, b, c) {
+    ShapeSeriesBase.prototype.yt = 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 };
@@ -303,7 +304,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         for (var i = 0; i < b.count; i++) {
             var j = b._inner[i];
             if (i >= 1) {
-                var k = GeometryUtil.g(a, d, j);
+                var k = GeometryUtil.h(a, d, j);
                 if (k < e) {
                     e = k;
                     g = true;
@@ -314,10 +315,10 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         if (c) {
             var l = b._inner[0];
-            var m = GeometryUtil.g(a, d, l);
+            var m = GeometryUtil.h(a, d, l);
             if (m < e) {
                 e = m;
-                var n = GeometryUtil.l(a, d, l);
+                var n = GeometryUtil.m(a, d, l);
                 f = { $type: Point_$type, x: d.x + (l.x - d.x) * n, y: d.y + (l.y - d.y) * n };
                 return new Tuple$2(Number_$type, Point_$type, e, f);
             }
@@ -325,95 +326,95 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         if (g) {
             var o = b._inner[h - 1];
             var p = b._inner[h];
-            var q = GeometryUtil.l(a, o, p);
+            var q = GeometryUtil.m(a, o, p);
             f = { $type: Point_$type, x: o.x + (p.x - o.x) * q, y: o.y + (p.y - o.y) * q };
         }
         return new Tuple$2(Number_$type, Point_$type, e, f);
     };
-    ShapeSeriesBase.prototype.x4 = function (a) {
-        return this.yq(a).c;
+    ShapeSeriesBase.prototype.x8 = function (a) {
+        return this.yu(a).c;
     };
-    ShapeSeriesBase.prototype.v6 = function (a, b, c) {
-        if (this.w2 == null || this.w4 == null || this.xz == null) {
+    ShapeSeriesBase.prototype.v8 = function (a, b, c) {
+        if (this.w5 == null || this.w7 == null || this.x3 == null) {
             return { $type: Point_$type, x: NaN, y: NaN };
         }
-        switch (this.w6) {
+        switch (this.w9) {
             case 1:
-                var d = this.yr(a);
+                var d = this.yv(a);
                 return d.d;
             case 2:
-                var e = this.yq(a);
+                var e = this.yu(a);
                 return e.e;
             case 3:
-                var f = this.yq(a);
+                var f = this.yu(a);
                 return f.d;
         }
         return { $type: Point_$type, x: NaN, y: NaN };
     };
-    ShapeSeriesBase.prototype.kl = function (a) {
-        var b = this.j1(a);
-        if (this.dl != null && b >= 0 && b < this.dl.count) {
-            return this.dl.item(b);
+    ShapeSeriesBase.prototype.km = function (a) {
+        var b = this.j2(a);
+        if (this.dm != null && b >= 0 && b < this.dm.count) {
+            return this.dm.item(b);
         }
         return null;
     };
-    ShapeSeriesBase.prototype.xb = function (a, b, c) {
+    ShapeSeriesBase.prototype.xe = function (a, b, c) {
         var d = new HighlightingInfo();
         d.i = this;
         d.g = 0;
-        d.f = this.dl.count - 1;
+        d.f = this.dm.count - 1;
         d.c = true;
         if (c != null && c.g == d.g && c.f == d.f) {
             return c;
         }
         return d;
     };
-    ShapeSeriesBase.prototype.de = function (a, b, c) {
-        if (this.eb && this.fx(this.bv) && !c) {
-            var d = this.xc(a, b, this.xe);
-            this.xe = d;
+    ShapeSeriesBase.prototype.df = function (a, b, c) {
+        if (this.ec && this.fy(this.bw) && !c) {
+            var d = this.xf(a, b, this.xh);
+            this.xh = d;
             return d;
         }
         else {
-            var e = this.xb(a, b, this.xe);
-            this.xe = e;
+            var e = this.xe(a, b, this.xh);
+            this.xh = e;
             return e;
         }
     };
-    ShapeSeriesBase.prototype.df = function (a, b, c) {
-        if (this.fx(this.bv) && !c) {
-            var d = this.xd(a, b, this.xf);
-            this.xf = d;
+    ShapeSeriesBase.prototype.dg = function (a, b, c) {
+        if (this.fy(this.bw) && !c) {
+            var d = this.xg(a, b, this.xi);
+            this.xi = d;
             return d;
         }
         else {
-            var e = this.xb(a, b, this.xf);
+            var e = this.xe(a, b, this.xi);
             e.d = true;
-            this.xf = e;
+            this.xi = e;
             return e;
         }
     };
-    ShapeSeriesBase.prototype.xx = function () {
-        return (this.assigningShapeStyle != null && this.xj) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
+    ShapeSeriesBase.prototype.x1 = function () {
+        return (this.assigningShapeStyle != null && this.xm) || this.d1 || (this.bw != 1) || (this.co != 1) || (this.cn != 1);
     };
-    ShapeSeriesBase.prototype.xw = function () {
-        return (this.assigningShapeMarkerStyle != null && this.xi) || this.d0 || (this.bv != 1) || (this.cn != 1) || (this.cm != 1);
+    ShapeSeriesBase.prototype.x0 = function () {
+        return (this.assigningShapeMarkerStyle != null && this.xl) || this.d1 || (this.bw != 1) || (this.co != 1) || (this.cn != 1);
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "yc", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "yg", {
         get: function () {
-            return this.c(ShapeSeriesBase.y4);
+            return this.c(ShapeSeriesBase.y9);
         },
         set: function (a) {
-            this.h(ShapeSeriesBase.y4, a);
+            this.h(ShapeSeriesBase.y9, a);
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.f9 = function () {
-        return this.highlightedItemsSource != null || this.yc != null;
+    ShapeSeriesBase.prototype.ga = function () {
+        return this.highlightedItemsSource != null || this.yg != null;
     };
-    ShapeSeriesBase.prototype.hr = function () {
-        var a = _super.prototype.hr.call(this);
+    ShapeSeriesBase.prototype.hs = function () {
+        var a = _super.prototype.hs.call(this);
         {
             var b = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
@@ -423,7 +424,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.yt));
+            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.yy));
             a.add(b);
         }
         {
@@ -436,7 +437,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.rv));
+            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.rx));
             a.add(c);
         }
         {
@@ -449,38 +450,38 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.rv));
+            d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.rx));
             a.add(d);
         }
         return a;
     };
-    ShapeSeriesBase.prototype.yt = function (a, b) {
-        if (this.yc != null) {
-            b.value = this.yc;
+    ShapeSeriesBase.prototype.yy = function (a, b) {
+        if (this.yg != null) {
+            b.value = this.yg;
             return;
         }
-        b.value = this.yl;
+        b.value = this.yp;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "xh", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "xk", {
         get: function () {
-            return this.xg;
+            return this.xj;
         },
         set: function (a) {
-            var b = this.xh != a;
+            var b = this.xk != a;
             if (b) {
-                var c = this.xh;
-                this.xg = a;
-                this.raisePropertyChanged("ShapeColumn", c, this.xh);
+                var c = this.xk;
+                this.xj = a;
+                this.raisePropertyChanged("ShapeColumn", c, this.xk);
             }
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.xo = function (array_) {
+    ShapeSeriesBase.prototype.xs = function (array_) {
         var a = (Array.isArray(array_));
         return a;
     };
-    ShapeSeriesBase.xs = function (a) {
+    ShapeSeriesBase.xw = function (a) {
         if (a == null) {
             return true;
         }
@@ -515,10 +516,10 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     e = (curr_.y);
                 }
                 if (!g) {
-                    if ((isNaN_(d) || ShapeSeriesBase.xs(d)) && (isNaN_(e) || ShapeSeriesBase.xs(e))) {
+                    if ((isNaN_(d) || ShapeSeriesBase.xw(d)) && (isNaN_(e) || ShapeSeriesBase.xw(e))) {
                         d = (curr_.X);
                         e = (curr_.Y);
-                        if (!isNaN_(d) && !ShapeSeriesBase.xs(d) && !isNaN_(e) && !ShapeSeriesBase.xs(e)) {
+                        if (!isNaN_(d) && !ShapeSeriesBase.xw(d) && !isNaN_(e) && !ShapeSeriesBase.xw(e)) {
                             g = true;
                             f = true;
                         }
@@ -533,8 +534,8 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    ShapeSeriesBase.prototype.dk = function (a) {
-        if (this.dl != null && this.xo(this.itemsSource) && a != null && a.split('!').length != 2) {
+    ShapeSeriesBase.prototype.dl = function (a) {
+        if (this.dm != null && this.xs(this.itemsSource) && a != null && a.split('!').length != 2) {
             if (this.coercionMethods == null) {
                 this.coercionMethods = {};
             }
@@ -542,115 +543,115 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             methods_.convertToListList = this.convertToListList;
             a += "!convertToListList";
         }
-        return _super.prototype.dk.call(this, a);
+        return _super.prototype.dl.call(this, a);
     };
-    ShapeSeriesBase.prototype.q5 = function (a, b, c, d) {
-        _super.prototype.q5.call(this, a, b, c, d);
+    ShapeSeriesBase.prototype.q7 = function (a, b, c, d) {
+        _super.prototype.q7.call(this, a, b, c, d);
         var e = false;
         var f = false;
         switch (b) {
             case ShapeSeriesBase.$$p[2]:
-                this.w6 = this.w7();
+                this.w9 = this.xa();
                 break;
             case "FastItemsSource":
                 var g = typeCast(IFastItemsSource_$type, c);
                 if (g != null) {
-                    g.deregisterColumn(this.xh);
-                    this.xh = null;
+                    g.deregisterColumn(this.xk);
+                    this.xk = null;
                 }
                 var h = typeCast(IFastItemsSource_$type, d);
                 if (h != null) {
-                    this.xh = this.dk(this.yl);
+                    this.xk = this.dl(this.yp);
                 }
-                e = this.w2 != null && !this.w2.c1();
-                f = this.w4 != null && !this.w4.c1();
+                e = this.w5 != null && !this.w5.c1();
+                f = this.w7 != null && !this.w7.c1();
                 if (e || f) {
-                    this.rn(this.ge && c != null);
+                    this.rp(this.gf && c != null);
                 }
                 break;
             case ShapeSeriesBase.$$p[6]:
-                if (this.dl != null) {
-                    this.dl.deregisterColumn(this.xh);
-                    this.xh = this.dk(this.yl);
+                if (this.dm != null) {
+                    this.dm.deregisterColumn(this.xk);
+                    this.xk = this.dl(this.yp);
                 }
                 break;
             case "ShapeColumn":
-                this.y1();
-                e = this.w2 != null && !this.w2.c1();
-                f = this.w4 != null && !this.w4.c1();
+                this.y6();
+                e = this.w5 != null && !this.w5.c1();
+                f = this.w7 != null && !this.w7.c1();
                 if (e || f) {
-                    this.rn(this.ge && this.d5);
+                    this.rp(this.gf && this.d6);
                 }
-                this.qh();
+                this.qj();
                 break;
             case ShapeSeriesBase.$$p[7]:
             case ShapeSeriesBase.$$p[8]:
-                this.w1 = this.w2;
-                this.w3 = this.w4;
+                this.w4 = this.w5;
+                this.w6 = this.w7;
                 var i = c;
                 var j = d;
-                this.y2(i);
-                this.yu(j);
+                this.y7(i);
+                this.yz(j);
                 if ((j != null && !j.c1()) || (j == null && i != null)) {
-                    this.rn(false);
+                    this.rp(false);
                 }
-                this.qh();
+                this.qj();
                 break;
             case "ActualResolution":
-                this.x3 = this.ib;
-                this.qh();
+                this.x7 = this.ic;
+                this.qj();
                 break;
             case "ActualBrush":
-                this.rn(false);
+                this.rp(false);
                 break;
             case ShapeSeriesBase.$$p[5]:
-                this.x6 = this.x5;
-                this.rn(false);
-                this.qh();
+                this.ya = this.x9;
+                this.rp(false);
+                this.qj();
                 break;
             case "ActualThickness":
-                this.rn(false);
-                this.qh();
+                this.rp(false);
+                this.qj();
                 break;
             case ShapeSeriesBase.$$p[1]:
-                this.xj = this.xv();
-                this.rn(false);
+                this.xm = this.xz();
+                this.rp(false);
                 break;
             case ShapeSeriesBase.$$p[0]:
-                this.xi = this.xu();
-                this.rn(false);
+                this.xl = this.xy();
+                this.rp(false);
                 break;
         }
     };
-    ShapeSeriesBase.prototype.xv = function () {
-        return this.xr;
+    ShapeSeriesBase.prototype.xz = function () {
+        return this.xv;
     };
-    ShapeSeriesBase.prototype.xu = function () {
-        return this.xq;
+    ShapeSeriesBase.prototype.xy = function () {
+        return this.xu;
     };
-    ShapeSeriesBase.prototype.xm = function (a) {
+    ShapeSeriesBase.prototype.xq = function (a) {
         if (typeCast(NumericYAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ShapeSeriesBase.prototype.xl = function (a) {
+    ShapeSeriesBase.prototype.xp = function (a) {
         if (typeCast(NumericXAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ShapeSeriesBase.prototype.y1 = function () {
-        this.xz = null;
-        if (this.xh == null) {
+    ShapeSeriesBase.prototype.y6 = function () {
+        this.x3 = null;
+        if (this.xk == null) {
             return;
         }
-        this.xz = new List$1(Rect.$, 2, this.xh.count);
-        for (var a = 0; a < this.xh.count; a++) {
-            this.xz.add(PointCollectionUtil.j(this.xh.item(a)));
+        this.x3 = new List$1(Rect.$, 2, this.xk.count);
+        for (var a = 0; a < this.xk.count; a++) {
+            this.x3.add(PointCollectionUtil.j(this.xk.item(a)));
         }
     };
-    ShapeSeriesBase.prototype.zf = function (a) {
+    ShapeSeriesBase.prototype.zk = function (a) {
         if (typeCast(IEnumerable$1_$type.specialize(IEnumerable$1_$type.specialize(Point_$type)), a) !== null) {
             return PointCollectionUtil.h(a);
         }
@@ -659,11 +660,11 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return Rect.empty;
     };
-    ShapeSeriesBase.prototype.x1 = function (a, b, c, d, e, f, g) {
+    ShapeSeriesBase.prototype.x5 = function (a, b, c, d, e, f, g) {
         var e_1, _a;
-        return this.x2(a, b, c, d, e, f, g);
+        return this.x6(a, b, c, d, e, f, g);
         if (typeCast(List$1.$.specialize(List$1.$.specialize(Point_$type)), c) !== null) {
-            return this.x2(a, b, c, d, e, f, g);
+            return this.x6(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;
@@ -672,7 +673,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.w0(a, b, PointCollectionUtil.b(k), d, e, f, g);
+                    j = this.w3(a, b, PointCollectionUtil.b(k), d, e, f, g);
                     if (j == null) {
                         continue;
                     }
@@ -696,7 +697,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         else if (typeCast(IEnumerable$1_$type.specialize(Point_$type), c) !== null) {
             var l = c;
-            var m = this.w0(a, b, PointCollectionUtil.b(l), d, e, f, g);
+            var m = this.w3(a, b, PointCollectionUtil.b(l), d, e, f, g);
             var n = new List$1(FlattenedShape.$, 0);
             if (m != null) {
                 n.add(m);
@@ -707,35 +708,35 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             throw new InvalidOperationException(1, "Unrecognized data in ShapeColumn");
         }
     };
-    ShapeSeriesBase.prototype.get_xp = function () {
+    ShapeSeriesBase.prototype.get_xt = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "xp", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "xt", {
         get: function () {
-            return this.get_xp();
+            return this.get_xt();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.xy = function () {
+    ShapeSeriesBase.prototype.x2 = function () {
         return false;
     };
-    ShapeSeriesBase.prototype.ro = function (a) {
-        this.y0(this.ct);
+    ShapeSeriesBase.prototype.rq = function (a) {
+        this.y5(this.cu);
     };
-    ShapeSeriesBase.prototype.rm = function (a, b, c, d, e) {
-        _super.prototype.rm.call(this, a, b, c, d, e);
-        var f = this.a9.a$j.item(d);
+    ShapeSeriesBase.prototype.ro = function (a, b, c, d, e) {
+        _super.prototype.ro.call(this, a, b, c, d, e);
+        var f = this.ba.a$j.item(d);
         var g = f;
         f.a3(c);
-        if (this.d3(f)) {
+        if (this.d4(f)) {
             return;
         }
-        this.y0(f);
+        this.y5(f);
     };
-    ShapeSeriesBase.prototype.y0 = function (a) {
+    ShapeSeriesBase.prototype.y5 = function (a) {
         var _this = this;
-        if (this.d3(a)) {
+        if (this.d4(a)) {
             return;
         }
         var b;
@@ -744,71 +745,71 @@ 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.xh == null) {
+        if (c.width < 1 || c.height < 1 || this.xk == null) {
             return;
         }
-        var f = this.w2;
-        var g = this.w4;
+        var f = this.w5;
+        var g = this.w7;
         var h = this.getEffectiveViewport1(a);
         var i = new ScalerParams(1, b, c, f.ch);
         i.c = h;
         var j = new ScalerParams(1, b, c, g.ch);
         j.c = h;
-        if (!this.gp) {
+        if (!this.gq) {
             d.cu();
             var k = new Rect(0, 0, 0, 0, 0);
             var l = void 0;
             var m = void 0;
             var n = void 0;
             var o = void 0;
-            var p = this.xh.count;
-            if (this.wt == null || this.wt.length != p) {
+            var p = this.xk.count;
+            if (this.ww == null || this.ww.length != p) {
+                this.ww = new Array(p);
+                this.wu = new Array(p);
+                this.wv = new Array(p);
                 this.wt = new Array(p);
-                this.wr = new Array(p);
-                this.ws = new Array(p);
-                this.wq = new Array(p);
-            }
-            var q = this.wt;
-            var r = this.wr;
-            var s = this.ws;
-            var t = this.wq;
+            }
+            var q = this.ww;
+            var r = this.wu;
+            var s = this.wv;
+            var t = this.wt;
             var u = void 0;
             for (var v = 0; v < p; v++) {
-                u = this.xz._inner[v];
+                u = this.x3._inner[v];
                 q[v] = u.top;
                 r[v] = u.left;
                 s[v] = u.right;
                 t[v] = u.bottom;
             }
-            this.w1.ho(boxArray$1(r), 0, r.length, i);
-            this.w1.ho(boxArray$1(s), 0, s.length, i);
-            this.w3.ho(boxArray$1(q), 0, q.length, j);
-            this.w3.ho(boxArray$1(t), 0, t.length, j);
+            this.w4.ho(boxArray$1(r), 0, r.length, i);
+            this.w4.ho(boxArray$1(s), 0, s.length, i);
+            this.w6.ho(boxArray$1(q), 0, q.length, j);
+            this.w6.ho(boxArray$1(t), 0, t.length, j);
             d.cv(r, q, s, t);
-            var w = this.xh;
-            var x = this.dl;
-            this.y3(d);
+            var w = this.xk;
+            var x = this.dm;
+            this.y8(d);
             var y = c.left;
             var z = c.right;
             var aa = c.top;
             var ab = c.bottom;
             var ac = null;
-            if (this.ze.isEmpty) {
+            if (this.zj.isEmpty) {
                 ac = null;
             }
             else {
-                ac = new Clipper(1, this.ze.left, this.ze.bottom, this.ze.right, this.ze.top, this.xp);
+                ac = new Clipper(1, this.zj.left, this.zj.bottom, this.zj.right, this.zj.top, this.xt);
             }
-            var ad = this.xy();
+            var ad = this.x2();
             if (ad) {
                 d.cc.clear();
             }
             var ae = false;
             var af = true;
             var ag = 0;
-            if (this.c9 != null) {
-                if (this.c9.fz()) {
-                    var ah = this.c9.mt(b, i);
+            if (this.da != null) {
+                if (this.da.f2()) {
+                    var ah = this.da.mz(b, i);
                     ae = ah.c;
                     ag = ah.d;
                 }
@@ -830,9 +831,9 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     else {
                         ai = null;
                     }
-                    var ak = this.x1(a, ai, w.item(aj), i, j, 0, ag);
+                    var ak = this.x5(a, ai, w.item(aj), i, j, 0, ag);
                     if (ad) {
-                        ShapeSeriesBase.yz(d, aj, ak);
+                        ShapeSeriesBase.y4(d, aj, ak);
                     }
                     d.ci(aj, x.item(aj), k, ak);
                 }
@@ -845,9 +846,9 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                         else {
                             ai = null;
                         }
-                        var al = this.x1(a, ai, w.item(aj), i, j, ag, ag);
+                        var al = this.x5(a, ai, w.item(aj), i, j, ag, ag);
                         if (ad) {
-                            ShapeSeriesBase.yz(d, aj, al);
+                            ShapeSeriesBase.y4(d, aj, al);
                         }
                         d.ci(aj, x.item(aj), k, al);
                     }
@@ -855,134 +856,134 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             d.ct();
         }
-        var am = this.xx();
-        this.w9.az(this, this.xx(), runOn(this, this.ww));
+        var am = this.x1();
+        this.xc.az(this, this.x1(), runOn(this, this.wz));
         var an = false;
-        var ao = this.w9.b;
+        var ao = this.xc.b;
         if (ao != null) {
             an = true;
         }
         var ap = a.q;
-        var aq = this.fw;
+        var aq = this.fx;
         var ar = d.ca;
         d.cp(function (as) {
             var at = as.dataContext != null ? as.dataContext.item : null;
             var au = as.dataContext != null ? as.dataContext.c : -1;
             d.cm(as, at, am);
             if (an) {
-                _this.yw(as, aq, au, _this.xh.count, ap, ar);
+                _this.y1(as, aq, au, _this.xk.count, ap, ar);
             }
             else {
                 if (ar) {
                     {
-                        _this.w9.a1(as, _this.h9, ar);
+                        _this.xc.a1(as, _this.ia, ar);
                     }
                 }
             }
             {
-                _this.w9.ad(as, false, false, false, false);
+                _this.xc.ad(as, false, false, false, false);
             }
         });
     };
-    ShapeSeriesBase.prototype.yw = function (a, b, c, d, e, f) {
-        var g = this.bv != 1;
-        var h = this.cn != 1;
-        var i = this.cm != 1;
-        this.w9.a0(this.w9.b, c, d, false);
+    ShapeSeriesBase.prototype.y1 = function (a, b, c, d, e, f) {
+        var g = this.bw != 1;
+        var h = this.co != 1;
+        var i = this.cn != 1;
+        this.xc.a0(this.xc.b, c, d, false);
         {
-            this.w9.a1(a, this.h9, f);
+            this.xc.a1(a, this.ia, f);
         }
-        var j = this.w9.ax;
+        var j = this.xc.ax;
         var k = null;
         var l = null;
         var m = null;
-        var n = this.dl;
-        if (g && this.c9 != null) {
-            k = this.c9.dj.getHighlightingInfo(this, n, j.z, j.y, false);
+        var n = this.dm;
+        if (g && this.da != null) {
+            k = this.da.dk.getHighlightingInfo(this, n, j.z, j.y, false);
             j.c = k;
         }
-        if (h && this.c9 != null) {
-            l = this.c9.dk.getHighlightingInfo(this, n, j.z, j.y, false);
-            if (l == null && this.bl != null) {
-                l = this.c9.dk.getHighlightingInfo(this.bl, this.bl.dl, j.z, j.y, false);
+        if (h && this.da != null) {
+            l = this.da.dl.getHighlightingInfo(this, n, j.z, j.y, false);
+            if (l == null && this.bm != null) {
+                l = this.da.dl.getHighlightingInfo(this.bm, this.bm.dm, j.z, j.y, false);
             }
             j.d = l;
         }
-        if (i && this.c9 != null) {
-            m = this.c9.di.getHighlightingInfo(this, n, j.z, j.y, false);
+        if (i && this.da != null) {
+            m = this.da.dj.getHighlightingInfo(this, n, j.z, j.y, false);
             j.b = m;
         }
         j.h = e;
-        this.yy(j);
-        this.w9.z(this, k, l, m, e, g, h, i, false);
-    };
-    ShapeSeriesBase.prototype.yv = function (a, b, c) {
-        var d = this.bv != 1;
-        var e = this.cn != 1;
-        var f = this.cm != 1;
-        this.w9.a0(this.w9.d, a, b, true);
-        this.w9.aa(this.h9);
-        var g = this.w9.aw;
+        this.y3(j);
+        this.xc.z(this, k, l, m, e, g, h, i, false);
+    };
+    ShapeSeriesBase.prototype.y0 = function (a, b, c) {
+        var d = this.bw != 1;
+        var e = this.co != 1;
+        var f = this.cn != 1;
+        this.xc.a0(this.xc.d, a, b, true);
+        this.xc.aa(this.ia);
+        var g = this.xc.aw;
         var h = null;
         var i = null;
         var j = null;
-        var k = this.dl;
+        var k = this.dm;
         var l = null;
         var m = null;
         var n = null;
-        if (d && this.c9 != null) {
-            h = this.c9.dj.getHighlightingInfo(this, k, g.z, g.y, true);
-            if (this.c9.dj.isCrossContextHighlight(this)) {
-                l = this.c9.dj.getHighlightingInfo(this, k, g.z, g.y, true);
+        if (d && this.da != null) {
+            h = this.da.dk.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (this.da.dk.isCrossContextHighlight(this)) {
+                l = this.da.dk.getHighlightingInfo(this, k, g.z, g.y, true);
             }
             g.c = h;
         }
-        if (e && this.c9 != null) {
-            i = this.c9.dk.getHighlightingInfo(this, k, g.z, g.y, true);
-            if (i == null && this.bl != null) {
-                i = this.c9.dk.getHighlightingInfo(this.bl, this.bl.dl, g.z, g.y, true);
+        if (e && this.da != null) {
+            i = this.da.dl.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (i == null && this.bm != null) {
+                i = this.da.dl.getHighlightingInfo(this.bm, this.bm.dm, g.z, g.y, true);
             }
-            if (this.c9.dk.isCrossContextHighlight(this)) {
-                m = this.c9.dk.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (this.da.dl.isCrossContextHighlight(this)) {
+                m = this.da.dl.getHighlightingInfo(this, k, g.z, g.y, true);
             }
             g.d = i;
         }
-        if (f && this.c9 != null) {
-            j = this.c9.di.getHighlightingInfo(this, k, g.z, g.y, true);
-            if (this.c9.di.isCrossContextHighlight(this)) {
-                n = this.c9.di.getHighlightingInfo(this, k, g.z, g.y, true);
+        if (f && this.da != null) {
+            j = this.da.dj.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (this.da.dj.isCrossContextHighlight(this)) {
+                n = this.da.dj.getHighlightingInfo(this, k, g.z, g.y, true);
             }
             g.b = i;
         }
         g.h = c;
-        this.yx(g);
-        this.w9.y(this, h, i, j, c, d, e, f, g.v, this.c9.dj.totalHighWaterMark, g.x, this.c9.dk.totalHighWaterMark, g.t, this.c9.di.totalHighWaterMark);
+        this.y2(g);
+        this.xc.y(this, h, i, j, c, d, e, f, g.v, this.da.dk.totalHighWaterMark, g.x, this.da.dl.totalHighWaterMark, g.t, this.da.dj.totalHighWaterMark);
     };
-    ShapeSeriesBase.prototype.yy = function (a) {
-        if (this.assigningShapeStyle != null && this.xj) {
+    ShapeSeriesBase.prototype.y3 = function (a) {
+        if (this.assigningShapeStyle != null && this.xm) {
             this.assigningShapeStyle(this, a);
         }
     };
-    ShapeSeriesBase.prototype.yx = function (a) {
-        if (this.assigningShapeMarkerStyle != null && this.xi) {
+    ShapeSeriesBase.prototype.y2 = function (a) {
+        if (this.assigningShapeMarkerStyle != null && this.xl) {
             this.assigningShapeMarkerStyle(this, a);
         }
     };
-    ShapeSeriesBase.prototype.ww = function (a, b) {
-        return this.wx(a, b);
+    ShapeSeriesBase.prototype.wz = function (a, b) {
+        return this.w0(a, b);
     };
-    ShapeSeriesBase.prototype.wx = function (a, b) {
-        if (b < a || a < 0 || a > this.xh.count || b < 0 || b > this.xh.count) {
+    ShapeSeriesBase.prototype.w0 = function (a, b) {
+        if (b < a || a < 0 || a > this.xk.count || b < 0 || b > this.xk.count) {
             return null;
         }
         var c = new Array((b - a) + 1);
         for (var d = a; d <= b; d++) {
             var e = d;
-            c[d - a] = this.dl.item(d);
+            c[d - a] = this.dm.item(d);
         }
         return c;
     };
-    ShapeSeriesBase.yz = function (a, b, c) {
+    ShapeSeriesBase.y4 = function (a, b, c) {
         var d = 0;
         var e = null;
         for (var f = 0; f < c.count; f++) {
@@ -995,76 +996,76 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         a.cc.addItem(b, e);
     };
-    ShapeSeriesBase.prototype.p6 = function () {
-        _super.prototype.p6.call(this);
-        if (this.w2 != null) {
-            this.w2.h8();
+    ShapeSeriesBase.prototype.p8 = function () {
+        _super.prototype.p8.call(this);
+        if (this.w5 != null) {
+            this.w5.h8();
         }
-        if (this.w4 != null) {
-            this.w4.h8();
+        if (this.w7 != null) {
+            this.w7.h8();
         }
     };
-    ShapeSeriesBase.prototype.sl = function (a, b) {
-        this.rn(false);
+    ShapeSeriesBase.prototype.sn = function (a, b) {
+        this.rp(false);
     };
-    ShapeSeriesBase.prototype.sk = function (a, b) {
-        this.rn(false);
+    ShapeSeriesBase.prototype.sm = function (a, b) {
+        this.rp(false);
     };
-    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);
         switch (a) {
             case 3:
-                if (d == this.yl) {
-                    this.xz._inner[b] = this.zf(this.xh.item(b));
+                if (d == this.yp) {
+                    this.x3._inner[b] = this.zk(this.xk.item(b));
                 }
                 break;
             case 1:
                 for (var e = b; e < b + c; e++) {
-                    this.xz.insert(e, this.zf(this.xh.item(e)));
+                    this.x3.insert(e, this.zk(this.xk.item(e)));
                 }
                 break;
             case 0:
-                this.xz.v(b, c);
+                this.x3.v(b, c);
                 break;
             case 2:
                 for (var f = b; f < b + c; f++) {
-                    this.xz._inner[f] = this.zf(this.xh.item(f));
+                    this.x3._inner[f] = this.zk(this.xk.item(f));
                 }
                 break;
             case 4:
-                this.y1();
+                this.y6();
                 break;
         }
-        this.rn(false);
+        this.rp(false);
     };
-    ShapeSeriesBase.prototype.hc = function (a, b, c) {
+    ShapeSeriesBase.prototype.hd = function (a, b, c) {
         var d = true;
-        if (!_super.prototype.hc.call(this, a, b, c) || (this.xt && this.xh == null) || b.isEmpty || a.isEmpty || this.w2 == null || this.w4 == null || this.w2.bi == null || this.w4.bi == null || this.w2.ly == this.w2.lx || this.w4.ly == this.w4.lx || this.xh == null || this.xh.count == 0 || this.xz == null || this.xz.count == 0 || this.xz.count != this.xh.count) {
+        if (!_super.prototype.hd.call(this, a, b, c) || (this.xx && this.xk == null) || b.isEmpty || a.isEmpty || this.w5 == null || this.w7 == null || this.w5.bi == null || this.w7.bi == null || this.w5.l2 == this.w5.l1 || this.w7.l2 == this.w7.l1 || this.xk == null || this.xk.count == 0 || this.x3 == null || this.x3.count == 0 || this.x3.count != this.xk.count) {
             d = false;
         }
         return d;
     };
-    ShapeSeriesBase.prototype.get_xt = function () {
+    ShapeSeriesBase.prototype.get_xx = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "xt", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "xx", {
         get: function () {
-            return this.get_xt();
+            return this.get_xx();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.qx = function (a) {
-        _super.prototype.qx.call(this, a);
-        this.xa = typeCast(ShapeSeriesViewBase.$, a);
+    ShapeSeriesBase.prototype.qz = function (a) {
+        _super.prototype.qz.call(this, a);
+        this.xd = typeCast(ShapeSeriesViewBase.$, a);
     };
-    ShapeSeriesBase.prototype.x2 = function (a, b, c, d, e, f, g) {
+    ShapeSeriesBase.prototype.x6 = 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.w0(a, b, i, d, e, f, g);
+            var l = this.w3(a, b, i, d, e, f, g);
             if (l == null) {
                 continue;
             }
@@ -1072,8 +1073,8 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h;
     };
-    ShapeSeriesBase.prototype.w0 = function (a, b, c, d, e, f, g) {
-        var h = this.ys(c, d, e);
+    ShapeSeriesBase.prototype.w3 = function (a, b, c, d, e, f, g) {
+        var h = this.yw(c, d, e);
         var i = h.c;
         var j = h.d;
         var k = i.length;
@@ -1096,7 +1097,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             n = p > n ? p : n;
             o = q > o ? q : o;
         }
-        var t = !(l > this.ze.right || n < this.ze.left || m > this.ze.bottom || o < this.ze.top);
+        var t = !(l > this.zj.right || n < this.zj.left || m > this.zj.bottom || o < this.zj.top);
         if (!t && f == 0 && g != 0) {
             if (g != 0) {
                 for (var u = 0; u < k; u++) {
@@ -1111,22 +1112,22 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 n = p > n ? p : n;
                 o = q > o ? q : o;
             }
-            t = !(l > this.ze.right || n < this.ze.left || m > this.ze.bottom || o < this.ze.top);
+            t = !(l > this.zj.right || n < this.zj.left || m > this.zj.bottom || o < this.zj.top);
         }
         if (!t) {
             return null;
         }
-        var w = b != null && (l < this.ze.left || m < this.ze.top || n > this.ze.right || o > this.ze.bottom);
+        var w = b != null && (l < this.zj.left || m < this.zj.top || n > this.zj.right || o > this.zj.bottom);
         var x = new Rect(0, l, m, n - l, o - m);
         if (!a.cb(x)) {
             return null;
         }
-        l = l < this.ze.left ? this.ze.left : l;
-        n = n > this.ze.right ? this.ze.right : n;
-        m = m < this.ze.top ? this.ze.top : m;
-        o = o > this.ze.bottom ? this.ze.bottom : o;
-        var y = PolySimplification.b(h, this.ib);
-        var z = new DefaultFlattener().c(h.c, h.d, y, this.x3);
+        l = l < this.zj.left ? this.zj.left : l;
+        n = n > this.zj.right ? this.zj.right : n;
+        m = m < this.zj.top ? this.zj.top : m;
+        o = o > this.zj.bottom ? this.zj.bottom : o;
+        var y = PolySimplification.b(h, this.ic);
+        var z = new DefaultFlattener().c(h.c, h.d, y, this.x7);
         var aa = z.count;
         if (w) {
             var ab = new List$1(Point_$type, 0);
@@ -1146,9 +1147,9 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         ad.c = x;
         return ad;
     };
-    ShapeSeriesBase.prototype.ys = function (a, b, c) {
-        var d = this.w1;
-        var e = this.w3;
+    ShapeSeriesBase.prototype.yw = function (a, b, c) {
+        var d = this.w4;
+        var e = this.w6;
         var f = a.count;
         var g = new Array(f);
         var h = new Array(f);
@@ -1160,26 +1161,121 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         e.ho(boxArray$1(h), 0, h.length, c);
         return new Tuple$2(Array_$type, Array_$type, g, h);
     };
-    ShapeSeriesBase.prototype.y3 = function (a) {
+    ShapeSeriesBase.prototype.y8 = function (a) {
         a.c0();
     };
-    ShapeSeriesBase.prototype.o3 = function (a, b) {
-        _super.prototype.o3.call(this, a, b);
+    ShapeSeriesBase.prototype.o4 = function (a, b) {
+        _super.prototype.o4.call(this, a, b);
         var c = b;
         c.cn();
     };
-    ShapeSeriesBase.prototype.yu = function (a) {
+    ShapeSeriesBase.prototype.yz = function (a) {
         if (a != null) {
             a.ct(this);
         }
     };
-    ShapeSeriesBase.prototype.y2 = function (a) {
+    ShapeSeriesBase.prototype.y7 = function (a) {
         if (a != null) {
             a.b0(this);
         }
     };
-    ShapeSeriesBase.prototype.a1 = function (a, b) {
-        var c = this.xa.c2(a, b);
+    ShapeSeriesBase.prototype.yx = function (a, b, c) {
+        var d = this.cu;
+        var e = d.bx;
+        var f = this.wn(a);
+        if (e.width < 1 || e.height < 1 || this.xk == null) {
+            return;
+        }
+        var g = this.getEffectiveViewport1(d);
+        var h = new ScalerParams(0, f, e, this.w5.ch, g);
+        var i = new ScalerParams(0, f, e, this.w7.ch, g);
+        d.cu();
+        var j = this.xk.count;
+        var k = new Array(j);
+        var l = new Array(j);
+        var m = new Array(j);
+        var n = new Array(j);
+        var o;
+        for (var p = 0; p < j; p++) {
+            o = this.x3._inner[p];
+            k[p] = o.top;
+            l[p] = o.left;
+            m[p] = o.right;
+            n[p] = o.bottom;
+        }
+        this.w5.ho(boxArray$1(l), 0, l.length, h);
+        this.w5.ho(boxArray$1(m), 0, m.length, h);
+        this.w7.ho(boxArray$1(k), 0, k.length, i);
+        this.w7.ho(boxArray$1(n), 0, n.length, i);
+        d.cv(l, k, m, n);
+        d.c0();
+        var q = null;
+        if (!this.zj.isEmpty) {
+            q = new Clipper(1, this.zj.left, this.zj.bottom, this.zj.right, this.zj.top, this.xt);
+        }
+        var r = false;
+        var s = 0;
+        if (this.da != null) {
+            if (this.da.f2()) {
+                var t = this.da.mz(f, h);
+                r = t.c;
+                s = t.d;
+            }
+        }
+        var u, v, w, x;
+        var y = new Rect(0, 0, 0, 0, 0);
+        for (var z = 0; z < j; z++) {
+            w = l[z];
+            u = k[z];
+            v = n[z];
+            x = m[z];
+            y.x = Math.min(w, x);
+            y.y = Math.min(u, v);
+            y.width = Math.max(w, x) - y.x;
+            y.height = Math.max(u, v) - y.y;
+            if (r) {
+                y.x = y.x + s;
+            }
+            if (!y.intersectsWith(e)) {
+                continue;
+            }
+            var aa = this.x5(d, q, this.xk.item(z), h, i, s, s);
+            if (aa.count <= 0) {
+                continue;
+            }
+            this.xn(b, c, z);
+        }
+    };
+    ShapeSeriesBase.prototype.xn = function (a, b, c) {
+        var _this = this;
+        if (b == 7 || b == 6) {
+            a.add(((function () {
+                var $ret = new ChartSelection();
+                $ret.series = _this;
+                return $ret;
+            })()));
+            return false;
+        }
+        else if (b == 1 || b == 2) {
+            a.add(((function () {
+                var $ret = new ChartSelection();
+                $ret.item = _this.dm.item(c);
+                return $ret;
+            })()));
+            return true;
+        }
+        else {
+            a.add(((function () {
+                var $ret = new ChartSelection();
+                $ret.item = _this.dm.item(c);
+                $ret.series = _this;
+                return $ret;
+            })()));
+            return true;
+        }
+    };
+    ShapeSeriesBase.prototype.a2 = function (a, b) {
+        var c = this.xd.c2(a, b);
         var d = null;
         if (c != null) {
             d = c.dataContext;
@@ -1187,24 +1283,24 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         if (d != null) {
             return d;
         }
-        return _super.prototype.a1.call(this, a, b);
+        return _super.prototype.a2.call(this, a, b);
     };
-    ShapeSeriesBase.prototype.ya = function (a) {
-        return this.dl.item(a);
+    ShapeSeriesBase.prototype.ye = function (a) {
+        return this.dm.item(a);
     };
-    ShapeSeriesBase.prototype.get_g5 = function () {
+    ShapeSeriesBase.prototype.get_g6 = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.set_g5 = function (a) {
-        _super.prototype.set_g5.call(this, a);
+    ShapeSeriesBase.prototype.set_g6 = function (a) {
+        _super.prototype.set_g6.call(this, a);
     };
-    ShapeSeriesBase.prototype.ax = function (a) {
+    ShapeSeriesBase.prototype.ay = function (a) {
         var e_2, _a, e_3, _b;
-        if (typeCast(NumericXAxis.$, a) !== null && this.xz != null) {
+        if (typeCast(NumericXAxis.$, a) !== null && this.x3 != null) {
             var b = 1.7976931348623157E+308;
             var c = -1.7976931348623157E+308;
             try {
-                for (var _c = __values(fromEnum(this.xz)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                for (var _c = __values(fromEnum(this.x3)), _d = _c.next(); !_d.done; _d = _c.next()) {
                     var d = _d.value;
                     b = Math.min(b, d.left);
                     c = Math.max(c, d.right);
@@ -1225,11 +1321,11 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             return new AxisRange(b, c);
         }
-        if (typeCast(NumericYAxis.$, a) !== null && this.xz != null) {
+        if (typeCast(NumericYAxis.$, a) !== null && this.x3 != null) {
             var e = 1.7976931348623157E+308;
             var f = -1.7976931348623157E+308;
             try {
-                for (var _e = __values(fromEnum(this.xz)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                for (var _e = __values(fromEnum(this.x3)), _f = _e.next(); !_f.done; _f = _e.next()) {
                     var g = _f.value;
                     e = Math.min(e, g.top);
                     f = Math.max(f, g.bottom);
@@ -1252,24 +1348,24 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return null;
     };
-    ShapeSeriesBase.prototype.get_fv = function () {
+    ShapeSeriesBase.prototype.get_fw = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.get_fj = function () {
+    ShapeSeriesBase.prototype.get_fk = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "xn", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "xr", {
         get: function () {
             return this.styleShape != null;
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.zg = function (a, b, c) {
+    ShapeSeriesBase.prototype.zl = function (a, b, c) {
         if (this.styleShape != null) {
-            if (this.xa.c9 != null && c == this.xa.c9) {
+            if (this.xd.c9 != null && c == this.xd.c9) {
                 c = new Style();
-                var d = this.xa.c9;
+                var d = this.xd.c9;
                 c.fill = d.fill;
                 c.opacity = d.opacity;
                 c.stroke = d.stroke;
@@ -1295,8 +1391,8 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return c;
     };
     ShapeSeriesBase.$t = markType(ShapeSeriesBase, 'ShapeSeriesBase', Series.$);
-    ShapeSeriesBase.y4 = 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:xq:y5', [0, false], 'IsCustomShapeStyleAllowed:xr:y6', [0, false], 'ItemSearchMode:w8:y7', [ShapeItemSearchMode_$type, enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:x8:y8', [1, 10000], 'ItemSearchThreshold:x9:y9', [1, 10000], 'ShapeFilterResolution:x5:za', [1, 2], 'ShapeMemberPath:yl:zb', [2, null], 'XAxis:w2:zc', [NumericXAxis.$, null], 'YAxis:w4:zd', [NumericYAxis.$, null]]);
+    ShapeSeriesBase.y9 = 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:xu:za', [0, false], 'IsCustomShapeStyleAllowed:xv:zb', [0, false], 'ItemSearchMode:xb:zc', [ShapeItemSearchMode_$type, enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:yc:zd', [1, 10000], 'ItemSearchThreshold:yd:ze', [1, 10000], 'ShapeFilterResolution:x9:zf', [1, 2], 'ShapeMemberPath:yp:zg', [2, null], 'XAxis:w5:zh', [NumericXAxis.$, null], 'YAxis:w7:zi', [NumericYAxis.$, null]]);
     return ShapeSeriesBase;
 }(Series));
 export { ShapeSeriesBase };
@@ -1430,7 +1526,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
         })());
     };
     ShapeSeriesViewBase.prototype.cb = function (a) {
-        return a.width >= this.b6.x6 && a.height >= this.b6.x6;
+        return a.width >= this.b6.ya && a.height >= this.b6.ya;
     };
     ShapeSeriesViewBase.cf = function (a) {
         var b = new List$1(PointCollection.$, 0);
@@ -1445,7 +1541,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     Object.defineProperty(ShapeSeriesViewBase.prototype, "ca", {
         get: function () {
-            return this.c8 != null || this.b7 != null || this.b6.xn;
+            return this.c8 != null || this.b7 != null || this.b6.xr;
         },
         enumerable: false,
         configurable: true
@@ -1484,13 +1580,13 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ShapeSeriesViewBase.cl = function (a, b, c) {
         if (b._fill == null) {
-            b._fill = a.e.u3;
+            b._fill = a.e.u5;
         }
         if (b._stroke == null) {
-            b._stroke = a.e.u7;
+            b._stroke = a.e.u9;
         }
         if (b.y == null) {
-            b.ad = a.e.ic;
+            b.ad = a.e.id;
         }
     };
     ShapeSeriesViewBase.prototype.cp = function (a) {
@@ -1521,7 +1617,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.k.j(a, a.y);
             }
         }
-        var f = this.b6.zg(b, a, a.y);
+        var f = this.b6.zl(b, a, a.y);
         if (a.y != f) {
             a.y = f;
             this.k.j(a, a.y);
@@ -1612,7 +1708,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var c = this.bs(a);
         this.c7._fill = c;
         this.c7._stroke = c;
-        this.c7.ad = this.e.ic + 3;
+        this.c7.ad = this.e.id + 3;
         return this.c7;
     };
     ShapeSeriesViewBase.prototype.a8 = function (a, b) {
@@ -1663,8 +1759,8 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             if (d >= h.d.left && d <= h.d.right && e >= h.d.top && e <= h.d.bottom) {
                 if (c) {
-                    var j = this.b6.ic / 2 + this.b6.is(b);
-                    if (GeometryUtil.d(a, h.a._inner[0], h.a, j)) {
+                    var j = this.b6.id / 2 + this.b6.it(b);
+                    if (GeometryUtil.e(a, h.a._inner[0], h.a, j)) {
                         return h;
                     }
                 }
@@ -1696,7 +1792,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
         if (this.k != null) {
             this.k.j(b, b.y);
         }
-        this.b6.ze = RectUtil.r(a, b.ad);
+        this.b6.zj = RectUtil.r(a, b.ad);
     };
     ShapeSeriesViewBase.prototype.an = function (a) {
         _super.prototype.an.call(this, a);
@@ -1706,7 +1802,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.bb.exportPathData(a, c, "shape" + b, ["Main "]);
+                this.e.bc.exportPathData(a, c, "shape" + b, ["Main "]);
             }
         }
     };