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

package/esm5/lib/CalloutLayer_combined.js

@@ -65,117 +65,117 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var _this = _super.call(this) || this;
         _this.calloutStyleUpdating = null;
         _this.calloutRenderStyleUpdating = null;
-        _this.aac = null;
-        _this.aad = null;
+        _this.aaf = null;
+        _this.aag = null;
+        _this.aah = null;
         _this.aae = null;
+        _this.aad = null;
+        _this.aba = new HashSet$1(CalloutAnnotationWrapper.$, 0);
+        _this.abd = new List$1(CalloutAnnotationWrapper.$, 0);
+        _this.abe = new List$1(CalloutAnnotationWrapper.$, 0);
+        _this.z4 = null;
+        _this.zs = null;
         _this.aab = null;
-        _this.aaa = null;
-        _this.aa7 = new HashSet$1(CalloutAnnotationWrapper.$, 0);
-        _this.aba = new List$1(CalloutAnnotationWrapper.$, 0);
-        _this.abb = new List$1(CalloutAnnotationWrapper.$, 0);
-        _this.z1 = null;
-        _this.zp = null;
-        _this.z8 = null;
-        _this.aa8 = new LinkedList$1(CalloutAnnotationWrapper.$);
-        _this.aa5 = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
-        _this.aak = null;
-        _this.ae0 = new Rect(0, 0, 0, 1, 1);
-        _this.aar = false;
-        _this.abm = 0;
-        _this.aez = Rect.empty;
-        _this.aap = false;
-        _this.aaq = false;
+        _this.abb = new LinkedList$1(CalloutAnnotationWrapper.$);
+        _this.aa8 = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
+        _this.aan = null;
+        _this.ae3 = new Rect(0, 0, 0, 1, 1);
+        _this.aau = false;
+        _this.abp = 0;
+        _this.ae2 = Rect.empty;
+        _this.aas = false;
+        _this.aat = false;
         _this.calloutContentUpdating = null;
         _this.calloutLabelUpdating = null;
         _this.calloutSeriesSelecting = null;
-        _this.aa9 = new List$1(SeriesPointOfInterest.$, 0);
-        _this.aat = false;
-        _this.aau = false;
-        _this.abd = 0;
-        _this.aas = false;
-        _this.zs = null;
-        _this.aao = true;
-        _this.zt = 1;
+        _this.abc = new List$1(SeriesPointOfInterest.$, 0);
+        _this.aaw = false;
+        _this.aax = false;
+        _this.abg = 0;
+        _this.aav = false;
+        _this.zv = null;
+        _this.aar = true;
+        _this.zw = 1;
         FastItemObjectColumn.m();
-        _this.zp = null;
-        _this.z1 = new CalloutPlacementPositionsCollection();
-        var a = _this.z1;
-        a.collectionChanged = delegateCombine(a.collectionChanged, runOn(_this, _this.ada));
-        _this.xc = true;
+        _this.zs = null;
+        _this.z4 = new CalloutPlacementPositionsCollection();
+        var a = _this.z4;
+        a.collectionChanged = delegateCombine(a.collectionChanged, runOn(_this, _this.add));
+        _this.xf = true;
         var b = new CalloutLayerFrame();
         var c = new CalloutLayerFrame();
         var d = new CalloutLayerFrame();
-        var e = _this.kb / 1000;
-        _this.w4 = b;
-        _this.w3 = c;
-        _this.w5 = d;
+        var e = _this.kc / 1000;
+        _this.w7 = b;
+        _this.w6 = c;
+        _this.w8 = d;
         _this.ab = CalloutLayer.$;
         return _this;
     }
-    CalloutLayer.prototype.bi = function () {
+    CalloutLayer.prototype.bj = function () {
         return new CalloutLayer();
     };
-    CalloutLayer.prototype.get_em = function () {
+    CalloutLayer.prototype.get_en = function () {
         return true;
     };
-    CalloutLayer.prototype.ada = function (a, b) {
-        this.adj();
+    CalloutLayer.prototype.add = function (a, b) {
+        this.adm();
     };
-    CalloutLayer.prototype.adj = function () {
-        this.zp = this.zr(this.z2);
-        this.adg();
+    CalloutLayer.prototype.adm = function () {
+        this.zs = this.zu(this.z5);
+        this.adj();
     };
-    CalloutLayer.prototype.adb = function (a, b) {
-        this.abb.clear();
-        this.rn(false);
+    CalloutLayer.prototype.ade = function (a, b) {
+        this.abe.clear();
+        this.rp(false);
     };
-    CalloutLayer.prototype.o9 = function (a, b, c, d) {
-        _super.prototype.o9.call(this, a, b, c, d);
-        var e = this.aa6();
+    CalloutLayer.prototype.pa = function (a, b, c, d) {
+        _super.prototype.pa.call(this, a, b, c, d);
+        var e = this.aa9();
         switch (a) {
             case 3:
-                this.ado(b, e);
+                this.adr(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.z7;
-                    this.abb.insert(f, h);
-                    this.ado(f, e);
+                    h.b.series = this.aaa;
+                    this.abe.insert(f, h);
+                    this.adr(f, e);
                 }
                 break;
             case 0:
-                this.abb.v(b, c);
+                this.abe.v(b, c);
                 break;
             case 2:
                 for (var i = b; i < b + c; i++) {
-                    this.ado(i, e);
+                    this.adr(i, e);
                 }
                 break;
             case 4:
-                this.abb.clear();
-                for (var j = 0; j < this.dl.count; j++) {
+                this.abe.clear();
+                for (var j = 0; j < this.dm.count; j++) {
                     var k = new CalloutAnnotation();
                     var l = new CalloutAnnotationWrapper();
                     l.b = k;
-                    l.b.series = this.z7;
-                    this.abb.add(l);
-                    this.ado(j, e);
+                    l.b.series = this.aaa;
+                    this.abe.add(l);
+                    this.adr(j, e);
                 }
                 break;
         }
-        this.rn(true);
+        this.rp(true);
     };
-    CalloutLayer.prototype.gd = function (a) {
+    CalloutLayer.prototype.ge = function (a) {
         return false;
     };
-    CalloutLayer.prototype.aa6 = function () {
+    CalloutLayer.prototype.aa9 = function () {
         var a = new Dictionary$2(String_$type, Series.$, 0);
-        if (this.c9 != null) {
-            for (var b = 0; b < this.c9.series.count; b++) {
-                var c = this.c9.series._inner[b];
+        if (this.da != null) {
+            for (var b = 0; b < this.da.series.count; b++) {
+                var c = this.da.series._inner[b];
                 if (c.name != null && !a.containsKey(c.name)) {
                     a.addItem(c.name, c);
                 }
@@ -183,25 +183,25 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return a;
     };
-    CalloutLayer.prototype.ado = function (a, b) {
+    CalloutLayer.prototype.adr = function (a, b) {
         var _this = this;
-        if (this.aaj == null || this.aah == null) {
+        if (this.aam == null || this.aak == null) {
             return;
         }
         var c = a;
-        if (this.aai != null) {
-            c = this.aai.item(a);
+        if (this.aal != null) {
+            c = this.aal.item(a);
         }
-        var d = this.aaj.item(a);
-        var e = this.aah.item(a);
-        var f = this.abb._inner[a];
-        if (this.aag != null) {
-            if (f.b.ab != this.aag.item(a)) {
-                f.b.key = this.aag.item(a);
+        var d = this.aam.item(a);
+        var e = this.aak.item(a);
+        var f = this.abe._inner[a];
+        if (this.aaj != null) {
+            if (f.b.ab != this.aaj.item(a)) {
+                f.b.key = this.aaj.item(a);
             }
         }
-        if (this.aa5.containsKey(f)) {
-            f.b = this.aa5.item(f).c.b;
+        if (this.aa8.containsKey(f)) {
+            f.b = this.aa8.item(f).c.b;
         }
         f.b.xValue = c;
         f.b.yValue = d;
@@ -210,14 +210,14 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 var $ret = new CalloutLabelUpdatingEventArgs();
                 $ret.d = c;
                 $ret.e = d;
-                $ret.item = _this.dl.item(a);
+                $ret.item = _this.dm.item(a);
                 return $ret;
             })());
             this.calloutLabelUpdating(this, g);
             if (g.c != null && !Base.equalsStatic(g.c, f.b.ao)) {
                 var h = g.c;
-                if (this.zs != null) {
-                    f.b.text = this.zs.i(h);
+                if (this.zv != null) {
+                    f.b.text = this.zv.i(h);
                 }
                 else {
                     f.b.text = h != null ? h.toString() : "";
@@ -225,25 +225,25 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         else {
-            if (this.zs != null) {
-                f.b.text = this.zs.i(e);
+            if (this.zv != null) {
+                f.b.text = this.zv.i(e);
             }
             else {
                 f.b.text = e != null ? e.toString() : "";
             }
         }
-        if (this.aaf != null) {
-            f.b.content = this.aaf.item(a);
+        if (this.aai != null) {
+            f.b.content = this.aai.item(a);
         }
         else {
-            f.b.content = this.dl.item(a);
+            f.b.content = this.dm.item(a);
         }
         if (this.calloutSeriesSelecting != null) {
             var i = ((function () {
                 var $ret = new CalloutSeriesSelectingEventArgs();
                 $ret.c = c;
                 $ret.d = d;
-                $ret.item = _this.dl.item(a);
+                $ret.item = _this.dm.item(a);
                 return $ret;
             })());
             this.calloutSeriesSelecting(this, i);
@@ -256,34 +256,34 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        this.adp(f);
+        this.ads(f);
     };
-    CalloutLayer.prototype.adp = function (a) {
+    CalloutLayer.prototype.ads = function (a) {
         var b = new Thickness(0, DeviceUtils.g(3));
-        if (isNaN_(this.ae2.left) || isNaN_(this.ae2.top) || isNaN_(this.ae2.right) || isNaN_(this.ae2.bottom)) {
+        if (isNaN_(this.ae5.left) || isNaN_(this.ae5.top) || isNaN_(this.ae5.right) || isNaN_(this.ae5.bottom)) {
             b = new Thickness(0, DeviceUtils.g(3));
         }
         else {
-            b = this.ae2;
+            b = this.ae5;
         }
         var c = DeviceUtils.g(3);
-        if (isNaN_(this.abe)) {
+        if (isNaN_(this.abh)) {
             c = DeviceUtils.g(3);
         }
         else {
-            c = this.abe;
-        }
-        var d = this.aet != null && !this.aa1 ? this.aet : this.z0.cl(a.b.l, a.b.itemColor);
-        var e = this.aey != null ? this.aey : null;
-        var f = this.aew != null ? this.aew : this.z0.co();
-        var g = this.aeu != null ? this.aeu : this.z0.cm();
-        var h = this.aex != null && !this.aa2 ? this.aex : this.z0.cp(a.b.l, a.b.itemColor);
-        var i = this.aev != null ? this.aev : this.z0.cn(a.b.l, a.b.itemColor);
-        var j = isNaN_(this.abk) ? 0 : this.abk;
-        if (e == null && (this.aaz || this.aew != null || this.aeu != null)) {
+            c = this.abh;
+        }
+        var d = this.aew != null && !this.aa4 ? this.aew : this.z3.cl(a.b.l, a.b.itemColor);
+        var e = this.ae1 != null ? this.ae1 : null;
+        var f = this.aez != null ? this.aez : this.z3.co();
+        var g = this.aex != null ? this.aex : this.z3.cm();
+        var h = this.ae0 != null && !this.aa5 ? this.ae0 : this.z3.cp(a.b.l, a.b.itemColor);
+        var i = this.aey != null ? this.aey : this.z3.cn(a.b.l, a.b.itemColor);
+        var j = isNaN_(this.abn) ? 0 : this.abn;
+        if (e == null && (this.aa2 || this.aez != null || this.aex != null)) {
             var k = d;
             if (k == null || BrushUtilCore.a(d)) {
-                k = this.c9 != null ? this.c9.u1 : null;
+                k = this.da != null ? this.da.vd : null;
                 if (a.c != null && (a.c.b == 8 || a.c.b == 9)) {
                     k = a.b.itemColor;
                 }
@@ -294,9 +294,9 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             e = BrushUtil.j(k, g, f);
         }
         if (e == null) {
-            e = this.z0.co();
+            e = this.z3.co();
         }
-        if (this.aay && this.calloutStyleUpdating != null) {
+        if (this.aa1 && this.calloutStyleUpdating != null) {
             var l = new CalloutStyleUpdatingEventArgs();
             l.item = a.b.aa;
             l.xValue = a.b.ac;
@@ -322,202 +322,202 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         a.b.leaderBrush = i;
         a.b.strokeThickness = j;
     };
-    CalloutLayer.prototype.ko = function (a, b) {
-        var c = this.nb(b);
+    CalloutLayer.prototype.kp = function (a, b) {
+        var c = this.nc(b);
         if (c == CalloutLayer.$$p[26]) {
-            return this.kp(a, b, this.acr);
+            return this.kq(a, b, this.acu);
         }
         if (c == CalloutLayer.$$p[36]) {
-            return this.kp(a, b, this.ac5);
+            return this.kq(a, b, this.ac8);
         }
         if (c == CalloutLayer.$$p[37]) {
-            return this.kp(a, b, this.ac8);
+            return this.kq(a, b, this.adb);
         }
         if (c == CalloutLayer.$$p[23]) {
-            return this.kp(a, b, this.acl);
+            return this.kq(a, b, this.aco);
         }
         if (c == CalloutLayer.$$p[17]) {
-            return this.kp(a, b, this.acd);
+            return this.kq(a, b, this.acg);
         }
-        return _super.prototype.ko.call(this, a, b);
+        return _super.prototype.kp.call(this, a, b);
     };
-    CalloutLayer.prototype.mb = function (a) {
-        var b = this.nb(a);
+    CalloutLayer.prototype.mc = function (a) {
+        var b = this.nc(a);
         if (b == CalloutLayer.$$p[26]) {
-            return this.acr;
+            return this.acu;
         }
         if (b == CalloutLayer.$$p[36]) {
-            return this.ac5;
+            return this.ac8;
         }
         if (b == CalloutLayer.$$p[37]) {
-            return this.ac8;
+            return this.adb;
         }
         if (b == CalloutLayer.$$p[23]) {
-            return this.acl;
+            return this.aco;
         }
         if (b == CalloutLayer.$$p[17]) {
-            return this.acd;
+            return this.acg;
         }
-        return _super.prototype.mb.call(this, a);
+        return _super.prototype.mc.call(this, a);
     };
-    Object.defineProperty(CalloutLayer.prototype, "aah", {
+    Object.defineProperty(CalloutLayer.prototype, "aak", {
         get: function () {
-            return this.aac;
+            return this.aaf;
         },
         set: function (a) {
-            if (this.aac != a) {
-                var b = this.aac;
-                this.aac = a;
-                this.raisePropertyChanged("LabelColumn", b, this.aac);
+            if (this.aaf != a) {
+                var b = this.aaf;
+                this.aaf = a;
+                this.raisePropertyChanged("LabelColumn", b, this.aaf);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "aai", {
+    Object.defineProperty(CalloutLayer.prototype, "aal", {
         get: function () {
-            return this.aad;
+            return this.aag;
         },
         set: function (a) {
-            if (this.aad != a) {
-                var b = this.aad;
-                this.aad = a;
-                this.raisePropertyChanged("XColumn", b, this.aad);
+            if (this.aag != a) {
+                var b = this.aag;
+                this.aag = a;
+                this.raisePropertyChanged("XColumn", b, this.aag);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "aaj", {
+    Object.defineProperty(CalloutLayer.prototype, "aam", {
         get: function () {
-            return this.aae;
+            return this.aah;
         },
         set: function (a) {
-            if (this.aae != a) {
-                var b = this.aae;
-                this.aae = a;
-                this.raisePropertyChanged("YColumn", b, this.aae);
+            if (this.aah != a) {
+                var b = this.aah;
+                this.aah = a;
+                this.raisePropertyChanged("YColumn", b, this.aah);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "aag", {
+    Object.defineProperty(CalloutLayer.prototype, "aaj", {
         get: function () {
-            return this.aab;
+            return this.aae;
         },
         set: function (a) {
-            if (this.aab != a) {
-                var b = this.aab;
-                this.aab = a;
-                this.raisePropertyChanged("KeyColumn", b, this.aab);
+            if (this.aae != a) {
+                var b = this.aae;
+                this.aae = a;
+                this.raisePropertyChanged("KeyColumn", b, this.aae);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "aaf", {
+    Object.defineProperty(CalloutLayer.prototype, "aai", {
         get: function () {
-            return this.aaa;
+            return this.aad;
         },
         set: function (a) {
-            if (this.aaa != a) {
-                var b = this.aaa;
-                this.aaa = a;
-                this.raisePropertyChanged("ContentColumn", b, this.aaa);
+            if (this.aad != a) {
+                var b = this.aad;
+                this.aad = a;
+                this.raisePropertyChanged("ContentColumn", b, this.aad);
             }
         },
         enumerable: false,
         configurable: true
     });
-    CalloutLayer.prototype.add = function (a, b) {
+    CalloutLayer.prototype.adg = function (a, b) {
         if (b.propertyName == CalloutAnnotation.$$p[15] || b.propertyName == CalloutAnnotation.$$p[16]) {
             var c = a.k;
-            if (!this.aa7.contains(c)) {
-                this.aa7.add_1(c);
-                this.aba.add(c);
-                this.rn(false);
+            if (!this.aba.contains(c)) {
+                this.aba.add_1(c);
+                this.abd.add(c);
+                this.rp(false);
             }
         }
     };
-    CalloutLayer.prototype.cq = function () {
+    CalloutLayer.prototype.cr = function () {
         return new CalloutLayerView(this);
     };
-    CalloutLayer.prototype.qx = function (a) {
-        _super.prototype.qx.call(this, a);
-        this.z0 = a;
+    CalloutLayer.prototype.qz = function (a) {
+        _super.prototype.qz.call(this, a);
+        this.z3 = a;
     };
-    Object.defineProperty(CalloutLayer.prototype, "z2", {
+    Object.defineProperty(CalloutLayer.prototype, "z5", {
         get: function () {
-            return this.z1;
+            return this.z4;
         },
         set: function (a) {
-            var b = this.z2;
+            var b = this.z5;
             if (a != b) {
-                this.z1 = a;
-                this.raisePropertyChanged("AllowedPositions", b, this.z2);
+                this.z4 = a;
+                this.raisePropertyChanged("AllowedPositions", b, this.z5);
             }
         },
         enumerable: false,
         configurable: true
     });
-    CalloutLayer.prototype.gs = function (a) {
-        if (this.z7 == null) {
+    CalloutLayer.prototype.gt = function (a) {
+        if (this.aaa == null) {
             return true;
         }
-        if (this.z7 == a) {
+        if (this.aaa == a) {
             return true;
         }
         return false;
     };
-    Object.defineProperty(CalloutLayer.prototype, "zv", {
+    Object.defineProperty(CalloutLayer.prototype, "zy", {
         get: function () {
-            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.ad6));
+            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.ad9));
         },
         set: function (a) {
-            this.h(CalloutLayer.ad6, enumGetBox(AutoCalloutVisibilityMode_$type, a));
+            this.h(CalloutLayer.ad9, enumGetBox(AutoCalloutVisibilityMode_$type, a));
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "zu", {
+    Object.defineProperty(CalloutLayer.prototype, "zx", {
         get: function () {
-            return this.zt;
+            return this.zw;
         },
         set: function (a) {
-            this.zt = a;
+            this.zw = a;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "ae2", {
+    Object.defineProperty(CalloutLayer.prototype, "ae5", {
         get: function () {
-            return new Thickness(1, this.abg, this.abi, this.abh, this.abf);
+            return new Thickness(1, this.abj, this.abl, this.abk, this.abi);
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "z9", {
+    Object.defineProperty(CalloutLayer.prototype, "aac", {
         get: function () {
-            if (this.z8 == null) {
-                this.z8 = FontUtil.toFontInfo(this.jx, this.acw);
+            if (this.aab == null) {
+                this.aab = FontUtil.toFontInfo(this.jy, this.acz);
             }
-            return this.z8;
+            return this.aab;
         },
         enumerable: false,
         configurable: true
     });
-    CalloutLayer.prototype.yh = function (a, b) {
-        if (this.z7 == null || this.z7 == a) {
-            if (!this.a0.c) {
-                this.rn(b);
+    CalloutLayer.prototype.yk = function (a, b) {
+        if (this.aaa == null || this.aaa == a) {
+            if (!this.a1.c) {
+                this.rp(b);
             }
         }
     };
-    CalloutLayer.prototype.yj = function (a, b) {
+    CalloutLayer.prototype.ym = function (a, b) {
         var e_1, _a;
         var _this = this;
-        _super.prototype.yj.call(this, a, b);
+        _super.prototype.ym.call(this, a, b);
         var c = a;
         c.q.clear();
         c.r.clear();
@@ -536,35 +536,35 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         c.v.clear();
         c.s.clear();
         c.t.clear();
-        var d = this.abc();
+        var d = this.abf();
         var e = new List$1(CalloutAnnotationWrapper.$, 0);
         var f = true;
-        if (this.aav) {
-            if (this.xa(this.z7)) {
-                this.adl(this.z7, c, e);
+        if (this.aay) {
+            if (this.xd(this.aaa)) {
+                this.ado(this.aaa, c, e);
             }
             else {
                 try {
-                    for (var _b = __values(fromEnum(this.c9.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    for (var _b = __values(fromEnum(this.da.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var g = _c.value;
-                        if (this.xa(g)) {
-                            if (!g.eq) {
+                        if (this.xd(g)) {
+                            if (!g.er) {
                                 if (!g.isVertical) {
                                     f = false;
                                 }
                             }
                             var h = false;
-                            if (g.ee && this.z6 == 0 || this.z6 == 3 || this.z6 == 2) {
-                                if (this.z6 == 0 || this.z6 == 2) {
+                            if (g.ef && this.z9 == 0 || this.z9 == 3 || this.z9 == 2) {
+                                if (this.z9 == 0 || this.z9 == 2) {
                                     h = true;
                                 }
-                                g.px(function (i) {
-                                    _this.adl(i, c, e);
+                                g.py(function (i) {
+                                    _this.ado(i, c, e);
                                     return true;
                                 });
                             }
                             if (!h) {
-                                this.adl(g, c, e);
+                                this.ado(g, c, e);
                             }
                         }
                     }
@@ -584,7 +584,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        if (this.aav && this.zu == 2) {
+        if (this.aay && this.zx == 2) {
             var i = 0;
             var j = 0;
             var k = 1.7976931348623157E+308;
@@ -623,73 +623,73 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        this.adk(c, d, e);
+        this.adn(c, d, e);
     };
-    CalloutLayer.prototype.sl = function (a, b) {
-        _super.prototype.sl.call(this, a, b);
-        var c = b.width - this.ae0.width;
-        var d = b.height - this.ae0.height;
+    CalloutLayer.prototype.sn = function (a, b) {
+        _super.prototype.sn.call(this, a, b);
+        var c = b.width - this.ae3.width;
+        var d = b.height - this.ae3.height;
         var e = 0;
         if (Math.abs(c) > Math.abs(d)) {
             e = c;
-            this.abd = c * this.wl.width;
+            this.abg = c * this.wo.width;
         }
         else {
             e = d;
-            this.abd = d * this.wl.height;
+            this.abg = d * this.wo.height;
         }
-        if (e > 0 && this.abd > 5) {
-            this.aau = true;
+        if (e > 0 && this.abg > 5) {
+            this.aax = true;
         }
-        if (e < 0 && this.abd > 5) {
-            this.aat = true;
+        if (e < 0 && this.abg > 5) {
+            this.aaw = true;
         }
     };
-    CalloutLayer.prototype.sk = function (a, b) {
-        _super.prototype.sk.call(this, a, b);
+    CalloutLayer.prototype.sm = function (a, b) {
+        _super.prototype.sm.call(this, a, b);
         if (!a.equals1(b)) {
-            this.aas = true;
+            this.aav = true;
         }
     };
-    Object.defineProperty(CalloutLayer.prototype, "ae1", {
+    Object.defineProperty(CalloutLayer.prototype, "ae4", {
         get: function () {
-            return this.aez;
+            return this.ae2;
         },
         set: function (a) {
-            this.aez = a;
+            this.ae2 = a;
         },
         enumerable: false,
         configurable: true
     });
-    CalloutLayer.prototype.adk = function (a, b, c) {
+    CalloutLayer.prototype.adn = function (a, b, c) {
         var e_2, _a;
-        if (this.c9 != null) {
-            this.ae0 = this.c9.vl;
+        if (this.da != null) {
+            this.ae3 = this.da.vx;
         }
-        if (this.wl.isEmpty) {
+        if (this.wo.isEmpty) {
             return;
         }
-        this.ae1 = new Rect(0, this.wl.left, this.wl.top, this.wl.width, this.wl.height);
-        if (this.aak != null && this.aca != null && this.aca != this.aak.a7) {
-            this.adf();
+        this.ae4 = new Rect(0, this.wo.left, this.wo.top, this.wo.width, this.wo.height);
+        if (this.aan != null && this.acd != null && this.acd != this.aan.a7) {
+            this.adi();
         }
-        if (this.aak != null && this.aak.g != this.aam()) {
-            this.adf();
+        if (this.aan != null && this.aan.g != this.aap()) {
+            this.adi();
         }
-        if (this.aak == null) {
-            var d = this.aal();
+        if (this.aan == null) {
+            var d = this.aao();
             if (d != null) {
-                this.aak = d;
-                var e = this.aak;
-                e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.adc));
+                this.aan = d;
+                var e = this.aan;
+                e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.adf));
             }
             else {
-                var f = this.wd(this.ct);
+                var f = this.wf(this.cu);
                 var g = new Array(2);
                 g[0] = 0;
                 g[1] = 3;
-                if (this.z7 != null) {
-                    if (this.z7.isVertical) {
+                if (this.aaa != null) {
+                    if (this.aaa.isVertical) {
                         g = new Array(2);
                         g[0] = 2;
                         g[1] = 1;
@@ -697,12 +697,12 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 else {
                     var h = false;
-                    if (this.c9 != null && this.c9.series.count > 0) {
+                    if (this.da != null && this.da.series.count > 0) {
                         h = true;
                         try {
-                            for (var _b = __values(fromEnum(this.c9.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                            for (var _b = __values(fromEnum(this.da.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
                                 var i = _c.value;
-                                if (!i.eq) {
+                                if (!i.er) {
                                     if (!i.isVertical) {
                                         h = false;
                                     }
@@ -729,21 +729,21 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                         g[1] = 1;
                     }
                 }
-                if (this.zx == 4 || this.zx == 6) {
+                if (this.z0 == 4 || this.z0 == 6) {
                     g = new Array(4);
                     g[0] = 10;
                     g[1] = 11;
                     g[2] = 8;
                     g[3] = 9;
                 }
-                if (this.zx == 5) {
+                if (this.z0 == 5) {
                     g = new Array(4);
                     g[0] = 9;
                     g[1] = 10;
                     g[2] = 11;
                     g[3] = 8;
                 }
-                if (this.zx == 7) {
+                if (this.z0 == 7) {
                     g = new Array(4);
                     g = new Array(4);
                     g[0] = 8;
@@ -751,31 +751,31 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     g[2] = 11;
                     g[3] = 9;
                 }
-                this.aak = new LabelCollisionManager(this.wl.right, this.wl.bottom, this.wl, this.z0.j(), this.abj, this.aam(), g, this.abq(), this.abp(), this.aaw, this.zp);
-                if (this.aca != null) {
-                    this.aak.a7 = this.aca;
-                    this.aak.a5 = this;
+                this.aan = new LabelCollisionManager(this.wo.right, this.wo.bottom, this.wo, this.z3.j(), this.abm, this.aap(), g, this.abt(), this.abs(), this.aaz, this.zs);
+                if (this.acd != null) {
+                    this.aan.a7 = this.acd;
+                    this.aan.a5 = this;
                 }
-                var j = this.aak;
-                j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.adc));
+                var j = this.aan;
+                j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.adf));
             }
         }
-        if (this.aat) {
-            this.aat = false;
-            if (this.aak.a3 > 2) {
-                this.aar = true;
+        if (this.aaw) {
+            this.aaw = false;
+            if (this.aan.a3 > 2) {
+                this.aau = true;
             }
         }
-        if (this.aau) {
-            this.aau = false;
-            if (this.abd > 5) {
-                this.aar = true;
+        if (this.aax) {
+            this.aax = false;
+            if (this.abg > 5) {
+                this.aau = true;
             }
         }
-        if (this.aas) {
-            this.aas = false;
-            this.aak.bm(this.wl.right, this.wl.bottom, this.wl);
-            this.aar = true;
+        if (this.aav) {
+            this.aav = false;
+            this.aan.bm(this.wo.right, this.wo.bottom, this.wo);
+            this.aau = true;
         }
         var k = new HashSet$1(CalloutAnnotationWrapper.$, 0);
         var l = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -788,55 +788,55 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         for (var q = 0; q < c.count; q++) {
             o.add_1(c._inner[q]);
         }
-        var r = this.aa8.c;
+        var r = this.abb.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.add));
-                this.aa8.h(r);
-                this.aa5.removeItem(r.c);
-                this.aak.bl(r.c.c);
+                t.propertyChanged = delegateRemove(t.propertyChanged, runOn(this, this.adg));
+                this.abb.h(r);
+                this.aa8.removeItem(r.c);
+                this.aan.bl(r.c.c);
             }
             r = s;
         }
         for (var u = 0; u < b.count; u++) {
-            if (!this.aa5.containsKey(b._inner[u])) {
-                this.aa8.f(b._inner[u]);
+            if (!this.aa8.containsKey(b._inner[u])) {
+                this.abb.f(b._inner[u]);
                 var v = b._inner[u].b;
-                v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.add));
-                this.aa5.addItem(b._inner[u], this.aa8.d);
+                v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.adg));
+                this.aa8.addItem(b._inner[u], this.abb.d);
                 m.add(b._inner[u]);
                 k.add_1(b._inner[u]);
-                this.aar = true;
+                this.aau = true;
             }
         }
         for (var w = 0; w < c.count; w++) {
-            if (!this.aa5.containsKey(c._inner[w])) {
-                this.aa8.f(c._inner[w]);
-                this.aa5.addItem(c._inner[w], this.aa8.d);
+            if (!this.aa8.containsKey(c._inner[w])) {
+                this.abb.f(c._inner[w]);
+                this.aa8.addItem(c._inner[w], this.abb.d);
                 var x = c._inner[w].b;
-                x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.add));
+                x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.adg));
                 m.add(c._inner[w]);
                 k.add_1(c._inner[w]);
-                this.aar = true;
+                this.aau = true;
             }
         }
-        if (this.aap == true) {
-            this.aap = false;
-            this.aar = true;
+        if (this.aas == true) {
+            this.aas = false;
+            this.aau = true;
         }
         var y = false;
-        if (this.aba.count > 0) {
+        if (this.abd.count > 0) {
             y = true;
+            this.abd.clear();
             this.aba.clear();
-            this.aa7.clear();
         }
-        r = this.aa8.c;
+        r = this.abb.c;
         while (r != null) {
-            var z = this.aan(r.c);
+            var z = this.aaq(r.c);
             if (z == null) {
                 return;
             }
@@ -852,41 +852,41 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     ab.r = z.g;
                     ab.q = z.f;
                     if (ab.c == null) {
-                        this.aak.z(ab, false);
+                        this.aan.z(ab, false);
                     }
                     if (aa) {
-                        this.aak.a8(ab);
+                        this.aan.a8(ab);
                     }
                     else {
-                        this.aak.bi(ab);
+                        this.aan.bi(ab);
                     }
                 }
             }
             r = r.a;
         }
-        var ac = this.aak.a4();
-        var ad = this.aak.ab();
-        if (!this.aar && y && (ac != 0 || ad)) {
+        var ac = this.aan.a4();
+        var ad = this.aan.ab();
+        if (!this.aau && y && (ac != 0 || ad)) {
             {
-                this.aar = true;
+                this.aau = true;
             }
         }
         if (ad) {
-            if (this.aak.t()) {
-                this.aar = true;
+            if (this.aan.t()) {
+                this.aau = true;
             }
         }
-        if (this.aar && (ac != 0 || ad)) {
-            this.aar = false;
-            this.abm = 0x7FFFFFFF;
-            if (this.aca != null) {
+        if (this.aau && (ac != 0 || ad)) {
+            this.aau = false;
+            this.abp = 0x7FFFFFFF;
+            if (this.acd != null) {
                 var ae = true;
-                for (var af = 0; af < this.c9.series.count; af++) {
-                    var ag = this.c9.series._inner[af];
-                    if (ag.eq && typeCast(CalloutLayer.$, ag) !== null) {
+                for (var af = 0; af < this.da.series.count; af++) {
+                    var ag = this.da.series._inner[af];
+                    if (ag.er && typeCast(CalloutLayer.$, ag) !== null) {
                         var ah = ag;
-                        if (ah.aca == this.aca) {
-                            if (!ah.ae1.equals1(this.aak.bu)) {
+                        if (ah.acd == this.acd) {
+                            if (!ah.ae4.equals1(this.aan.bu)) {
                                 ae = false;
                                 break;
                             }
@@ -894,21 +894,21 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                 }
                 if (ae) {
-                    this.aak.bp();
+                    this.aan.bp();
                 }
                 else {
-                    this.aak.a9();
-                    this.aak.ba();
+                    this.aan.a9();
+                    this.aan.ba();
                 }
             }
             else {
-                this.aak.bp();
+                this.aan.bp();
             }
         }
         else {
-            this.aak.ba();
+            this.aan.ba();
         }
-        var ai = this.aa8.c;
+        var ai = this.abb.c;
         var aj;
         var ak;
         var al;
@@ -925,8 +925,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var aw;
         var ax;
         var ay;
-        var az = this.aax;
-        var a0 = this.ct.bt();
+        var az = this.aa0;
+        var a0 = this.cu.bt();
         while (ai != null) {
             var a1 = ai.c;
             var a2 = a1.b;
@@ -997,34 +997,34 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             ai = ai.a;
         }
     };
-    CalloutLayer.prototype.adf = function () {
-        if (this.aak != null) {
-            var a = this.aa8.c;
+    CalloutLayer.prototype.adi = function () {
+        if (this.aan != null) {
+            var a = this.abb.c;
             while (a != null) {
                 var b = a.c.c;
                 if (b != null) {
-                    this.aak.bl(b);
+                    this.aan.bl(b);
                 }
                 a = a.a;
             }
-            var c = this.aak;
-            c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.adc));
-            this.aak = null;
+            var c = this.aan;
+            c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.adf));
+            this.aan = null;
         }
-        this.ade();
+        this.adh();
     };
-    CalloutLayer.prototype.aal = function () {
-        if (this.c9 == null) {
+    CalloutLayer.prototype.aao = function () {
+        if (this.da == null) {
             return null;
         }
-        for (var a = 0; a < this.c9.series.count; a++) {
-            var b = this.c9.series._inner[a];
-            if (b.eq && typeCast(CalloutLayer.$, b) !== null) {
+        for (var a = 0; a < this.da.series.count; a++) {
+            var b = this.da.series._inner[a];
+            if (b.er && typeCast(CalloutLayer.$, b) !== null) {
                 var c = b;
                 if (c != this) {
-                    if (c.aca != null && c.aca == this.aca) {
-                        if (c.aak != null) {
-                            return c.aak;
+                    if (c.acd != null && c.acd == this.acd) {
+                        if (c.aan != null) {
+                            return c.aan;
                         }
                     }
                 }
@@ -1032,14 +1032,14 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return null;
     };
-    CalloutLayer.prototype.abp = function () {
+    CalloutLayer.prototype.abs = function () {
         return 20000;
     };
-    CalloutLayer.prototype.abq = function () {
+    CalloutLayer.prototype.abt = function () {
         return 300;
     };
-    CalloutLayer.prototype.aam = function () {
-        switch (this.zx) {
+    CalloutLayer.prototype.aap = function () {
+        switch (this.z0) {
             case 0: return 2;
             case 2: return 1;
             case 3: return 2;
@@ -1051,25 +1051,25 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return 2;
     };
-    CalloutLayer.prototype.adc = function (a) {
-        var b = this.aak.a4();
-        var c = this.abm;
-        if (b < this.abm) {
-            this.abm = b;
+    CalloutLayer.prototype.adf = function (a) {
+        var b = this.aan.a4();
+        var c = this.abp;
+        if (b < this.abp) {
+            this.abp = b;
             if (c != 0x7FFFFFFF) {
-                this.rn(false);
+                this.rp(false);
             }
         }
     };
-    CalloutLayer.prototype.aan = function (a) {
-        var b = this.z7;
+    CalloutLayer.prototype.aaq = function (a) {
+        var b = this.aaa;
         if (a.b.l != null) {
             b = a.b.l;
         }
         if (b == null) {
-            for (var c = 0; c < this.c9.series.count; c++) {
-                var d = this.c9.series._inner[c];
-                if (!d.eq) {
+            for (var c = 0; c < this.da.series.count; c++) {
+                var d = this.da.series._inner[c];
+                if (!d.er) {
                     b = d;
                     break;
                 }
@@ -1079,7 +1079,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             return null;
         }
         var e = b.ai();
-        var f = b.iw();
+        var f = b.ix();
         var g = null;
         var h = null;
         var i = false;
@@ -1111,27 +1111,27 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var k = 0;
         var l = 0;
         if (g.cb && g.categoryMode != 0) {
-            if (b.e4) {
+            if (b.e5) {
                 k = b.getOffsetValue();
             }
-            else if (b.ew) {
+            else if (b.ex) {
                 k = b.getOffsetValue();
             }
         }
         if (h.cb && h.categoryMode != 0) {
-            if (b.ew) {
+            if (b.ex) {
                 l = b.getOffsetValue();
             }
         }
-        var m = new ScalerParams(0, this.c9.vl, g.ke, g.ch, g.j9());
+        var m = new ScalerParams(0, this.da.vx, g.kf, g.ch, g.ka());
         m.b = f;
-        var n = new ScalerParams(0, this.c9.vl, h.ke, h.ch, h.j9());
+        var n = new ScalerParams(0, this.da.vx, h.kf, h.ch, h.ka());
         n.b = f;
         var o = 0;
         var p = 0;
         if (i) {
-            o = g.ek(this.abl(a.b.ac), m) + k;
-            p = h.ek(this.abl(a.b.ad), n) + l;
+            o = g.ek(this.abo(a.b.ac), m) + k;
+            p = h.ek(this.abo(a.b.ad), n) + l;
             var q = o;
             var r = p;
             var s = { $type: Point_$type, x: 0.5, y: 0.5 };
@@ -1141,8 +1141,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             p = ViewportUtils.i(u, n.e, n.d, n.c);
         }
         else {
-            o = g.ek(this.abl(a.b.ac), m) + k;
-            p = h.ek(this.abl(a.b.ad), n) + l;
+            o = g.ek(this.abo(a.b.ac), m) + k;
+            p = h.ek(this.abo(a.b.ad), n) + l;
         }
         var v = new QuadTreeBoundingBox();
         v.d = o;
@@ -1152,7 +1152,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         v.i = a.b;
         return v;
     };
-    CalloutLayer.prototype.abl = function (a) {
+    CalloutLayer.prototype.abo = function (a) {
         if (typeCast(Date_$type, a) !== null) {
             return a.getTime();
         }
@@ -1161,80 +1161,80 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return a;
     };
-    CalloutLayer.prototype.abc = function () {
+    CalloutLayer.prototype.abf = function () {
         var a = new List$1(CalloutAnnotationWrapper.$, 0);
-        for (var b = 0; b < this.abb.count; b++) {
-            if (stringIsNullOrEmpty(this.abb._inner[b].b.ao)) {
+        for (var b = 0; b < this.abe.count; b++) {
+            if (stringIsNullOrEmpty(this.abe._inner[b].b.ao)) {
                 continue;
             }
-            if (this.abb._inner[b].c == null) {
+            if (this.abe._inner[b].c == null) {
                 var c = new LabelCollisionInfo();
-                this.abb._inner[b].c = c;
-                var d = this.z0.cr(this.abr(this.abb._inner[b]), this.abb._inner[b].b.backgroundPadding);
+                this.abe._inner[b].c = c;
+                var d = this.z3.cr(this.abu(this.abe._inner[b]), this.abe._inner[b].b.backgroundPadding);
                 c.o = d.height / 2;
                 c.p = d.width / 2;
             }
-            var e = this.aan(this.abb._inner[b]);
-            if (e == null || e.d < this.wl.left || e.d > this.wl.right || e.e < this.wl.top || e.e > this.wl.bottom) {
+            var e = this.aaq(this.abe._inner[b]);
+            if (e == null || e.d < this.wo.left || e.d > this.wo.right || e.e < this.wo.top || e.e > this.wo.bottom) {
                 continue;
             }
-            a.add(this.abb._inner[b]);
+            a.add(this.abe._inner[b]);
         }
         return a;
     };
-    CalloutLayer.prototype.abr = function (a) {
+    CalloutLayer.prototype.abu = function (a) {
         return a.b.ao;
     };
-    CalloutLayer.prototype.xa = function (a) {
-        if (!_super.prototype.xa.call(this, a)) {
+    CalloutLayer.prototype.xd = function (a) {
+        if (!_super.prototype.xd.call(this, a)) {
             return false;
         }
-        if (this.act != null) {
-            if (a.e9) {
-                var b = a.na();
-                if (!Base.equalsStatic(this.act, b)) {
+        if (this.acw != null) {
+            if (a.fa) {
+                var b = a.nb();
+                if (!Base.equalsStatic(this.acw, b)) {
                     return false;
                 }
             }
             else {
-                if (!Base.equalsStatic(this.act, a.name)) {
+                if (!Base.equalsStatic(this.acw, a.name)) {
                     return false;
                 }
             }
         }
         return true;
     };
-    CalloutLayer.prototype.ql = function () {
-        _super.prototype.ql.call(this);
-        if (!this.a0.c && !this.d1()) {
+    CalloutLayer.prototype.qn = function () {
+        _super.prototype.qn.call(this);
+        if (!this.a1.c && !this.d2()) {
             return;
         }
-        if (this.aao) {
-            this.aao = false;
-            this.adh();
+        if (this.aar) {
+            this.aar = false;
+            this.adk();
         }
-        if (this.d1()) {
-            this.adn(this.w5, false);
+        if (this.d2()) {
+            this.adq(this.w8, false);
         }
         else {
-            this.adn(this.w3, false);
+            this.adq(this.w6, false);
         }
     };
-    CalloutLayer.prototype.adi = function () {
-        if (!this.aaq) {
-            this.aaq = true;
-            this.rn(true);
+    CalloutLayer.prototype.adl = function () {
+        if (!this.aat) {
+            this.aat = true;
+            this.rp(true);
         }
     };
-    CalloutLayer.prototype.adl = function (a, b, c) {
+    CalloutLayer.prototype.ado = function (a, b, c) {
         var d = false;
-        if (this.aaq) {
-            this.aaq = false;
+        if (this.aat) {
+            this.aat = false;
             d = true;
         }
-        a.kg = this.zs;
-        if (!a.gg && a.d9(this.aa9, this.aa4, this.aa0, this.abn, false)) {
-            var e = this.aa9;
+        a.kh = this.zv;
+        if (!a.gh && a.ea(this.abc, this.aa7, this.aa3, this.abq, false)) {
+            var e = this.abc;
             var _loop_1 = function (f) {
                 var g = e._inner[f];
                 var h = g.b != null ? g.b.item : null;
@@ -1247,8 +1247,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 m.b = n;
                 n.key = l;
                 var o = false;
-                if (this_1.aa5.containsKey(m)) {
-                    m = this_1.aa5.item(m).c;
+                if (this_1.aa8.containsKey(m)) {
+                    m = this_1.aa8.item(m).c;
                     n = m.b;
                     o = d;
                 }
@@ -1257,10 +1257,10 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 var p = n.ac;
                 var q = n.ad;
-                if (this_1.abl(p) != this_1.abl(g.d) && (!isNaN_(this_1.abl(p)) || !isNaN_(this_1.abl(g.d)))) {
+                if (this_1.abo(p) != this_1.abo(g.d) && (!isNaN_(this_1.abo(p)) || !isNaN_(this_1.abo(g.d)))) {
                     n.xValue = g.d;
                 }
-                if (this_1.abl(q) != this_1.abl(g.e) && (!isNaN_(this_1.abl(q)) || !isNaN_(this_1.abl(g.e)))) {
+                if (this_1.abo(q) != this_1.abo(g.e) && (!isNaN_(this_1.abo(q)) || !isNaN_(this_1.abo(g.e)))) {
                     n.yValue = g.e;
                 }
                 n.itemColor = j;
@@ -1284,8 +1284,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                         this_1.calloutLabelUpdating(this_1, s);
                         if (s.c != null && !Base.equalsStatic(s.c, m.b.ao)) {
                             var t = s.c;
-                            if (this_1.zs != null) {
-                                m.b.text = this_1.zs.i(t);
+                            if (this_1.zv != null) {
+                                m.b.text = this_1.zv.i(t);
                             }
                             else {
                                 m.b.text = t != null ? t.toString() : "";
@@ -1323,17 +1323,17 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                 }
                 if (o) {
-                    this_1.adp(m);
+                    this_1.ads(m);
                 }
                 if (m.c == null) {
                     var v = new LabelCollisionInfo();
                     m.c = v;
-                    var w = this_1.z0.cr(this_1.abr(m), m.b.backgroundPadding);
+                    var w = this_1.z3.cr(this_1.abu(m), m.b.backgroundPadding);
                     v.o = w.height / 2;
                     v.p = w.width / 2;
                 }
-                var x = this_1.aan(m);
-                if (x == null || x.d < this_1.wl.left || x.d > this_1.wl.right || x.e < this_1.wl.top || x.e > this_1.wl.bottom) {
+                var x = this_1.aaq(m);
+                if (x == null || x.d < this_1.wo.left || x.d > this_1.wo.right || x.e < this_1.wo.top || x.e > this_1.wo.bottom) {
                     return "continue";
                 }
                 m.e = x.d;
@@ -1344,29 +1344,29 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 c.add(m);
             };
             var this_1 = this;
-            for (var f = 0; f < this.aa9.count; f++) {
+            for (var f = 0; f < this.abc.count; f++) {
                 _loop_1(f);
             }
         }
-        a.kg = null;
+        a.kh = null;
     };
-    CalloutLayer.prototype.b0 = function () {
+    CalloutLayer.prototype.b1 = function () {
         return 1;
     };
-    CalloutLayer.prototype.a1 = function (a, b) {
-        var c = this.aak.f(a, b);
+    CalloutLayer.prototype.a2 = function (a, b) {
+        var c = this.aan.f(a, b);
         if (c == null) {
             return null;
         }
         return c.y;
     };
-    CalloutLayer.prototype.gu = function (a, b) {
-        if (this.aak == null) {
+    CalloutLayer.prototype.gv = function (a, b) {
+        if (this.aan == null) {
             return false;
         }
-        return this.aak.f(a, b) != null;
+        return this.aan.f(a, b) != null;
     };
-    CalloutLayer.prototype.adn = function (a, b) {
+    CalloutLayer.prototype.adq = function (a, b) {
         var e_3, _a;
         var c = 0;
         var d = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -1375,7 +1375,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             if (isNaN_(a.u._inner[c]) || isNaN_(a.v._inner[c])) {
                 continue;
             }
-            var f = this.z0.cb.item(e);
+            var f = this.z3.cb.item(e);
             d.add_1(e);
             if (f.h != a.q._inner[c]) {
                 f.h = a.q._inner[c];
@@ -1384,17 +1384,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.ct.bt();
+            f.o = f.e > 0 ? a.i._inner[c] : this.cu.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.z0.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.z0.ck(f, e, a.r._inner[c]);
+            this.z3.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.z3.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.z0.cb.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values(fromEnum(this.z3.cb.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var i = _c.value;
                 if (!d.contains(i)) {
                     h.add(i);
@@ -1415,76 +1415,76 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         for (var j = 0; j < h.count; j++) {
-            this.z0.cb.h(h._inner[j]);
+            this.z3.cb.h(h._inner[j]);
         }
     };
-    CalloutLayer.prototype.ym = function (a, b) {
-        _super.prototype.ym.call(this, a, b);
-        if (this.d1()) {
-            this.adn(this.w5, true);
+    CalloutLayer.prototype.yp = function (a, b) {
+        _super.prototype.yp.call(this, a, b);
+        if (this.d2()) {
+            this.adq(this.w8, true);
         }
         else {
-            this.adn(this.w3, false);
+            this.adq(this.w6, false);
         }
     };
-    CalloutLayer.prototype.f8 = function () {
+    CalloutLayer.prototype.f9 = function () {
         return true;
     };
-    CalloutLayer.prototype.q5 = function (a, b, c, d) {
-        _super.prototype.q5.call(this, a, b, c, d);
+    CalloutLayer.prototype.q7 = function (a, b, c, d) {
+        _super.prototype.q7.call(this, a, b, c, d);
         switch (b) {
             case CalloutLayer.$$p[29]:
-                this.z8 = null;
-                this.z0.ci();
-                this.rn(true);
+                this.aab = null;
+                this.z3.ci();
+                this.rp(true);
                 break;
             case CalloutLayer.$$p[27]:
             case CalloutLayer.$$p[28]:
-                this.rn(true);
+                this.rp(true);
                 break;
             case CalloutLayer.$$p[24]:
             case CalloutLayer.$$p[25]:
-                if (this.aco != null) {
-                    this.zs = new BindingFormatter();
-                    this.zs.j = this.aco;
-                    this.zs.d = this.zq;
+                if (this.acr != null) {
+                    this.zv = new BindingFormatter();
+                    this.zv.j = this.acr;
+                    this.zv.d = this.zt;
                 }
                 else {
-                    this.zs = null;
+                    this.zv = null;
                 }
                 break;
             case CalloutLayer.$$p[16]:
             case CalloutLayer.$$p[18]:
-                this.rn(true);
+                this.rp(true);
                 break;
             case "SeriesViewer":
                 if (c != null) {
                     var e = c;
-                    e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.adm));
+                    e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.adp));
                 }
                 if (d != null) {
                     var f = d;
-                    f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.adm));
+                    f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.adp));
                 }
                 if (d == null) {
-                    this.adf();
+                    this.adi();
                 }
                 break;
             case "AutoCalloutVisibilityMode":
-                this.zu = this.zw();
-                this.adg();
+                this.zx = this.zz();
+                this.adj();
                 break;
             case "AllowedPositions":
                 if (c != null) {
                     var g = c;
-                    g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.ada));
+                    g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.add));
                 }
                 if (d != null) {
                     var h = d;
-                    h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.ada));
+                    h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.add));
                 }
-                this.zp = this.zr(this.z2);
-                this.adg();
+                this.zs = this.zu(this.z5);
+                this.adj();
                 break;
             case CalloutLayer.$$p[19]:
             case CalloutLayer.$$p[20]:
@@ -1503,88 +1503,88 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             case CalloutLayer.$$p[14]:
             case CalloutLayer.$$p[15]:
             case CalloutLayer.$$p[2]:
-                this.adg();
+                this.adj();
                 break;
             case CalloutLayer.$$p[26]:
-                if (this.dl != null) {
-                    this.dl.deregisterColumn(this.aah);
-                    this.aah = this.dk(this.acr);
+                if (this.dm != null) {
+                    this.dm.deregisterColumn(this.aak);
+                    this.aak = this.dl(this.acu);
                 }
                 break;
             case "LabelColumn":
-                this.adg();
+                this.adj();
                 break;
             case CalloutLayer.$$p[17]:
-                if (this.dl != null) {
-                    this.dl.deregisterColumn(this.aaf);
-                    this.aaf = this.dk(this.acd);
+                if (this.dm != null) {
+                    this.dm.deregisterColumn(this.aai);
+                    this.aai = this.dl(this.acg);
                 }
                 break;
             case "ContentColumn":
-                this.adg();
+                this.adj();
                 break;
             case CalloutLayer.$$p[36]:
-                if (this.dl != null) {
-                    this.dl.deregisterColumn(this.aai);
-                    this.aai = stringIsNullOrEmpty(this.ac5) == false ? this.dk(this.ac5) : null;
+                if (this.dm != null) {
+                    this.dm.deregisterColumn(this.aal);
+                    this.aal = stringIsNullOrEmpty(this.ac8) == false ? this.dl(this.ac8) : null;
                 }
                 break;
             case "XColumn":
-                this.adg();
+                this.adj();
                 break;
             case CalloutLayer.$$p[37]:
-                if (this.dl != null) {
-                    this.dl.deregisterColumn(this.aaj);
-                    this.aaj = this.dk(this.ac8);
+                if (this.dm != null) {
+                    this.dm.deregisterColumn(this.aam);
+                    this.aam = this.dl(this.adb);
                 }
                 break;
             case "YColumn":
-                this.adg();
+                this.adj();
                 break;
             case CalloutLayer.$$p[23]:
-                if (this.dl != null) {
-                    this.dl.deregisterColumn(this.aag);
-                    this.aag = this.dk(this.acl);
+                if (this.dm != null) {
+                    this.dm.deregisterColumn(this.aaj);
+                    this.aaj = this.dl(this.aco);
                 }
                 break;
             case "KeyColumn":
-                this.adg();
+                this.adj();
                 break;
             case "FastItemsSource":
-                this.aap = true;
+                this.aas = true;
                 if (typeCast(IFastItemsSource_$type, c) != null) {
-                    c.deregisterColumn(this.aah);
-                    c.deregisterColumn(this.aaf);
+                    c.deregisterColumn(this.aak);
                     c.deregisterColumn(this.aai);
+                    c.deregisterColumn(this.aal);
+                    c.deregisterColumn(this.aam);
                     c.deregisterColumn(this.aaj);
-                    c.deregisterColumn(this.aag);
-                    this.aah = null;
-                    this.aaf = null;
+                    this.aak = null;
                     this.aai = null;
+                    this.aal = null;
+                    this.aam = null;
                     this.aaj = null;
-                    this.aag = null;
-                    this.abb.clear();
+                    this.abe.clear();
                 }
                 if (typeCast(IFastItemsSource_$type, d) != null) {
-                    this.aah = this.dk(this.acr);
-                    this.aaf = this.dk(this.acd);
-                    if (stringIsNullOrEmpty(this.ac5) == false) {
-                        this.aai = this.dk(this.ac5);
+                    this.aak = this.dl(this.acu);
+                    this.aai = this.dl(this.acg);
+                    if (stringIsNullOrEmpty(this.ac8) == false) {
+                        this.aal = this.dl(this.ac8);
                     }
-                    this.aaj = this.dk(this.ac8);
-                    this.aag = this.dk(this.acl);
+                    this.aam = this.dl(this.adb);
+                    this.aaj = this.dl(this.aco);
                 }
-                this.adg();
+                this.adj();
                 break;
         }
     };
-    CalloutLayer.prototype.zw = function () {
-        if (this.zv == 0) {
+    CalloutLayer.prototype.zz = function () {
+        if (this.zy == 0) {
             return 1;
         }
-        return this.zv;
+        return this.zy;
     };
-    CalloutLayer.prototype.zr = function (a) {
+    CalloutLayer.prototype.zu = function (a) {
         if (a == null || a.count == 0) {
             return null;
         }
@@ -1594,53 +1594,53 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    CalloutLayer.prototype.adm = function (a) {
-        if (a.eq) {
+    CalloutLayer.prototype.adp = function (a) {
+        if (a.er) {
             return;
         }
-        if ((a == this.z7 || this.z7 == null) && this.aav) {
-            this.rn(false);
+        if ((a == this.aaa || this.aaa == null) && this.aay) {
+            this.rp(false);
         }
     };
-    CalloutLayer.prototype.adg = function () {
-        if (this.aao == false) {
-            this.aao = true;
-            this.rn(false);
+    CalloutLayer.prototype.adj = function () {
+        if (this.aar == false) {
+            this.aar = true;
+            this.rp(false);
         }
     };
-    CalloutLayer.prototype.ade = function () {
-        this.z0.cb.clear();
-        this.aa8.g();
-        this.aa5.clear();
-    };
     CalloutLayer.prototype.adh = function () {
-        if (this.aaj == null || this.aah == null) {
-            var a = this.aa8.c;
+        this.z3.cb.clear();
+        this.abb.g();
+        this.aa8.clear();
+    };
+    CalloutLayer.prototype.adk = function () {
+        if (this.aam == null || this.aak == null) {
+            var a = this.abb.c;
             while (a != null) {
-                this.adp(a.c);
+                this.ads(a.c);
                 a = a.a;
             }
             return;
         }
-        var b = this.aa6();
-        for (var c = 0; c < this.aaj.count; c++) {
+        var b = this.aa9();
+        for (var c = 0; c < this.aam.count; c++) {
             var d = void 0;
-            if (this.abb.count <= c) {
+            if (this.abe.count <= c) {
                 var e = new CalloutAnnotation();
                 d = new CalloutAnnotationWrapper();
                 d.b = e;
-                d.b.series = this.z7;
-                this.abb.add(d);
+                d.b.series = this.aaa;
+                this.abe.add(d);
             }
             else {
-                d = this.abb._inner[c];
+                d = this.abe._inner[c];
             }
-            this.ado(c, b);
+            this.adr(c, b);
         }
     };
     CalloutLayer.$t = markType(CalloutLayer, 'CalloutLayer', AnnotationLayer.$);
-    CalloutLayer.ad6 = 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:abn:adq', [1, 5], 'CalloutBackground:aet:adr', [Brush.$, null], 'CalloutCollisionMode:zx:ads', [CalloutCollisionMode_$type, enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:abe:adt', [1, NaN], 'CalloutDarkTextColor:aeu:adu', [Brush.$, null], 'CalloutInterpolatedValuePrecision:abo:adv', [1, -1], 'CalloutLeaderBrush:aev:adw', [Brush.$, null], 'CalloutLightTextColor:aew:adx', [Brush.$, null], 'CalloutOutline:aex:ady', [Brush.$, null], 'CalloutPaddingBottom:abf:adz', [1, NaN], 'CalloutPaddingLeft:abg:ad0', [1, NaN], 'CalloutPaddingRight:abh:ad1', [1, NaN], 'CalloutPaddingTop:abi:ad2', [1, NaN], 'CalloutPositionPadding:abj:ad3', [1, 10], 'CalloutStrokeThickness:abk:ad4', [1, NaN], 'CalloutTextColor:aey:ad5', [Brush.$, null], 'CollisionChannel:aca:ad7', [2, null], 'ContentMemberPath:acd:ad8', [2, null], 'HighlightedValueLabelMode:z6:ad9', [HighlightedValueLabelMode_$type, enumGetBox(HighlightedValueLabelMode_$type, 0)], 'IsAutoCalloutBehaviorEnabled:aav:aea', [0, false], 'IsCalloutOffsettingEnabled:aaw:aeb', [0, true], 'IsCustomCalloutRenderStyleEnabled:aax:aec', [0, false], 'IsCustomCalloutStyleEnabled:aay:aed', [0, false], 'KeyMemberPath:acl:aee', [2, null], 'LabelFormat:aco:aef', [2, null], 'LabelFormatSpecifiers:zq:aeg', [Array_$type, null], 'LabelMemberPath:acr:aeh', [2, null], 'TargetSeriesName:act:aei', [2, null], 'TargetSeries:z7:aej', [Series.$, null], 'TextStyle:acw:aek', [2, null], 'UseAutoContrastingLabelColors:aaz:ael', [0, false], 'UseInterpolatedValueForAutoCalloutLabels:aa0:aem', [0, false], 'UseItemColorForFill:aa1:aen', [0, false], 'UseItemColorForOutline:aa2:aeo', [0, false], 'UseSeriesColorForOutline:aa3:aep', [0, false], 'UseValueForAutoCalloutLabels:aa4:aeq', [0, true], 'XMemberPath:ac5:aer', [2, null], 'YMemberPath:ac8:aes', [2, null]]);
+    CalloutLayer.ad9 = 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:abq:adt', [1, 5], 'CalloutBackground:aew:adu', [Brush.$, null], 'CalloutCollisionMode:z0:adv', [CalloutCollisionMode_$type, enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:abh:adw', [1, NaN], 'CalloutDarkTextColor:aex:adx', [Brush.$, null], 'CalloutInterpolatedValuePrecision:abr:ady', [1, -1], 'CalloutLeaderBrush:aey:adz', [Brush.$, null], 'CalloutLightTextColor:aez:ad0', [Brush.$, null], 'CalloutOutline:ae0:ad1', [Brush.$, null], 'CalloutPaddingBottom:abi:ad2', [1, NaN], 'CalloutPaddingLeft:abj:ad3', [1, NaN], 'CalloutPaddingRight:abk:ad4', [1, NaN], 'CalloutPaddingTop:abl:ad5', [1, NaN], 'CalloutPositionPadding:abm:ad6', [1, 10], 'CalloutStrokeThickness:abn:ad7', [1, NaN], 'CalloutTextColor:ae1:ad8', [Brush.$, null], 'CollisionChannel:acd:aea', [2, null], 'ContentMemberPath:acg:aeb', [2, null], 'HighlightedValueLabelMode:z9:aec', [HighlightedValueLabelMode_$type, enumGetBox(HighlightedValueLabelMode_$type, 0)], 'IsAutoCalloutBehaviorEnabled:aay:aed', [0, false], 'IsCalloutOffsettingEnabled:aaz:aee', [0, true], 'IsCustomCalloutRenderStyleEnabled:aa0:aef', [0, false], 'IsCustomCalloutStyleEnabled:aa1:aeg', [0, false], 'KeyMemberPath:aco:aeh', [2, null], 'LabelFormat:acr:aei', [2, null], 'LabelFormatSpecifiers:zt:aej', [Array_$type, null], 'LabelMemberPath:acu:aek', [2, null], 'TargetSeriesName:acw:ael', [2, null], 'TargetSeries:aaa:aem', [Series.$, null], 'TextStyle:acz:aen', [2, null], 'UseAutoContrastingLabelColors:aa2:aeo', [0, false], 'UseInterpolatedValueForAutoCalloutLabels:aa3:aep', [0, false], 'UseItemColorForFill:aa4:aeq', [0, false], 'UseItemColorForOutline:aa5:aer', [0, false], 'UseSeriesColorForOutline:aa6:aes', [0, false], 'UseValueForAutoCalloutLabels:aa7:aet', [0, true], 'XMemberPath:ac8:aeu', [2, null], 'YMemberPath:adb:aev', [2, null]]);
     return CalloutLayer;
 }(AnnotationLayer));
 export { CalloutLayer };
@@ -1705,10 +1705,10 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     CalloutLayerView.prototype.ca = function () {
-        if (this.b7.z9 != null) {
-            return this.b7.z9;
+        if (this.b7.aac != null) {
+            return this.b7.aac;
         }
-        return this.e.c9.getFontInfo();
+        return this.e.da.getFontInfo();
     };
     CalloutLayerView.prototype.an = function (a) {
         _super.prototype.an.call(this, a);
@@ -1729,7 +1729,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.c9.c8.j.ae, a);
+            var b = FontUtil.getCurrentFontHeight(this.e.da.c9.j.ae, a);
             this.cd = b;
         }
         return this.cd;
@@ -1752,13 +1752,13 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
         a.k(this.e, b, c);
     };
     CalloutLayerView.prototype.cl = function (a, b) {
-        if (b != null && this.b7.aa1) {
+        if (b != null && this.b7.aa4) {
             return this.cq(b);
         }
         if (a != null) {
-            return this.cq(a.va);
+            return this.cq(a.vc);
         }
-        return this.e.va;
+        return this.e.vc;
     };
     CalloutLayerView.prototype.co = function () {
         return ((function () {
@@ -1775,12 +1775,12 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
         })());
     };
     CalloutLayerView.prototype.cp = function (a, b) {
-        if (b != null && this.b7.aa2) {
+        if (b != null && this.b7.aa5) {
             return this.cq(b);
         }
-        if (this.b7.aa3) {
+        if (this.b7.aa6) {
             if (a != null) {
-                return this.cq(a.va);
+                return this.cq(a.vc);
             }
         }
         return ((function () {
@@ -1790,13 +1790,13 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
         })());
     };
     CalloutLayerView.prototype.cn = function (a, b) {
-        if (b != null && this.b7.aa2) {
+        if (b != null && this.b7.aa5) {
             return this.cq(b);
         }
         if (a != null) {
-            return this.cq(a.u3);
+            return this.cq(a.u5);
         }
-        return this.e.u3;
+        return this.e.u5;
     };
     CalloutLayerView.prototype.ci = function () {
         this.cd = NaN;
@@ -1985,7 +1985,7 @@ var CalloutView = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     CalloutView.prototype.i = function (a, b, c) {
-        a.bb.exportCalloutData(this.f, this.g, this.v.left, this.v.top, c, this.t, this.l, b, this.s, "callout", ["Main", "Callout"]);
+        a.bc.exportCalloutData(this.f, this.g, this.v.left, this.v.top, c, this.t, this.l, b, this.s, "callout", ["Main", "Callout"]);
     };
     CalloutView.$t = markType(CalloutView, 'CalloutView');
     return CalloutView;