igniteui-webcomponents-charts 4.7.2-beta.1 → 4.7.2

package/esm5/lib/CalloutLayer_combined.js

@@ -62,49 +62,49 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var _this = _super.call(this) || this;
         _this.calloutStyleUpdating = null;
         _this.calloutRenderStyleUpdating = null;
-        _this.xl = null;
         _this.xm = null;
         _this.xn = null;
+        _this.xo = null;
+        _this.xl = null;
         _this.xk = null;
-        _this.xj = null;
-        _this.yd = new HashSet$1(CalloutAnnotationWrapper.$, 0);
-        _this.yg = new List$1(CalloutAnnotationWrapper.$, 0);
+        _this.ye = new HashSet$1(CalloutAnnotationWrapper.$, 0);
         _this.yh = new List$1(CalloutAnnotationWrapper.$, 0);
-        _this.xb = null;
-        _this.w1 = null;
-        _this.xh = null;
-        _this.ye = new LinkedList$1(CalloutAnnotationWrapper.$);
-        _this.yb = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
-        _this.xt = null;
-        _this.abn = new Rect(0, 0, 0, 1, 1);
-        _this.x0 = false;
-        _this.ys = 0;
-        _this.abm = Rect.empty;
-        _this.xy = false;
+        _this.yi = new List$1(CalloutAnnotationWrapper.$, 0);
+        _this.xc = null;
+        _this.w2 = null;
+        _this.xi = null;
+        _this.yf = new LinkedList$1(CalloutAnnotationWrapper.$);
+        _this.yc = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
+        _this.xu = null;
+        _this.abo = new Rect(0, 0, 0, 1, 1);
+        _this.x1 = false;
+        _this.yt = 0;
+        _this.abn = Rect.empty;
         _this.xz = false;
+        _this.x0 = false;
         _this.calloutContentUpdating = null;
         _this.calloutLabelUpdating = null;
         _this.calloutSeriesSelecting = null;
-        _this.yf = new List$1(SeriesPointOfInterest.$, 0);
-        _this.x2 = false;
+        _this.yg = new List$1(SeriesPointOfInterest.$, 0);
         _this.x3 = false;
-        _this.yj = 0;
-        _this.x1 = false;
-        _this.xx = true;
-        _this.w3 = 1;
+        _this.x4 = false;
+        _this.yk = 0;
+        _this.x2 = false;
+        _this.xy = true;
+        _this.w4 = 1;
         FastItemObjectColumn.m();
-        _this.w1 = null;
-        _this.xb = new CalloutPlacementPositionsCollection();
-        var a = _this.xb;
-        a.collectionChanged = delegateCombine(a.collectionChanged, runOn(_this, _this.z7));
-        _this.uo = true;
+        _this.w2 = null;
+        _this.xc = new CalloutPlacementPositionsCollection();
+        var a = _this.xc;
+        a.collectionChanged = delegateCombine(a.collectionChanged, runOn(_this, _this.z8));
+        _this.up = true;
         var b = new CalloutLayerFrame();
         var c = new CalloutLayerFrame();
         var d = new CalloutLayerFrame();
         var e = _this.jj / 1000;
-        _this.ug = b;
-        _this.uf = c;
-        _this.uh = d;
+        _this.uh = b;
+        _this.ug = c;
+        _this.ui = d;
         _this.ab = CalloutLayer.$;
         return _this;
     }
@@ -114,60 +114,60 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
     CalloutLayer.prototype.get_d3 = function () {
         return true;
     };
-    CalloutLayer.prototype.z7 = function (a, b) {
-        this.aag();
+    CalloutLayer.prototype.z8 = function (a, b) {
+        this.aah();
     };
-    CalloutLayer.prototype.aag = function () {
-        this.w1 = this.w2(this.xc);
-        this.aad();
+    CalloutLayer.prototype.aah = function () {
+        this.w2 = this.w3(this.xd);
+        this.aae();
     };
-    CalloutLayer.prototype.z8 = function (a, b) {
-        this.yh.clear();
-        this.pq(false);
+    CalloutLayer.prototype.z9 = function (a, b) {
+        this.yi.clear();
+        this.pr(false);
     };
     CalloutLayer.prototype.np = function (a, b, c, d) {
         _super.prototype.np.call(this, a, b, c, d);
-        var e = this.yc();
+        var e = this.yd();
         switch (a) {
             case 3:
-                this.aal(b, e);
+                this.aam(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.xg;
-                    this.yh.insert(f, h);
-                    this.aal(f, e);
+                    h.b.series = this.xh;
+                    this.yi.insert(f, h);
+                    this.aam(f, e);
                 }
                 break;
             case 0:
-                this.yh.v(b, c);
+                this.yi.v(b, c);
                 break;
             case 2:
                 for (var i = b; i < b + c; i++) {
-                    this.aal(i, e);
+                    this.aam(i, e);
                 }
                 break;
             case 4:
-                this.yh.clear();
+                this.yi.clear();
                 for (var j = 0; j < this.c7.count; j++) {
                     var k = new CalloutAnnotation();
                     var l = new CalloutAnnotationWrapper();
                     l.b = k;
-                    l.b.series = this.xg;
-                    this.yh.add(l);
-                    this.aal(j, e);
+                    l.b.series = this.xh;
+                    this.yi.add(l);
+                    this.aam(j, e);
                 }
                 break;
         }
-        this.pq(true);
+        this.pr(true);
     };
     CalloutLayer.prototype.fq = function (a) {
         return false;
     };
-    CalloutLayer.prototype.yc = function () {
+    CalloutLayer.prototype.yd = function () {
         var a = new Dictionary$2(String_$type, Series.$, 0);
         if (this.cv != null) {
             for (var b = 0; b < this.cv.series.count; b++) {
@@ -179,25 +179,25 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return a;
     };
-    CalloutLayer.prototype.aal = function (a, b) {
+    CalloutLayer.prototype.aam = function (a, b) {
         var _this = this;
-        if (this.xs == null || this.xq == null) {
+        if (this.xt == null || this.xr == null) {
             return;
         }
         var c = a;
-        if (this.xr != null) {
-            c = this.xr.item(a);
-        }
-        var d = this.xs.item(a);
-        var e = this.xq.item(a);
-        var f = this.yh._inner[a];
-        if (this.xp != null) {
-            if (f.b.ab != this.xp.item(a)) {
-                f.b.key = this.xp.item(a);
+        if (this.xs != null) {
+            c = this.xs.item(a);
+        }
+        var d = this.xt.item(a);
+        var e = this.xr.item(a);
+        var f = this.yi._inner[a];
+        if (this.xq != null) {
+            if (f.b.ab != this.xq.item(a)) {
+                f.b.key = this.xq.item(a);
             }
         }
-        if (this.yb.containsKey(f)) {
-            f.b = this.yb.item(f).c.b;
+        if (this.yc.containsKey(f)) {
+            f.b = this.yc.item(f).c.b;
         }
         f.b.xValue = c;
         f.b.yValue = d;
@@ -218,8 +218,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         else {
             f.b.text = e != null ? e.toString() : "";
         }
-        if (this.xo != null) {
-            f.b.content = this.xo.item(a);
+        if (this.xp != null) {
+            f.b.content = this.xp.item(a);
         }
         else {
             f.b.content = this.c7.item(a);
@@ -242,29 +242,29 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        this.aam(f);
+        this.aan(f);
     };
-    CalloutLayer.prototype.aam = function (a) {
+    CalloutLayer.prototype.aan = function (a) {
         var b = new Thickness(0, DeviceUtils.g(3));
-        if (isNaN_(this.abp.left) || isNaN_(this.abp.top) || isNaN_(this.abp.right) || isNaN_(this.abp.bottom)) {
+        if (isNaN_(this.abq.left) || isNaN_(this.abq.top) || isNaN_(this.abq.right) || isNaN_(this.abq.bottom)) {
             b = new Thickness(0, DeviceUtils.g(3));
         }
         else {
-            b = this.abp;
+            b = this.abq;
         }
         var c = DeviceUtils.g(3);
-        if (isNaN_(this.yk)) {
+        if (isNaN_(this.yl)) {
             c = DeviceUtils.g(3);
         }
         else {
-            c = this.yk;
-        }
-        var d = this.abi != null ? this.abi : this.xa.cl(a.b.l);
-        var e = this.abl != null ? this.abl : this.xa.co();
-        var f = this.abk != null ? this.abk : this.xa.cn(a.b.l);
-        var g = this.abj != null ? this.abj : this.xa.cm(a.b.l);
-        var h = isNaN_(this.yq) ? 0 : this.yq;
-        if (this.x7 && this.calloutStyleUpdating != null) {
+            c = this.yl;
+        }
+        var d = this.abj != null ? this.abj : this.xb.cl(a.b.l);
+        var e = this.abm != null ? this.abm : this.xb.co();
+        var f = this.abl != null ? this.abl : this.xb.cn(a.b.l);
+        var g = this.abk != null ? this.abk : this.xb.cm(a.b.l);
+        var h = isNaN_(this.yr) ? 0 : this.yr;
+        if (this.x8 && this.calloutStyleUpdating != null) {
             var i = new CalloutStyleUpdatingEventArgs();
             i.item = a.b.aa;
             i.xValue = a.b.ac;
@@ -293,36 +293,22 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
     CalloutLayer.prototype.jv = function (a, b) {
         var c = this.lw(b);
         if (c == CalloutLayer.$$p[21]) {
-            return this.jw(a, b, this.zr);
+            return this.jw(a, b, this.zs);
         }
         if (c == CalloutLayer.$$p[28]) {
-            return this.jw(a, b, this.z2);
+            return this.jw(a, b, this.z3);
         }
         if (c == CalloutLayer.$$p[29]) {
-            return this.jw(a, b, this.z5);
+            return this.jw(a, b, this.z6);
         }
         if (c == CalloutLayer.$$p[20]) {
-            return this.jw(a, b, this.zo);
+            return this.jw(a, b, this.zp);
         }
         if (c == CalloutLayer.$$p[15]) {
-            return this.jw(a, b, this.zh);
+            return this.jw(a, b, this.zi);
         }
         return _super.prototype.jv.call(this, a, b);
     };
-    Object.defineProperty(CalloutLayer.prototype, "xq", {
-        get: function () {
-            return this.xl;
-        },
-        set: function (a) {
-            if (this.xl != a) {
-                var b = this.xl;
-                this.xl = a;
-                this.raisePropertyChanged("LabelColumn", b, this.xl);
-            }
-        },
-        enumerable: false,
-        configurable: true
-    });
     Object.defineProperty(CalloutLayer.prototype, "xr", {
         get: function () {
             return this.xm;
@@ -331,7 +317,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             if (this.xm != a) {
                 var b = this.xm;
                 this.xm = a;
-                this.raisePropertyChanged("XColumn", b, this.xm);
+                this.raisePropertyChanged("LabelColumn", b, this.xm);
             }
         },
         enumerable: false,
@@ -345,118 +331,132 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             if (this.xn != a) {
                 var b = this.xn;
                 this.xn = a;
-                this.raisePropertyChanged("YColumn", b, this.xn);
+                this.raisePropertyChanged("XColumn", b, this.xn);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "xp", {
+    Object.defineProperty(CalloutLayer.prototype, "xt", {
         get: function () {
-            return this.xk;
+            return this.xo;
         },
         set: function (a) {
-            if (this.xk != a) {
-                var b = this.xk;
-                this.xk = a;
-                this.raisePropertyChanged("KeyColumn", b, this.xk);
+            if (this.xo != a) {
+                var b = this.xo;
+                this.xo = a;
+                this.raisePropertyChanged("YColumn", b, this.xo);
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(CalloutLayer.prototype, "xq", {
+        get: function () {
+            return this.xl;
+        },
+        set: function (a) {
+            if (this.xl != a) {
+                var b = this.xl;
+                this.xl = a;
+                this.raisePropertyChanged("KeyColumn", b, this.xl);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "xo", {
+    Object.defineProperty(CalloutLayer.prototype, "xp", {
         get: function () {
-            return this.xj;
+            return this.xk;
         },
         set: function (a) {
-            if (this.xj != a) {
-                var b = this.xj;
-                this.xj = a;
-                this.raisePropertyChanged("ContentColumn", b, this.xj);
+            if (this.xk != a) {
+                var b = this.xk;
+                this.xk = a;
+                this.raisePropertyChanged("ContentColumn", b, this.xk);
             }
         },
         enumerable: false,
         configurable: true
     });
-    CalloutLayer.prototype.aaa = function (a, b) {
+    CalloutLayer.prototype.aab = function (a, b) {
         if (b.propertyName == CalloutAnnotation.$$p[14] || b.propertyName == CalloutAnnotation.$$p[15]) {
             var c = a.k;
-            if (!this.yd.contains(c)) {
-                this.yd.add_1(c);
-                this.yg.add(c);
-                this.pq(false);
+            if (!this.ye.contains(c)) {
+                this.ye.add_1(c);
+                this.yh.add(c);
+                this.pr(false);
             }
         }
     };
     CalloutLayer.prototype.cd = function () {
         return new CalloutLayerView(this);
     };
-    CalloutLayer.prototype.o1 = function (a) {
-        _super.prototype.o1.call(this, a);
-        this.xa = a;
+    CalloutLayer.prototype.o2 = function (a) {
+        _super.prototype.o2.call(this, a);
+        this.xb = a;
     };
-    Object.defineProperty(CalloutLayer.prototype, "xc", {
+    Object.defineProperty(CalloutLayer.prototype, "xd", {
         get: function () {
-            return this.xb;
+            return this.xc;
         },
         set: function (a) {
-            var b = this.xc;
+            var b = this.xd;
             if (a != b) {
-                this.xb = a;
-                this.raisePropertyChanged("AllowedPositions", b, this.xc);
+                this.xc = a;
+                this.raisePropertyChanged("AllowedPositions", b, this.xd);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "w5", {
+    Object.defineProperty(CalloutLayer.prototype, "w6", {
         get: function () {
-            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.aa1));
+            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.aa2));
         },
         set: function (a) {
-            this.h(CalloutLayer.aa1, enumGetBox(AutoCalloutVisibilityMode_$type, a));
+            this.h(CalloutLayer.aa2, enumGetBox(AutoCalloutVisibilityMode_$type, a));
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "w4", {
+    Object.defineProperty(CalloutLayer.prototype, "w5", {
         get: function () {
-            return this.w3;
+            return this.w4;
         },
         set: function (a) {
-            this.w3 = a;
+            this.w4 = a;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "abp", {
+    Object.defineProperty(CalloutLayer.prototype, "abq", {
         get: function () {
-            return new Thickness(1, this.ym, this.yo, this.yn, this.yl);
+            return new Thickness(1, this.yn, this.yp, this.yo, this.ym);
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(CalloutLayer.prototype, "xi", {
+    Object.defineProperty(CalloutLayer.prototype, "xj", {
         get: function () {
-            if (this.xh == null) {
-                this.xh = FontUtil.toFontInfo(this.i5, this.zw);
+            if (this.xi == null) {
+                this.xi = FontUtil.toFontInfo(this.i5, this.zx);
             }
-            return this.xh;
+            return this.xi;
         },
         enumerable: false,
         configurable: true
     });
-    CalloutLayer.prototype.vt = function (a, b) {
-        if (this.xg == null || this.xg == a) {
+    CalloutLayer.prototype.vu = function (a, b) {
+        if (this.xh == null || this.xh == a) {
             if (!this.at.c) {
-                this.pq(b);
+                this.pr(b);
             }
         }
     };
-    CalloutLayer.prototype.vv = function (a, b) {
+    CalloutLayer.prototype.vw = function (a, b) {
         var e_1, _a;
-        _super.prototype.vv.call(this, a, b);
+        _super.prototype.vw.call(this, a, b);
         var c = a;
         c.q.clear();
         c.r.clear();
@@ -475,24 +475,24 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         c.v.clear();
         c.s.clear();
         c.t.clear();
-        var d = this.yi();
+        var d = this.yj();
         var e = new List$1(CalloutAnnotationWrapper.$, 0);
         var f = true;
-        if (this.x4) {
-            if (this.um(this.xg)) {
-                this.aai(this.xg, c, e);
+        if (this.x5) {
+            if (this.un(this.xh)) {
+                this.aaj(this.xh, c, e);
             }
             else {
                 try {
                     for (var _b = __values(fromEnum(this.cv.series)), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var g = _c.value;
-                        if (this.um(g)) {
+                        if (this.un(g)) {
                             if (!g.d7) {
                                 if (!g.isVertical) {
                                     f = false;
                                 }
                             }
-                            this.aai(g, c, e);
+                            this.aaj(g, c, e);
                         }
                     }
                 }
@@ -511,7 +511,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        if (this.x4 && this.w4 == 2) {
+        if (this.x5 && this.w5 == 2) {
             var h = 0;
             var i = 0;
             var j = 1.7976931348623157E+308;
@@ -550,70 +550,70 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        this.aah(c, d, e);
+        this.aai(c, d, e);
     };
-    CalloutLayer.prototype.qo = function (a, b) {
-        _super.prototype.qo.call(this, a, b);
-        var c = b.width - this.abn.width;
-        var d = b.height - this.abn.height;
+    CalloutLayer.prototype.qp = function (a, b) {
+        _super.prototype.qp.call(this, a, b);
+        var c = b.width - this.abo.width;
+        var d = b.height - this.abo.height;
         var e = 0;
         if (Math.abs(c) > Math.abs(d)) {
             e = c;
-            this.yj = c * this.tx.width;
+            this.yk = c * this.ty.width;
         }
         else {
             e = d;
-            this.yj = d * this.tx.height;
+            this.yk = d * this.ty.height;
         }
-        if (e > 0 && this.yj > 5) {
-            this.x3 = true;
+        if (e > 0 && this.yk > 5) {
+            this.x4 = true;
         }
-        if (e < 0 && this.yj > 5) {
-            this.x2 = true;
+        if (e < 0 && this.yk > 5) {
+            this.x3 = true;
         }
     };
-    CalloutLayer.prototype.qn = function (a, b) {
-        _super.prototype.qn.call(this, a, b);
+    CalloutLayer.prototype.qo = function (a, b) {
+        _super.prototype.qo.call(this, a, b);
         if (!a.equals1(b)) {
-            this.x1 = true;
+            this.x2 = true;
         }
     };
-    Object.defineProperty(CalloutLayer.prototype, "abo", {
+    Object.defineProperty(CalloutLayer.prototype, "abp", {
         get: function () {
-            return this.abm;
+            return this.abn;
         },
         set: function (a) {
-            this.abm = a;
+            this.abn = a;
         },
         enumerable: false,
         configurable: true
     });
-    CalloutLayer.prototype.aah = function (a, b, c) {
+    CalloutLayer.prototype.aai = function (a, b, c) {
         var e_2, _a;
         if (this.cv != null) {
-            this.abn = this.cv.tn;
+            this.abo = this.cv.tr;
         }
-        if (this.tx.isEmpty) {
+        if (this.ty.isEmpty) {
             return;
         }
-        this.abo = new Rect(0, this.tx.left, this.tx.top, this.tx.width, this.tx.height);
-        if (this.xt != null && this.ze != null && this.ze != this.xt.ap) {
-            this.aac();
+        this.abp = new Rect(0, this.ty.left, this.ty.top, this.ty.width, this.ty.height);
+        if (this.xu != null && this.zf != null && this.zf != this.xu.ap) {
+            this.aad();
         }
-        if (this.xt == null) {
-            var d = this.xu();
+        if (this.xu == null) {
+            var d = this.xv();
             if (d != null) {
-                this.xt = d;
-                var e = this.xt;
-                e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.z9));
+                this.xu = d;
+                var e = this.xu;
+                e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.aaa));
             }
             else {
-                var f = this.tp(this.cg);
+                var f = this.tq(this.cg);
                 var g = new Array(2);
                 g[0] = 0;
                 g[1] = 3;
-                if (this.xg != null) {
-                    if (this.xg.isVertical) {
+                if (this.xh != null) {
+                    if (this.xh.isVertical) {
                         g = new Array(2);
                         g[0] = 2;
                         g[1] = 1;
@@ -653,31 +653,31 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                         g[1] = 1;
                     }
                 }
-                this.xt = new LabelCollisionManager(this.tx.right, this.tx.bottom, this.tx, this.xa.j(), this.yp, this.xv(), g, this.yw(), this.yv(), this.x5, this.w1);
-                if (this.ze != null) {
-                    this.xt.ap = this.ze;
-                    this.xt.an = this;
+                this.xu = new LabelCollisionManager(this.ty.right, this.ty.bottom, this.ty, this.xb.j(), this.yq, this.xw(), g, this.yx(), this.yw(), this.x6, this.w2);
+                if (this.zf != null) {
+                    this.xu.ap = this.zf;
+                    this.xu.an = this;
                 }
-                var j = this.xt;
-                j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.z9));
-            }
-        }
-        if (this.x2) {
-            this.x2 = false;
-            if (this.xt.al > 2) {
-                this.x0 = true;
+                var j = this.xu;
+                j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.aaa));
             }
         }
         if (this.x3) {
             this.x3 = false;
-            if (this.yj > 5) {
-                this.x0 = true;
+            if (this.xu.al > 2) {
+                this.x1 = true;
             }
         }
-        if (this.x1) {
-            this.x1 = false;
-            this.xt.a3(this.tx.right, this.tx.bottom, this.tx);
-            this.x0 = true;
+        if (this.x4) {
+            this.x4 = false;
+            if (this.yk > 5) {
+                this.x1 = true;
+            }
+        }
+        if (this.x2) {
+            this.x2 = false;
+            this.xu.a3(this.ty.right, this.ty.bottom, this.ty);
+            this.x1 = true;
         }
         var k = new HashSet$1(CalloutAnnotationWrapper.$, 0);
         var l = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -690,54 +690,54 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         for (var q = 0; q < c.count; q++) {
             o.add_1(c._inner[q]);
         }
-        var r = this.ye.c;
+        var r = this.yf.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.aaa));
-                this.ye.h(r);
-                this.yb.removeItem(r.c);
-                this.xt.a2(r.c.c);
+                t.propertyChanged = delegateRemove(t.propertyChanged, runOn(this, this.aab));
+                this.yf.h(r);
+                this.yc.removeItem(r.c);
+                this.xu.a2(r.c.c);
             }
             r = s;
         }
         for (var u = 0; u < b.count; u++) {
-            if (!this.yb.containsKey(b._inner[u])) {
-                this.ye.f(b._inner[u]);
+            if (!this.yc.containsKey(b._inner[u])) {
+                this.yf.f(b._inner[u]);
                 var v = b._inner[u].b;
-                v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.aaa));
-                this.yb.addItem(b._inner[u], this.ye.d);
+                v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.aab));
+                this.yc.addItem(b._inner[u], this.yf.d);
                 m.add(b._inner[u]);
                 k.add_1(b._inner[u]);
-                this.x0 = true;
+                this.x1 = true;
             }
         }
         for (var w = 0; w < c.count; w++) {
-            if (!this.yb.containsKey(c._inner[w])) {
-                this.ye.f(c._inner[w]);
-                this.yb.addItem(c._inner[w], this.ye.d);
+            if (!this.yc.containsKey(c._inner[w])) {
+                this.yf.f(c._inner[w]);
+                this.yc.addItem(c._inner[w], this.yf.d);
                 var x = c._inner[w].b;
-                x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.aaa));
+                x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.aab));
                 m.add(c._inner[w]);
                 k.add_1(c._inner[w]);
-                this.x0 = true;
+                this.x1 = true;
             }
         }
-        if (this.xy == true) {
-            this.xy = false;
-            this.x0 = true;
+        if (this.xz == true) {
+            this.xz = false;
+            this.x1 = true;
         }
-        if (this.yg.count > 0) {
-            this.x0 = true;
-            this.yg.clear();
-            this.yd.clear();
+        if (this.yh.count > 0) {
+            this.x1 = true;
+            this.yh.clear();
+            this.ye.clear();
         }
-        r = this.ye.c;
+        r = this.yf.c;
         while (r != null) {
-            var y = this.xw(r.c);
+            var y = this.xx(r.c);
             if (y == null) {
                 return;
             }
@@ -753,36 +753,36 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     aa.n = y.e;
                     aa.m = y.d;
                     if (aa.b == null) {
-                        this.xt.t(aa, false);
+                        this.xu.t(aa, false);
                     }
                     if (z) {
-                        this.xt.aq(aa);
+                        this.xu.aq(aa);
                     }
                     else {
-                        this.xt.az(aa);
+                        this.xu.az(aa);
                     }
                 }
             }
             r = r.a;
         }
-        var ab = this.xt.am();
-        var ac = this.xt.u();
+        var ab = this.xu.am();
+        var ac = this.xu.u();
         if (ac) {
-            if (this.xt.q()) {
-                this.x0 = true;
+            if (this.xu.q()) {
+                this.x1 = true;
             }
         }
-        if (this.x0 && (ab != 0 || ac)) {
-            this.x0 = false;
-            this.ys = 0x7FFFFFFF;
-            if (this.ze != null) {
+        if (this.x1 && (ab != 0 || ac)) {
+            this.x1 = false;
+            this.yt = 0x7FFFFFFF;
+            if (this.zf != null) {
                 var ad = true;
                 for (var ae = 0; ae < this.cv.series.count; ae++) {
                     var af = this.cv.series._inner[ae];
                     if (af.d7 && typeCast(CalloutLayer.$, af) !== null) {
                         var ag = af;
-                        if (ag.ze == this.ze) {
-                            if (!ag.abo.equals1(this.xt.a5)) {
+                        if (ag.zf == this.zf) {
+                            if (!ag.abp.equals1(this.xu.a5)) {
                                 ad = false;
                                 break;
                             }
@@ -790,21 +790,21 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                 }
                 if (ad) {
-                    this.xt.a4();
+                    this.xu.a4();
                 }
                 else {
-                    this.xt.ar();
-                    this.xt.as();
+                    this.xu.ar();
+                    this.xu.as();
                 }
             }
             else {
-                this.xt.a4();
+                this.xu.a4();
             }
         }
         else {
-            this.xt.as();
+            this.xu.as();
         }
-        var ah = this.ye.c;
+        var ah = this.yf.c;
         var ai;
         var aj;
         var ak;
@@ -821,7 +821,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         var av;
         var aw;
         var ax;
-        var ay = this.x6;
+        var ay = this.x7;
         while (ah != null) {
             var az = ah.c;
             var a0 = az.b;
@@ -883,23 +883,23 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             ah = ah.a;
         }
     };
-    CalloutLayer.prototype.aac = function () {
-        if (this.xt != null) {
-            var a = this.ye.c;
+    CalloutLayer.prototype.aad = function () {
+        if (this.xu != null) {
+            var a = this.yf.c;
             while (a != null) {
                 var b = a.c.c;
                 if (b != null) {
-                    this.xt.a2(b);
+                    this.xu.a2(b);
                 }
                 a = a.a;
             }
-            var c = this.xt;
-            c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.z9));
-            this.xt = null;
+            var c = this.xu;
+            c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.aaa));
+            this.xu = null;
         }
-        this.aab();
+        this.aac();
     };
-    CalloutLayer.prototype.xu = function () {
+    CalloutLayer.prototype.xv = function () {
         if (this.cv == null) {
             return null;
         }
@@ -908,9 +908,9 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             if (b.d7 && typeCast(CalloutLayer.$, b) !== null) {
                 var c = b;
                 if (c != this) {
-                    if (c.ze != null && c.ze == this.ze) {
-                        if (c.xt != null) {
-                            return c.xt;
+                    if (c.zf != null && c.zf == this.zf) {
+                        if (c.xu != null) {
+                            return c.xu;
                         }
                     }
                 }
@@ -918,14 +918,14 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return null;
     };
-    CalloutLayer.prototype.yv = function () {
+    CalloutLayer.prototype.yw = function () {
         return 20000;
     };
-    CalloutLayer.prototype.yw = function () {
+    CalloutLayer.prototype.yx = function () {
         return 300;
     };
-    CalloutLayer.prototype.xv = function () {
-        switch (this.w7) {
+    CalloutLayer.prototype.xw = function () {
+        switch (this.w8) {
             case 0: return 2;
             case 2: return 1;
             case 3: return 2;
@@ -933,15 +933,15 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return 2;
     };
-    CalloutLayer.prototype.z9 = function (a) {
-        var b = this.xt.am();
-        if (b < this.ys) {
-            this.ys = b;
-            this.pq(false);
+    CalloutLayer.prototype.aaa = function (a) {
+        var b = this.xu.am();
+        if (b < this.yt) {
+            this.yt = b;
+            this.pr(false);
         }
     };
-    CalloutLayer.prototype.xw = function (a) {
-        var b = this.xg;
+    CalloutLayer.prototype.xx = function (a) {
+        var b = this.xh;
         if (a.b.l != null) {
             b = a.b.l;
         }
@@ -999,15 +999,15 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 l = b.getOffsetValue();
             }
         }
-        var m = new ScalerParams(0, this.cv.tn, g.kd, g.ch, g.j8());
+        var m = new ScalerParams(0, this.cv.tr, g.kd, g.ch, g.j8());
         m.b = f;
-        var n = new ScalerParams(0, this.cv.tn, h.kd, h.ch, h.j8());
+        var n = new ScalerParams(0, this.cv.tr, h.kd, h.ch, h.j8());
         n.b = f;
         var o = 0;
         var p = 0;
         if (i) {
-            o = g.ej(this.yr(a.b.ac), m) + k;
-            p = h.ej(this.yr(a.b.ad), n) + l;
+            o = g.ej(this.ys(a.b.ac), m) + k;
+            p = h.ej(this.ys(a.b.ad), n) + l;
             var q = o;
             var r = p;
             var s = { $type: Point_$type, x: 0.5, y: 0.5 };
@@ -1017,8 +1017,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             p = ViewportUtils.f(u, n.e, n.d);
         }
         else {
-            o = g.ej(this.yr(a.b.ac), m) + k;
-            p = h.ej(this.yr(a.b.ad), n) + l;
+            o = g.ej(this.ys(a.b.ac), m) + k;
+            p = h.ej(this.ys(a.b.ad), n) + l;
         }
         var v = new QuadTreeBoundingBox();
         v.b = o;
@@ -1028,7 +1028,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         v.g = a.b;
         return v;
     };
-    CalloutLayer.prototype.yr = function (a) {
+    CalloutLayer.prototype.ys = function (a) {
         if (typeCast(Date_$type, a) !== null) {
             return a.getTime();
         }
@@ -1037,79 +1037,79 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return a;
     };
-    CalloutLayer.prototype.yi = function () {
+    CalloutLayer.prototype.yj = function () {
         var a = new List$1(CalloutAnnotationWrapper.$, 0);
-        for (var b = 0; b < this.yh.count; b++) {
-            if (stringIsNullOrEmpty(this.yh._inner[b].b.ao)) {
+        for (var b = 0; b < this.yi.count; b++) {
+            if (stringIsNullOrEmpty(this.yi._inner[b].b.ao)) {
                 continue;
             }
-            if (this.yh._inner[b].c == null) {
+            if (this.yi._inner[b].c == null) {
                 var c = new LabelCollisionInfo();
-                this.yh._inner[b].c = c;
-                var d = this.xa.cq(this.yx(this.yh._inner[b]), this.yh._inner[b].b.backgroundPadding);
+                this.yi._inner[b].c = c;
+                var d = this.xb.cq(this.yy(this.yi._inner[b]), this.yi._inner[b].b.backgroundPadding);
                 c.k = d.height / 2;
                 c.l = d.width / 2;
             }
-            var e = this.xw(this.yh._inner[b]);
-            if (e == null || e.b < this.tx.left || e.b > this.tx.right || e.c < this.tx.top || e.c > this.tx.bottom) {
+            var e = this.xx(this.yi._inner[b]);
+            if (e == null || e.b < this.ty.left || e.b > this.ty.right || e.c < this.ty.top || e.c > this.ty.bottom) {
                 continue;
             }
-            a.add(this.yh._inner[b]);
+            a.add(this.yi._inner[b]);
         }
         return a;
     };
-    CalloutLayer.prototype.yx = function (a) {
+    CalloutLayer.prototype.yy = function (a) {
         return a.b.ao;
     };
-    CalloutLayer.prototype.um = function (a) {
-        if (!_super.prototype.um.call(this, a)) {
+    CalloutLayer.prototype.un = function (a) {
+        if (!_super.prototype.un.call(this, a)) {
             return false;
         }
-        if (this.zt != null) {
+        if (this.zu != null) {
             if (a.eq) {
                 var b = a.lv();
-                if (!Base.equalsStatic(this.zt, b)) {
+                if (!Base.equalsStatic(this.zu, b)) {
                     return false;
                 }
             }
             else {
-                if (!Base.equalsStatic(this.zt, a.name)) {
+                if (!Base.equalsStatic(this.zu, a.name)) {
                     return false;
                 }
             }
         }
         return true;
     };
-    CalloutLayer.prototype.op = function () {
-        _super.prototype.op.call(this);
+    CalloutLayer.prototype.oq = function () {
+        _super.prototype.oq.call(this);
         if (!this.at.c && !this.dk()) {
             return;
         }
-        if (this.xx) {
-            this.xx = false;
-            this.aae();
+        if (this.xy) {
+            this.xy = false;
+            this.aaf();
         }
         if (this.dk()) {
-            this.aak(this.uh, false);
+            this.aal(this.ui, false);
         }
         else {
-            this.aak(this.uf, false);
+            this.aal(this.ug, false);
         }
     };
-    CalloutLayer.prototype.aaf = function () {
-        if (!this.xz) {
-            this.xz = true;
-            this.pq(true);
+    CalloutLayer.prototype.aag = function () {
+        if (!this.x0) {
+            this.x0 = true;
+            this.pr(true);
         }
     };
-    CalloutLayer.prototype.aai = function (a, b, c) {
+    CalloutLayer.prototype.aaj = function (a, b, c) {
         var d = false;
-        if (this.xz) {
-            this.xz = false;
+        if (this.x0) {
+            this.x0 = false;
             d = true;
         }
-        if (!a.ft && a.dt(this.yf, this.ya, this.x8, this.yt)) {
-            var e = this.yf;
+        if (!a.ft && a.dt(this.yg, this.yb, this.x9, this.yu)) {
+            var e = this.yg;
             var _loop_1 = function (f) {
                 var g = e._inner[f];
                 var h = g.a != null ? g.a.item : null;
@@ -1121,8 +1121,8 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 l.b = m;
                 m.key = k;
                 var n = false;
-                if (this_1.yb.containsKey(l)) {
-                    l = this_1.yb.item(l).c;
+                if (this_1.yc.containsKey(l)) {
+                    l = this_1.yc.item(l).c;
                     m = l.b;
                     n = d;
                 }
@@ -1131,10 +1131,10 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 var o = m.ac;
                 var p = m.ad;
-                if (this_1.yr(o) != this_1.yr(g.b)) {
+                if (this_1.ys(o) != this_1.ys(g.b)) {
                     m.xValue = g.b;
                 }
-                if (this_1.yr(p) != this_1.yr(g.c)) {
+                if (this_1.ys(p) != this_1.ys(g.c)) {
                     m.yValue = g.c;
                 }
                 m.series = a;
@@ -1191,17 +1191,17 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                     }
                 }
                 if (n) {
-                    this_1.aam(l);
+                    this_1.aan(l);
                 }
                 if (l.c == null) {
                     var u = new LabelCollisionInfo();
                     l.c = u;
-                    var v = this_1.xa.cq(this_1.yx(l), l.b.backgroundPadding);
+                    var v = this_1.xb.cq(this_1.yy(l), l.b.backgroundPadding);
                     u.k = v.height / 2;
                     u.l = v.width / 2;
                 }
-                var w = this_1.xw(l);
-                if (w == null || w.b < this_1.tx.left || w.b > this_1.tx.right || w.c < this_1.tx.top || w.c > this_1.tx.bottom) {
+                var w = this_1.xx(l);
+                if (w == null || w.b < this_1.ty.left || w.b > this_1.ty.right || w.c < this_1.ty.top || w.c > this_1.ty.bottom) {
                     return "continue";
                 }
                 l.e = w.b;
@@ -1209,7 +1209,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
                 c.add(l);
             };
             var this_1 = this;
-            for (var f = 0; f < this.yf.count; f++) {
+            for (var f = 0; f < this.yg.count; f++) {
                 _loop_1(f);
             }
         }
@@ -1218,19 +1218,19 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         return 1;
     };
     CalloutLayer.prototype.au = function (a, b) {
-        var c = this.xt.f(a, b);
+        var c = this.xu.f(a, b);
         if (c == null) {
             return null;
         }
         return c.u;
     };
     CalloutLayer.prototype.f5 = function (a, b) {
-        if (this.xt == null) {
+        if (this.xu == null) {
             return false;
         }
-        return this.xt.f(a, b) != null;
+        return this.xu.f(a, b) != null;
     };
-    CalloutLayer.prototype.aak = function (a, b) {
+    CalloutLayer.prototype.aal = function (a, b) {
         var e_3, _a;
         var c = 0;
         var d = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -1239,7 +1239,7 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             if (isNaN_(a.u._inner[c]) || isNaN_(a.v._inner[c])) {
                 continue;
             }
-            var f = this.xa.cb.item(e);
+            var f = this.xb.cb.item(e);
             d.add_1(e);
             if (f.h != a.q._inner[c]) {
                 f.h = a.q._inner[c];
@@ -1252,13 +1252,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.xa.cj(f, Math.min(a.s._inner[c], a.s._inner[c] + a.u._inner[c]), Math.min(a.t._inner[c], a.t._inner[c] + a.v._inner[c]));
-            this.xa.ck(f, e, a.r._inner[c]);
+            this.xb.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.xb.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.xa.cb.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
+            for (var _b = __values(fromEnum(this.xb.cb.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var i = _c.value;
                 if (!d.contains(i)) {
                     h.add(i);
@@ -1279,64 +1279,64 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         for (var j = 0; j < h.count; j++) {
-            this.xa.cb.h(h._inner[j]);
+            this.xb.cb.h(h._inner[j]);
         }
     };
-    CalloutLayer.prototype.vy = function (a, b) {
-        _super.prototype.vy.call(this, a, b);
+    CalloutLayer.prototype.vz = function (a, b) {
+        _super.prototype.vz.call(this, a, b);
         if (this.dk()) {
-            this.aak(this.uh, true);
+            this.aal(this.ui, true);
         }
         else {
-            this.aak(this.uf, false);
+            this.aal(this.ug, false);
         }
     };
     CalloutLayer.prototype.fn = function () {
         return true;
     };
-    CalloutLayer.prototype.o9 = function (a, b, c, d) {
-        _super.prototype.o9.call(this, a, b, c, d);
+    CalloutLayer.prototype.pa = function (a, b, c, d) {
+        _super.prototype.pa.call(this, a, b, c, d);
         switch (b) {
             case CalloutLayer.$$p[24]:
-                this.xh = null;
-                this.xa.ci();
-                this.pq(true);
+                this.xi = null;
+                this.xb.ci();
+                this.pr(true);
                 break;
             case CalloutLayer.$$p[22]:
             case CalloutLayer.$$p[23]:
-                this.pq(true);
+                this.pr(true);
                 break;
             case CalloutLayer.$$p[14]:
-                this.pq(true);
+                this.pr(true);
                 break;
             case "SeriesViewer":
                 if (c != null) {
                     var e = c;
-                    e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.aaj));
+                    e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.aak));
                 }
                 if (d != null) {
                     var f = d;
-                    f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.aaj));
+                    f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.aak));
                 }
                 if (d == null) {
-                    this.aac();
+                    this.aad();
                 }
                 break;
             case "AutoCalloutVisibilityMode":
-                this.w4 = this.w6();
-                this.aad();
+                this.w5 = this.w7();
+                this.aae();
                 break;
             case "AllowedPositions":
                 if (c != null) {
                     var g = c;
-                    g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.z7));
+                    g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.z8));
                 }
                 if (d != null) {
                     var h = d;
-                    h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.z7));
+                    h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.z8));
                 }
-                this.w1 = this.w2(this.xc);
-                this.aad();
+                this.w2 = this.w3(this.xd);
+                this.aae();
                 break;
             case CalloutLayer.$$p[16]:
             case CalloutLayer.$$p[17]:
@@ -1353,88 +1353,88 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
             case CalloutLayer.$$p[7]:
             case CalloutLayer.$$p[12]:
             case CalloutLayer.$$p[13]:
-                this.aad();
+                this.aae();
                 break;
             case CalloutLayer.$$p[21]:
                 if (this.c7 != null) {
-                    this.c7.deregisterColumn(this.xq);
-                    this.xq = this.c6(this.zr);
+                    this.c7.deregisterColumn(this.xr);
+                    this.xr = this.c6(this.zs);
                 }
                 break;
             case "LabelColumn":
-                this.aad();
+                this.aae();
                 break;
             case CalloutLayer.$$p[15]:
                 if (this.c7 != null) {
-                    this.c7.deregisterColumn(this.xo);
-                    this.xo = this.c6(this.zh);
+                    this.c7.deregisterColumn(this.xp);
+                    this.xp = this.c6(this.zi);
                 }
                 break;
             case "ContentColumn":
-                this.aad();
+                this.aae();
                 break;
             case CalloutLayer.$$p[28]:
                 if (this.c7 != null) {
-                    this.c7.deregisterColumn(this.xr);
-                    this.xr = stringIsNullOrEmpty(this.z2) == false ? this.c6(this.z2) : null;
+                    this.c7.deregisterColumn(this.xs);
+                    this.xs = stringIsNullOrEmpty(this.z3) == false ? this.c6(this.z3) : null;
                 }
                 break;
             case "XColumn":
-                this.aad();
+                this.aae();
                 break;
             case CalloutLayer.$$p[29]:
                 if (this.c7 != null) {
-                    this.c7.deregisterColumn(this.xs);
-                    this.xs = this.c6(this.z5);
+                    this.c7.deregisterColumn(this.xt);
+                    this.xt = this.c6(this.z6);
                 }
                 break;
             case "YColumn":
-                this.aad();
+                this.aae();
                 break;
             case CalloutLayer.$$p[20]:
                 if (this.c7 != null) {
-                    this.c7.deregisterColumn(this.xp);
-                    this.xp = this.c6(this.zo);
+                    this.c7.deregisterColumn(this.xq);
+                    this.xq = this.c6(this.zp);
                 }
                 break;
             case "KeyColumn":
-                this.aad();
+                this.aae();
                 break;
             case "FastItemsSource":
-                this.xy = true;
+                this.xz = true;
                 if (typeCast(IFastItemsSource_$type, c) != null) {
-                    c.deregisterColumn(this.xq);
-                    c.deregisterColumn(this.xo);
                     c.deregisterColumn(this.xr);
-                    c.deregisterColumn(this.xs);
                     c.deregisterColumn(this.xp);
-                    this.xq = null;
-                    this.xo = null;
+                    c.deregisterColumn(this.xs);
+                    c.deregisterColumn(this.xt);
+                    c.deregisterColumn(this.xq);
                     this.xr = null;
-                    this.xs = null;
                     this.xp = null;
-                    this.yh.clear();
+                    this.xs = null;
+                    this.xt = null;
+                    this.xq = null;
+                    this.yi.clear();
                 }
                 if (typeCast(IFastItemsSource_$type, d) != null) {
-                    this.xq = this.c6(this.zr);
-                    this.xo = this.c6(this.zh);
-                    if (stringIsNullOrEmpty(this.z2) == false) {
-                        this.xr = this.c6(this.z2);
+                    this.xr = this.c6(this.zs);
+                    this.xp = this.c6(this.zi);
+                    if (stringIsNullOrEmpty(this.z3) == false) {
+                        this.xs = this.c6(this.z3);
                     }
-                    this.xs = this.c6(this.z5);
-                    this.xp = this.c6(this.zo);
+                    this.xt = this.c6(this.z6);
+                    this.xq = this.c6(this.zp);
                 }
-                this.aad();
+                this.aae();
                 break;
         }
     };
-    CalloutLayer.prototype.w6 = function () {
-        if (this.w5 == 0) {
+    CalloutLayer.prototype.w7 = function () {
+        if (this.w6 == 0) {
             return 1;
         }
-        return this.w5;
+        return this.w6;
     };
-    CalloutLayer.prototype.w2 = function (a) {
+    CalloutLayer.prototype.w3 = function (a) {
         if (a == null || a.count == 0) {
             return null;
         }
@@ -1444,53 +1444,53 @@ var CalloutLayer = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    CalloutLayer.prototype.aaj = function (a) {
+    CalloutLayer.prototype.aak = function (a) {
         if (a.d7) {
             return;
         }
-        if ((a == this.xg || this.xg == null) && this.x4) {
-            this.pq(false);
+        if ((a == this.xh || this.xh == null) && this.x5) {
+            this.pr(false);
         }
     };
-    CalloutLayer.prototype.aad = function () {
-        if (this.xx == false) {
-            this.xx = true;
-            this.pq(false);
+    CalloutLayer.prototype.aae = function () {
+        if (this.xy == false) {
+            this.xy = true;
+            this.pr(false);
         }
     };
-    CalloutLayer.prototype.aab = function () {
-        this.xa.cb.clear();
-        this.ye.g();
-        this.yb.clear();
+    CalloutLayer.prototype.aac = function () {
+        this.xb.cb.clear();
+        this.yf.g();
+        this.yc.clear();
     };
-    CalloutLayer.prototype.aae = function () {
-        if (this.xs == null || this.xq == null) {
-            var a = this.ye.c;
+    CalloutLayer.prototype.aaf = function () {
+        if (this.xt == null || this.xr == null) {
+            var a = this.yf.c;
             while (a != null) {
-                this.aam(a.c);
+                this.aan(a.c);
                 a = a.a;
             }
             return;
         }
-        var b = this.yc();
-        for (var c = 0; c < this.xs.count; c++) {
+        var b = this.yd();
+        for (var c = 0; c < this.xt.count; c++) {
             var d = void 0;
-            if (this.yh.count <= c) {
+            if (this.yi.count <= c) {
                 var e = new CalloutAnnotation();
                 d = new CalloutAnnotationWrapper();
                 d.b = e;
-                d.b.series = this.xg;
-                this.yh.add(d);
+                d.b.series = this.xh;
+                this.yi.add(d);
             }
             else {
-                d = this.yh._inner[c];
+                d = this.yi._inner[c];
             }
-            this.aal(c, b);
+            this.aam(c, b);
         }
     };
     CalloutLayer.$t = markType(CalloutLayer, 'CalloutLayer', AnnotationLayer.$);
-    CalloutLayer.aa1 = DependencyProperty.i("AutoCalloutVisibilityMode", AutoCalloutVisibilityMode_$type, CalloutLayer.$, new PropertyMetadata(2, enumGetBox(AutoCalloutVisibilityMode_$type, 0), function (a, b) { return a.raisePropertyChanged("AutoCalloutVisibilityMode", b.oldValue, b.newValue); }));
-    CalloutLayer.$$p = markDep(DependencyProperty, PropertyMetadata, CalloutLayer, 'raisePropertyChanged', ['AutoCalloutLabelPrecision:yt:aan', [1, 5], 'CalloutBackground:abi:aao', [Brush.$, null], 'CalloutCollisionMode:w7:aap', [CalloutCollisionMode_$type, enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:yk:aaq', [1, NaN], 'CalloutInterpolatedValuePrecision:yu:aar', [1, -1], 'CalloutLeaderBrush:abj:aas', [Brush.$, null], 'CalloutOutline:abk:aat', [Brush.$, null], 'CalloutPaddingBottom:yl:aau', [1, NaN], 'CalloutPaddingLeft:ym:aav', [1, NaN], 'CalloutPaddingRight:yn:aaw', [1, NaN], 'CalloutPaddingTop:yo:aax', [1, NaN], 'CalloutPositionPadding:yp:aay', [1, 10], 'CalloutStrokeThickness:yq:aaz', [1, NaN], 'CalloutTextColor:abl:aa0', [Brush.$, null], 'CollisionChannel:ze:aa2', [2, null], 'ContentMemberPath:zh:aa3', [2, null], 'IsAutoCalloutBehaviorEnabled:x4:aa4', [0, false], 'IsCalloutOffsettingEnabled:x5:aa5', [0, true], 'IsCustomCalloutRenderStyleEnabled:x6:aa6', [0, false], 'IsCustomCalloutStyleEnabled:x7:aa7', [0, false], 'KeyMemberPath:zo:aa8', [2, null], 'LabelMemberPath:zr:aa9', [2, null], 'TargetSeriesName:zt:aba', [2, null], 'TargetSeries:xg:abb', [Series.$, null], 'TextStyle:zw:abc', [2, null], 'UseInterpolatedValueForAutoCalloutLabels:x8:abd', [0, false], 'UseSeriesColorForOutline:x9:abe', [0, false], 'UseValueForAutoCalloutLabels:ya:abf', [0, true], 'XMemberPath:z2:abg', [2, null], 'YMemberPath:z5:abh', [2, null]]);
+    CalloutLayer.aa2 = 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:yu:aao', [1, 5], 'CalloutBackground:abj:aap', [Brush.$, null], 'CalloutCollisionMode:w8:aaq', [CalloutCollisionMode_$type, enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:yl:aar', [1, NaN], 'CalloutInterpolatedValuePrecision:yv:aas', [1, -1], 'CalloutLeaderBrush:abk:aat', [Brush.$, null], 'CalloutOutline:abl:aau', [Brush.$, null], 'CalloutPaddingBottom:ym:aav', [1, NaN], 'CalloutPaddingLeft:yn:aaw', [1, NaN], 'CalloutPaddingRight:yo:aax', [1, NaN], 'CalloutPaddingTop:yp:aay', [1, NaN], 'CalloutPositionPadding:yq:aaz', [1, 10], 'CalloutStrokeThickness:yr:aa0', [1, NaN], 'CalloutTextColor:abm:aa1', [Brush.$, null], 'CollisionChannel:zf:aa3', [2, null], 'ContentMemberPath:zi:aa4', [2, null], 'IsAutoCalloutBehaviorEnabled:x5:aa5', [0, false], 'IsCalloutOffsettingEnabled:x6:aa6', [0, true], 'IsCustomCalloutRenderStyleEnabled:x7:aa7', [0, false], 'IsCustomCalloutStyleEnabled:x8:aa8', [0, false], 'KeyMemberPath:zp:aa9', [2, null], 'LabelMemberPath:zs:aba', [2, null], 'TargetSeriesName:zu:abb', [2, null], 'TargetSeries:xh:abc', [Series.$, null], 'TextStyle:zx:abd', [2, null], 'UseInterpolatedValueForAutoCalloutLabels:x9:abe', [0, false], 'UseSeriesColorForOutline:ya:abf', [0, false], 'UseValueForAutoCalloutLabels:yb:abg', [0, true], 'XMemberPath:z3:abh', [2, null], 'YMemberPath:z6:abi', [2, null]]);
     return CalloutLayer;
 }(AnnotationLayer));
 export { CalloutLayer };
@@ -1555,8 +1555,8 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     CalloutLayerView.prototype.ca = function () {
-        if (this.b7.xi != null) {
-            return this.b7.xi;
+        if (this.b7.xj != null) {
+            return this.b7.xj;
         }
         return this.e.cv.getFontInfo();
     };
@@ -1603,9 +1603,9 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     CalloutLayerView.prototype.cl = function (a) {
         if (a != null) {
-            return this.cp(a.sy);
+            return this.cp(a.sz);
         }
-        return this.e.sy;
+        return this.e.sz;
     };
     CalloutLayerView.prototype.co = function () {
         return ((function () {
@@ -1615,9 +1615,9 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
         })());
     };
     CalloutLayerView.prototype.cn = function (a) {
-        if (this.b7.x9) {
+        if (this.b7.ya) {
             if (a != null) {
-                return this.cp(a.sy);
+                return this.cp(a.sz);
             }
         }
         return ((function () {
@@ -1628,9 +1628,9 @@ var CalloutLayerView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     CalloutLayerView.prototype.cm = function (a) {
         if (a != null) {
-            return this.cp(a.st);
+            return this.cp(a.su);
         }
-        return this.e.st;
+        return this.e.su;
     };
     CalloutLayerView.prototype.ci = function () {
         this.cd = NaN;