igniteui-webcomponents-charts 3.2.2 → 3.2.4

package/esm5/lib/CalloutLayer_combined.js

@@ -62,109 +62,109 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var _this = _super.call(this) || this;
         _this.calloutStyleUpdating = null;
         _this.calloutRenderStyleUpdating = null;
-        _this.rs = null;
-        _this.rt = null;
+        _this.rw = null;
+        _this.rx = null;
+        _this.ry = null;
+        _this.rv = null;
         _this.ru = null;
-        _this.rr = null;
-        _this.rq = null;
-        _this.sk = new HashSet$1(CalloutAnnotationWrapper.$, 0);
-        _this.sn = new List$1(CalloutAnnotationWrapper.$, 0);
-        _this.so = new List$1(CalloutAnnotationWrapper.$, 0);
-        _this.ri = null;
-        _this.q8 = null;
-        _this.ro = null;
-        _this.sl = new LinkedList$1(CalloutAnnotationWrapper.$);
-        _this.si = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
-        _this.r0 = null;
-        _this.vu = new Rect(0, 0, 0, 1, 1);
-        _this.r7 = false;
-        _this.sz = 0;
-        _this.vt = Rect.empty;
-        _this.r5 = false;
-        _this.r6 = false;
+        _this.so = new HashSet$1(CalloutAnnotationWrapper.$, 0);
+        _this.sr = new List$1(CalloutAnnotationWrapper.$, 0);
+        _this.ss = new List$1(CalloutAnnotationWrapper.$, 0);
+        _this.rm = null;
+        _this.rc = null;
+        _this.rs = null;
+        _this.sp = new LinkedList$1(CalloutAnnotationWrapper.$);
+        _this.sm = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
+        _this.r4 = null;
+        _this.vy = new Rect(0, 0, 0, 1, 1);
+        _this.sb = false;
+        _this.s3 = 0;
+        _this.vx = Rect.empty;
+        _this.r9 = false;
+        _this.sa = false;
         _this.calloutContentUpdating = null;
         _this.calloutLabelUpdating = null;
         _this.calloutSeriesSelecting = null;
-        _this.sm = new List$1(SeriesPointOfInterest.$, 0);
-        _this.r9 = false;
-        _this.sa = false;
-        _this.sq = 0;
-        _this.r8 = false;
-        _this.r4 = true;
-        _this.ra = 1;
+        _this.sq = new List$1(SeriesPointOfInterest.$, 0);
+        _this.sd = false;
+        _this.se = false;
+        _this.su = 0;
+        _this.sc = false;
+        _this.r8 = true;
+        _this.re = 1;
         FastItemObjectColumn.m();
-        _this.q8 = null;
-        _this.ri = new CalloutPlacementPositionsCollection();
-        var a = _this.ri;
-        a.collectionChanged = delegateCombine(a.collectionChanged, runOn(_this, _this.ue));
-        _this.qe = true;
+        _this.rc = null;
+        _this.rm = new CalloutPlacementPositionsCollection();
+        var a = _this.rm;
+        a.collectionChanged = delegateCombine(a.collectionChanged, runOn(_this, _this.ui));
+        _this.qi = true;
         var b = new CalloutLayerFrame();
         var c = new CalloutLayerFrame();
         var d = new CalloutLayerFrame();
-        var e = _this.hm / 1000;
-        _this.p6 = b;
-        _this.p5 = c;
-        _this.p7 = d;
+        var e = _this.ho / 1000;
+        _this.qa = b;
+        _this.p9 = c;
+        _this.qb = d;
         _this.ab = CalloutLayer.$;
         return _this;
     }
     CalloutLayer.prototype.get_c8 = function () {
         return true;
     };
-    CalloutLayer.prototype.ue = function (a, b) {
-        this.un();
+    CalloutLayer.prototype.ui = function (a, b) {
+        this.ur();
     };
-    CalloutLayer.prototype.un = function () {
-        this.q8 = this.q9(this.rj);
-        this.uk();
+    CalloutLayer.prototype.ur = function () {
+        this.rc = this.rd(this.rn);
+        this.uo();
     };
-    CalloutLayer.prototype.uf = function (a, b) {
-        this.so.clear();
-        this.mi(false);
+    CalloutLayer.prototype.uj = function (a, b) {
+        this.ss.clear();
+        this.ml(false);
     };
-    CalloutLayer.prototype.k0 = function (a, b, c, d) {
-        _super.prototype.k0.call(this, a, b, c, d);
-        var e = this.sj();
+    CalloutLayer.prototype.k3 = function (a, b, c, d) {
+        _super.prototype.k3.call(this, a, b, c, d);
+        var e = this.sn();
         switch (a) {
             case 3:
-                this.us(b, e);
+                this.uw(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.rn;
-                    this.so.insert(f, h);
-                    this.us(f, e);
+                    h.b.series = this.rr;
+                    this.ss.insert(f, h);
+                    this.uw(f, e);
                 }
                 break;
             case 0:
-                this.so.v(b, c);
+                this.ss.v(b, c);
                 break;
             case 2:
                 for (var i = b; i < b + c; i++) {
-                    this.us(i, e);
+                    this.uw(i, e);
                 }
                 break;
             case 4:
-                this.so.clear();
+                this.ss.clear();
                 for (var j = 0; j < this.ck.count; j++) {
                     var k = new CalloutAnnotation();
                     var l = new CalloutAnnotationWrapper();
                     l.b = k;
-                    l.b.series = this.rn;
-                    this.so.add(l);
-                    this.us(j, e);
+                    l.b.series = this.rr;
+                    this.ss.add(l);
+                    this.uw(j, e);
                 }
                 break;
         }
-        this.mi(true);
+        this.ml(true);
     };
-    CalloutLayer.prototype.eo = function (a) {
+    CalloutLayer.prototype.ep = function (a) {
         return false;
     };
-    CalloutLayer.prototype.sj = function () {
+    CalloutLayer.prototype.sn = function () {
         var a = new Dictionary$2(String_$type, Series.$, 0);
         if (this.cd != null) {
             for (var b = 0; b < this.cd.series.count; b++) {
@@ -176,47 +176,47 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return a;
     };
-    CalloutLayer.prototype.us = function (a, b) {
+    CalloutLayer.prototype.uw = function (a, b) {
         var _this = this;
-        if (this.rz == null || this.rx == null) {
+        if (this.r3 == null || this.r1 == null) {
             return;
         }
         var c = a;
-        if (this.ry != null) {
-            c = this.ry.item(a);
-        }
-        var d = this.rz.item(a);
-        var e = this.rx.item(a);
-        var f = this.so._inner[a];
-        if (this.rw != null) {
-            if (f.b.ab != this.rw.item(a)) {
-                f.b.key = this.rw.item(a);
+        if (this.r2 != null) {
+            c = this.r2.item(a);
+        }
+        var d = this.r3.item(a);
+        var e = this.r1.item(a);
+        var f = this.ss._inner[a];
+        if (this.r0 != null) {
+            if (f.b.ab != this.r0.item(a)) {
+                f.b.key = this.r0.item(a);
             }
         }
-        if (this.si.containsKey(f)) {
-            f.b = this.si.item(f).c.b;
+        if (this.sm.containsKey(f)) {
+            f.b = this.sm.item(f).c.b;
         }
         f.b.xValue = c;
         f.b.yValue = d;
         if (this.calloutLabelUpdating != null) {
             var g = ((function () {
                 var $ret = new CalloutLabelUpdatingEventArgs();
-                $ret.c = c;
-                $ret.d = d;
+                $ret.d = c;
+                $ret.e = d;
                 $ret.item = _this.ck.item(a);
                 return $ret;
             })());
             this.calloutLabelUpdating(this, g);
-            if (g.b != null && !Base.equalsStatic(g.b, f.b.ao)) {
-                var h = g.b;
+            if (g.c != null && !Base.equalsStatic(g.c, f.b.ao)) {
+                var h = g.c;
                 f.b.text = h != null ? h.toString() : "";
             }
         }
         else {
             f.b.text = e != null ? e.toString() : "";
         }
-        if (this.rv != null) {
-            f.b.content = this.rv.item(a);
+        if (this.rz != null) {
+            f.b.content = this.rz.item(a);
         }
         else {
             f.b.content = this.ck.item(a);
@@ -239,29 +239,29 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        this.ut(f);
+        this.ux(f);
     };
-    CalloutLayer.prototype.ut = function (a) {
+    CalloutLayer.prototype.ux = function (a) {
         var b = new Thickness(0, DeviceUtils.g(3));
-        if (isNaN_(this.vw.left) || isNaN_(this.vw.top) || isNaN_(this.vw.right) || isNaN_(this.vw.bottom)) {
+        if (isNaN_(this.v0.left) || isNaN_(this.v0.top) || isNaN_(this.v0.right) || isNaN_(this.v0.bottom)) {
             b = new Thickness(0, DeviceUtils.g(3));
         }
         else {
-            b = this.vw;
+            b = this.v0;
         }
         var c = DeviceUtils.g(3);
-        if (isNaN_(this.sr)) {
+        if (isNaN_(this.sv)) {
             c = DeviceUtils.g(3);
         }
         else {
-            c = this.sr;
-        }
-        var d = this.vp != null ? this.vp : this.rh.ci(a.b.l);
-        var e = this.vs != null ? this.vs : this.rh.cl();
-        var f = this.vr != null ? this.vr : this.rh.ck(a.b.l);
-        var g = this.vq != null ? this.vq : this.rh.cj(a.b.l);
-        var h = isNaN_(this.sx) ? 0 : this.sx;
-        if (this.se && this.calloutStyleUpdating != null) {
+            c = this.sv;
+        }
+        var d = this.vt != null ? this.vt : this.rl.ci(a.b.l);
+        var e = this.vw != null ? this.vw : this.rl.cl();
+        var f = this.vv != null ? this.vv : this.rl.ck(a.b.l);
+        var g = this.vu != null ? this.vu : this.rl.cj(a.b.l);
+        var h = isNaN_(this.s1) ? 0 : this.s1;
+        if (this.si && this.calloutStyleUpdating != null) {
             var i = new CalloutStyleUpdatingEventArgs();
             i.item = a.b.aa;
             i.xValue = a.b.ac;
@@ -287,173 +287,173 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         a.b.leaderBrush = g;
         a.b.strokeThickness = h;
     };
-    CalloutLayer.prototype.hw = function (a, b) {
-        var c = this.jq(b);
+    CalloutLayer.prototype.hy = function (a, b) {
+        var c = this.js(b);
         if (c == CalloutLayer.$$p[21]) {
-            return this.hx(a, b, this.ty);
+            return this.hz(a, b, this.t2);
         }
         if (c == CalloutLayer.$$p[28]) {
-            return this.hx(a, b, this.t9);
+            return this.hz(a, b, this.ud);
         }
         if (c == CalloutLayer.$$p[29]) {
-            return this.hx(a, b, this.uc);
+            return this.hz(a, b, this.ug);
         }
         if (c == CalloutLayer.$$p[20]) {
-            return this.hx(a, b, this.tv);
+            return this.hz(a, b, this.tz);
         }
         if (c == CalloutLayer.$$p[15]) {
-            return this.hx(a, b, this.to);
+            return this.hz(a, b, this.ts);
         }
-        return _super.prototype.hw.call(this, a, b);
+        return _super.prototype.hy.call(this, a, b);
     };
-    Object.defineProperty(CalloutLayer.prototype, "rx", {
+    Object.defineProperty(CalloutLayer.prototype, "r1", {
         get: function () {
-            return this.rs;
+            return this.rw;
         },
         set: function (a) {
-            if (this.rs != a) {
-                var b = this.rs;
-                this.rs = a;
-                this.raisePropertyChanged("LabelColumn", b, this.rs);
+            if (this.rw != a) {
+                var b = this.rw;
+                this.rw = a;
+                this.raisePropertyChanged("LabelColumn", b, this.rw);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "ry", {
+    Object.defineProperty(CalloutLayer.prototype, "r2", {
         get: function () {
-            return this.rt;
+            return this.rx;
         },
         set: function (a) {
-            if (this.rt != a) {
-                var b = this.rt;
-                this.rt = a;
-                this.raisePropertyChanged("XColumn", b, this.rt);
+            if (this.rx != a) {
+                var b = this.rx;
+                this.rx = a;
+                this.raisePropertyChanged("XColumn", b, this.rx);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "rz", {
+    Object.defineProperty(CalloutLayer.prototype, "r3", {
         get: function () {
-            return this.ru;
+            return this.ry;
         },
         set: function (a) {
-            if (this.ru != a) {
-                var b = this.ru;
-                this.ru = a;
-                this.raisePropertyChanged("YColumn", b, this.ru);
+            if (this.ry != a) {
+                var b = this.ry;
+                this.ry = a;
+                this.raisePropertyChanged("YColumn", b, this.ry);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "rw", {
+    Object.defineProperty(CalloutLayer.prototype, "r0", {
         get: function () {
-            return this.rr;
+            return this.rv;
         },
         set: function (a) {
-            if (this.rr != a) {
-                var b = this.rr;
-                this.rr = a;
-                this.raisePropertyChanged("KeyColumn", b, this.rr);
+            if (this.rv != a) {
+                var b = this.rv;
+                this.rv = a;
+                this.raisePropertyChanged("KeyColumn", b, this.rv);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "rv", {
+    Object.defineProperty(CalloutLayer.prototype, "rz", {
         get: function () {
-            return this.rq;
+            return this.ru;
         },
         set: function (a) {
-            if (this.rq != a) {
-                var b = this.rq;
-                this.rq = a;
-                this.raisePropertyChanged("ContentColumn", b, this.rq);
+            if (this.ru != a) {
+                var b = this.ru;
+                this.ru = a;
+                this.raisePropertyChanged("ContentColumn", b, this.ru);
             }
         },
         enumerable: true,
         configurable: true
     });
-    CalloutLayer.prototype.uh = function (a, b) {
+    CalloutLayer.prototype.ul = function (a, b) {
         if (b.propertyName == CalloutAnnotation.$$p[14] || b.propertyName == CalloutAnnotation.$$p[15]) {
             var c = a.k;
-            if (!this.sk.contains(c)) {
-                this.sk.add_1(c);
-                this.sn.add(c);
-                this.mi(false);
+            if (!this.so.contains(c)) {
+                this.so.add_1(c);
+                this.sr.add(c);
+                this.ml(false);
             }
         }
     };
     CalloutLayer.prototype.bx = function () {
         return new CalloutLayerView(this);
     };
-    CalloutLayer.prototype.lz = function (a) {
-        _super.prototype.lz.call(this, a);
-        this.rh = a;
+    CalloutLayer.prototype.l2 = function (a) {
+        _super.prototype.l2.call(this, a);
+        this.rl = a;
     };
-    Object.defineProperty(CalloutLayer.prototype, "rj", {
+    Object.defineProperty(CalloutLayer.prototype, "rn", {
         get: function () {
-            return this.ri;
+            return this.rm;
         },
         set: function (a) {
-            var b = this.rj;
+            var b = this.rn;
             if (a != b) {
-                this.ri = a;
-                this.raisePropertyChanged("AllowedPositions", b, this.rj);
+                this.rm = a;
+                this.raisePropertyChanged("AllowedPositions", b, this.rn);
             }
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "rc", {
+    Object.defineProperty(CalloutLayer.prototype, "rg", {
         get: function () {
-            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.u8));
+            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.vc));
         },
         set: function (a) {
-            this.h(CalloutLayer.u8, enumGetBox(AutoCalloutVisibilityMode_$type, a));
+            this.h(CalloutLayer.vc, enumGetBox(AutoCalloutVisibilityMode_$type, a));
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "rb", {
+    Object.defineProperty(CalloutLayer.prototype, "rf", {
         get: function () {
-            return this.ra;
+            return this.re;
         },
         set: function (a) {
-            this.ra = a;
+            this.re = a;
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "vw", {
+    Object.defineProperty(CalloutLayer.prototype, "v0", {
         get: function () {
-            return new Thickness(1, this.st, this.sv, this.su, this.ss);
+            return new Thickness(1, this.sx, this.sz, this.sy, this.sw);
         },
         enumerable: true,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "rp", {
+    Object.defineProperty(CalloutLayer.prototype, "rt", {
         get: function () {
-            if (this.ro == null) {
-                this.ro = FontUtil.toFontInfo(this.g9, this.t3);
+            if (this.rs == null) {
+                this.rs = FontUtil.toFontInfo(this.hb, this.t7);
             }
-            return this.ro;
+            return this.rs;
         },
         enumerable: true,
         configurable: true
     });
-    CalloutLayer.prototype.qp = function (a, b) {
-        if (this.rn == null || this.rn == a) {
+    CalloutLayer.prototype.qt = function (a, b) {
+        if (this.rr == null || this.rr == a) {
             if (!this.as.c) {
-                this.mi(b);
+                this.ml(b);
             }
         }
     };
-    CalloutLayer.prototype.qr = function (a, b) {
+    CalloutLayer.prototype.qv = function (a, b) {
         var e_1, _a;
-        _super.prototype.qr.call(this, a, b);
+        _super.prototype.qv.call(this, a, b);
         var c = a;
         c.q.clear();
         c.r.clear();
@@ -472,24 +472,24 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         c.v.clear();
         c.s.clear();
         c.t.clear();
-        var d = this.sp();
+        var d = this.st();
         var e = new List$1(CalloutAnnotationWrapper.$, 0);
         var f = true;
-        if (this.sb) {
-            if (this.qc(this.rn)) {
-                this.up(this.rn, c, e);
+        if (this.sf) {
+            if (this.qg(this.rr)) {
+                this.ut(this.rr, c, e);
             }
             else {
                 try {
                     for (var _b = tslib_1.__values(fromEnum(this.cd.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var g = _c.value;
-                        if (this.qc(g)) {
+                        if (this.qg(g)) {
                             if (!g.dc) {
                                 if (!g.isVertical) {
                                     f = false;
                                 }
                             }
-                            this.up(g, c, e);
+                            this.ut(g, c, e);
                         }
                     }
                 }
@@ -508,7 +508,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        if (this.sb && this.rb == 2) {
+        if (this.sf && this.rf == 2) {
             var h = 0;
             var i = 0;
             var j = 1.7976931348623157E+308;
@@ -547,70 +547,70 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        this.uo(c, d, e);
+        this.us(c, d, e);
     };
-    CalloutLayer.prototype.m6 = function (a, b) {
-        _super.prototype.m6.call(this, a, b);
-        var c = b.width - this.vu.width;
-        var d = b.height - this.vu.height;
+    CalloutLayer.prototype.m9 = function (a, b) {
+        _super.prototype.m9.call(this, a, b);
+        var c = b.width - this.vy.width;
+        var d = b.height - this.vy.height;
         var e = 0;
         if (Math.abs(c) > Math.abs(d)) {
             e = c;
-            this.sq = c * this.pz.width;
+            this.su = c * this.p3.width;
         }
         else {
             e = d;
-            this.sq = d * this.pz.height;
+            this.su = d * this.p3.height;
         }
-        if (e > 0 && this.sq > 5) {
-            this.sa = true;
+        if (e > 0 && this.su > 5) {
+            this.se = true;
         }
-        if (e < 0 && this.sq > 5) {
-            this.r9 = true;
+        if (e < 0 && this.su > 5) {
+            this.sd = true;
         }
     };
-    CalloutLayer.prototype.m5 = function (a, b) {
-        _super.prototype.m5.call(this, a, b);
+    CalloutLayer.prototype.m8 = function (a, b) {
+        _super.prototype.m8.call(this, a, b);
         if (!a.equals1(b)) {
-            this.r8 = true;
+            this.sc = true;
         }
     };
-    Object.defineProperty(CalloutLayer.prototype, "vv", {
+    Object.defineProperty(CalloutLayer.prototype, "vz", {
         get: function () {
-            return this.vt;
+            return this.vx;
         },
         set: function (a) {
-            this.vt = a;
+            this.vx = a;
         },
         enumerable: true,
         configurable: true
     });
-    CalloutLayer.prototype.uo = function (a, b, c) {
+    CalloutLayer.prototype.us = function (a, b, c) {
         var e_2, _a;
         if (this.cd != null) {
-            this.vu = this.cd.sf;
+            this.vy = this.cd.s9;
         }
-        if (this.pz.isEmpty) {
+        if (this.p3.isEmpty) {
             return;
         }
-        this.vv = new Rect(0, this.pz.left, this.pz.top, this.pz.width, this.pz.height);
-        if (this.r0 != null && this.tl != null && this.tl != this.r0.ap) {
-            this.uj();
+        this.vz = new Rect(0, this.p3.left, this.p3.top, this.p3.width, this.p3.height);
+        if (this.r4 != null && this.tp != null && this.tp != this.r4.ap) {
+            this.un();
         }
-        if (this.r0 == null) {
-            var d = this.r1();
+        if (this.r4 == null) {
+            var d = this.r5();
             if (d != null) {
-                this.r0 = d;
-                var e = this.r0;
-                e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.ug));
+                this.r4 = d;
+                var e = this.r4;
+                e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.uk));
             }
             else {
-                var f = this.pr(this.b0);
+                var f = this.pv(this.b0);
                 var g = new Array(2);
                 g[0] = 0;
                 g[1] = 3;
-                if (this.rn != null) {
-                    if (this.rn.isVertical) {
+                if (this.rr != null) {
+                    if (this.rr.isVertical) {
                         g = new Array(2);
                         g[0] = 2;
                         g[1] = 1;
@@ -650,31 +650,31 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                         g[1] = 1;
                     }
                 }
-                this.r0 = new LabelCollisionManager(this.pz.right, this.pz.bottom, this.pz, this.rh.j(), this.sw, this.r2(), g, this.s3(), this.s2(), this.sc, this.q8);
-                if (this.tl != null) {
-                    this.r0.ap = this.tl;
-                    this.r0.an = this;
+                this.r4 = new LabelCollisionManager(this.p3.right, this.p3.bottom, this.p3, this.rl.j(), this.s0, this.r6(), g, this.s7(), this.s6(), this.sg, this.rc);
+                if (this.tp != null) {
+                    this.r4.ap = this.tp;
+                    this.r4.an = this;
                 }
-                var j = this.r0;
-                j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.ug));
+                var j = this.r4;
+                j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.uk));
             }
         }
-        if (this.r9) {
-            this.r9 = false;
-            if (this.r0.al > 2) {
-                this.r7 = true;
+        if (this.sd) {
+            this.sd = false;
+            if (this.r4.al > 2) {
+                this.sb = true;
             }
         }
-        if (this.sa) {
-            this.sa = false;
-            if (this.sq > 5) {
-                this.r7 = true;
+        if (this.se) {
+            this.se = false;
+            if (this.su > 5) {
+                this.sb = true;
             }
         }
-        if (this.r8) {
-            this.r8 = false;
-            this.r0.a3(this.pz.right, this.pz.bottom, this.pz);
-            this.r7 = true;
+        if (this.sc) {
+            this.sc = false;
+            this.r4.a3(this.p3.right, this.p3.bottom, this.p3);
+            this.sb = true;
         }
         var k = new HashSet$1(CalloutAnnotationWrapper.$, 0);
         var l = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -687,54 +687,54 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         for (var q = 0; q < c.count; q++) {
             o.add_1(c._inner[q]);
         }
-        var r = this.sl.c;
+        var r = this.sp.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.uh));
-                this.sl.h(r);
-                this.si.removeItem(r.c);
-                this.r0.a2(r.c.c);
+                t.propertyChanged = delegateRemove(t.propertyChanged, runOn(this, this.ul));
+                this.sp.h(r);
+                this.sm.removeItem(r.c);
+                this.r4.a2(r.c.c);
             }
             r = s;
         }
         for (var u = 0; u < b.count; u++) {
-            if (!this.si.containsKey(b._inner[u])) {
-                this.sl.f(b._inner[u]);
+            if (!this.sm.containsKey(b._inner[u])) {
+                this.sp.f(b._inner[u]);
                 var v = b._inner[u].b;
-                v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.uh));
-                this.si.addItem(b._inner[u], this.sl.d);
+                v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.ul));
+                this.sm.addItem(b._inner[u], this.sp.d);
                 m.add(b._inner[u]);
                 k.add_1(b._inner[u]);
-                this.r7 = true;
+                this.sb = true;
             }
         }
         for (var w = 0; w < c.count; w++) {
-            if (!this.si.containsKey(c._inner[w])) {
-                this.sl.f(c._inner[w]);
-                this.si.addItem(c._inner[w], this.sl.d);
+            if (!this.sm.containsKey(c._inner[w])) {
+                this.sp.f(c._inner[w]);
+                this.sm.addItem(c._inner[w], this.sp.d);
                 var x = c._inner[w].b;
-                x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.uh));
+                x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.ul));
                 m.add(c._inner[w]);
                 k.add_1(c._inner[w]);
-                this.r7 = true;
+                this.sb = true;
             }
         }
-        if (this.r5 == true) {
-            this.r5 = false;
-            this.r7 = true;
+        if (this.r9 == true) {
+            this.r9 = false;
+            this.sb = true;
         }
-        if (this.sn.count > 0) {
-            this.r7 = true;
-            this.sn.clear();
-            this.sk.clear();
+        if (this.sr.count > 0) {
+            this.sb = true;
+            this.sr.clear();
+            this.so.clear();
         }
-        r = this.sl.c;
+        r = this.sp.c;
         while (r != null) {
-            var y = this.r3(r.c);
+            var y = this.r7(r.c);
             if (y == null) {
                 return;
             }
@@ -750,36 +750,36 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     aa.n = y.e;
                     aa.m = y.d;
                     if (aa.b == null) {
-                        this.r0.t(aa, false);
+                        this.r4.t(aa, false);
                     }
                     if (z) {
-                        this.r0.aq(aa);
+                        this.r4.aq(aa);
                     }
                     else {
-                        this.r0.az(aa);
+                        this.r4.az(aa);
                     }
                 }
             }
             r = r.a;
         }
-        var ab = this.r0.am();
-        var ac = this.r0.u();
+        var ab = this.r4.am();
+        var ac = this.r4.u();
         if (ac) {
-            if (this.r0.q()) {
-                this.r7 = true;
+            if (this.r4.q()) {
+                this.sb = true;
             }
         }
-        if (this.r7 && (ab != 0 || ac)) {
-            this.r7 = false;
-            this.sz = 0x7FFFFFFF;
-            if (this.tl != null) {
+        if (this.sb && (ab != 0 || ac)) {
+            this.sb = false;
+            this.s3 = 0x7FFFFFFF;
+            if (this.tp != null) {
                 var ad = true;
                 for (var ae = 0; ae < this.cd.series.count; ae++) {
                     var af = this.cd.series._inner[ae];
                     if (af.dc && typeCast(CalloutLayer.$, af) !== null) {
                         var ag = af;
-                        if (ag.tl == this.tl) {
-                            if (!ag.vv.equals1(this.r0.a5)) {
+                        if (ag.tp == this.tp) {
+                            if (!ag.vz.equals1(this.r4.a5)) {
                                 ad = false;
                                 break;
                             }
@@ -787,21 +787,21 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                 }
                 if (ad) {
-                    this.r0.a4();
+                    this.r4.a4();
                 }
                 else {
-                    this.r0.ar();
-                    this.r0.as();
+                    this.r4.ar();
+                    this.r4.as();
                 }
             }
             else {
-                this.r0.a4();
+                this.r4.a4();
             }
         }
         else {
-            this.r0.as();
+            this.r4.as();
         }
-        var ah = this.sl.c;
+        var ah = this.sp.c;
         var ai;
         var aj;
         var ak;
@@ -818,7 +818,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var av;
         var aw;
         var ax;
-        var ay = this.sd;
+        var ay = this.sh;
         while (ah != null) {
             var az = ah.c;
             var a0 = az.b;
@@ -880,23 +880,23 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             ah = ah.a;
         }
     };
-    CalloutLayer.prototype.uj = function () {
-        if (this.r0 != null) {
-            var a = this.sl.c;
+    CalloutLayer.prototype.un = function () {
+        if (this.r4 != null) {
+            var a = this.sp.c;
             while (a != null) {
                 var b = a.c.c;
                 if (b != null) {
-                    this.r0.a2(b);
+                    this.r4.a2(b);
                 }
                 a = a.a;
             }
-            var c = this.r0;
-            c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.ug));
-            this.r0 = null;
+            var c = this.r4;
+            c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.uk));
+            this.r4 = null;
         }
-        this.ui();
+        this.um();
     };
-    CalloutLayer.prototype.r1 = function () {
+    CalloutLayer.prototype.r5 = function () {
         if (this.cd == null) {
             return null;
         }
@@ -905,9 +905,9 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             if (b.dc && typeCast(CalloutLayer.$, b) !== null) {
                 var c = b;
                 if (c != this) {
-                    if (c.tl != null && c.tl == this.tl) {
-                        if (c.r0 != null) {
-                            return c.r0;
+                    if (c.tp != null && c.tp == this.tp) {
+                        if (c.r4 != null) {
+                            return c.r4;
                         }
                     }
                 }
@@ -915,14 +915,14 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return null;
     };
-    CalloutLayer.prototype.s2 = function () {
+    CalloutLayer.prototype.s6 = function () {
         return 20000;
     };
-    CalloutLayer.prototype.s3 = function () {
+    CalloutLayer.prototype.s7 = function () {
         return 300;
     };
-    CalloutLayer.prototype.r2 = function () {
-        switch (this.re) {
+    CalloutLayer.prototype.r6 = function () {
+        switch (this.ri) {
             case 0: return 2;
             case 2: return 1;
             case 3: return 2;
@@ -930,15 +930,15 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return 2;
     };
-    CalloutLayer.prototype.ug = function (a) {
-        var b = this.r0.am();
-        if (b < this.sz) {
-            this.sz = b;
-            this.mi(false);
+    CalloutLayer.prototype.uk = function (a) {
+        var b = this.r4.am();
+        if (b < this.s3) {
+            this.s3 = b;
+            this.ml(false);
         }
     };
-    CalloutLayer.prototype.r3 = function (a) {
-        var b = this.rn;
+    CalloutLayer.prototype.r7 = function (a) {
+        var b = this.rr;
         if (a.b.l != null) {
             b = a.b.l;
         }
@@ -955,7 +955,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             return null;
         }
         var e = b.ag();
-        var f = b.gc();
+        var f = b.ge();
         var g = null;
         var h = null;
         var i = false;
@@ -984,27 +984,27 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var k = 0;
         var l = 0;
         if (g.ca && g.categoryMode != 0) {
-            if (b.dp) {
+            if (b.dq) {
                 k = b.getOffsetValue();
             }
-            else if (b.dg) {
+            else if (b.dh) {
                 k = b.getOffsetValue();
             }
         }
         if (h.ca && h.categoryMode != 0) {
-            if (b.dg) {
+            if (b.dh) {
                 l = b.getOffsetValue();
             }
         }
-        var m = new ScalerParams(0, this.cd.sf, g.kc, g.cg, g.j7());
+        var m = new ScalerParams(0, this.cd.s9, g.kc, g.cg, g.j7());
         m.b = f;
-        var n = new ScalerParams(0, this.cd.sf, h.kc, h.cg, h.j7());
+        var n = new ScalerParams(0, this.cd.s9, h.kc, h.cg, h.j7());
         n.b = f;
         var o = 0;
         var p = 0;
         if (i) {
-            o = g.ei(this.sy(a.b.ac), m) + k;
-            p = h.ei(this.sy(a.b.ad), n) + l;
+            o = g.ei(this.s2(a.b.ac), m) + k;
+            p = h.ei(this.s2(a.b.ad), n) + l;
             var q = o;
             var r = p;
             var s = { $type: Point_$type, x: 0.5, y: 0.5 };
@@ -1014,8 +1014,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             p = ViewportUtils.f(u, n.e, n.d);
         }
         else {
-            o = g.ei(this.sy(a.b.ac), m) + k;
-            p = h.ei(this.sy(a.b.ad), n) + l;
+            o = g.ei(this.s2(a.b.ac), m) + k;
+            p = h.ei(this.s2(a.b.ad), n) + l;
         }
         var v = new QuadTreeBoundingBox();
         v.b = o;
@@ -1025,7 +1025,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         v.g = a.b;
         return v;
     };
-    CalloutLayer.prototype.sy = function (a) {
+    CalloutLayer.prototype.s2 = function (a) {
         if (typeCast(Date_$type, a) !== null) {
             return a.getTime();
         }
@@ -1034,79 +1034,79 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return a;
     };
-    CalloutLayer.prototype.sp = function () {
+    CalloutLayer.prototype.st = function () {
         var a = new List$1(CalloutAnnotationWrapper.$, 0);
-        for (var b = 0; b < this.so.count; b++) {
-            if (stringIsNullOrEmpty(this.so._inner[b].b.ao)) {
+        for (var b = 0; b < this.ss.count; b++) {
+            if (stringIsNullOrEmpty(this.ss._inner[b].b.ao)) {
                 continue;
             }
-            if (this.so._inner[b].c == null) {
+            if (this.ss._inner[b].c == null) {
                 var c = new LabelCollisionInfo();
-                this.so._inner[b].c = c;
-                var d = this.rh.cn(this.s4(this.so._inner[b]), this.so._inner[b].b.backgroundPadding);
+                this.ss._inner[b].c = c;
+                var d = this.rl.cn(this.s8(this.ss._inner[b]), this.ss._inner[b].b.backgroundPadding);
                 c.k = d.height / 2;
                 c.l = d.width / 2;
             }
-            var e = this.r3(this.so._inner[b]);
-            if (e == null || e.b < this.pz.left || e.b > this.pz.right || e.c < this.pz.top || e.c > this.pz.bottom) {
+            var e = this.r7(this.ss._inner[b]);
+            if (e == null || e.b < this.p3.left || e.b > this.p3.right || e.c < this.p3.top || e.c > this.p3.bottom) {
                 continue;
             }
-            a.add(this.so._inner[b]);
+            a.add(this.ss._inner[b]);
         }
         return a;
     };
-    CalloutLayer.prototype.s4 = function (a) {
+    CalloutLayer.prototype.s8 = function (a) {
         return a.b.ao;
     };
-    CalloutLayer.prototype.qc = function (a) {
-        if (!_super.prototype.qc.call(this, a)) {
+    CalloutLayer.prototype.qg = function (a) {
+        if (!_super.prototype.qg.call(this, a)) {
             return false;
         }
-        if (this.t0 != null) {
-            if (a.du) {
-                var b = a.jp();
-                if (!Base.equalsStatic(this.t0, b)) {
+        if (this.t4 != null) {
+            if (a.dv) {
+                var b = a.jr();
+                if (!Base.equalsStatic(this.t4, b)) {
                     return false;
                 }
             }
             else {
-                if (!Base.equalsStatic(this.t0, a.name)) {
+                if (!Base.equalsStatic(this.t4, a.name)) {
                     return false;
                 }
             }
         }
         return true;
     };
-    CalloutLayer.prototype.ls = function () {
-        _super.prototype.ls.call(this);
+    CalloutLayer.prototype.lv = function () {
+        _super.prototype.lv.call(this);
         if (!this.as.c && !this.cv()) {
             return;
         }
-        if (this.r4) {
-            this.r4 = false;
-            this.ul();
+        if (this.r8) {
+            this.r8 = false;
+            this.up();
         }
         if (this.cv()) {
-            this.ur(this.p7, false);
+            this.uv(this.qb, false);
         }
         else {
-            this.ur(this.p5, false);
+            this.uv(this.p9, false);
         }
     };
-    CalloutLayer.prototype.um = function () {
-        if (!this.r6) {
-            this.r6 = true;
-            this.mi(true);
+    CalloutLayer.prototype.uq = function () {
+        if (!this.sa) {
+            this.sa = true;
+            this.ml(true);
         }
     };
-    CalloutLayer.prototype.up = function (a, b, c) {
+    CalloutLayer.prototype.ut = function (a, b, c) {
         var d = false;
-        if (this.r6) {
-            this.r6 = false;
+        if (this.sa) {
+            this.sa = false;
             d = true;
         }
-        if (a.c1(this.sm, this.sh, this.sf, this.s0)) {
-            var e = this.sm;
+        if (!a.er && a.c1(this.sq, this.sl, this.sj, this.s4)) {
+            var e = this.sq;
             var _loop_1 = function (f) {
                 var g = e._inner[f];
                 var h = g.a != null ? g.a.item : null;
@@ -1118,8 +1118,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 l.b = m;
                 m.key = k;
                 var n = false;
-                if (this_1.si.containsKey(l)) {
-                    l = this_1.si.item(l).c;
+                if (this_1.sm.containsKey(l)) {
+                    l = this_1.sm.item(l).c;
                     m = l.b;
                     n = d;
                 }
@@ -1128,10 +1128,10 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 var o = m.ac;
                 var p = m.ad;
-                if (this_1.sy(o) != this_1.sy(g.b)) {
+                if (this_1.s2(o) != this_1.s2(g.b)) {
                     m.xValue = g.b;
                 }
-                if (this_1.sy(p) != this_1.sy(g.c)) {
+                if (this_1.s2(p) != this_1.s2(g.c)) {
                     m.yValue = g.c;
                 }
                 m.series = a;
@@ -1144,14 +1144,16 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     if (this_1.calloutLabelUpdating != null) {
                         var r = ((function () {
                             var $ret = new CalloutLabelUpdatingEventArgs();
-                            $ret.c = m.ac;
-                            $ret.d = m.ad;
+                            $ret.d = m.ac;
+                            $ret.e = m.ad;
                             $ret.item = h;
+                            $ret.a = a;
+                            $ret.f = a.name;
                             return $ret;
                         })());
                         this_1.calloutLabelUpdating(this_1, r);
-                        if (r.b != null && !Base.equalsStatic(r.b, l.b.ao)) {
-                            var s = r.b;
+                        if (r.c != null && !Base.equalsStatic(r.c, l.b.ao)) {
+                            var s = r.c;
                             l.b.text = s != null ? s.toString() : "";
                         }
                     }
@@ -1186,17 +1188,17 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                 }
                 if (n) {
-                    this_1.ut(l);
+                    this_1.ux(l);
                 }
                 if (l.c == null) {
                     var u = new LabelCollisionInfo();
                     l.c = u;
-                    var v = this_1.rh.cn(this_1.s4(l), l.b.backgroundPadding);
+                    var v = this_1.rl.cn(this_1.s8(l), l.b.backgroundPadding);
                     u.k = v.height / 2;
                     u.l = v.width / 2;
                 }
-                var w = this_1.r3(l);
-                if (w == null || w.b < this_1.pz.left || w.b > this_1.pz.right || w.c < this_1.pz.top || w.c > this_1.pz.bottom) {
+                var w = this_1.r7(l);
+                if (w == null || w.b < this_1.p3.left || w.b > this_1.p3.right || w.c < this_1.p3.top || w.c > this_1.p3.bottom) {
                     return "continue";
                 }
                 l.e = w.b;
@@ -1204,7 +1206,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 c.add(l);
             };
             var this_1 = this;
-            for (var f = 0; f < this.sm.count; f++) {
+            for (var f = 0; f < this.sq.count; f++) {
                 _loop_1(f);
             }
         }
@@ -1213,19 +1215,19 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         return 1;
     };
     CalloutLayer.prototype.at = function (a, b) {
-        var c = this.r0.f(a, b);
+        var c = this.r4.f(a, b);
         if (c == null) {
             return null;
         }
         return c.u;
     };
-    CalloutLayer.prototype.ev = function (a, b) {
-        if (this.r0 == null) {
+    CalloutLayer.prototype.ex = function (a, b) {
+        if (this.r4 == null) {
             return false;
         }
-        return this.r0.f(a, b) != null;
+        return this.r4.f(a, b) != null;
     };
-    CalloutLayer.prototype.ur = function (a, b) {
+    CalloutLayer.prototype.uv = function (a, b) {
         var e_3, _a;
         var c = 0;
         var d = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -1234,7 +1236,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             if (isNaN_(a.u._inner[c]) || isNaN_(a.v._inner[c])) {
                 continue;
             }
-            var f = this.rh.b8.item(e);
+            var f = this.rl.b8.item(e);
             d.add_1(e);
             if (f.h != a.q._inner[c]) {
                 f.h = a.q._inner[c];
@@ -1247,13 +1249,13 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             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.rh.cg(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.rh.ch(f, e, a.r._inner[c]);
+            this.rl.cg(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.rl.ch(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 = tslib_1.__values(fromEnum(this.rh.b8.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = tslib_1.__values(fromEnum(this.rl.b8.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var i = _c.value;
                 if (!d.contains(i)) {
                     h.add(i);
@@ -1274,64 +1276,64 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         for (var j = 0; j < h.count; j++) {
-            this.rh.b8.h(h._inner[j]);
+            this.rl.b8.h(h._inner[j]);
         }
     };
-    CalloutLayer.prototype.qu = function (a, b) {
-        _super.prototype.qu.call(this, a, b);
+    CalloutLayer.prototype.qy = function (a, b) {
+        _super.prototype.qy.call(this, a, b);
         if (this.cv()) {
-            this.ur(this.p7, true);
+            this.uv(this.qb, true);
         }
         else {
-            this.ur(this.p5, false);
+            this.uv(this.p9, false);
         }
     };
-    CalloutLayer.prototype.em = function () {
+    CalloutLayer.prototype.en = function () {
         return true;
     };
-    CalloutLayer.prototype.l4 = function (a, b, c, d) {
-        _super.prototype.l4.call(this, a, b, c, d);
+    CalloutLayer.prototype.l7 = function (a, b, c, d) {
+        _super.prototype.l7.call(this, a, b, c, d);
         switch (b) {
             case CalloutLayer.$$p[24]:
-                this.ro = null;
-                this.rh.cf();
-                this.mi(true);
+                this.rs = null;
+                this.rl.cf();
+                this.ml(true);
                 break;
             case CalloutLayer.$$p[22]:
             case CalloutLayer.$$p[23]:
-                this.mi(true);
+                this.ml(true);
                 break;
             case CalloutLayer.$$p[14]:
-                this.mi(true);
+                this.ml(true);
                 break;
             case "SeriesViewer":
                 if (c != null) {
                     var e = c;
-                    e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.uq));
+                    e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.uu));
                 }
                 if (d != null) {
                     var f = d;
-                    f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.uq));
+                    f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.uu));
                 }
                 if (d == null) {
-                    this.uj();
+                    this.un();
                 }
                 break;
             case "AutoCalloutVisibilityMode":
-                this.rb = this.rd();
-                this.uk();
+                this.rf = this.rh();
+                this.uo();
                 break;
             case "AllowedPositions":
                 if (c != null) {
                     var g = c;
-                    g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.ue));
+                    g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.ui));
                 }
                 if (d != null) {
                     var h = d;
-                    h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.ue));
+                    h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.ui));
                 }
-                this.q8 = this.q9(this.rj);
-                this.uk();
+                this.rc = this.rd(this.rn);
+                this.uo();
                 break;
             case CalloutLayer.$$p[16]:
             case CalloutLayer.$$p[17]:
@@ -1348,88 +1350,88 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             case CalloutLayer.$$p[7]:
             case CalloutLayer.$$p[12]:
             case CalloutLayer.$$p[13]:
-                this.uk();
+                this.uo();
                 break;
             case CalloutLayer.$$p[21]:
                 if (this.ck != null) {
-                    this.ck.deregisterColumn(this.rx);
-                    this.rx = this.cj(this.ty);
+                    this.ck.deregisterColumn(this.r1);
+                    this.r1 = this.cj(this.t2);
                 }
                 break;
             case "LabelColumn":
-                this.uk();
+                this.uo();
                 break;
             case CalloutLayer.$$p[15]:
                 if (this.ck != null) {
-                    this.ck.deregisterColumn(this.rv);
-                    this.rv = this.cj(this.to);
+                    this.ck.deregisterColumn(this.rz);
+                    this.rz = this.cj(this.ts);
                 }
                 break;
             case "ContentColumn":
-                this.uk();
+                this.uo();
                 break;
             case CalloutLayer.$$p[28]:
                 if (this.ck != null) {
-                    this.ck.deregisterColumn(this.ry);
-                    this.ry = stringIsNullOrEmpty(this.t9) == false ? this.cj(this.t9) : null;
+                    this.ck.deregisterColumn(this.r2);
+                    this.r2 = stringIsNullOrEmpty(this.ud) == false ? this.cj(this.ud) : null;
                 }
                 break;
             case "XColumn":
-                this.uk();
+                this.uo();
                 break;
             case CalloutLayer.$$p[29]:
                 if (this.ck != null) {
-                    this.ck.deregisterColumn(this.rz);
-                    this.rz = this.cj(this.uc);
+                    this.ck.deregisterColumn(this.r3);
+                    this.r3 = this.cj(this.ug);
                 }
                 break;
             case "YColumn":
-                this.uk();
+                this.uo();
                 break;
             case CalloutLayer.$$p[20]:
                 if (this.ck != null) {
-                    this.ck.deregisterColumn(this.rw);
-                    this.rw = this.cj(this.tv);
+                    this.ck.deregisterColumn(this.r0);
+                    this.r0 = this.cj(this.tz);
                 }
                 break;
             case "KeyColumn":
-                this.uk();
+                this.uo();
                 break;
             case "FastItemsSource":
-                this.r5 = true;
+                this.r9 = true;
                 if (typeCast(IFastItemsSource_$type, c) != null) {
-                    c.deregisterColumn(this.rx);
-                    c.deregisterColumn(this.rv);
-                    c.deregisterColumn(this.ry);
+                    c.deregisterColumn(this.r1);
                     c.deregisterColumn(this.rz);
-                    c.deregisterColumn(this.rw);
-                    this.rx = null;
-                    this.rv = null;
-                    this.ry = null;
+                    c.deregisterColumn(this.r2);
+                    c.deregisterColumn(this.r3);
+                    c.deregisterColumn(this.r0);
+                    this.r1 = null;
                     this.rz = null;
-                    this.rw = null;
-                    this.so.clear();
+                    this.r2 = null;
+                    this.r3 = null;
+                    this.r0 = null;
+                    this.ss.clear();
                 }
                 if (typeCast(IFastItemsSource_$type, d) != null) {
-                    this.rx = this.cj(this.ty);
-                    this.rv = this.cj(this.to);
-                    if (stringIsNullOrEmpty(this.t9) == false) {
-                        this.ry = this.cj(this.t9);
+                    this.r1 = this.cj(this.t2);
+                    this.rz = this.cj(this.ts);
+                    if (stringIsNullOrEmpty(this.ud) == false) {
+                        this.r2 = this.cj(this.ud);
                     }
-                    this.rz = this.cj(this.uc);
-                    this.rw = this.cj(this.tv);
+                    this.r3 = this.cj(this.ug);
+                    this.r0 = this.cj(this.tz);
                 }
-                this.uk();
+                this.uo();
                 break;
         }
     };
-    CalloutLayer.prototype.rd = function () {
-        if (this.rc == 0) {
+    CalloutLayer.prototype.rh = function () {
+        if (this.rg == 0) {
             return 1;
         }
-        return this.rc;
+        return this.rg;
     };
-    CalloutLayer.prototype.q9 = function (a) {
+    CalloutLayer.prototype.rd = function (a) {
         if (a == null || a.count == 0) {
             return null;
         }
@@ -1439,53 +1441,53 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    CalloutLayer.prototype.uq = function (a) {
+    CalloutLayer.prototype.uu = function (a) {
         if (a.dc) {
             return;
         }
-        if ((a == this.rn || this.rn == null) && this.sb) {
-            this.mi(false);
+        if ((a == this.rr || this.rr == null) && this.sf) {
+            this.ml(false);
         }
     };
-    CalloutLayer.prototype.uk = function () {
-        if (this.r4 == false) {
-            this.r4 = true;
-            this.mi(false);
+    CalloutLayer.prototype.uo = function () {
+        if (this.r8 == false) {
+            this.r8 = true;
+            this.ml(false);
         }
     };
-    CalloutLayer.prototype.ui = function () {
-        this.rh.b8.clear();
-        this.sl.g();
-        this.si.clear();
+    CalloutLayer.prototype.um = function () {
+        this.rl.b8.clear();
+        this.sp.g();
+        this.sm.clear();
     };
-    CalloutLayer.prototype.ul = function () {
-        if (this.rz == null || this.rx == null) {
-            var a = this.sl.c;
+    CalloutLayer.prototype.up = function () {
+        if (this.r3 == null || this.r1 == null) {
+            var a = this.sp.c;
             while (a != null) {
-                this.ut(a.c);
+                this.ux(a.c);
                 a = a.a;
             }
             return;
         }
-        var b = this.sj();
-        for (var c = 0; c < this.rz.count; c++) {
+        var b = this.sn();
+        for (var c = 0; c < this.r3.count; c++) {
             var d = void 0;
-            if (this.so.count <= c) {
+            if (this.ss.count <= c) {
                 var e = new CalloutAnnotation();
                 d = new CalloutAnnotationWrapper();
                 d.b = e;
-                d.b.series = this.rn;
-                this.so.add(d);
+                d.b.series = this.rr;
+                this.ss.add(d);
             }
             else {
-                d = this.so._inner[c];
+                d = this.ss._inner[c];
             }
-            this.us(c, b);
+            this.uw(c, b);
         }
     };
     CalloutLayer.$t = markType(CalloutLayer, 'CalloutLayer', AnnotationLayer.$);
-    CalloutLayer.u8 = 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:s0:uu', [1, 5], 'CalloutBackground:vp:uv', [Brush.$, null], 'CalloutCollisionMode:re:uw', [CalloutCollisionMode_$type, enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:sr:ux', [1, NaN], 'CalloutInterpolatedValuePrecision:s1:uy', [1, -1], 'CalloutLeaderBrush:vq:uz', [Brush.$, null], 'CalloutOutline:vr:u0', [Brush.$, null], 'CalloutPaddingBottom:ss:u1', [1, NaN], 'CalloutPaddingLeft:st:u2', [1, NaN], 'CalloutPaddingRight:su:u3', [1, NaN], 'CalloutPaddingTop:sv:u4', [1, NaN], 'CalloutPositionPadding:sw:u5', [1, 10], 'CalloutStrokeThickness:sx:u6', [1, NaN], 'CalloutTextColor:vs:u7', [Brush.$, null], 'CollisionChannel:tl:u9', [2, null], 'ContentMemberPath:to:va', [2, null], 'IsAutoCalloutBehaviorEnabled:sb:vb', [0, false], 'IsCalloutOffsettingEnabled:sc:vc', [0, true], 'IsCustomCalloutRenderStyleEnabled:sd:vd', [0, false], 'IsCustomCalloutStyleEnabled:se:ve', [0, false], 'KeyMemberPath:tv:vf', [2, null], 'LabelMemberPath:ty:vg', [2, null], 'TargetSeriesName:t0:vh', [2, null], 'TargetSeries:rn:vi', [Series.$, null], 'TextStyle:t3:vj', [2, null], 'UseInterpolatedValueForAutoCalloutLabels:sf:vk', [0, false], 'UseSeriesColorForOutline:sg:vl', [0, false], 'UseValueForAutoCalloutLabels:sh:vm', [0, true], 'XMemberPath:t9:vn', [2, null], 'YMemberPath:uc:vo', [2, null]]);
+    CalloutLayer.vc = 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:s4:uy', [1, 5], 'CalloutBackground:vt:uz', [Brush.$, null], 'CalloutCollisionMode:ri:u0', [CalloutCollisionMode_$type, enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:sv:u1', [1, NaN], 'CalloutInterpolatedValuePrecision:s5:u2', [1, -1], 'CalloutLeaderBrush:vu:u3', [Brush.$, null], 'CalloutOutline:vv:u4', [Brush.$, null], 'CalloutPaddingBottom:sw:u5', [1, NaN], 'CalloutPaddingLeft:sx:u6', [1, NaN], 'CalloutPaddingRight:sy:u7', [1, NaN], 'CalloutPaddingTop:sz:u8', [1, NaN], 'CalloutPositionPadding:s0:u9', [1, 10], 'CalloutStrokeThickness:s1:va', [1, NaN], 'CalloutTextColor:vw:vb', [Brush.$, null], 'CollisionChannel:tp:vd', [2, null], 'ContentMemberPath:ts:ve', [2, null], 'IsAutoCalloutBehaviorEnabled:sf:vf', [0, false], 'IsCalloutOffsettingEnabled:sg:vg', [0, true], 'IsCustomCalloutRenderStyleEnabled:sh:vh', [0, false], 'IsCustomCalloutStyleEnabled:si:vi', [0, false], 'KeyMemberPath:tz:vj', [2, null], 'LabelMemberPath:t2:vk', [2, null], 'TargetSeriesName:t4:vl', [2, null], 'TargetSeries:rr:vm', [Series.$, null], 'TextStyle:t7:vn', [2, null], 'UseInterpolatedValueForAutoCalloutLabels:sj:vo', [0, false], 'UseSeriesColorForOutline:sk:vp', [0, false], 'UseValueForAutoCalloutLabels:sl:vq', [0, true], 'XMemberPath:ud:vr', [2, null], 'YMemberPath:ug:vs', [2, null]]);
     return CalloutLayer;
 }(AnnotationLayer));
 export { CalloutLayer };
@@ -1550,8 +1552,8 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     CalloutLayerView.prototype.b7 = function () {
-        if (this.b4.rp != null) {
-            return this.b4.rp;
+        if (this.b4.rt != null) {
+            return this.b4.rt;
         }
         return this.e.cd.getFontInfo();
     };
@@ -1574,7 +1576,7 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
     CalloutLayerView.prototype.cb = function () {
         var a = this.b7();
         if (isNaN_(this.ca)) {
-            var b = FontUtil.getCurrentFontHeight(this.e.cd.cq.j.ae, a);
+            var b = FontUtil.getCurrentFontHeight(this.e.cd.cu.j.ae, a);
             this.ca = b;
         }
         return this.ca;
@@ -1598,9 +1600,9 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     CalloutLayerView.prototype.ci = function (a) {
         if (a != null) {
-            return this.cm(a.o4);
+            return this.cm(a.o8);
         }
-        return this.e.o4;
+        return this.e.o8;
     };
     CalloutLayerView.prototype.cl = function () {
         return ((function () {
@@ -1610,9 +1612,9 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
         })());
     };
     CalloutLayerView.prototype.ck = function (a) {
-        if (this.b4.sg) {
+        if (this.b4.sk) {
             if (a != null) {
-                return this.cm(a.o4);
+                return this.cm(a.o8);
             }
         }
         return ((function () {
@@ -1623,9 +1625,9 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     CalloutLayerView.prototype.cj = function (a) {
         if (a != null) {
-            return this.cm(a.oz);
+            return this.cm(a.o3);
         }
-        return this.e.oz;
+        return this.e.o3;
     };
     CalloutLayerView.prototype.cf = function () {
         this.ca = NaN;