igniteui-webcomponents-charts 5.2.0 → 5.3.0

package/esm5/lib/ShapeSeriesBase_combined.js

@@ -62,86 +62,86 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ShapeSeriesBase, _super);
     function ShapeSeriesBase() {
         var _this = _super.call(this) || this;
-        _this.xt = null;
-        _this.xy = false;
+        _this.xs = null;
         _this.xx = false;
+        _this.xw = false;
+        _this.xq = null;
         _this.xr = null;
-        _this.xs = null;
-        _this.xh = 1;
+        _this.xg = 1;
+        _this.w1 = null;
         _this.w2 = null;
-        _this.w3 = null;
         _this.assigningShapeStyle = null;
         _this.assigningShapeMarkerStyle = null;
-        _this.xl = null;
-        _this.xu = null;
-        _this.xd = null;
-        _this.xf = null;
-        _this.yk = 0;
-        _this.yg = null;
-        _this.wz = null;
-        _this.w1 = null;
-        _this.w0 = null;
+        _this.xk = null;
+        _this.xt = null;
+        _this.xc = null;
+        _this.xe = null;
+        _this.yj = 0;
+        _this.yf = null;
         _this.wy = null;
-        _this.z4 = null;
-        _this.xb = null;
-        _this.xn = null;
-        _this.w6 = null;
-        _this.yn = 0;
+        _this.w0 = null;
+        _this.wz = null;
+        _this.wx = null;
+        _this.z3 = null;
+        _this.xa = null;
+        _this.xm = null;
+        _this.w5 = null;
+        _this.ym = 0;
         _this.styleShape = null;
-        _this.xl = new ShapeSeriesRenderManager();
+        _this.xk = new ShapeSeriesRenderManager();
         FastItemObjectColumn.m();
-        _this.yn = _this.ym;
-        _this.z4 = Rect.empty;
+        _this.ym = _this.yl;
+        _this.z3 = Rect.empty;
         return _this;
     }
-    ShapeSeriesBase.prototype.o2 = function () {
-        _super.prototype.o2.call(this);
-        this.xe = null;
-        this.xg = null;
+    ShapeSeriesBase.prototype.o1 = function () {
+        _super.prototype.o1.call(this);
+        this.xd = null;
+        this.xf = null;
     };
     ShapeSeriesBase.prototype.ai = function () {
-        return [this.xe, this.xg];
+        return [this.xd, this.xf];
     };
-    ShapeSeriesBase.prototype.kq = function (a, b) {
-        var c = this.nd(b);
+    ShapeSeriesBase.prototype.kp = function (a, b) {
+        var c = this.nc(b);
         if (c == ShapeSeriesBase.$$p[9]) {
-            return this.kr(a, b, this.y7);
+            return this.kq(a, b, this.y6);
         }
         return null;
     };
-    ShapeSeriesBase.prototype.md = function (a) {
-        var b = this.nd(a);
+    ShapeSeriesBase.prototype.mc = function (a) {
+        var b = this.nc(a);
         if (b == ShapeSeriesBase.$$p[9]) {
-            return this.y7;
+            return this.y6;
         }
-        return _super.prototype.md.call(this, a);
+        return _super.prototype.mc.call(this, a);
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "xv", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "xu", {
         get: function () {
-            return this.xt;
+            return this.xs;
         },
         set: function (a) {
-            if (this.xt != a) {
-                var b = this.xv;
-                this.xt = a;
-                this.raisePropertyChanged("FillColumn", b, this.xv);
+            if (this.xs != a) {
+                var b = this.xu;
+                this.xs = a;
+                this.raisePropertyChanged("FillColumn", b, this.xu);
             }
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.get_fe = function () {
+    ShapeSeriesBase.prototype.get_fd = function () {
         return true;
     };
     ShapeSeriesBase.prototype.get_ed = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.xp = function (a, b, c) {
+    ShapeSeriesBase.prototype.xo = function (a, b, c) {
         if (this.dn == null) {
             return null;
         }
-        var d = this.v7(b);
-        var e = this.xm.c2(d, false);
+        var d = this.v6(b);
+        var e = this.xl.c2(d, false);
         var f = -1;
         if (e == null) {
             if (a != null) {
@@ -167,11 +167,11 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return g;
     };
-    ShapeSeriesBase.prototype.xq = function (a, b, c) {
+    ShapeSeriesBase.prototype.xp = function (a, b, c) {
         if (this.dn == null) {
             return null;
         }
-        var d = this.xm.b4(this.v7(b));
+        var d = this.xl.b4(this.v6(b));
         var e = -1;
         if (d == null) {
             if (a != null) {
@@ -198,52 +198,52 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return f;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "xi", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "xh", {
         get: function () {
-            return this.xh;
+            return this.xg;
         },
         set: function (a) {
-            var b = this.xh;
-            this.xh = a;
-            if (b != this.xh) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.xh));
+            var b = this.xg;
+            this.xg = a;
+            if (b != this.xg) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ShapeItemSearchMode_$type, b), enumGetBox(ShapeItemSearchMode_$type, this.xg));
             }
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.xj = function () {
-        if (this.xk != 0) {
-            return this.xk;
+    ShapeSeriesBase.prototype.xi = function () {
+        if (this.xj != 0) {
+            return this.xj;
         }
         return 1;
     };
-    ShapeSeriesBase.prototype.ir = function (a) {
-        switch (this.xi) {
-            case 1: return this.zd(a).c;
-            case 2: return this.yl(a);
-            case 3: return this.yl(a);
+    ShapeSeriesBase.prototype.iq = function (a) {
+        switch (this.xh) {
+            case 1: return this.zc(a).c;
+            case 2: return this.yk(a);
+            case 3: return this.yk(a);
         }
         return -1;
     };
-    ShapeSeriesBase.prototype.zd = function (a) {
-        var b = this.v7(a);
+    ShapeSeriesBase.prototype.zc = function (a) {
+        var b = this.v6(a);
         var c = { $type: Point_$type, x: NaN, y: NaN };
-        var d = this.xm.ce;
+        var d = this.xl.ce;
         if (d == null) {
             return new Tuple$2(Number_$type, Point_$type, -1, c);
         }
-        var e = this.xm.b5(b, false, !this.x0);
+        var e = this.xl.b5(b, false, !this.xz);
         if (e != null) {
             c = RectUtil.l(e.d);
             return new Tuple$2(Number_$type, Point_$type, e.b, c);
         }
         var f = b.x;
         var g = b.y;
-        if (this.dn == null || this.xe == null || this.xg == null || this.yg == null) {
+        if (this.dn == null || this.xd == null || this.xf == null || this.yf == null) {
             return new Tuple$2(Number_$type, Point_$type, -1, c);
         }
-        if (this.dn.count > this.yq) {
+        if (this.dn.count > this.yp) {
             return new Tuple$2(Number_$type, Point_$type, -1, c);
         }
         var h = 1.7976931348623157E+308;
@@ -259,26 +259,26 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$2(Number_$type, Point_$type, i, c);
     };
-    ShapeSeriesBase.prototype.zc = function (a) {
-        var b = this.v7(a);
+    ShapeSeriesBase.prototype.zb = function (a) {
+        var b = this.v6(a);
         var c = b.x;
         var d = b.y;
         var e = { $type: Point_$type, x: NaN, y: NaN };
-        if (this.dn == null || this.xe == null || this.xg == null || this.yg == null) {
+        if (this.dn == null || this.xd == null || this.xf == null || this.yf == null) {
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
-        if (this.dn.count > this.yq) {
+        if (this.dn.count > this.yp) {
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
         var f = 1.7976931348623157E+308;
-        var g = this.xm.ce;
+        var g = this.xl.ce;
         if (g == null) {
             return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
         }
-        var h = this.xm.b5(b, false, !this.x0);
+        var h = this.xl.b5(b, false, !this.xz);
         if (h != null) {
             var i = RectUtil.l(h.d);
-            var j = this.zb(b, h.a, this.x0);
+            var j = this.za(b, h.a, this.xz);
             return new Tuple$3(Number_$type, Point_$type, Point_$type, h.b, j.d, i);
         }
         for (var k = 0; k < g.count; k++) {
@@ -295,7 +295,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.zb(b, g._inner[q].a, this.x0);
+                var t = this.za(b, g._inner[q].a, this.xz);
                 if (t.c < o) {
                     o = t.c;
                     e = t.d;
@@ -308,17 +308,17 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$3(Number_$type, Point_$type, Point_$type, -1, e, e);
     };
-    ShapeSeriesBase.prototype.get_x0 = function () {
+    ShapeSeriesBase.prototype.get_xz = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "x0", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "xz", {
         get: function () {
-            return this.get_x0();
+            return this.get_xz();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.zb = function (a, b, c) {
+    ShapeSeriesBase.prototype.za = 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 };
@@ -354,34 +354,34 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Tuple$2(Number_$type, Point_$type, e, f);
     };
-    ShapeSeriesBase.prototype.yl = function (a) {
-        return this.zc(a).c;
+    ShapeSeriesBase.prototype.yk = function (a) {
+        return this.zb(a).c;
     };
-    ShapeSeriesBase.prototype.wc = function (a, b, c) {
-        if (this.xe == null || this.xg == null || this.yg == null) {
+    ShapeSeriesBase.prototype.wb = function (a, b, c) {
+        if (this.xd == null || this.xf == null || this.yf == null) {
             return { $type: Point_$type, x: NaN, y: NaN };
         }
-        switch (this.xi) {
+        switch (this.xh) {
             case 1:
-                var d = this.zd(a);
+                var d = this.zc(a);
                 return d.d;
             case 2:
-                var e = this.zc(a);
+                var e = this.zb(a);
                 return e.e;
             case 3:
-                var f = this.zc(a);
+                var f = this.zb(a);
                 return f.d;
         }
         return { $type: Point_$type, x: NaN, y: NaN };
     };
-    ShapeSeriesBase.prototype.kn = function (a) {
-        var b = this.j3(a);
+    ShapeSeriesBase.prototype.km = function (a) {
+        var b = this.j2(a);
         if (this.dn != null && b >= 0 && b < this.dn.count) {
             return this.dn.item(b);
         }
         return null;
     };
-    ShapeSeriesBase.prototype.xo = function (a, b, c) {
+    ShapeSeriesBase.prototype.xn = function (a, b, c) {
         var d = new HighlightingInfo();
         d.i = this;
         d.g = 0;
@@ -393,51 +393,51 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return d;
     };
     ShapeSeriesBase.prototype.dg = function (a, b, c) {
-        if (this.ed && this.fz(this.bx) && !c) {
-            var d = this.xp(a, b, this.xr);
-            this.xr = d;
+        if (this.ed && this.fy(this.bx) && !c) {
+            var d = this.xo(a, b, this.xq);
+            this.xq = d;
             return d;
         }
         else {
-            var e = this.xo(a, b, this.xr);
-            this.xr = e;
+            var e = this.xn(a, b, this.xq);
+            this.xq = e;
             return e;
         }
     };
     ShapeSeriesBase.prototype.dh = function (a, b, c) {
-        if (this.fz(this.bx) && !c) {
-            var d = this.xq(a, b, this.xs);
-            this.xs = d;
+        if (this.fy(this.bx) && !c) {
+            var d = this.xp(a, b, this.xr);
+            this.xr = d;
             return d;
         }
         else {
-            var e = this.xo(a, b, this.xs);
+            var e = this.xn(a, b, this.xr);
             e.d = true;
-            this.xs = e;
+            this.xr = e;
             return e;
         }
     };
-    ShapeSeriesBase.prototype.ye = function () {
-        return (this.assigningShapeStyle != null && this.xy) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1) || (this.xv != null && this.xa != null);
-    };
     ShapeSeriesBase.prototype.yd = function () {
-        return (this.assigningShapeMarkerStyle != null && this.xx) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
+        return (this.assigningShapeStyle != null && this.xx) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1) || (this.xu != null && this.w9 != null);
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "yy", {
+    ShapeSeriesBase.prototype.yc = function () {
+        return (this.assigningShapeMarkerStyle != null && this.xw) || this.d2 || (this.bx != 1) || (this.cp != 1) || (this.co != 1);
+    };
+    Object.defineProperty(ShapeSeriesBase.prototype, "yx", {
         get: function () {
-            return this.c(ShapeSeriesBase.zu);
+            return this.c(ShapeSeriesBase.zt);
         },
         set: function (a) {
-            this.h(ShapeSeriesBase.zu, a);
+            this.h(ShapeSeriesBase.zt, a);
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.gb = function () {
-        return this.highlightedItemsSource != null || this.yy != null;
+    ShapeSeriesBase.prototype.ga = function () {
+        return this.highlightedItemsSource != null || this.yx != null;
     };
-    ShapeSeriesBase.prototype.ht = function () {
-        var a = _super.prototype.ht.call(this);
+    ShapeSeriesBase.prototype.hs = function () {
+        var a = _super.prototype.hs.call(this);
         {
             var b = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
@@ -447,7 +447,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.zg));
+            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.zf));
             a.add(b);
         }
         {
@@ -460,7 +460,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.r0));
+            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.rz));
             a.add(c);
         }
         {
@@ -473,38 +473,38 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.r0));
+            d.valueResolving = delegateCombine(d.valueResolving, runOn(this, this.rz));
             a.add(d);
         }
         return a;
     };
-    ShapeSeriesBase.prototype.zg = function (a, b) {
-        if (this.yy != null) {
-            b.value = this.yy;
+    ShapeSeriesBase.prototype.zf = function (a, b) {
+        if (this.yx != null) {
+            b.value = this.yx;
             return;
         }
-        b.value = this.y7;
+        b.value = this.y6;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "xw", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "xv", {
         get: function () {
-            return this.xu;
+            return this.xt;
         },
         set: function (a) {
-            var b = this.xw != a;
+            var b = this.xv != a;
             if (b) {
-                var c = this.xw;
-                this.xu = a;
-                this.raisePropertyChanged("ShapeColumn", c, this.xw);
+                var c = this.xv;
+                this.xt = a;
+                this.raisePropertyChanged("ShapeColumn", c, this.xv);
             }
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.x5 = function (array_) {
+    ShapeSeriesBase.prototype.x4 = function (array_) {
         var a = (Array.isArray(array_));
         return a;
     };
-    ShapeSeriesBase.x9 = function (a) {
+    ShapeSeriesBase.x8 = function (a) {
         if (a == null) {
             return true;
         }
@@ -539,10 +539,10 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     e = (curr_.y);
                 }
                 if (!g) {
-                    if ((isNaN_(d) || ShapeSeriesBase.x9(d)) && (isNaN_(e) || ShapeSeriesBase.x9(e))) {
+                    if ((isNaN_(d) || ShapeSeriesBase.x8(d)) && (isNaN_(e) || ShapeSeriesBase.x8(e))) {
                         d = (curr_.X);
                         e = (curr_.Y);
-                        if (!isNaN_(d) && !ShapeSeriesBase.x9(d) && !isNaN_(e) && !ShapeSeriesBase.x9(e)) {
+                        if (!isNaN_(d) && !ShapeSeriesBase.x8(d) && !isNaN_(e) && !ShapeSeriesBase.x8(e)) {
                             g = true;
                             f = true;
                         }
@@ -558,7 +558,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return b;
     };
     ShapeSeriesBase.prototype.dm = function (a) {
-        if (this.dn != null && this.x5(this.itemsSource) && a != null && a.split('!').length != 2) {
+        if (this.dn != null && this.x4(this.itemsSource) && a != null && a.split('!').length != 2) {
             if (this.coercionMethods == null) {
                 this.coercionMethods = {};
             }
@@ -568,153 +568,153 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return _super.prototype.dm.call(this, a);
     };
-    ShapeSeriesBase.prototype.q9 = function (a, b, c, d) {
-        _super.prototype.q9.call(this, a, b, c, d);
+    ShapeSeriesBase.prototype.q8 = function (a, b, c, d) {
+        _super.prototype.q8.call(this, a, b, c, d);
         var e = false;
         var f = false;
         switch (b) {
             case ShapeSeriesBase.$$p[5]:
-                this.xi = this.xj();
+                this.xh = this.xi();
                 break;
             case "FastItemsSource":
                 var g = typeCast(IFastItemsSource_$type, c);
                 if (g != null) {
+                    if (this.xu != null) {
+                        g.deregisterColumn(this.xu);
+                    }
                     if (this.xv != null) {
                         g.deregisterColumn(this.xv);
                     }
-                    if (this.xw != null) {
-                        g.deregisterColumn(this.xw);
-                    }
-                    this.xw = null;
+                    this.xv = null;
                 }
                 var h = typeCast(IFastItemsSource_$type, d);
                 if (h != null) {
-                    if (this.y7 != null) {
-                        this.xw = this.dm(this.y7);
+                    if (this.y6 != null) {
+                        this.xv = this.dm(this.y6);
                     }
-                    if (this.yu != null) {
-                        this.xv = this.dk(this.yu);
+                    if (this.yt != null) {
+                        this.xu = this.dk(this.yt);
                     }
                 }
-                e = this.xe != null && !this.xe.c1();
-                f = this.xg != null && !this.xg.c1();
+                e = this.xd != null && !this.xd.c1();
+                f = this.xf != null && !this.xf.c1();
                 if (e || f) {
-                    this.rr(this.gg && c != null);
+                    this.rq(this.gf && c != null);
                 }
                 break;
             case ShapeSeriesBase.$$p[9]:
                 if (this.dn != null) {
-                    this.dn.deregisterColumn(this.xw);
-                    this.xw = this.dm(this.y7);
+                    this.dn.deregisterColumn(this.xv);
+                    this.xv = this.dm(this.y6);
                 }
                 break;
             case "ShapeColumn":
-                this.zo();
-                e = this.xe != null && !this.xe.c1();
-                f = this.xg != null && !this.xg.c1();
+                this.zn();
+                e = this.xd != null && !this.xd.c1();
+                f = this.xf != null && !this.xf.c1();
                 if (e || f) {
-                    this.rr(this.gg && this.d7);
+                    this.rq(this.gf && this.d7);
                 }
-                this.ql();
+                this.qk();
                 break;
             case ShapeSeriesBase.$$p[10]:
             case ShapeSeriesBase.$$p[11]:
-                this.xd = this.xe;
-                this.xf = this.xg;
+                this.xc = this.xd;
+                this.xe = this.xf;
                 var i = c;
                 var j = d;
-                this.zp(i);
-                this.zh(j);
+                this.zo(i);
+                this.zg(j);
                 if ((j != null && !j.c1()) || (j == null && i != null)) {
-                    this.rr(false);
+                    this.rq(false);
                 }
-                this.ql();
+                this.qk();
                 break;
             case "ActualResolution":
-                this.yk = this.id;
-                this.ql();
+                this.yj = this.ic;
+                this.qk();
                 break;
             case "ActualBrush":
-                this.rr(false);
+                this.rq(false);
                 break;
             case ShapeSeriesBase.$$p[8]:
-                this.yn = this.ym;
-                this.rr(false);
-                this.ql();
+                this.ym = this.yl;
+                this.rq(false);
+                this.qk();
                 break;
             case ShapeSeriesBase.$$p[2]:
             case "ActualThickness":
-                this.rr(false);
-                this.ql();
+                this.rq(false);
+                this.qk();
                 break;
             case ShapeSeriesBase.$$p[4]:
-                this.xy = this.yc();
-                this.rr(false);
+                this.xx = this.yb();
+                this.rq(false);
                 break;
             case ShapeSeriesBase.$$p[3]:
-                this.xx = this.yb();
-                this.rr(false);
+                this.xw = this.ya();
+                this.rq(false);
                 break;
             case ShapeSeriesBase.$$p[1]:
                 if (c != null) {
                     c.o.remove(this);
                     c.x();
-                    this.xb = null;
-                    this.xn = null;
+                    this.xa = null;
+                    this.xm = null;
                 }
                 if (d != null) {
                     d.o.add(this);
                     d.x();
-                    this.xb = typeCast(CustomPaletteBrushScale.$, d);
-                    this.xn = typeCast(ValueBrushScale.$, d);
+                    this.xa = typeCast(CustomPaletteBrushScale.$, d);
+                    this.xm = typeCast(ValueBrushScale.$, d);
                 }
-                this.rr(false);
-                this.ql();
+                this.rq(false);
+                this.qk();
                 break;
             case "FillColumn":
-                this.rr(this.gg && this.d7);
-                this.ql();
+                this.rq(this.gf && this.d7);
+                this.qk();
                 break;
             case ShapeSeriesBase.$$p[0]:
-                if (this.xa != null) {
-                    this.xa.x();
+                if (this.w9 != null) {
+                    this.w9.x();
                 }
                 if (this.dn != null) {
-                    this.dn.deregisterColumn(this.xv);
-                    this.xv = this.dk(this.yu);
+                    this.dn.deregisterColumn(this.xu);
+                    this.xu = this.dk(this.yt);
                 }
                 break;
         }
     };
-    ShapeSeriesBase.prototype.yc = function () {
-        return this.x8;
-    };
     ShapeSeriesBase.prototype.yb = function () {
         return this.x7;
     };
-    ShapeSeriesBase.prototype.x2 = function (a) {
+    ShapeSeriesBase.prototype.ya = function () {
+        return this.x6;
+    };
+    ShapeSeriesBase.prototype.x1 = function (a) {
         if (typeCast(NumericYAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ShapeSeriesBase.prototype.x1 = function (a) {
+    ShapeSeriesBase.prototype.x0 = function (a) {
         if (typeCast(NumericXAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ShapeSeriesBase.prototype.zo = function () {
-        this.yg = null;
-        if (this.xw == null) {
+    ShapeSeriesBase.prototype.zn = function () {
+        this.yf = null;
+        if (this.xv == null) {
             return;
         }
-        this.yg = new List$1(Rect.$, 2, this.xw.count);
-        for (var a = 0; a < this.xw.count; a++) {
-            this.yg.add(PointCollectionUtil.j(this.xw.item(a)));
+        this.yf = new List$1(Rect.$, 2, this.xv.count);
+        for (var a = 0; a < this.xv.count; a++) {
+            this.yf.add(PointCollectionUtil.j(this.xv.item(a)));
         }
     };
-    ShapeSeriesBase.prototype.z5 = function (a) {
+    ShapeSeriesBase.prototype.z4 = function (a) {
         if (typeCast(IEnumerable$1_$type.specialize(IEnumerable$1_$type.specialize(Point_$type)), a) !== null) {
             return PointCollectionUtil.h(a);
         }
@@ -723,11 +723,11 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return Rect.empty;
     };
-    ShapeSeriesBase.prototype.yi = function (a, b, c, d, e, f, g) {
+    ShapeSeriesBase.prototype.yh = function (a, b, c, d, e, f, g) {
         var e_1, _a;
-        return this.yj(a, b, c, d, e, f, g);
+        return this.yi(a, b, c, d, e, f, g);
         if (typeCast(List$1.$.specialize(List$1.$.specialize(Point_$type)), c) !== null) {
-            return this.yj(a, b, c, d, e, f, g);
+            return this.yi(a, b, c, d, e, f, g);
         }
         else if (typeCast(IEnumerable$1_$type.specialize(IEnumerable$1_$type.specialize(Point_$type)), c) !== null) {
             var h = c;
@@ -736,7 +736,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.xc(a, b, PointCollectionUtil.b(k), d, e, f, g);
+                    j = this.xb(a, b, PointCollectionUtil.b(k), d, e, f, g);
                     if (j == null) {
                         continue;
                     }
@@ -760,7 +760,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         else if (typeCast(IEnumerable$1_$type.specialize(Point_$type), c) !== null) {
             var l = c;
-            var m = this.xc(a, b, PointCollectionUtil.b(l), d, e, f, g);
+            var m = this.xb(a, b, PointCollectionUtil.b(l), d, e, f, g);
             var n = new List$1(FlattenedShape.$, 0);
             if (m != null) {
                 n.add(m);
@@ -771,51 +771,51 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             throw new InvalidOperationException(1, "Unrecognized data in ShapeColumn");
         }
     };
-    ShapeSeriesBase.prototype.get_x6 = function () {
+    ShapeSeriesBase.prototype.get_x5 = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "x6", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "x5", {
         get: function () {
-            return this.get_x6();
+            return this.get_x5();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.yf = function () {
+    ShapeSeriesBase.prototype.ye = function () {
         return false;
     };
-    ShapeSeriesBase.prototype.rs = function (a) {
-        this.zn(this.cv);
+    ShapeSeriesBase.prototype.rr = function (a) {
+        this.zm(this.cv);
     };
-    ShapeSeriesBase.prototype.rq = function (a, b, c, d, e) {
-        _super.prototype.rq.call(this, a, b, c, d, e);
+    ShapeSeriesBase.prototype.rp = function (a, b, c, d, e) {
+        _super.prototype.rp.call(this, a, b, c, d, e);
         var f = this.ba.a$j.item(d);
         var g = f;
         f.a3(c);
         if (this.d5(f)) {
             return;
         }
-        this.zn(f);
+        this.zm(f);
     };
     ShapeSeriesBase.prototype.updateFillScaleGlobals = function () {
         var a = new ActualRange();
         a.b = NaN;
         a.a = NaN;
-        if (this.xv != null) {
-            a.b = this.xv.minimum;
-            a.a = this.xv.maximum;
+        if (this.xu != null) {
+            a.b = this.xu.minimum;
+            a.a = this.xu.maximum;
         }
-        if (this.xa != null) {
-            this.xa.z(a.b, a.a);
+        if (this.w9 != null) {
+            this.w9.z(a.b, a.a);
         }
     };
-    ShapeSeriesBase.prototype.zn = function (a) {
+    ShapeSeriesBase.prototype.zm = function (a) {
         var _this = this;
         if (this.d5(a)) {
             return;
         }
-        if (this.xa != null) {
-            this.w6 = this.w7();
+        if (this.w9 != null) {
+            this.w5 = this.w6();
         }
         var b;
         var c;
@@ -823,62 +823,62 @@ 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.xw == null) {
+        if (c.width < 1 || c.height < 1 || this.xv == null) {
             return;
         }
-        var f = this.xe;
-        var g = this.xg;
+        var f = this.xd;
+        var g = this.xf;
         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.gr) {
+        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.xw.count;
-            if (this.w1 == null || this.w1.length != p) {
-                this.w1 = new Array(p);
-                this.wz = new Array(p);
+            var p = this.xv.count;
+            if (this.w0 == null || this.w0.length != p) {
                 this.w0 = new Array(p);
                 this.wy = new Array(p);
+                this.wz = new Array(p);
+                this.wx = new Array(p);
             }
-            var q = this.w1;
-            var r = this.wz;
-            var s = this.w0;
-            var t = this.wy;
+            var q = this.w0;
+            var r = this.wy;
+            var s = this.wz;
+            var t = this.wx;
             var u = void 0;
             for (var v = 0; v < p; v++) {
-                u = this.yg._inner[v];
+                u = this.yf._inner[v];
                 q[v] = u.top;
                 r[v] = u.left;
                 s[v] = u.right;
                 t[v] = u.bottom;
             }
-            this.xd.hq(boxArray$1(r), 0, r.length, i);
-            this.xd.hq(boxArray$1(s), 0, s.length, i);
-            this.xf.hq(boxArray$1(q), 0, q.length, j);
-            this.xf.hq(boxArray$1(t), 0, t.length, j);
+            this.xc.hq(boxArray$1(r), 0, r.length, i);
+            this.xc.hq(boxArray$1(s), 0, s.length, i);
+            this.xe.hq(boxArray$1(q), 0, q.length, j);
+            this.xe.hq(boxArray$1(t), 0, t.length, j);
             d.cv(r, q, s, t);
-            var w = this.xw;
+            var w = this.xv;
             var x = this.dn;
-            this.zq(d);
+            this.zp(d);
             var y = c.left;
             var z = c.right;
             var aa = c.top;
             var ab = c.bottom;
             var ac = null;
-            if (this.z4.isEmpty) {
+            if (this.z3.isEmpty) {
                 ac = null;
             }
             else {
-                ac = new Clipper(1, this.z4.left, this.z4.bottom, this.z4.right, this.z4.top, this.x6);
+                ac = new Clipper(1, this.z3.left, this.z3.bottom, this.z3.right, this.z3.top, this.x5);
             }
-            var ad = this.yf();
+            var ad = this.ye();
             if (ad) {
                 d.cc.clear();
             }
@@ -909,9 +909,9 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     else {
                         ai = null;
                     }
-                    var ak = this.yi(a, ai, w.item(aj), i, j, 0, ag);
+                    var ak = this.yh(a, ai, w.item(aj), i, j, 0, ag);
                     if (ad) {
-                        ShapeSeriesBase.zm(d, aj, ak);
+                        ShapeSeriesBase.zl(d, aj, ak);
                     }
                     d.ci(aj, x.item(aj), k, ak);
                 }
@@ -924,9 +924,9 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                         else {
                             ai = null;
                         }
-                        var al = this.yi(a, ai, w.item(aj), i, j, ag, ag);
+                        var al = this.yh(a, ai, w.item(aj), i, j, ag, ag);
                         if (ad) {
-                            ShapeSeriesBase.zm(d, aj, al);
+                            ShapeSeriesBase.zl(d, aj, al);
                         }
                         d.ci(aj, x.item(aj), k, al);
                     }
@@ -934,82 +934,82 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             d.ct();
         }
-        var am = this.ye();
-        this.xl.az(this, this.ye(), runOn(this, this.w4));
+        var am = this.yd();
+        this.xk.az(this, this.yd(), runOn(this, this.w3));
         var an = false;
-        var ao = this.xl.b;
+        var ao = this.xk.b;
         if (ao != null) {
             an = true;
         }
         var ap = a.q;
-        var aq = this.fy;
+        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.zj(as, aq, au, _this.xw.count, ap, ar);
+                _this.zi(as, aq, au, _this.xv.count, ap, ar);
             }
             else {
                 if (ar) {
                     {
-                        _this.xl.a1(as, _this.ib, ar);
+                        _this.xk.a1(as, _this.ia, ar);
                     }
                 }
             }
             {
-                _this.xl.ad(as, false, false, false, false);
+                _this.xk.ad(as, false, false, false, false);
             }
         });
     };
-    ShapeSeriesBase.prototype.w7 = function () {
+    ShapeSeriesBase.prototype.w6 = function () {
         var a = new ActualRange();
         a.b = NaN;
         a.a = NaN;
-        if (this.xv != null) {
-            a.b = this.xv.minimum;
-            a.a = this.xv.maximum;
+        if (this.xu != null) {
+            a.b = this.xu.minimum;
+            a.a = this.xu.maximum;
         }
-        var b = typeCast(ValueBrushScale.$, this.xa);
+        var b = typeCast(ValueBrushScale.$, this.w9);
         if (b != null) {
             b.s();
-            if (this.x3 && this.xa.o.count > 1) {
+            if (this.x2 && this.w9.o.count > 1) {
                 a.b = b.q;
                 a.a = b.p;
             }
         }
         return a;
     };
-    ShapeSeriesBase.prototype.zj = function (a, b, c, d, e, f) {
+    ShapeSeriesBase.prototype.zi = function (a, b, c, d, e, f) {
         var g = this.bx != 1;
         var h = this.cp != 1;
         var i = this.co != 1;
-        this.xl.a0(this.xl.b, c, d, false);
+        this.xk.a0(this.xk.b, c, d, false);
         {
-            this.xl.a1(a, this.ib, f);
+            this.xk.a1(a, this.ia, f);
         }
-        var j = this.xl.ax;
+        var j = this.xk.ax;
         var k = null;
         var l = null;
         var m = null;
         var n = this.dn;
-        if (this.xv != null && this.xa != null) {
-            if (j.z >= 0 && j.z < this.xv.count) {
-                var o = this.xv.item(j.z);
-                var p = this.w6;
+        if (this.xu != null && this.w9 != null) {
+            if (j.z >= 0 && j.z < this.xu.count) {
+                var o = this.xu.item(j.z);
+                var p = this.w5;
                 var q = p.b;
                 var r = p.a;
                 var s = j.aa;
-                if (this.xb != null) {
-                    s = this.xb.getBrush1(j.z, this.xv.count);
+                if (this.xa != null) {
+                    s = this.xa.getBrush1(j.z, this.xu.count);
                 }
-                else if (this.xn != null && this.xv != null) {
-                    var t = this.xv.item(j.z);
-                    s = this.xn.getBrushByRange(t, q, r);
+                else if (this.xm != null && this.xu != null) {
+                    var t = this.xu.item(j.z);
+                    s = this.xm.getBrushByRange(t, q, r);
                 }
-                else if (this.xa != null) {
-                    s = this.xa.getBrush(j.z);
+                else if (this.w9 != null) {
+                    s = this.w9.getBrush(j.z);
                 }
                 j.aa = s;
             }
@@ -1033,16 +1033,16 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             j.b = m;
         }
         j.h = e;
-        this.zl(j);
-        this.xl.z(this, k, l, m, e, g, h, i, false);
+        this.zk(j);
+        this.xk.z(this, k, l, m, e, g, h, i, false);
     };
-    ShapeSeriesBase.prototype.zi = function (a, b, c) {
+    ShapeSeriesBase.prototype.zh = function (a, b, c) {
         var d = this.bx != 1;
         var e = this.cp != 1;
         var f = this.co != 1;
-        this.xl.a0(this.xl.d, a, b, true);
-        this.xl.aa(this.ib);
-        var g = this.xl.aw;
+        this.xk.a0(this.xk.d, a, b, true);
+        this.xk.aa(this.ia);
+        var g = this.xk.aw;
         var h = null;
         var i = null;
         var j = null;
@@ -1075,24 +1075,24 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             g.b = i;
         }
         g.h = c;
-        this.zk(g);
-        this.xl.y(this, h, i, j, c, d, e, f, g.v, this.db.dl.totalHighWaterMark, g.x, this.db.dm.totalHighWaterMark, g.t, this.db.dk.totalHighWaterMark);
+        this.zj(g);
+        this.xk.y(this, h, i, j, c, d, e, f, g.v, this.db.dl.totalHighWaterMark, g.x, this.db.dm.totalHighWaterMark, g.t, this.db.dk.totalHighWaterMark);
     };
-    ShapeSeriesBase.prototype.zl = function (a) {
-        if (this.assigningShapeStyle != null && this.xy) {
+    ShapeSeriesBase.prototype.zk = function (a) {
+        if (this.assigningShapeStyle != null && this.xx) {
             this.assigningShapeStyle(this, a);
         }
     };
-    ShapeSeriesBase.prototype.zk = function (a) {
-        if (this.assigningShapeMarkerStyle != null && this.xx) {
+    ShapeSeriesBase.prototype.zj = function (a) {
+        if (this.assigningShapeMarkerStyle != null && this.xw) {
             this.assigningShapeMarkerStyle(this, a);
         }
     };
-    ShapeSeriesBase.prototype.w4 = function (a, b) {
-        return this.w5(a, b);
+    ShapeSeriesBase.prototype.w3 = function (a, b) {
+        return this.w4(a, b);
     };
-    ShapeSeriesBase.prototype.w5 = function (a, b) {
-        if (b < a || a < 0 || a > this.xw.count || b < 0 || b > this.xw.count) {
+    ShapeSeriesBase.prototype.w4 = function (a, b) {
+        if (b < a || a < 0 || a > this.xv.count || b < 0 || b > this.xv.count) {
             return null;
         }
         var c = new Array((b - a) + 1);
@@ -1102,7 +1102,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ShapeSeriesBase.zm = function (a, b, c) {
+    ShapeSeriesBase.zl = function (a, b, c) {
         var d = 0;
         var e = null;
         for (var f = 0; f < c.count; f++) {
@@ -1115,76 +1115,76 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         a.cc.addItem(b, e);
     };
-    ShapeSeriesBase.prototype.qb = function () {
-        _super.prototype.qb.call(this);
-        if (this.xe != null) {
-            this.xe.ia();
+    ShapeSeriesBase.prototype.qa = function () {
+        _super.prototype.qa.call(this);
+        if (this.xd != null) {
+            this.xd.ia();
         }
-        if (this.xg != null) {
-            this.xg.ia();
+        if (this.xf != null) {
+            this.xf.ia();
         }
     };
-    ShapeSeriesBase.prototype.sr = function (a, b) {
-        this.rr(false);
-    };
     ShapeSeriesBase.prototype.sq = function (a, b) {
-        this.rr(false);
+        this.rq(false);
+    };
+    ShapeSeriesBase.prototype.sp = function (a, b) {
+        this.rq(false);
     };
-    ShapeSeriesBase.prototype.pb = function (a, b, c, d) {
-        _super.prototype.pb.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.y7) {
-                    this.yg._inner[b] = this.z5(this.xw.item(b));
+                if (d == this.y6) {
+                    this.yf._inner[b] = this.z4(this.xv.item(b));
                 }
                 break;
             case 1:
                 for (var e = b; e < b + c; e++) {
-                    this.yg.insert(e, this.z5(this.xw.item(e)));
+                    this.yf.insert(e, this.z4(this.xv.item(e)));
                 }
                 break;
             case 0:
-                this.yg.v(b, c);
+                this.yf.v(b, c);
                 break;
             case 2:
                 for (var f = b; f < b + c; f++) {
-                    this.yg._inner[f] = this.z5(this.xw.item(f));
+                    this.yf._inner[f] = this.z4(this.xv.item(f));
                 }
                 break;
             case 4:
-                this.zo();
+                this.zn();
                 break;
         }
-        this.rr(false);
+        this.rq(false);
     };
-    ShapeSeriesBase.prototype.he = function (a, b, c) {
+    ShapeSeriesBase.prototype.hd = function (a, b, c) {
         var d = true;
-        if (!_super.prototype.he.call(this, a, b, c) || (this.ya && this.xw == null) || b.isEmpty || a.isEmpty || this.xe == null || this.xg == null || this.xe.bi == null || this.xg.bi == null || this.xe.l4 == this.xe.l3 || this.xg.l4 == this.xg.l3 || this.xw == null || this.xw.count == 0 || this.yg == null || this.yg.count == 0 || this.yg.count != this.xw.count) {
+        if (!_super.prototype.hd.call(this, a, b, c) || (this.x9 && this.xv == null) || b.isEmpty || a.isEmpty || this.xd == null || this.xf == null || this.xd.bi == null || this.xf.bi == null || this.xd.l4 == this.xd.l3 || this.xf.l4 == this.xf.l3 || this.xv == null || this.xv.count == 0 || this.yf == null || this.yf.count == 0 || this.yf.count != this.xv.count) {
             d = false;
         }
         return d;
     };
-    ShapeSeriesBase.prototype.get_ya = function () {
+    ShapeSeriesBase.prototype.get_x9 = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "ya", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "x9", {
         get: function () {
-            return this.get_ya();
+            return this.get_x9();
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.q1 = function (a) {
-        _super.prototype.q1.call(this, a);
-        this.xm = typeCast(ShapeSeriesViewBase.$, a);
+    ShapeSeriesBase.prototype.q0 = function (a) {
+        _super.prototype.q0.call(this, a);
+        this.xl = typeCast(ShapeSeriesViewBase.$, a);
     };
-    ShapeSeriesBase.prototype.yj = function (a, b, c, d, e, f, g) {
+    ShapeSeriesBase.prototype.yi = 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.xc(a, b, i, d, e, f, g);
+            var l = this.xb(a, b, i, d, e, f, g);
             if (l == null) {
                 continue;
             }
@@ -1192,8 +1192,8 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h;
     };
-    ShapeSeriesBase.prototype.xc = function (a, b, c, d, e, f, g) {
-        var h = this.ze(c, d, e);
+    ShapeSeriesBase.prototype.xb = function (a, b, c, d, e, f, g) {
+        var h = this.zd(c, d, e);
         var i = h.c;
         var j = h.d;
         var k = i.length;
@@ -1216,7 +1216,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             n = p > n ? p : n;
             o = q > o ? q : o;
         }
-        var t = !(l > this.z4.right || n < this.z4.left || m > this.z4.bottom || o < this.z4.top);
+        var t = !(l > this.z3.right || n < this.z3.left || m > this.z3.bottom || o < this.z3.top);
         if (!t && f == 0 && g != 0) {
             if (g != 0) {
                 for (var u = 0; u < k; u++) {
@@ -1231,22 +1231,22 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 n = p > n ? p : n;
                 o = q > o ? q : o;
             }
-            t = !(l > this.z4.right || n < this.z4.left || m > this.z4.bottom || o < this.z4.top);
+            t = !(l > this.z3.right || n < this.z3.left || m > this.z3.bottom || o < this.z3.top);
         }
         if (!t) {
             return null;
         }
-        var w = b != null && (l < this.z4.left || m < this.z4.top || n > this.z4.right || o > this.z4.bottom);
+        var w = b != null && (l < this.z3.left || m < this.z3.top || n > this.z3.right || o > this.z3.bottom);
         var x = new Rect(0, l, m, n - l, o - m);
         if (!a.cb(x)) {
             return null;
         }
-        l = l < this.z4.left ? this.z4.left : l;
-        n = n > this.z4.right ? this.z4.right : n;
-        m = m < this.z4.top ? this.z4.top : m;
-        o = o > this.z4.bottom ? this.z4.bottom : o;
-        var y = PolySimplification.b(h, this.id);
-        var z = new DefaultFlattener().c(h.c, h.d, y, this.yk);
+        l = l < this.z3.left ? this.z3.left : l;
+        n = n > this.z3.right ? this.z3.right : n;
+        m = m < this.z3.top ? this.z3.top : m;
+        o = o > this.z3.bottom ? this.z3.bottom : o;
+        var y = PolySimplification.b(h, this.ic);
+        var z = new DefaultFlattener().c(h.c, h.d, y, this.yj);
         var aa = z.count;
         if (w) {
             var ab = new List$1(Point_$type, 0);
@@ -1266,9 +1266,9 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         ad.c = x;
         return ad;
     };
-    ShapeSeriesBase.prototype.ze = function (a, b, c) {
-        var d = this.xd;
-        var e = this.xf;
+    ShapeSeriesBase.prototype.zd = function (a, b, c) {
+        var d = this.xc;
+        var e = this.xe;
         var f = a.count;
         var g = new Array(f);
         var h = new Array(f);
@@ -1280,57 +1280,57 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         e.hq(boxArray$1(h), 0, h.length, c);
         return new Tuple$2(Array_$type, Array_$type, g, h);
     };
-    ShapeSeriesBase.prototype.zq = function (a) {
+    ShapeSeriesBase.prototype.zp = function (a) {
         a.c0();
     };
-    ShapeSeriesBase.prototype.o5 = function (a, b) {
-        _super.prototype.o5.call(this, a, b);
+    ShapeSeriesBase.prototype.o4 = function (a, b) {
+        _super.prototype.o4.call(this, a, b);
         var c = b;
         c.cn();
     };
-    ShapeSeriesBase.prototype.zh = function (a) {
+    ShapeSeriesBase.prototype.zg = function (a) {
         if (a != null) {
             a.ct(this);
         }
     };
-    ShapeSeriesBase.prototype.zp = function (a) {
+    ShapeSeriesBase.prototype.zo = function (a) {
         if (a != null) {
             a.b0(this);
         }
     };
-    ShapeSeriesBase.prototype.zf = function (a, b, c) {
+    ShapeSeriesBase.prototype.ze = function (a, b, c) {
         var d = this.cv;
         var e = d.bx;
-        var f = this.wr(a);
-        if (e.width < 1 || e.height < 1 || this.xw == null) {
+        var f = this.wq(a);
+        if (e.width < 1 || e.height < 1 || this.xv == null) {
             return;
         }
         var g = this.getEffectiveViewport1(d);
-        var h = new ScalerParams(0, f, e, this.xe.ch, g);
-        var i = new ScalerParams(0, f, e, this.xg.ch, g);
+        var h = new ScalerParams(0, f, e, this.xd.ch, g);
+        var i = new ScalerParams(0, f, e, this.xf.ch, g);
         d.cu();
-        var j = this.xw.count;
+        var j = this.xv.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.yg._inner[p];
+            o = this.yf._inner[p];
             k[p] = o.top;
             l[p] = o.left;
             m[p] = o.right;
             n[p] = o.bottom;
         }
-        this.xe.hq(boxArray$1(l), 0, l.length, h);
-        this.xe.hq(boxArray$1(m), 0, m.length, h);
-        this.xg.hq(boxArray$1(k), 0, k.length, i);
-        this.xg.hq(boxArray$1(n), 0, n.length, i);
+        this.xd.hq(boxArray$1(l), 0, l.length, h);
+        this.xd.hq(boxArray$1(m), 0, m.length, h);
+        this.xf.hq(boxArray$1(k), 0, k.length, i);
+        this.xf.hq(boxArray$1(n), 0, n.length, i);
         d.cv(l, k, m, n);
         d.c0();
         var q = null;
-        if (!this.z4.isEmpty) {
-            q = new Clipper(1, this.z4.left, this.z4.bottom, this.z4.right, this.z4.top, this.x6);
+        if (!this.z3.isEmpty) {
+            q = new Clipper(1, this.z3.left, this.z3.bottom, this.z3.right, this.z3.top, this.x5);
         }
         var r = false;
         var s = 0;
@@ -1358,14 +1358,14 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             if (!y.intersectsWith(e)) {
                 continue;
             }
-            var aa = this.yi(d, q, this.xw.item(z), h, i, s, s);
+            var aa = this.yh(d, q, this.xv.item(z), h, i, s, s);
             if (aa.count <= 0) {
                 continue;
             }
-            this.xz(b, c, z);
+            this.xy(b, c, z);
         }
     };
-    ShapeSeriesBase.prototype.xz = function (a, b, c) {
+    ShapeSeriesBase.prototype.xy = function (a, b, c) {
         var _this = this;
         if (b == 7 || b == 6) {
             a.add(((function () {
@@ -1394,7 +1394,7 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     ShapeSeriesBase.prototype.a2 = function (a, b) {
-        var c = this.xm.c2(a, b);
+        var c = this.xl.c2(a, b);
         var d = null;
         if (c != null) {
             d = c.dataContext;
@@ -1404,22 +1404,22 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return _super.prototype.a2.call(this, a, b);
     };
-    ShapeSeriesBase.prototype.yr = function (a) {
+    ShapeSeriesBase.prototype.yq = function (a) {
         return this.dn.item(a);
     };
-    ShapeSeriesBase.prototype.get_g7 = function () {
+    ShapeSeriesBase.prototype.get_g6 = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.set_g7 = function (a) {
-        _super.prototype.set_g7.call(this, a);
+    ShapeSeriesBase.prototype.set_g6 = function (a) {
+        _super.prototype.set_g6.call(this, a);
     };
     ShapeSeriesBase.prototype.ay = function (a) {
         var e_2, _a, e_3, _b;
-        if (typeCast(NumericXAxis.$, a) !== null && this.yg != null) {
+        if (typeCast(NumericXAxis.$, a) !== null && this.yf != null) {
             var b = 1.7976931348623157E+308;
             var c = -1.7976931348623157E+308;
             try {
-                for (var _c = __values(fromEnum(this.yg)), _d = _c.next(); !_d.done; _d = _c.next()) {
+                for (var _c = __values(fromEnum(this.yf)), _d = _c.next(); !_d.done; _d = _c.next()) {
                     var d = _d.value;
                     b = Math.min(b, d.left);
                     c = Math.max(c, d.right);
@@ -1440,11 +1440,11 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             return new AxisRange(b, c);
         }
-        if (typeCast(NumericYAxis.$, a) !== null && this.yg != null) {
+        if (typeCast(NumericYAxis.$, a) !== null && this.yf != null) {
             var e = 1.7976931348623157E+308;
             var f = -1.7976931348623157E+308;
             try {
-                for (var _e = __values(fromEnum(this.yg)), _f = _e.next(); !_f.done; _f = _e.next()) {
+                for (var _e = __values(fromEnum(this.yf)), _f = _e.next(); !_f.done; _f = _e.next()) {
                     var g = _f.value;
                     e = Math.min(e, g.top);
                     f = Math.max(f, g.bottom);
@@ -1467,24 +1467,24 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return null;
     };
-    ShapeSeriesBase.prototype.get_fx = function () {
+    ShapeSeriesBase.prototype.get_fw = function () {
         return true;
     };
-    ShapeSeriesBase.prototype.get_fl = function () {
+    ShapeSeriesBase.prototype.get_fk = function () {
         return true;
     };
-    Object.defineProperty(ShapeSeriesBase.prototype, "x4", {
+    Object.defineProperty(ShapeSeriesBase.prototype, "x3", {
         get: function () {
             return this.styleShape != null;
         },
         enumerable: false,
         configurable: true
     });
-    ShapeSeriesBase.prototype.z6 = function (a, b, c) {
+    ShapeSeriesBase.prototype.z5 = function (a, b, c) {
         if (this.styleShape != null) {
-            if (this.xm.c9 != null && c == this.xm.c9) {
+            if (this.xl.c9 != null && c == this.xl.c9) {
                 c = new Style();
-                var d = this.xm.c9;
+                var d = this.xl.c9;
                 c.fill = d.fill;
                 c.opacity = d.opacity;
                 c.stroke = d.stroke;
@@ -1510,8 +1510,8 @@ var ShapeSeriesBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return c;
     };
     ShapeSeriesBase.$t = markType(ShapeSeriesBase, 'ShapeSeriesBase', Series.$, [ISupportsFillScale_$type]);
-    ShapeSeriesBase.zu = 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', ['FillMemberPath:yu:zr', [2], 'FillScale:xa:zs', [BrushScale.$], 'FillScaleUseGlobalValues:x3:zt', [0, false], 'IsCustomShapeMarkerStyleAllowed:x7:zv', [0, false], 'IsCustomShapeStyleAllowed:x8:zw', [0, false], 'ItemSearchMode:xk:zx', [ShapeItemSearchMode_$type, enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:yp:zy', [1, 10000], 'ItemSearchThreshold:yq:zz', [1, 10000], 'ShapeFilterResolution:ym:z0', [1, 2], 'ShapeMemberPath:y7:z1', [2, null], 'XAxis:xe:z2', [NumericXAxis.$, null], 'YAxis:xg:z3', [NumericYAxis.$, null]]);
+    ShapeSeriesBase.zt = 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', ['FillMemberPath:yt:zq', [2], 'FillScale:w9:zr', [BrushScale.$], 'FillScaleUseGlobalValues:x2:zs', [0, false], 'IsCustomShapeMarkerStyleAllowed:x6:zu', [0, false], 'IsCustomShapeStyleAllowed:x7:zv', [0, false], 'ItemSearchMode:xj:zw', [ShapeItemSearchMode_$type, enumGetBox(ShapeItemSearchMode_$type, 0)], 'ItemSearchPointsThreshold:yo:zx', [1, 10000], 'ItemSearchThreshold:yp:zy', [1, 10000], 'ShapeFilterResolution:yl:zz', [1, 2], 'ShapeMemberPath:y6:z0', [2, null], 'XAxis:xd:z1', [NumericXAxis.$, null], 'YAxis:xf:z2', [NumericYAxis.$, null]]);
     return ShapeSeriesBase;
 }(Series));
 export { ShapeSeriesBase };
@@ -1645,7 +1645,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
         })());
     };
     ShapeSeriesViewBase.prototype.cb = function (a) {
-        return a.width >= this.b6.yn && a.height >= this.b6.yn;
+        return a.width >= this.b6.ym && a.height >= this.b6.ym;
     };
     ShapeSeriesViewBase.cf = function (a) {
         var b = new List$1(PointCollection.$, 0);
@@ -1660,7 +1660,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     Object.defineProperty(ShapeSeriesViewBase.prototype, "ca", {
         get: function () {
-            return this.c8 != null || this.b7 != null || this.b6.x4;
+            return this.c8 != null || this.b7 != null || this.b6.x3;
         },
         enumerable: false,
         configurable: true
@@ -1699,13 +1699,13 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ShapeSeriesViewBase.cl = function (a, b, c) {
         if (b._fill == null) {
-            b._fill = a.e.u9;
+            b._fill = a.e.u8;
         }
         if (b._stroke == null) {
-            b._stroke = a.e.vd;
+            b._stroke = a.e.vc;
         }
         if (b.y == null) {
-            b.ad = a.e.ie;
+            b.ad = a.e.id;
         }
     };
     ShapeSeriesViewBase.prototype.cp = function (a) {
@@ -1736,7 +1736,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 this.k.j(a, a.y);
             }
         }
-        var f = this.b6.z6(b, a, a.y);
+        var f = this.b6.z5(b, a, a.y);
         if (a.y != f) {
             a.y = f;
             this.k.j(a, a.y);
@@ -1827,7 +1827,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.ie + 3;
+        this.c7.ad = this.e.id + 3;
         return this.c7;
     };
     ShapeSeriesViewBase.prototype.a8 = function (a, b) {
@@ -1878,7 +1878,7 @@ 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.ie / 2 + this.b6.iu(b);
+                    var j = this.b6.id / 2 + this.b6.it(b);
                     if (GeometryUtil.e(a, h.a._inner[0], h.a, j)) {
                         return h;
                     }
@@ -1911,7 +1911,7 @@ var ShapeSeriesViewBase = /** @class */ /*@__PURE__*/ (function (_super) {
         if (this.k != null) {
             this.k.j(b, b.y);
         }
-        this.b6.z4 = RectUtil.r(a, b.ad);
+        this.b6.z3 = RectUtil.r(a, b.ad);
     };
     ShapeSeriesViewBase.prototype.an = function (a) {
         _super.prototype.an.call(this, a);