igniteui-webcomponents-charts 4.7.0 → 4.7.1

package/esm5/lib/CalloutLayer_combined.js

@@ -62,113 +62,116 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var _this = _super.call(this) || this;
         _this.calloutStyleUpdating = null;
         _this.calloutRenderStyleUpdating = null;
-        _this.xk = null;
         _this.xl = null;
         _this.xm = null;
+        _this.xn = null;
+        _this.xk = null;
         _this.xj = null;
-        _this.xi = null;
-        _this.yc = new HashSet$1(CalloutAnnotationWrapper.$, 0);
-        _this.yf = new List$1(CalloutAnnotationWrapper.$, 0);
+        _this.yd = new HashSet$1(CalloutAnnotationWrapper.$, 0);
         _this.yg = new List$1(CalloutAnnotationWrapper.$, 0);
-        _this.xa = null;
-        _this.w0 = null;
-        _this.xg = null;
-        _this.yd = new LinkedList$1(CalloutAnnotationWrapper.$);
-        _this.ya = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
-        _this.xs = null;
-        _this.abm = new Rect(0, 0, 0, 1, 1);
-        _this.xz = false;
-        _this.yr = 0;
-        _this.abl = Rect.empty;
-        _this.xx = false;
+        _this.yh = new List$1(CalloutAnnotationWrapper.$, 0);
+        _this.xb = null;
+        _this.w1 = null;
+        _this.xh = null;
+        _this.ye = new LinkedList$1(CalloutAnnotationWrapper.$);
+        _this.yb = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
+        _this.xt = null;
+        _this.abn = new Rect(0, 0, 0, 1, 1);
+        _this.x0 = false;
+        _this.ys = 0;
+        _this.abm = Rect.empty;
         _this.xy = false;
+        _this.xz = false;
         _this.calloutContentUpdating = null;
         _this.calloutLabelUpdating = null;
         _this.calloutSeriesSelecting = null;
-        _this.ye = new List$1(SeriesPointOfInterest.$, 0);
-        _this.x1 = false;
+        _this.yf = new List$1(SeriesPointOfInterest.$, 0);
         _this.x2 = false;
-        _this.yi = 0;
-        _this.x0 = false;
-        _this.xw = true;
-        _this.w2 = 1;
+        _this.x3 = false;
+        _this.yj = 0;
+        _this.x1 = false;
+        _this.xx = true;
+        _this.w3 = 1;
         FastItemObjectColumn.m();
-        _this.w0 = null;
-        _this.xa = new CalloutPlacementPositionsCollection();
-        var a = _this.xa;
-        a.collectionChanged = delegateCombine(a.collectionChanged, runOn(_this, _this.z6));
-        _this.un = true;
+        _this.w1 = null;
+        _this.xb = new CalloutPlacementPositionsCollection();
+        var a = _this.xb;
+        a.collectionChanged = delegateCombine(a.collectionChanged, runOn(_this, _this.z7));
+        _this.uo = true;
         var b = new CalloutLayerFrame();
         var c = new CalloutLayerFrame();
         var d = new CalloutLayerFrame();
-        var e = _this.ji / 1000;
-        _this.uf = b;
-        _this.ue = c;
-        _this.ug = d;
+        var e = _this.jj / 1000;
+        _this.ug = b;
+        _this.uf = c;
+        _this.uh = d;
         _this.ab = CalloutLayer.$;
         return _this;
     }
-    CalloutLayer.prototype.get_d2 = function () {
+    CalloutLayer.prototype.bg = function () {
+        return new CalloutLayer();
+    };
+    CalloutLayer.prototype.get_d3 = function () {
         return true;
     };
-    CalloutLayer.prototype.z6 = function (a, b) {
-        this.aaf();
+    CalloutLayer.prototype.z7 = function (a, b) {
+        this.aag();
     };
-    CalloutLayer.prototype.aaf = function () {
-        this.w0 = this.w1(this.xb);
-        this.aac();
+    CalloutLayer.prototype.aag = function () {
+        this.w1 = this.w2(this.xc);
+        this.aad();
     };
-    CalloutLayer.prototype.z7 = function (a, b) {
-        this.yg.clear();
-        this.pp(false);
+    CalloutLayer.prototype.z8 = function (a, b) {
+        this.yh.clear();
+        this.pq(false);
     };
-    CalloutLayer.prototype.no = function (a, b, c, d) {
-        _super.prototype.no.call(this, a, b, c, d);
-        var e = this.yb();
+    CalloutLayer.prototype.np = function (a, b, c, d) {
+        _super.prototype.np.call(this, a, b, c, d);
+        var e = this.yc();
         switch (a) {
             case 3:
-                this.aak(b, e);
+                this.aal(b, e);
                 break;
             case 1:
                 for (var f = b; f < b + c; f++) {
                     var g = new CalloutAnnotation();
                     var h = new CalloutAnnotationWrapper();
                     h.b = g;
-                    h.b.series = this.xf;
-                    this.yg.insert(f, h);
-                    this.aak(f, e);
+                    h.b.series = this.xg;
+                    this.yh.insert(f, h);
+                    this.aal(f, e);
                 }
                 break;
             case 0:
-                this.yg.v(b, c);
+                this.yh.v(b, c);
                 break;
             case 2:
                 for (var i = b; i < b + c; i++) {
-                    this.aak(i, e);
+                    this.aal(i, e);
                 }
                 break;
             case 4:
-                this.yg.clear();
-                for (var j = 0; j < this.c6.count; j++) {
+                this.yh.clear();
+                for (var j = 0; j < this.c7.count; j++) {
                     var k = new CalloutAnnotation();
                     var l = new CalloutAnnotationWrapper();
                     l.b = k;
-                    l.b.series = this.xf;
-                    this.yg.add(l);
-                    this.aak(j, e);
+                    l.b.series = this.xg;
+                    this.yh.add(l);
+                    this.aal(j, e);
                 }
                 break;
         }
-        this.pp(true);
+        this.pq(true);
     };
-    CalloutLayer.prototype.fp = function (a) {
+    CalloutLayer.prototype.fq = function (a) {
         return false;
     };
-    CalloutLayer.prototype.yb = function () {
+    CalloutLayer.prototype.yc = function () {
         var a = new Dictionary$2(String_$type, Series.$, 0);
-        if (this.cy != null) {
-            for (var b = 0; b < this.cy.series.count; b++) {
-                var c = this.cy.series._inner[b];
+        if (this.cz != null) {
+            for (var b = 0; b < this.cz.series.count; b++) {
+                var c = this.cz.series._inner[b];
                 if (c.name != null && !a.containsKey(c.name)) {
                     a.addItem(c.name, c);
                 }
@@ -176,25 +179,25 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return a;
     };
-    CalloutLayer.prototype.aak = function (a, b) {
+    CalloutLayer.prototype.aal = function (a, b) {
         var _this = this;
-        if (this.xr == null || this.xp == null) {
+        if (this.xs == null || this.xq == null) {
             return;
         }
         var c = a;
-        if (this.xq != null) {
-            c = this.xq.item(a);
-        }
-        var d = this.xr.item(a);
-        var e = this.xp.item(a);
-        var f = this.yg._inner[a];
-        if (this.xo != null) {
-            if (f.b.ab != this.xo.item(a)) {
-                f.b.key = this.xo.item(a);
+        if (this.xr != null) {
+            c = this.xr.item(a);
+        }
+        var d = this.xs.item(a);
+        var e = this.xq.item(a);
+        var f = this.yh._inner[a];
+        if (this.xp != null) {
+            if (f.b.ab != this.xp.item(a)) {
+                f.b.key = this.xp.item(a);
             }
         }
-        if (this.ya.containsKey(f)) {
-            f.b = this.ya.item(f).c.b;
+        if (this.yb.containsKey(f)) {
+            f.b = this.yb.item(f).c.b;
         }
         f.b.xValue = c;
         f.b.yValue = d;
@@ -203,7 +206,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 var $ret = new CalloutLabelUpdatingEventArgs();
                 $ret.d = c;
                 $ret.e = d;
-                $ret.item = _this.c6.item(a);
+                $ret.item = _this.c7.item(a);
                 return $ret;
             })());
             this.calloutLabelUpdating(this, g);
@@ -215,18 +218,18 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         else {
             f.b.text = e != null ? e.toString() : "";
         }
-        if (this.xn != null) {
-            f.b.content = this.xn.item(a);
+        if (this.xo != null) {
+            f.b.content = this.xo.item(a);
         }
         else {
-            f.b.content = this.c6.item(a);
+            f.b.content = this.c7.item(a);
         }
         if (this.calloutSeriesSelecting != null) {
             var i = ((function () {
                 var $ret = new CalloutSeriesSelectingEventArgs();
                 $ret.c = c;
                 $ret.d = d;
-                $ret.item = _this.c6.item(a);
+                $ret.item = _this.c7.item(a);
                 return $ret;
             })());
             this.calloutSeriesSelecting(this, i);
@@ -239,29 +242,29 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        this.aal(f);
+        this.aam(f);
     };
-    CalloutLayer.prototype.aal = function (a) {
+    CalloutLayer.prototype.aam = function (a) {
         var b = new Thickness(0, DeviceUtils.g(3));
-        if (isNaN_(this.abo.left) || isNaN_(this.abo.top) || isNaN_(this.abo.right) || isNaN_(this.abo.bottom)) {
+        if (isNaN_(this.abp.left) || isNaN_(this.abp.top) || isNaN_(this.abp.right) || isNaN_(this.abp.bottom)) {
             b = new Thickness(0, DeviceUtils.g(3));
         }
         else {
-            b = this.abo;
+            b = this.abp;
         }
         var c = DeviceUtils.g(3);
-        if (isNaN_(this.yj)) {
+        if (isNaN_(this.yk)) {
             c = DeviceUtils.g(3);
         }
         else {
-            c = this.yj;
-        }
-        var d = this.abh != null ? this.abh : this.w9.cl(a.b.l);
-        var e = this.abk != null ? this.abk : this.w9.co();
-        var f = this.abj != null ? this.abj : this.w9.cn(a.b.l);
-        var g = this.abi != null ? this.abi : this.w9.cm(a.b.l);
-        var h = isNaN_(this.yp) ? 0 : this.yp;
-        if (this.x6 && this.calloutStyleUpdating != null) {
+            c = this.yk;
+        }
+        var d = this.abi != null ? this.abi : this.xa.cl(a.b.l);
+        var e = this.abl != null ? this.abl : this.xa.co();
+        var f = this.abk != null ? this.abk : this.xa.cn(a.b.l);
+        var g = this.abj != null ? this.abj : this.xa.cm(a.b.l);
+        var h = isNaN_(this.yq) ? 0 : this.yq;
+        if (this.x7 && this.calloutStyleUpdating != null) {
             var i = new CalloutStyleUpdatingEventArgs();
             i.item = a.b.aa;
             i.xValue = a.b.ac;
@@ -287,39 +290,25 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         a.b.leaderBrush = g;
         a.b.strokeThickness = h;
     };
-    CalloutLayer.prototype.ju = function (a, b) {
-        var c = this.lv(b);
+    CalloutLayer.prototype.jv = function (a, b) {
+        var c = this.lw(b);
         if (c == CalloutLayer.$$p[21]) {
-            return this.jv(a, b, this.zq);
+            return this.jw(a, b, this.zr);
         }
         if (c == CalloutLayer.$$p[28]) {
-            return this.jv(a, b, this.z1);
+            return this.jw(a, b, this.z2);
         }
         if (c == CalloutLayer.$$p[29]) {
-            return this.jv(a, b, this.z4);
+            return this.jw(a, b, this.z5);
         }
         if (c == CalloutLayer.$$p[20]) {
-            return this.jv(a, b, this.zn);
+            return this.jw(a, b, this.zo);
         }
         if (c == CalloutLayer.$$p[15]) {
-            return this.jv(a, b, this.zg);
+            return this.jw(a, b, this.zh);
         }
-        return _super.prototype.ju.call(this, a, b);
+        return _super.prototype.jv.call(this, a, b);
     };
-    Object.defineProperty(CalloutLayer.prototype, "xp", {
-        get: function () {
-            return this.xk;
-        },
-        set: function (a) {
-            if (this.xk != a) {
-                var b = this.xk;
-                this.xk = a;
-                this.raisePropertyChanged("LabelColumn", b, this.xk);
-            }
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(CalloutLayer.prototype, "xq", {
         get: function () {
             return this.xl;
@@ -328,7 +317,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             if (this.xl != a) {
                 var b = this.xl;
                 this.xl = a;
-                this.raisePropertyChanged("XColumn", b, this.xl);
+                this.raisePropertyChanged("LabelColumn", b, this.xl);
             }
         },
         enumerable: false,
@@ -342,118 +331,132 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             if (this.xm != a) {
                 var b = this.xm;
                 this.xm = a;
-                this.raisePropertyChanged("YColumn", b, this.xm);
+                this.raisePropertyChanged("XColumn", b, this.xm);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "xo", {
+    Object.defineProperty(CalloutLayer.prototype, "xs", {
         get: function () {
-            return this.xj;
+            return this.xn;
         },
         set: function (a) {
-            if (this.xj != a) {
-                var b = this.xj;
-                this.xj = a;
-                this.raisePropertyChanged("KeyColumn", b, this.xj);
+            if (this.xn != a) {
+                var b = this.xn;
+                this.xn = a;
+                this.raisePropertyChanged("YColumn", b, this.xn);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(CalloutLayer.prototype, "xp", {
+        get: function () {
+            return this.xk;
+        },
+        set: function (a) {
+            if (this.xk != a) {
+                var b = this.xk;
+                this.xk = a;
+                this.raisePropertyChanged("KeyColumn", b, this.xk);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "xn", {
+    Object.defineProperty(CalloutLayer.prototype, "xo", {
         get: function () {
-            return this.xi;
+            return this.xj;
         },
         set: function (a) {
-            if (this.xi != a) {
-                var b = this.xi;
-                this.xi = a;
-                this.raisePropertyChanged("ContentColumn", b, this.xi);
+            if (this.xj != a) {
+                var b = this.xj;
+                this.xj = a;
+                this.raisePropertyChanged("ContentColumn", b, this.xj);
             }
         },
         enumerable: false,
         configurable: true
     });
-    CalloutLayer.prototype.z9 = function (a, b) {
+    CalloutLayer.prototype.aaa = function (a, b) {
         if (b.propertyName == CalloutAnnotation.$$p[14] || b.propertyName == CalloutAnnotation.$$p[15]) {
             var c = a.k;
-            if (!this.yc.contains(c)) {
-                this.yc.add_1(c);
-                this.yf.add(c);
-                this.pp(false);
+            if (!this.yd.contains(c)) {
+                this.yd.add_1(c);
+                this.yg.add(c);
+                this.pq(false);
             }
         }
     };
-    CalloutLayer.prototype.cg = function () {
+    CalloutLayer.prototype.ch = function () {
         return new CalloutLayerView(this);
     };
-    CalloutLayer.prototype.o0 = function (a) {
-        _super.prototype.o0.call(this, a);
-        this.w9 = a;
+    CalloutLayer.prototype.o1 = function (a) {
+        _super.prototype.o1.call(this, a);
+        this.xa = a;
     };
-    Object.defineProperty(CalloutLayer.prototype, "xb", {
+    Object.defineProperty(CalloutLayer.prototype, "xc", {
         get: function () {
-            return this.xa;
+            return this.xb;
         },
         set: function (a) {
-            var b = this.xb;
+            var b = this.xc;
             if (a != b) {
-                this.xa = a;
-                this.raisePropertyChanged("AllowedPositions", b, this.xb);
+                this.xb = a;
+                this.raisePropertyChanged("AllowedPositions", b, this.xc);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "w4", {
+    Object.defineProperty(CalloutLayer.prototype, "w5", {
         get: function () {
-            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.aa0));
+            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.aa1));
         },
         set: function (a) {
-            this.h(CalloutLayer.aa0, enumGetBox(AutoCalloutVisibilityMode_$type, a));
+            this.h(CalloutLayer.aa1, enumGetBox(AutoCalloutVisibilityMode_$type, a));
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "w3", {
+    Object.defineProperty(CalloutLayer.prototype, "w4", {
         get: function () {
-            return this.w2;
+            return this.w3;
         },
         set: function (a) {
-            this.w2 = a;
+            this.w3 = a;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "abo", {
+    Object.defineProperty(CalloutLayer.prototype, "abp", {
         get: function () {
-            return new Thickness(1, this.yl, this.yn, this.ym, this.yk);
+            return new Thickness(1, this.ym, this.yo, this.yn, this.yl);
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "xh", {
+    Object.defineProperty(CalloutLayer.prototype, "xi", {
         get: function () {
-            if (this.xg == null) {
-                this.xg = FontUtil.toFontInfo(this.i4, this.zv);
+            if (this.xh == null) {
+                this.xh = FontUtil.toFontInfo(this.i5, this.zw);
             }
-            return this.xg;
+            return this.xh;
         },
         enumerable: false,
         configurable: true
     });
-    CalloutLayer.prototype.vs = function (a, b) {
-        if (this.xf == null || this.xf == a) {
+    CalloutLayer.prototype.vt = function (a, b) {
+        if (this.xg == null || this.xg == a) {
             if (!this.at.c) {
-                this.pp(b);
+                this.pq(b);
             }
         }
     };
-    CalloutLayer.prototype.vu = function (a, b) {
+    CalloutLayer.prototype.vv = function (a, b) {
         var e_1, _a;
-        _super.prototype.vu.call(this, a, b);
+        _super.prototype.vv.call(this, a, b);
         var c = a;
         c.q.clear();
         c.r.clear();
@@ -472,24 +475,24 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         c.v.clear();
         c.s.clear();
         c.t.clear();
-        var d = this.yh();
+        var d = this.yi();
         var e = new List$1(CalloutAnnotationWrapper.$, 0);
         var f = true;
-        if (this.x3) {
-            if (this.ul(this.xf)) {
-                this.aah(this.xf, c, e);
+        if (this.x4) {
+            if (this.um(this.xg)) {
+                this.aai(this.xg, c, e);
             }
             else {
                 try {
-                    for (var _b = __values(fromEnum(this.cy.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    for (var _b = __values(fromEnum(this.cz.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var g = _c.value;
-                        if (this.ul(g)) {
-                            if (!g.d6) {
+                        if (this.um(g)) {
+                            if (!g.d7) {
                                 if (!g.isVertical) {
                                     f = false;
                                 }
                             }
-                            this.aah(g, c, e);
+                            this.aai(g, c, e);
                         }
                     }
                 }
@@ -508,7 +511,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        if (this.x3 && this.w3 == 2) {
+        if (this.x4 && this.w4 == 2) {
             var h = 0;
             var i = 0;
             var j = 1.7976931348623157E+308;
@@ -547,70 +550,70 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        this.aag(c, d, e);
+        this.aah(c, d, e);
     };
-    CalloutLayer.prototype.qn = function (a, b) {
-        _super.prototype.qn.call(this, a, b);
-        var c = b.width - this.abm.width;
-        var d = b.height - this.abm.height;
+    CalloutLayer.prototype.qo = function (a, b) {
+        _super.prototype.qo.call(this, a, b);
+        var c = b.width - this.abn.width;
+        var d = b.height - this.abn.height;
         var e = 0;
         if (Math.abs(c) > Math.abs(d)) {
             e = c;
-            this.yi = c * this.tw.width;
+            this.yj = c * this.tx.width;
         }
         else {
             e = d;
-            this.yi = d * this.tw.height;
+            this.yj = d * this.tx.height;
         }
-        if (e > 0 && this.yi > 5) {
-            this.x2 = true;
+        if (e > 0 && this.yj > 5) {
+            this.x3 = true;
         }
-        if (e < 0 && this.yi > 5) {
-            this.x1 = true;
+        if (e < 0 && this.yj > 5) {
+            this.x2 = true;
         }
     };
-    CalloutLayer.prototype.qm = function (a, b) {
-        _super.prototype.qm.call(this, a, b);
+    CalloutLayer.prototype.qn = function (a, b) {
+        _super.prototype.qn.call(this, a, b);
         if (!a.equals1(b)) {
-            this.x0 = true;
+            this.x1 = true;
         }
     };
-    Object.defineProperty(CalloutLayer.prototype, "abn", {
+    Object.defineProperty(CalloutLayer.prototype, "abo", {
         get: function () {
-            return this.abl;
+            return this.abm;
         },
         set: function (a) {
-            this.abl = a;
+            this.abm = a;
         },
         enumerable: false,
         configurable: true
     });
-    CalloutLayer.prototype.aag = function (a, b, c) {
+    CalloutLayer.prototype.aah = function (a, b, c) {
         var e_2, _a;
-        if (this.cy != null) {
-            this.abm = this.cy.tn;
+        if (this.cz != null) {
+            this.abn = this.cz.tn;
         }
-        if (this.tw.isEmpty) {
+        if (this.tx.isEmpty) {
             return;
         }
-        this.abn = new Rect(0, this.tw.left, this.tw.top, this.tw.width, this.tw.height);
-        if (this.xs != null && this.zd != null && this.zd != this.xs.ap) {
-            this.aab();
+        this.abo = new Rect(0, this.tx.left, this.tx.top, this.tx.width, this.tx.height);
+        if (this.xt != null && this.ze != null && this.ze != this.xt.ap) {
+            this.aac();
         }
-        if (this.xs == null) {
-            var d = this.xt();
+        if (this.xt == null) {
+            var d = this.xu();
             if (d != null) {
-                this.xs = d;
-                var e = this.xs;
-                e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.z8));
+                this.xt = d;
+                var e = this.xt;
+                e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.z9));
             }
             else {
-                var f = this.to(this.cj);
+                var f = this.tp(this.ck);
                 var g = new Array(2);
                 g[0] = 0;
                 g[1] = 3;
-                if (this.xf != null) {
-                    if (this.xf.isVertical) {
+                if (this.xg != null) {
+                    if (this.xg.isVertical) {
                         g = new Array(2);
                         g[0] = 2;
                         g[1] = 1;
@@ -618,12 +621,12 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 else {
                     var h = false;
-                    if (this.cy != null && this.cy.series.count > 0) {
+                    if (this.cz != null && this.cz.series.count > 0) {
                         h = true;
                         try {
-                            for (var _b = __values(fromEnum(this.cy.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                            for (var _b = __values(fromEnum(this.cz.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
                                 var i = _c.value;
-                                if (!i.d6) {
+                                if (!i.d7) {
                                     if (!i.isVertical) {
                                         h = false;
                                     }
@@ -650,31 +653,31 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                         g[1] = 1;
                     }
                 }
-                this.xs = new LabelCollisionManager(this.tw.right, this.tw.bottom, this.tw, this.w9.j(), this.yo, this.xu(), g, this.yv(), this.yu(), this.x4, this.w0);
-                if (this.zd != null) {
-                    this.xs.ap = this.zd;
-                    this.xs.an = this;
+                this.xt = new LabelCollisionManager(this.tx.right, this.tx.bottom, this.tx, this.xa.j(), this.yp, this.xv(), g, this.yw(), this.yv(), this.x5, this.w1);
+                if (this.ze != null) {
+                    this.xt.ap = this.ze;
+                    this.xt.an = this;
                 }
-                var j = this.xs;
-                j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.z8));
-            }
-        }
-        if (this.x1) {
-            this.x1 = false;
-            if (this.xs.al > 2) {
-                this.xz = true;
+                var j = this.xt;
+                j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.z9));
             }
         }
         if (this.x2) {
             this.x2 = false;
-            if (this.yi > 5) {
-                this.xz = true;
+            if (this.xt.al > 2) {
+                this.x0 = true;
             }
         }
-        if (this.x0) {
-            this.x0 = false;
-            this.xs.a3(this.tw.right, this.tw.bottom, this.tw);
-            this.xz = true;
+        if (this.x3) {
+            this.x3 = false;
+            if (this.yj > 5) {
+                this.x0 = true;
+            }
+        }
+        if (this.x1) {
+            this.x1 = false;
+            this.xt.a3(this.tx.right, this.tx.bottom, this.tx);
+            this.x0 = true;
         }
         var k = new HashSet$1(CalloutAnnotationWrapper.$, 0);
         var l = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -687,54 +690,54 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         for (var q = 0; q < c.count; q++) {
             o.add_1(c._inner[q]);
         }
-        var r = this.yd.c;
+        var r = this.ye.c;
         while (r != null) {
             var s = r.a;
             if (!o.contains(r.c)) {
                 n.add(r.c);
                 l.add_1(r.c);
                 var t = r.c.b;
-                t.propertyChanged = delegateRemove(t.propertyChanged, runOn(this, this.z9));
-                this.yd.h(r);
-                this.ya.removeItem(r.c);
-                this.xs.a2(r.c.c);
+                t.propertyChanged = delegateRemove(t.propertyChanged, runOn(this, this.aaa));
+                this.ye.h(r);
+                this.yb.removeItem(r.c);
+                this.xt.a2(r.c.c);
             }
             r = s;
         }
         for (var u = 0; u < b.count; u++) {
-            if (!this.ya.containsKey(b._inner[u])) {
-                this.yd.f(b._inner[u]);
+            if (!this.yb.containsKey(b._inner[u])) {
+                this.ye.f(b._inner[u]);
                 var v = b._inner[u].b;
-                v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.z9));
-                this.ya.addItem(b._inner[u], this.yd.d);
+                v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.aaa));
+                this.yb.addItem(b._inner[u], this.ye.d);
                 m.add(b._inner[u]);
                 k.add_1(b._inner[u]);
-                this.xz = true;
+                this.x0 = true;
             }
         }
         for (var w = 0; w < c.count; w++) {
-            if (!this.ya.containsKey(c._inner[w])) {
-                this.yd.f(c._inner[w]);
-                this.ya.addItem(c._inner[w], this.yd.d);
+            if (!this.yb.containsKey(c._inner[w])) {
+                this.ye.f(c._inner[w]);
+                this.yb.addItem(c._inner[w], this.ye.d);
                 var x = c._inner[w].b;
-                x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.z9));
+                x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.aaa));
                 m.add(c._inner[w]);
                 k.add_1(c._inner[w]);
-                this.xz = true;
+                this.x0 = true;
             }
         }
-        if (this.xx == true) {
-            this.xx = false;
-            this.xz = true;
+        if (this.xy == true) {
+            this.xy = false;
+            this.x0 = true;
         }
-        if (this.yf.count > 0) {
-            this.xz = true;
-            this.yf.clear();
-            this.yc.clear();
+        if (this.yg.count > 0) {
+            this.x0 = true;
+            this.yg.clear();
+            this.yd.clear();
         }
-        r = this.yd.c;
+        r = this.ye.c;
         while (r != null) {
-            var y = this.xv(r.c);
+            var y = this.xw(r.c);
             if (y == null) {
                 return;
             }
@@ -750,36 +753,36 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     aa.n = y.e;
                     aa.m = y.d;
                     if (aa.b == null) {
-                        this.xs.t(aa, false);
+                        this.xt.t(aa, false);
                     }
                     if (z) {
-                        this.xs.aq(aa);
+                        this.xt.aq(aa);
                     }
                     else {
-                        this.xs.az(aa);
+                        this.xt.az(aa);
                     }
                 }
             }
             r = r.a;
         }
-        var ab = this.xs.am();
-        var ac = this.xs.u();
+        var ab = this.xt.am();
+        var ac = this.xt.u();
         if (ac) {
-            if (this.xs.q()) {
-                this.xz = true;
+            if (this.xt.q()) {
+                this.x0 = true;
             }
         }
-        if (this.xz && (ab != 0 || ac)) {
-            this.xz = false;
-            this.yr = 0x7FFFFFFF;
-            if (this.zd != null) {
+        if (this.x0 && (ab != 0 || ac)) {
+            this.x0 = false;
+            this.ys = 0x7FFFFFFF;
+            if (this.ze != null) {
                 var ad = true;
-                for (var ae = 0; ae < this.cy.series.count; ae++) {
-                    var af = this.cy.series._inner[ae];
-                    if (af.d6 && typeCast(CalloutLayer.$, af) !== null) {
+                for (var ae = 0; ae < this.cz.series.count; ae++) {
+                    var af = this.cz.series._inner[ae];
+                    if (af.d7 && typeCast(CalloutLayer.$, af) !== null) {
                         var ag = af;
-                        if (ag.zd == this.zd) {
-                            if (!ag.abn.equals1(this.xs.a5)) {
+                        if (ag.ze == this.ze) {
+                            if (!ag.abo.equals1(this.xt.a5)) {
                                 ad = false;
                                 break;
                             }
@@ -787,21 +790,21 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                 }
                 if (ad) {
-                    this.xs.a4();
+                    this.xt.a4();
                 }
                 else {
-                    this.xs.ar();
-                    this.xs.as();
+                    this.xt.ar();
+                    this.xt.as();
                 }
             }
             else {
-                this.xs.a4();
+                this.xt.a4();
             }
         }
         else {
-            this.xs.as();
+            this.xt.as();
         }
-        var ah = this.yd.c;
+        var ah = this.ye.c;
         var ai;
         var aj;
         var ak;
@@ -818,7 +821,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var av;
         var aw;
         var ax;
-        var ay = this.x5;
+        var ay = this.x6;
         while (ah != null) {
             var az = ah.c;
             var a0 = az.b;
@@ -880,34 +883,34 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             ah = ah.a;
         }
     };
-    CalloutLayer.prototype.aab = function () {
-        if (this.xs != null) {
-            var a = this.yd.c;
+    CalloutLayer.prototype.aac = function () {
+        if (this.xt != null) {
+            var a = this.ye.c;
             while (a != null) {
                 var b = a.c.c;
                 if (b != null) {
-                    this.xs.a2(b);
+                    this.xt.a2(b);
                 }
                 a = a.a;
             }
-            var c = this.xs;
-            c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.z8));
-            this.xs = null;
+            var c = this.xt;
+            c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.z9));
+            this.xt = null;
         }
-        this.aaa();
+        this.aab();
     };
-    CalloutLayer.prototype.xt = function () {
-        if (this.cy == null) {
+    CalloutLayer.prototype.xu = function () {
+        if (this.cz == null) {
             return null;
         }
-        for (var a = 0; a < this.cy.series.count; a++) {
-            var b = this.cy.series._inner[a];
-            if (b.d6 && typeCast(CalloutLayer.$, b) !== null) {
+        for (var a = 0; a < this.cz.series.count; a++) {
+            var b = this.cz.series._inner[a];
+            if (b.d7 && typeCast(CalloutLayer.$, b) !== null) {
                 var c = b;
                 if (c != this) {
-                    if (c.zd != null && c.zd == this.zd) {
-                        if (c.xs != null) {
-                            return c.xs;
+                    if (c.ze != null && c.ze == this.ze) {
+                        if (c.xt != null) {
+                            return c.xt;
                         }
                     }
                 }
@@ -915,14 +918,14 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return null;
     };
-    CalloutLayer.prototype.yu = function () {
+    CalloutLayer.prototype.yv = function () {
         return 20000;
     };
-    CalloutLayer.prototype.yv = function () {
+    CalloutLayer.prototype.yw = function () {
         return 300;
     };
-    CalloutLayer.prototype.xu = function () {
-        switch (this.w6) {
+    CalloutLayer.prototype.xv = function () {
+        switch (this.w7) {
             case 0: return 2;
             case 2: return 1;
             case 3: return 2;
@@ -930,22 +933,22 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return 2;
     };
-    CalloutLayer.prototype.z8 = function (a) {
-        var b = this.xs.am();
-        if (b < this.yr) {
-            this.yr = b;
-            this.pp(false);
+    CalloutLayer.prototype.z9 = function (a) {
+        var b = this.xt.am();
+        if (b < this.ys) {
+            this.ys = b;
+            this.pq(false);
         }
     };
-    CalloutLayer.prototype.xv = function (a) {
-        var b = this.xf;
+    CalloutLayer.prototype.xw = function (a) {
+        var b = this.xg;
         if (a.b.l != null) {
             b = a.b.l;
         }
         if (b == null) {
-            for (var c = 0; c < this.cy.series.count; c++) {
-                var d = this.cy.series._inner[c];
-                if (!d.d6) {
+            for (var c = 0; c < this.cz.series.count; c++) {
+                var d = this.cz.series._inner[c];
+                if (!d.d7) {
                     b = d;
                     break;
                 }
@@ -955,7 +958,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             return null;
         }
         var e = b.ag();
-        var f = b.h2();
+        var f = b.h3();
         var g = null;
         var h = null;
         var i = false;
@@ -984,27 +987,27 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var k = 0;
         var l = 0;
         if (g.cb && g.categoryMode != 0) {
-            if (b.ek) {
+            if (b.el) {
                 k = b.getOffsetValue();
             }
-            else if (b.ec) {
+            else if (b.ed) {
                 k = b.getOffsetValue();
             }
         }
         if (h.cb && h.categoryMode != 0) {
-            if (b.ec) {
+            if (b.ed) {
                 l = b.getOffsetValue();
             }
         }
-        var m = new ScalerParams(0, this.cy.tn, g.kd, g.ch, g.j8());
+        var m = new ScalerParams(0, this.cz.tn, g.kd, g.ch, g.j8());
         m.b = f;
-        var n = new ScalerParams(0, this.cy.tn, h.kd, h.ch, h.j8());
+        var n = new ScalerParams(0, this.cz.tn, h.kd, h.ch, h.j8());
         n.b = f;
         var o = 0;
         var p = 0;
         if (i) {
-            o = g.ej(this.yq(a.b.ac), m) + k;
-            p = h.ej(this.yq(a.b.ad), n) + l;
+            o = g.ej(this.yr(a.b.ac), m) + k;
+            p = h.ej(this.yr(a.b.ad), n) + l;
             var q = o;
             var r = p;
             var s = { $type: Point_$type, x: 0.5, y: 0.5 };
@@ -1014,8 +1017,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             p = ViewportUtils.f(u, n.e, n.d);
         }
         else {
-            o = g.ej(this.yq(a.b.ac), m) + k;
-            p = h.ej(this.yq(a.b.ad), n) + l;
+            o = g.ej(this.yr(a.b.ac), m) + k;
+            p = h.ej(this.yr(a.b.ad), n) + l;
         }
         var v = new QuadTreeBoundingBox();
         v.b = o;
@@ -1025,7 +1028,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         v.g = a.b;
         return v;
     };
-    CalloutLayer.prototype.yq = function (a) {
+    CalloutLayer.prototype.yr = function (a) {
         if (typeCast(Date_$type, a) !== null) {
             return a.getTime();
         }
@@ -1034,79 +1037,79 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return a;
     };
-    CalloutLayer.prototype.yh = function () {
+    CalloutLayer.prototype.yi = function () {
         var a = new List$1(CalloutAnnotationWrapper.$, 0);
-        for (var b = 0; b < this.yg.count; b++) {
-            if (stringIsNullOrEmpty(this.yg._inner[b].b.ao)) {
+        for (var b = 0; b < this.yh.count; b++) {
+            if (stringIsNullOrEmpty(this.yh._inner[b].b.ao)) {
                 continue;
             }
-            if (this.yg._inner[b].c == null) {
+            if (this.yh._inner[b].c == null) {
                 var c = new LabelCollisionInfo();
-                this.yg._inner[b].c = c;
-                var d = this.w9.cq(this.yw(this.yg._inner[b]), this.yg._inner[b].b.backgroundPadding);
+                this.yh._inner[b].c = c;
+                var d = this.xa.cq(this.yx(this.yh._inner[b]), this.yh._inner[b].b.backgroundPadding);
                 c.k = d.height / 2;
                 c.l = d.width / 2;
             }
-            var e = this.xv(this.yg._inner[b]);
-            if (e == null || e.b < this.tw.left || e.b > this.tw.right || e.c < this.tw.top || e.c > this.tw.bottom) {
+            var e = this.xw(this.yh._inner[b]);
+            if (e == null || e.b < this.tx.left || e.b > this.tx.right || e.c < this.tx.top || e.c > this.tx.bottom) {
                 continue;
             }
-            a.add(this.yg._inner[b]);
+            a.add(this.yh._inner[b]);
         }
         return a;
     };
-    CalloutLayer.prototype.yw = function (a) {
+    CalloutLayer.prototype.yx = function (a) {
         return a.b.ao;
     };
-    CalloutLayer.prototype.ul = function (a) {
-        if (!_super.prototype.ul.call(this, a)) {
+    CalloutLayer.prototype.um = function (a) {
+        if (!_super.prototype.um.call(this, a)) {
             return false;
         }
-        if (this.zs != null) {
-            if (a.ep) {
-                var b = a.lu();
-                if (!Base.equalsStatic(this.zs, b)) {
+        if (this.zt != null) {
+            if (a.eq) {
+                var b = a.lv();
+                if (!Base.equalsStatic(this.zt, b)) {
                     return false;
                 }
             }
             else {
-                if (!Base.equalsStatic(this.zs, a.name)) {
+                if (!Base.equalsStatic(this.zt, a.name)) {
                     return false;
                 }
             }
         }
         return true;
     };
-    CalloutLayer.prototype.oo = function () {
-        _super.prototype.oo.call(this);
-        if (!this.at.c && !this.dj()) {
+    CalloutLayer.prototype.op = function () {
+        _super.prototype.op.call(this);
+        if (!this.at.c && !this.dk()) {
             return;
         }
-        if (this.xw) {
-            this.xw = false;
-            this.aad();
+        if (this.xx) {
+            this.xx = false;
+            this.aae();
         }
-        if (this.dj()) {
-            this.aaj(this.ug, false);
+        if (this.dk()) {
+            this.aak(this.uh, false);
         }
         else {
-            this.aaj(this.ue, false);
+            this.aak(this.uf, false);
         }
     };
-    CalloutLayer.prototype.aae = function () {
-        if (!this.xy) {
-            this.xy = true;
-            this.pp(true);
+    CalloutLayer.prototype.aaf = function () {
+        if (!this.xz) {
+            this.xz = true;
+            this.pq(true);
         }
     };
-    CalloutLayer.prototype.aah = function (a, b, c) {
+    CalloutLayer.prototype.aai = function (a, b, c) {
         var d = false;
-        if (this.xy) {
-            this.xy = false;
+        if (this.xz) {
+            this.xz = false;
             d = true;
         }
-        if (!a.fs && a.ds(this.ye, this.x9, this.x7, this.ys)) {
-            var e = this.ye;
+        if (!a.ft && a.dt(this.yf, this.ya, this.x8, this.yt)) {
+            var e = this.yf;
             var _loop_1 = function (f) {
                 var g = e._inner[f];
                 var h = g.a != null ? g.a.item : null;
@@ -1118,8 +1121,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 l.b = m;
                 m.key = k;
                 var n = false;
-                if (this_1.ya.containsKey(l)) {
-                    l = this_1.ya.item(l).c;
+                if (this_1.yb.containsKey(l)) {
+                    l = this_1.yb.item(l).c;
                     m = l.b;
                     n = d;
                 }
@@ -1128,10 +1131,10 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 var o = m.ac;
                 var p = m.ad;
-                if (this_1.yq(o) != this_1.yq(g.b)) {
+                if (this_1.yr(o) != this_1.yr(g.b)) {
                     m.xValue = g.b;
                 }
-                if (this_1.yq(p) != this_1.yq(g.c)) {
+                if (this_1.yr(p) != this_1.yr(g.c)) {
                     m.yValue = g.c;
                 }
                 m.series = a;
@@ -1188,17 +1191,17 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                 }
                 if (n) {
-                    this_1.aal(l);
+                    this_1.aam(l);
                 }
                 if (l.c == null) {
                     var u = new LabelCollisionInfo();
                     l.c = u;
-                    var v = this_1.w9.cq(this_1.yw(l), l.b.backgroundPadding);
+                    var v = this_1.xa.cq(this_1.yx(l), l.b.backgroundPadding);
                     u.k = v.height / 2;
                     u.l = v.width / 2;
                 }
-                var w = this_1.xv(l);
-                if (w == null || w.b < this_1.tw.left || w.b > this_1.tw.right || w.c < this_1.tw.top || w.c > this_1.tw.bottom) {
+                var w = this_1.xw(l);
+                if (w == null || w.b < this_1.tx.left || w.b > this_1.tx.right || w.c < this_1.tx.top || w.c > this_1.tx.bottom) {
                     return "continue";
                 }
                 l.e = w.b;
@@ -1206,28 +1209,28 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 c.add(l);
             };
             var this_1 = this;
-            for (var f = 0; f < this.ye.count; f++) {
+            for (var f = 0; f < this.yf.count; f++) {
                 _loop_1(f);
             }
         }
     };
-    CalloutLayer.prototype.bx = function () {
+    CalloutLayer.prototype.by = function () {
         return 1;
     };
     CalloutLayer.prototype.au = function (a, b) {
-        var c = this.xs.f(a, b);
+        var c = this.xt.f(a, b);
         if (c == null) {
             return null;
         }
         return c.u;
     };
-    CalloutLayer.prototype.f4 = function (a, b) {
-        if (this.xs == null) {
+    CalloutLayer.prototype.f5 = function (a, b) {
+        if (this.xt == null) {
             return false;
         }
-        return this.xs.f(a, b) != null;
+        return this.xt.f(a, b) != null;
     };
-    CalloutLayer.prototype.aaj = function (a, b) {
+    CalloutLayer.prototype.aak = function (a, b) {
         var e_3, _a;
         var c = 0;
         var d = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -1236,7 +1239,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             if (isNaN_(a.u._inner[c]) || isNaN_(a.v._inner[c])) {
                 continue;
             }
-            var f = this.w9.cb.item(e);
+            var f = this.xa.cb.item(e);
             d.add_1(e);
             if (f.h != a.q._inner[c]) {
                 f.h = a.q._inner[c];
@@ -1245,17 +1248,17 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             f.e = a.o._inner[c];
             f.m = a.f._inner[c];
             f.p = a.p._inner[c];
-            f.o = f.e > 0 ? a.i._inner[c] : this.cj.bt();
+            f.o = f.e > 0 ? a.i._inner[c] : this.ck.bt();
             f.n = a.h._inner[c];
             f.x = new Thickness(1, a.k._inner[c], a.m._inner[c], a.l._inner[c], a.j._inner[c]);
             f.d = a.g._inner[c];
-            this.w9.cj(f, Math.min(a.s._inner[c], a.s._inner[c] + a.u._inner[c]), Math.min(a.t._inner[c], a.t._inner[c] + a.v._inner[c]));
-            this.w9.ck(f, e, a.r._inner[c]);
+            this.xa.cj(f, Math.min(a.s._inner[c], a.s._inner[c] + a.u._inner[c]), Math.min(a.t._inner[c], a.t._inner[c] + a.v._inner[c]));
+            this.xa.ck(f, e, a.r._inner[c]);
             f.r = { $type: Point_$type, x: a.u._inner[c], y: a.v._inner[c] };
         }
         var h = new List$1(CalloutAnnotationWrapper.$, 0);
         try {
-            for (var _b = __values(fromEnum(this.w9.cb.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values(fromEnum(this.xa.cb.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var i = _c.value;
                 if (!d.contains(i)) {
                     h.add(i);
@@ -1276,64 +1279,64 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         for (var j = 0; j < h.count; j++) {
-            this.w9.cb.h(h._inner[j]);
+            this.xa.cb.h(h._inner[j]);
         }
     };
-    CalloutLayer.prototype.vx = function (a, b) {
-        _super.prototype.vx.call(this, a, b);
-        if (this.dj()) {
-            this.aaj(this.ug, true);
+    CalloutLayer.prototype.vy = function (a, b) {
+        _super.prototype.vy.call(this, a, b);
+        if (this.dk()) {
+            this.aak(this.uh, true);
         }
         else {
-            this.aaj(this.ue, false);
+            this.aak(this.uf, false);
         }
     };
-    CalloutLayer.prototype.fm = function () {
+    CalloutLayer.prototype.fn = function () {
         return true;
     };
-    CalloutLayer.prototype.o8 = function (a, b, c, d) {
-        _super.prototype.o8.call(this, a, b, c, d);
+    CalloutLayer.prototype.o9 = function (a, b, c, d) {
+        _super.prototype.o9.call(this, a, b, c, d);
         switch (b) {
             case CalloutLayer.$$p[24]:
-                this.xg = null;
-                this.w9.ci();
-                this.pp(true);
+                this.xh = null;
+                this.xa.ci();
+                this.pq(true);
                 break;
             case CalloutLayer.$$p[22]:
             case CalloutLayer.$$p[23]:
-                this.pp(true);
+                this.pq(true);
                 break;
             case CalloutLayer.$$p[14]:
-                this.pp(true);
+                this.pq(true);
                 break;
             case "SeriesViewer":
                 if (c != null) {
                     var e = c;
-                    e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.aai));
+                    e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.aaj));
                 }
                 if (d != null) {
                     var f = d;
-                    f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.aai));
+                    f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.aaj));
                 }
                 if (d == null) {
-                    this.aab();
+                    this.aac();
                 }
                 break;
             case "AutoCalloutVisibilityMode":
-                this.w3 = this.w5();
-                this.aac();
+                this.w4 = this.w6();
+                this.aad();
                 break;
             case "AllowedPositions":
                 if (c != null) {
                     var g = c;
-                    g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.z6));
+                    g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.z7));
                 }
                 if (d != null) {
                     var h = d;
-                    h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.z6));
+                    h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.z7));
                 }
-                this.w0 = this.w1(this.xb);
-                this.aac();
+                this.w1 = this.w2(this.xc);
+                this.aad();
                 break;
             case CalloutLayer.$$p[16]:
             case CalloutLayer.$$p[17]:
@@ -1350,88 +1353,88 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             case CalloutLayer.$$p[7]:
             case CalloutLayer.$$p[12]:
             case CalloutLayer.$$p[13]:
-                this.aac();
+                this.aad();
                 break;
             case CalloutLayer.$$p[21]:
-                if (this.c6 != null) {
-                    this.c6.deregisterColumn(this.xp);
-                    this.xp = this.c5(this.zq);
+                if (this.c7 != null) {
+                    this.c7.deregisterColumn(this.xq);
+                    this.xq = this.c6(this.zr);
                 }
                 break;
             case "LabelColumn":
-                this.aac();
+                this.aad();
                 break;
             case CalloutLayer.$$p[15]:
-                if (this.c6 != null) {
-                    this.c6.deregisterColumn(this.xn);
-                    this.xn = this.c5(this.zg);
+                if (this.c7 != null) {
+                    this.c7.deregisterColumn(this.xo);
+                    this.xo = this.c6(this.zh);
                 }
                 break;
             case "ContentColumn":
-                this.aac();
+                this.aad();
                 break;
             case CalloutLayer.$$p[28]:
-                if (this.c6 != null) {
-                    this.c6.deregisterColumn(this.xq);
-                    this.xq = stringIsNullOrEmpty(this.z1) == false ? this.c5(this.z1) : null;
+                if (this.c7 != null) {
+                    this.c7.deregisterColumn(this.xr);
+                    this.xr = stringIsNullOrEmpty(this.z2) == false ? this.c6(this.z2) : null;
                 }
                 break;
             case "XColumn":
-                this.aac();
+                this.aad();
                 break;
             case CalloutLayer.$$p[29]:
-                if (this.c6 != null) {
-                    this.c6.deregisterColumn(this.xr);
-                    this.xr = this.c5(this.z4);
+                if (this.c7 != null) {
+                    this.c7.deregisterColumn(this.xs);
+                    this.xs = this.c6(this.z5);
                 }
                 break;
             case "YColumn":
-                this.aac();
+                this.aad();
                 break;
             case CalloutLayer.$$p[20]:
-                if (this.c6 != null) {
-                    this.c6.deregisterColumn(this.xo);
-                    this.xo = this.c5(this.zn);
+                if (this.c7 != null) {
+                    this.c7.deregisterColumn(this.xp);
+                    this.xp = this.c6(this.zo);
                 }
                 break;
             case "KeyColumn":
-                this.aac();
+                this.aad();
                 break;
             case "FastItemsSource":
-                this.xx = true;
+                this.xy = true;
                 if (typeCast(IFastItemsSource_$type, c) != null) {
-                    c.deregisterColumn(this.xp);
-                    c.deregisterColumn(this.xn);
                     c.deregisterColumn(this.xq);
-                    c.deregisterColumn(this.xr);
                     c.deregisterColumn(this.xo);
-                    this.xp = null;
-                    this.xn = null;
+                    c.deregisterColumn(this.xr);
+                    c.deregisterColumn(this.xs);
+                    c.deregisterColumn(this.xp);
                     this.xq = null;
-                    this.xr = null;
                     this.xo = null;
-                    this.yg.clear();
+                    this.xr = null;
+                    this.xs = null;
+                    this.xp = null;
+                    this.yh.clear();
                 }
                 if (typeCast(IFastItemsSource_$type, d) != null) {
-                    this.xp = this.c5(this.zq);
-                    this.xn = this.c5(this.zg);
-                    if (stringIsNullOrEmpty(this.z1) == false) {
-                        this.xq = this.c5(this.z1);
+                    this.xq = this.c6(this.zr);
+                    this.xo = this.c6(this.zh);
+                    if (stringIsNullOrEmpty(this.z2) == false) {
+                        this.xr = this.c6(this.z2);
                     }
-                    this.xr = this.c5(this.z4);
-                    this.xo = this.c5(this.zn);
+                    this.xs = this.c6(this.z5);
+                    this.xp = this.c6(this.zo);
                 }
-                this.aac();
+                this.aad();
                 break;
         }
     };
-    CalloutLayer.prototype.w5 = function () {
-        if (this.w4 == 0) {
+    CalloutLayer.prototype.w6 = function () {
+        if (this.w5 == 0) {
             return 1;
         }
-        return this.w4;
+        return this.w5;
     };
-    CalloutLayer.prototype.w1 = function (a) {
+    CalloutLayer.prototype.w2 = function (a) {
         if (a == null || a.count == 0) {
             return null;
         }
@@ -1441,53 +1444,53 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    CalloutLayer.prototype.aai = function (a) {
-        if (a.d6) {
+    CalloutLayer.prototype.aaj = function (a) {
+        if (a.d7) {
             return;
         }
-        if ((a == this.xf || this.xf == null) && this.x3) {
-            this.pp(false);
+        if ((a == this.xg || this.xg == null) && this.x4) {
+            this.pq(false);
         }
     };
-    CalloutLayer.prototype.aac = function () {
-        if (this.xw == false) {
-            this.xw = true;
-            this.pp(false);
+    CalloutLayer.prototype.aad = function () {
+        if (this.xx == false) {
+            this.xx = true;
+            this.pq(false);
         }
     };
-    CalloutLayer.prototype.aaa = function () {
-        this.w9.cb.clear();
-        this.yd.g();
-        this.ya.clear();
+    CalloutLayer.prototype.aab = function () {
+        this.xa.cb.clear();
+        this.ye.g();
+        this.yb.clear();
     };
-    CalloutLayer.prototype.aad = function () {
-        if (this.xr == null || this.xp == null) {
-            var a = this.yd.c;
+    CalloutLayer.prototype.aae = function () {
+        if (this.xs == null || this.xq == null) {
+            var a = this.ye.c;
             while (a != null) {
-                this.aal(a.c);
+                this.aam(a.c);
                 a = a.a;
             }
             return;
         }
-        var b = this.yb();
-        for (var c = 0; c < this.xr.count; c++) {
+        var b = this.yc();
+        for (var c = 0; c < this.xs.count; c++) {
             var d = void 0;
-            if (this.yg.count <= c) {
+            if (this.yh.count <= c) {
                 var e = new CalloutAnnotation();
                 d = new CalloutAnnotationWrapper();
                 d.b = e;
-                d.b.series = this.xf;
-                this.yg.add(d);
+                d.b.series = this.xg;
+                this.yh.add(d);
             }
             else {
-                d = this.yg._inner[c];
+                d = this.yh._inner[c];
             }
-            this.aak(c, b);
+            this.aal(c, b);
         }
     };
     CalloutLayer.$t = markType(CalloutLayer, 'CalloutLayer', AnnotationLayer.$);
-    CalloutLayer.aa0 = DependencyProperty.i("AutoCalloutVisibilityMode", AutoCalloutVisibilityMode_$type, CalloutLayer.$, new PropertyMetadata(2, enumGetBox(AutoCalloutVisibilityMode_$type, 0), function (a, b) { return a.raisePropertyChanged("AutoCalloutVisibilityMode", b.oldValue, b.newValue); }));
-    CalloutLayer.$$p = markDep(DependencyProperty, PropertyMetadata, CalloutLayer, 'raisePropertyChanged', ['AutoCalloutLabelPrecision:ys:aam', [1, 5], 'CalloutBackground:abh:aan', [Brush.$, null], 'CalloutCollisionMode:w6:aao', [CalloutCollisionMode_$type, enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:yj:aap', [1, NaN], 'CalloutInterpolatedValuePrecision:yt:aaq', [1, -1], 'CalloutLeaderBrush:abi:aar', [Brush.$, null], 'CalloutOutline:abj:aas', [Brush.$, null], 'CalloutPaddingBottom:yk:aat', [1, NaN], 'CalloutPaddingLeft:yl:aau', [1, NaN], 'CalloutPaddingRight:ym:aav', [1, NaN], 'CalloutPaddingTop:yn:aaw', [1, NaN], 'CalloutPositionPadding:yo:aax', [1, 10], 'CalloutStrokeThickness:yp:aay', [1, NaN], 'CalloutTextColor:abk:aaz', [Brush.$, null], 'CollisionChannel:zd:aa1', [2, null], 'ContentMemberPath:zg:aa2', [2, null], 'IsAutoCalloutBehaviorEnabled:x3:aa3', [0, false], 'IsCalloutOffsettingEnabled:x4:aa4', [0, true], 'IsCustomCalloutRenderStyleEnabled:x5:aa5', [0, false], 'IsCustomCalloutStyleEnabled:x6:aa6', [0, false], 'KeyMemberPath:zn:aa7', [2, null], 'LabelMemberPath:zq:aa8', [2, null], 'TargetSeriesName:zs:aa9', [2, null], 'TargetSeries:xf:aba', [Series.$, null], 'TextStyle:zv:abb', [2, null], 'UseInterpolatedValueForAutoCalloutLabels:x7:abc', [0, false], 'UseSeriesColorForOutline:x8:abd', [0, false], 'UseValueForAutoCalloutLabels:x9:abe', [0, true], 'XMemberPath:z1:abf', [2, null], 'YMemberPath:z4:abg', [2, null]]);
+    CalloutLayer.aa1 = DependencyProperty.i("AutoCalloutVisibilityMode", AutoCalloutVisibilityMode_$type, CalloutLayer.$, new PropertyMetadata(2, enumGetBox(AutoCalloutVisibilityMode_$type, 0), function (a, b) { return a.raisePropertyChanged("AutoCalloutVisibilityMode", b.oldValue, b.newValue); }));
+    CalloutLayer.$$p = markDep(DependencyProperty, PropertyMetadata, CalloutLayer, 'raisePropertyChanged', ['AutoCalloutLabelPrecision:yt:aan', [1, 5], 'CalloutBackground:abi:aao', [Brush.$, null], 'CalloutCollisionMode:w7:aap', [CalloutCollisionMode_$type, enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:yk:aaq', [1, NaN], 'CalloutInterpolatedValuePrecision:yu:aar', [1, -1], 'CalloutLeaderBrush:abj:aas', [Brush.$, null], 'CalloutOutline:abk:aat', [Brush.$, null], 'CalloutPaddingBottom:yl:aau', [1, NaN], 'CalloutPaddingLeft:ym:aav', [1, NaN], 'CalloutPaddingRight:yn:aaw', [1, NaN], 'CalloutPaddingTop:yo:aax', [1, NaN], 'CalloutPositionPadding:yp:aay', [1, 10], 'CalloutStrokeThickness:yq:aaz', [1, NaN], 'CalloutTextColor:abl:aa0', [Brush.$, null], 'CollisionChannel:ze:aa2', [2, null], 'ContentMemberPath:zh:aa3', [2, null], 'IsAutoCalloutBehaviorEnabled:x4:aa4', [0, false], 'IsCalloutOffsettingEnabled:x5:aa5', [0, true], 'IsCustomCalloutRenderStyleEnabled:x6:aa6', [0, false], 'IsCustomCalloutStyleEnabled:x7:aa7', [0, false], 'KeyMemberPath:zo:aa8', [2, null], 'LabelMemberPath:zr:aa9', [2, null], 'TargetSeriesName:zt:aba', [2, null], 'TargetSeries:xg:abb', [Series.$, null], 'TextStyle:zw:abc', [2, null], 'UseInterpolatedValueForAutoCalloutLabels:x8:abd', [0, false], 'UseSeriesColorForOutline:x9:abe', [0, false], 'UseValueForAutoCalloutLabels:ya:abf', [0, true], 'XMemberPath:z2:abg', [2, null], 'YMemberPath:z5:abh', [2, null]]);
     return CalloutLayer;
 }(AnnotationLayer));
 export { CalloutLayer };
@@ -1552,10 +1555,10 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     CalloutLayerView.prototype.ca = function () {
-        if (this.b7.xh != null) {
-            return this.b7.xh;
+        if (this.b7.xi != null) {
+            return this.b7.xi;
         }
-        return this.e.cy.getFontInfo();
+        return this.e.cz.getFontInfo();
     };
     CalloutLayerView.prototype.an = function (a) {
         _super.prototype.an.call(this, a);
@@ -1576,7 +1579,7 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
     CalloutLayerView.prototype.ce = function () {
         var a = this.ca();
         if (isNaN_(this.cd)) {
-            var b = FontUtil.getCurrentFontHeight(this.e.cy.cv.j.ae, a);
+            var b = FontUtil.getCurrentFontHeight(this.e.cz.cv.j.ae, a);
             this.cd = b;
         }
         return this.cd;
@@ -1600,9 +1603,9 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     CalloutLayerView.prototype.cl = function (a) {
         if (a != null) {
-            return this.cp(a.sx);
+            return this.cp(a.sy);
         }
-        return this.e.sx;
+        return this.e.sy;
     };
     CalloutLayerView.prototype.co = function () {
         return ((function () {
@@ -1612,9 +1615,9 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
         })());
     };
     CalloutLayerView.prototype.cn = function (a) {
-        if (this.b7.x8) {
+        if (this.b7.x9) {
             if (a != null) {
-                return this.cp(a.sx);
+                return this.cp(a.sy);
             }
         }
         return ((function () {
@@ -1625,9 +1628,9 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     CalloutLayerView.prototype.cm = function (a) {
         if (a != null) {
-            return this.cp(a.ss);
+            return this.cp(a.st);
         }
-        return this.e.ss;
+        return this.e.st;
     };
     CalloutLayerView.prototype.ci = function () {
         this.cd = NaN;