igniteui-webcomponents-charts 5.2.0 → 5.3.0

package/esm2015/lib/CalloutLayer_combined.js

@@ -70,157 +70,157 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
         }
         constructor() {
             super();
-            this.aaw = true;
-            this.afv = new Size(1, 0, 0);
+            this.aav = true;
+            this.afu = new Size(1, 0, 0);
             this.calloutStyleUpdating = null;
             this.calloutRenderStyleUpdating = null;
+            this.aaj = null;
             this.aak = null;
             this.aal = null;
-            this.aam = null;
-            this.aaj = null;
             this.aai = null;
-            this.abi = new HashSet$1(CalloutAnnotationWrapper.$, 0);
+            this.aah = null;
+            this.abh = new HashSet$1(CalloutAnnotationWrapper.$, 0);
+            this.abk = new List$1(CalloutAnnotationWrapper.$, 0);
             this.abl = new List$1(CalloutAnnotationWrapper.$, 0);
-            this.abm = new List$1(CalloutAnnotationWrapper.$, 0);
-            this.z9 = null;
-            this.zx = null;
-            this.aag = null;
-            this.abj = new LinkedList$1(CalloutAnnotationWrapper.$);
-            this.abg = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
-            this.aas = null;
-            this.aft = new Rect(0, 0, 0, 1, 1);
-            this.aa0 = false;
-            this.ab1 = 0;
-            this.afs = Rect.empty;
-            this.aay = false;
+            this.z8 = null;
+            this.zw = null;
+            this.aaf = null;
+            this.abi = new LinkedList$1(CalloutAnnotationWrapper.$);
+            this.abf = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
+            this.aar = null;
+            this.afs = new Rect(0, 0, 0, 1, 1);
             this.aaz = false;
+            this.ab0 = 0;
+            this.afr = Rect.empty;
+            this.aax = false;
+            this.aay = false;
             this.calloutContentUpdating = null;
             this.calloutLabelUpdating = null;
             this.calloutSeriesSelecting = null;
-            this.abk = new List$1(SeriesPointOfInterest.$, 0);
-            this.aa2 = false;
-            this.aa3 = false;
-            this.abo = 0;
+            this.abj = new List$1(SeriesPointOfInterest.$, 0);
             this.aa1 = false;
-            this.z0 = null;
-            this.aax = true;
-            this.z1 = 1;
+            this.aa2 = false;
+            this.abn = 0;
+            this.aa0 = false;
+            this.zz = null;
+            this.aaw = true;
+            this.z0 = 1;
             FastItemObjectColumn.m();
-            this.zx = null;
-            this.z9 = new CalloutPlacementPositionsCollection();
-            let a = this.z9;
-            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.adw));
-            this.xk = true;
+            this.zw = null;
+            this.z8 = new CalloutPlacementPositionsCollection();
+            let a = this.z8;
+            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.adv));
+            this.xj = true;
             let b = new CalloutLayerFrame();
             let c = new CalloutLayerFrame();
             let d = new CalloutLayerFrame();
-            let e = this.kd / 1000;
-            this.xc = b;
-            this.xb = c;
-            this.xd = d;
+            let e = this.kc / 1000;
+            this.xb = b;
+            this.xa = c;
+            this.xc = d;
             this.ab = CalloutLayer.$;
         }
-        adw(a, b) {
-            this.ad5();
+        adv(a, b) {
+            this.ad4();
         }
-        ad5() {
-            this.zx = this.zz(this.aaa);
-            this.ad2();
+        ad4() {
+            this.zw = this.zy(this.z9);
+            this.ad1();
         }
-        adx(a, b) {
-            this.abm.clear();
-            this.rr(false);
+        adw(a, b) {
+            this.abl.clear();
+            this.rq(false);
         }
-        pb(a, b, c, d) {
-            super.pb(a, b, c, d);
-            let e = this.abh();
+        pa(a, b, c, d) {
+            super.pa(a, b, c, d);
+            let e = this.abg();
             switch (a) {
                 case 3:
-                    this.aeb(b, e);
+                    this.aea(b, e);
                     break;
                 case 1:
                     for (let f = b; f < b + c; f++) {
                         let g = new CalloutAnnotation();
                         let h = new CalloutAnnotationWrapper();
                         h.b = g;
-                        h.b.series = this.aaf;
-                        this.abm.insert(f, h);
-                        this.aeb(f, e);
+                        h.b.series = this.aae;
+                        this.abl.insert(f, h);
+                        this.aea(f, e);
                     }
                     break;
                 case 0:
-                    this.abm.v(b, c);
+                    this.abl.v(b, c);
                     break;
                 case 2:
                     for (let i = b; i < b + c; i++) {
-                        this.aeb(i, e);
+                        this.aea(i, e);
                     }
                     break;
                 case 4:
-                    this.abm.clear();
+                    this.abl.clear();
                     for (let j = 0; j < this.dn.count; j++) {
                         let k = new CalloutAnnotation();
                         let l = new CalloutAnnotationWrapper();
                         l.b = k;
-                        l.b.series = this.aaf;
-                        this.abm.add(l);
-                        this.aeb(j, e);
+                        l.b.series = this.aae;
+                        this.abl.add(l);
+                        this.aea(j, e);
                     }
                     break;
             }
-            this.rr(true);
+            this.rq(true);
         }
-        gf(a) {
+        ge(a) {
             return false;
         }
-        afx() {
+        afw() {
             let a = new Thickness(0, DeviceUtils.g(3));
-            if (isNaN_(this.afw.left) || isNaN_(this.afw.top) || isNaN_(this.afw.right) || isNaN_(this.afw.bottom)) {
+            if (isNaN_(this.afv.left) || isNaN_(this.afv.top) || isNaN_(this.afv.right) || isNaN_(this.afv.bottom)) {
                 a = new Thickness(0, DeviceUtils.g(3));
             }
             else {
-                a = this.afw;
+                a = this.afv;
             }
             return a;
         }
-        wt() {
+        ws() {
             let a = 0;
             let b = 0;
-            if (!this.aa4) {
+            if (!this.aa3) {
                 return new Size(1, b, a);
             }
-            if (!this.aaw) {
-                return this.afv;
+            if (!this.aav) {
+                return this.afu;
             }
             let c = "Ig";
-            let d = this.afx();
-            let e = this.z8.cr(c, d);
+            let d = this.afw();
+            let e = this.z7.cr(c, d);
             if (!isNaN_(e.height)) {
                 a = Math.max(e.height, a);
             }
-            if (!isNaN_(this.aby)) {
-                a += this.aby;
+            if (!isNaN_(this.abx)) {
+                a += this.abx;
             }
-            if (!isNaN_(this.aby)) {
-                b += this.aby;
+            if (!isNaN_(this.abx)) {
+                b += this.abx;
             }
-            if (!isNaN_(this.abs)) {
-                a = Math.max(a, this.abs);
+            if (!isNaN_(this.abr)) {
+                a = Math.max(a, this.abr);
             }
-            if (!isNaN_(this.abq)) {
-                a = Math.min(a, this.abq);
+            if (!isNaN_(this.abp)) {
+                a = Math.min(a, this.abp);
             }
-            if (!isNaN_(this.abt)) {
-                b = Math.max(b, this.abt);
+            if (!isNaN_(this.abs)) {
+                b = Math.max(b, this.abs);
             }
-            if (!isNaN_(this.abr)) {
-                b = Math.min(b, this.abr);
+            if (!isNaN_(this.abq)) {
+                b = Math.min(b, this.abq);
             }
-            this.aaw = false;
-            this.afv = new Size(1, b, a);
-            return this.afv;
+            this.aav = false;
+            this.afu = new Size(1, b, a);
+            return this.afu;
         }
-        abh() {
+        abg() {
             let a = new Dictionary$2(String_$type, Series.$, 0);
             if (this.db != null) {
                 for (let b = 0; b < this.db.series.count; b++) {
@@ -232,24 +232,24 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        aeb(a, b) {
-            if (this.aar == null || this.aap == null) {
+        aea(a, b) {
+            if (this.aaq == null || this.aao == null) {
                 return;
             }
             let c = a;
-            if (this.aaq != null) {
-                c = this.aaq.item(a);
-            }
-            let d = this.aar.item(a);
-            let e = this.aap.item(a);
-            let f = this.abm._inner[a];
-            if (this.aao != null) {
-                if (f.b.ab != this.aao.item(a)) {
-                    f.b.key = this.aao.item(a);
+            if (this.aap != null) {
+                c = this.aap.item(a);
+            }
+            let d = this.aaq.item(a);
+            let e = this.aao.item(a);
+            let f = this.abl._inner[a];
+            if (this.aan != null) {
+                if (f.b.ab != this.aan.item(a)) {
+                    f.b.key = this.aan.item(a);
                 }
             }
-            if (this.abg.containsKey(f)) {
-                f.b = this.abg.item(f).c.b;
+            if (this.abf.containsKey(f)) {
+                f.b = this.abf.item(f).c.b;
             }
             f.b.xValue = c;
             f.b.yValue = d;
@@ -264,8 +264,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 this.calloutLabelUpdating(this, g);
                 if (g.c != null && !Base.equalsStatic(g.c, f.b.ao)) {
                     let h = g.c;
-                    if (this.z0 != null) {
-                        f.b.text = this.z0.i(h);
+                    if (this.zz != null) {
+                        f.b.text = this.zz.i(h);
                     }
                     else {
                         f.b.text = h != null ? h.toString() : "";
@@ -273,15 +273,15 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 }
             }
             else {
-                if (this.z0 != null) {
-                    f.b.text = this.z0.i(e);
+                if (this.zz != null) {
+                    f.b.text = this.zz.i(e);
                 }
                 else {
                     f.b.text = e != null ? e.toString() : "";
                 }
             }
-            if (this.aan != null) {
-                f.b.content = this.aan.item(a);
+            if (this.aam != null) {
+                f.b.content = this.aam.item(a);
             }
             else {
                 f.b.content = this.dn.item(a);
@@ -304,31 +304,31 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            this.aec(f);
+            this.aeb(f);
         }
-        aec(a) {
+        aeb(a) {
             let b = new Thickness(0, DeviceUtils.g(3));
-            if (isNaN_(this.afw.left) || isNaN_(this.afw.top) || isNaN_(this.afw.right) || isNaN_(this.afw.bottom)) {
+            if (isNaN_(this.afv.left) || isNaN_(this.afv.top) || isNaN_(this.afv.right) || isNaN_(this.afv.bottom)) {
                 b = new Thickness(0, DeviceUtils.g(3));
             }
             else {
-                b = this.afw;
+                b = this.afv;
             }
             let c = DeviceUtils.g(3);
-            if (isNaN_(this.abp)) {
+            if (isNaN_(this.abo)) {
                 c = DeviceUtils.g(3);
             }
             else {
-                c = this.abp;
-            }
-            let d = this.afm != null && !this.abc ? this.afm : this.z8.cl(a.b.l, a.b.itemColor);
-            let e = this.afr != null ? this.afr : null;
-            let f = this.afp != null ? this.afp : this.z8.co();
-            let g = this.afn != null ? this.afn : this.z8.cm();
-            let h = this.afq != null && !this.abd ? this.afq : this.z8.cp(a.b.l, a.b.itemColor);
-            let i = this.afo != null ? this.afo : this.z8.cn(a.b.l, a.b.itemColor);
-            let j = isNaN_(this.abz) ? 0 : this.abz;
-            if (e == null && (this.aba || this.afp != null || this.afn != null)) {
+                c = this.abo;
+            }
+            let d = this.afl != null && !this.abb ? this.afl : this.z7.cl(a.b.l, a.b.itemColor);
+            let e = this.afq != null ? this.afq : null;
+            let f = this.afo != null ? this.afo : this.z7.co();
+            let g = this.afm != null ? this.afm : this.z7.cm();
+            let h = this.afp != null && !this.abc ? this.afp : this.z7.cp(a.b.l, a.b.itemColor);
+            let i = this.afn != null ? this.afn : this.z7.cn(a.b.l, a.b.itemColor);
+            let j = isNaN_(this.aby) ? 0 : this.aby;
+            if (e == null && (this.aa9 || this.afo != null || this.afm != null)) {
                 let k = d;
                 if (k == null || BrushUtilCore.a(d)) {
                     k = this.db != null ? this.db.vk : null;
@@ -342,9 +342,9 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 e = BrushUtil.j(k, g, f);
             }
             if (e == null) {
-                e = this.z8.co();
+                e = this.z7.co();
             }
-            if (this.aa8 && this.calloutStyleUpdating != null) {
+            if (this.aa7 && this.calloutStyleUpdating != null) {
                 let l = new CalloutStyleUpdatingEventArgs();
                 l.item = a.b.aa;
                 l.xValue = a.b.ac;
@@ -370,43 +370,53 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             a.b.leaderBrush = i;
             a.b.strokeThickness = j;
         }
-        kq(a, b) {
-            let c = this.nd(b);
+        kp(a, b) {
+            let c = this.nc(b);
             if (c == CalloutLayer.$$p[31]) {
-                return this.kr(a, b, this.adb);
+                return this.kq(a, b, this.ada);
             }
             if (c == CalloutLayer.$$p[42]) {
-                return this.kr(a, b, this.adr);
+                return this.kq(a, b, this.adq);
             }
             if (c == CalloutLayer.$$p[43]) {
-                return this.kr(a, b, this.adu);
+                return this.kq(a, b, this.adt);
             }
             if (c == CalloutLayer.$$p[28]) {
-                return this.kr(a, b, this.ac5);
+                return this.kq(a, b, this.ac4);
             }
             if (c == CalloutLayer.$$p[22]) {
-                return this.kr(a, b, this.acx);
+                return this.kq(a, b, this.acw);
             }
-            return super.kq(a, b);
+            return super.kp(a, b);
         }
-        md(a) {
-            let b = this.nd(a);
+        mc(a) {
+            let b = this.nc(a);
             if (b == CalloutLayer.$$p[31]) {
-                return this.adb;
+                return this.ada;
             }
             if (b == CalloutLayer.$$p[42]) {
-                return this.adr;
+                return this.adq;
             }
             if (b == CalloutLayer.$$p[43]) {
-                return this.adu;
+                return this.adt;
             }
             if (b == CalloutLayer.$$p[28]) {
-                return this.ac5;
+                return this.ac4;
             }
             if (b == CalloutLayer.$$p[22]) {
-                return this.acx;
+                return this.acw;
+            }
+            return super.mc(a);
+        }
+        get aao() {
+            return this.aaj;
+        }
+        set aao(a) {
+            if (this.aaj != a) {
+                let b = this.aaj;
+                this.aaj = a;
+                this.raisePropertyChanged("LabelColumn", b, this.aaj);
             }
-            return super.md(a);
         }
         get aap() {
             return this.aak;
@@ -415,7 +425,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             if (this.aak != a) {
                 let b = this.aak;
                 this.aak = a;
-                this.raisePropertyChanged("LabelColumn", b, this.aak);
+                this.raisePropertyChanged("XColumn", b, this.aak);
             }
         }
         get aaq() {
@@ -425,27 +435,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             if (this.aal != a) {
                 let b = this.aal;
                 this.aal = a;
-                this.raisePropertyChanged("XColumn", b, this.aal);
-            }
-        }
-        get aar() {
-            return this.aam;
-        }
-        set aar(a) {
-            if (this.aam != a) {
-                let b = this.aam;
-                this.aam = a;
-                this.raisePropertyChanged("YColumn", b, this.aam);
-            }
-        }
-        get aao() {
-            return this.aaj;
-        }
-        set aao(a) {
-            if (this.aaj != a) {
-                let b = this.aaj;
-                this.aaj = a;
-                this.raisePropertyChanged("KeyColumn", b, this.aaj);
+                this.raisePropertyChanged("YColumn", b, this.aal);
             }
         }
         get aan() {
@@ -455,75 +445,85 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             if (this.aai != a) {
                 let b = this.aai;
                 this.aai = a;
-                this.raisePropertyChanged("ContentColumn", b, this.aai);
+                this.raisePropertyChanged("KeyColumn", b, this.aai);
             }
         }
-        adz(a, b) {
+        get aam() {
+            return this.aah;
+        }
+        set aam(a) {
+            if (this.aah != a) {
+                let b = this.aah;
+                this.aah = a;
+                this.raisePropertyChanged("ContentColumn", b, this.aah);
+            }
+        }
+        ady(a, b) {
             if (b.propertyName == CalloutAnnotation.$$p[15] || b.propertyName == CalloutAnnotation.$$p[16]) {
                 let c = a.k;
-                if (!this.abi.contains(c)) {
-                    this.abi.add_1(c);
-                    this.abl.add(c);
-                    this.rr(false);
+                if (!this.abh.contains(c)) {
+                    this.abh.add_1(c);
+                    this.abk.add(c);
+                    this.rq(false);
                 }
             }
         }
         cs() {
             return new CalloutLayerView(this);
         }
-        q1(a) {
-            super.q1(a);
-            this.z8 = a;
+        q0(a) {
+            super.q0(a);
+            this.z7 = a;
         }
-        get aaa() {
-            return this.z9;
+        get z9() {
+            return this.z8;
         }
-        set aaa(a) {
-            let b = this.aaa;
+        set z9(a) {
+            let b = this.z9;
             if (a != b) {
-                this.z9 = a;
-                this.raisePropertyChanged("AllowedPositions", b, this.aaa);
+                this.z8 = a;
+                this.raisePropertyChanged("AllowedPositions", b, this.z9);
             }
         }
-        gu(a) {
-            if (this.aaf == null) {
+        gt(a) {
+            if (this.aae == null) {
                 return true;
             }
-            if (this.aaf == a) {
+            if (this.aae == a) {
                 return true;
             }
             return false;
         }
-        get z3() {
-            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.aey));
-        }
-        set z3(a) {
-            this.h(CalloutLayer.aey, enumGetBox(AutoCalloutVisibilityMode_$type, a));
-        }
         get z2() {
-            return this.z1;
+            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.aex));
         }
         set z2(a) {
-            this.z1 = a;
+            this.h(CalloutLayer.aex, enumGetBox(AutoCalloutVisibilityMode_$type, a));
+        }
+        get z1() {
+            return this.z0;
+        }
+        set z1(a) {
+            this.z0 = a;
         }
-        get afw() {
-            return new Thickness(1, this.abv, this.abx, this.abw, this.abu);
+        get afv() {
+            return new Thickness(1, this.abu, this.abw, this.abv, this.abt);
         }
-        get aah() {
-            if (this.aag == null) {
-                this.aag = FontUtil.toFontInfo(this.jz, this.adh);
+        get aag() {
+            if (this.aaf == null) {
+                this.aaf = FontUtil.toFontInfo(this.jy, this.adg);
             }
-            return this.aag;
+            return this.aaf;
         }
-        yp(a, b) {
-            if (this.aaf == null || this.aaf == a) {
+        yo(a, b) {
+            if (this.aae == null || this.aae == a) {
                 if (!this.a1.c) {
-                    this.rr(b);
+                    this.rq(b);
                 }
             }
         }
-        yr(a, b) {
-            super.yr(a, b);
+        yq(a, b) {
+            super.yq(a, b);
             let c = a;
             c.q.clear();
             c.r.clear();
@@ -542,23 +542,23 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             c.v.clear();
             c.s.clear();
             c.t.clear();
-            let d = this.abn();
+            let d = this.abm();
             let e = new List$1(CalloutAnnotationWrapper.$, 0);
             let f = Number.POSITIVE_INFINITY;
             let g = true;
-            if (this.aa5) {
-                if (this.xi(this.aaf)) {
-                    if (typeCast(IHasCategoryAxis_$type, this.aaf) !== null) {
-                        let h = this.aaf.getCategoryWidth();
+            if (this.aa4) {
+                if (this.xh(this.aae)) {
+                    if (typeCast(IHasCategoryAxis_$type, this.aae) !== null) {
+                        let h = this.aae.getCategoryWidth();
                         if (!isNaN_(h) && !isInfinity(h) && h > 0) {
                             f = Math.min(f, h);
                         }
                     }
-                    this.ad7(this.aaf, c, e);
+                    this.ad6(this.aae, c, e);
                 }
                 else {
                     for (let i of fromEnum(this.db.series)) {
-                        if (this.xi(i)) {
+                        if (this.xh(i)) {
                             if (typeCast(IHasCategoryAxis_$type, i) !== null) {
                                 let j = i.getCategoryWidth();
                                 if (!isNaN_(j) && !isInfinity(j) && j > 0) {
@@ -571,23 +571,23 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                                 }
                             }
                             let k = false;
-                            if (i.eg && this.aae == 0 || this.aae == 3 || this.aae == 2) {
-                                if (this.aae == 0 || this.aae == 2) {
+                            if (i.eg && this.aad == 0 || this.aad == 3 || this.aad == 2) {
+                                if (this.aad == 0 || this.aad == 2) {
                                     k = true;
                                 }
-                                i.p1((l) => {
-                                    this.ad7(l, c, e);
+                                i.p0((l) => {
+                                    this.ad6(l, c, e);
                                     return true;
                                 });
                             }
                             if (!k) {
-                                this.ad7(i, c, e);
+                                this.ad6(i, c, e);
                             }
                         }
                     }
                 }
             }
-            if (this.aa5 && this.z2 == 2) {
+            if (this.aa4 && this.z1 == 2) {
                 let l = 0;
                 let m = 0;
                 let n = 1.7976931348623157E+308;
@@ -640,68 +640,68 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            this.ad6(c, d, e);
+            this.ad5(c, d, e);
         }
-        sr(a, b) {
-            super.sr(a, b);
-            let c = b.width - this.aft.width;
-            let d = b.height - this.aft.height;
+        sq(a, b) {
+            super.sq(a, b);
+            let c = b.width - this.afs.width;
+            let d = b.height - this.afs.height;
             let e = 0;
             if (Math.abs(c) > Math.abs(d)) {
                 e = c;
-                this.abo = c * this.ws.width;
+                this.abn = c * this.wr.width;
             }
             else {
                 e = d;
-                this.abo = d * this.ws.height;
-            }
-            if (e > 0 && this.abo > 5) {
-                this.aa3 = true;
+                this.abn = d * this.wr.height;
             }
-            if (e < 0 && this.abo > 5) {
+            if (e > 0 && this.abn > 5) {
                 this.aa2 = true;
             }
+            if (e < 0 && this.abn > 5) {
+                this.aa1 = true;
+            }
         }
-        sq(a, b) {
-            super.sq(a, b);
+        sp(a, b) {
+            super.sp(a, b);
             if (!a.equals1(b)) {
-                this.aa1 = true;
+                this.aa0 = true;
             }
         }
-        get afu() {
-            return this.afs;
+        get aft() {
+            return this.afr;
         }
-        set afu(a) {
-            this.afs = a;
+        set aft(a) {
+            this.afr = a;
         }
-        ad6(a, b, c) {
+        ad5(a, b, c) {
             if (this.db != null) {
-                this.aft = this.db.v4;
+                this.afs = this.db.v4;
             }
-            if (this.ws.isEmpty) {
+            if (this.wr.isEmpty) {
                 return;
             }
-            this.afu = new Rect(0, this.ws.left, this.ws.top, this.ws.width, this.ws.height);
-            if (this.aas != null && this.acu != null && this.acu != this.aas.bd) {
-                this.ad1();
+            this.aft = new Rect(0, this.wr.left, this.wr.top, this.wr.width, this.wr.height);
+            if (this.aar != null && this.act != null && this.act != this.aar.bd) {
+                this.ad0();
             }
-            if (this.aas != null && this.aas.j != this.aau()) {
-                this.ad1();
+            if (this.aar != null && this.aar.j != this.aat()) {
+                this.ad0();
             }
-            if (this.aas == null) {
-                let d = this.aat();
+            if (this.aar == null) {
+                let d = this.aas();
                 if (d != null) {
-                    this.aas = d;
-                    let e = this.aas;
-                    e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.ady));
+                    this.aar = d;
+                    let e = this.aar;
+                    e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.adx));
                 }
                 else {
-                    let f = this.wj(this.cv);
+                    let f = this.wi(this.cv);
                     let g = new Array(2);
                     g[0] = 0;
                     g[1] = 3;
-                    if (this.aaf != null) {
-                        if (this.aaf.isVertical) {
+                    if (this.aae != null) {
+                        if (this.aae.isVertical) {
                             g = new Array(2);
                             g[0] = 2;
                             g[1] = 1;
@@ -725,21 +725,21 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                             g[1] = 1;
                         }
                     }
-                    if (this.z5 == 4 || this.z5 == 6) {
+                    if (this.z4 == 4 || this.z4 == 6) {
                         g = new Array(4);
                         g[0] = 10;
                         g[1] = 11;
                         g[2] = 8;
                         g[3] = 9;
                     }
-                    if (this.z5 == 5) {
+                    if (this.z4 == 5) {
                         g = new Array(4);
                         g[0] = 9;
                         g[1] = 10;
                         g[2] = 11;
                         g[3] = 8;
                     }
-                    if (this.z5 == 7) {
+                    if (this.z4 == 7) {
                         g = new Array(4);
                         g = new Array(4);
                         g[0] = 8;
@@ -747,32 +747,32 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         g[2] = 11;
                         g[3] = 9;
                     }
-                    this.aas = new LabelCollisionManager(this.ws.right, this.ws.bottom, this.ws, this.z8.j(), this.aby, this.aau(), g, this.ab5(), this.ab4(), this.aa6, this.zx);
-                    this.aas.v = this.aa9;
-                    if (this.acu != null) {
-                        this.aas.bd = this.acu;
-                        this.aas.bb = this;
+                    this.aar = new LabelCollisionManager(this.wr.right, this.wr.bottom, this.wr, this.z7.j(), this.abx, this.aat(), g, this.ab4(), this.ab3(), this.aa5, this.zw);
+                    this.aar.v = this.aa8;
+                    if (this.act != null) {
+                        this.aar.bd = this.act;
+                        this.aar.bb = this;
                     }
-                    let j = this.aas;
-                    j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.ady));
+                    let j = this.aar;
+                    j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.adx));
                 }
             }
-            if (this.aa2) {
-                this.aa2 = false;
-                if (this.aas.a9 > 2) {
-                    this.aa0 = true;
+            if (this.aa1) {
+                this.aa1 = false;
+                if (this.aar.a9 > 2) {
+                    this.aaz = true;
                 }
             }
-            if (this.aa3) {
-                this.aa3 = false;
-                if (this.abo > 5) {
-                    this.aa0 = true;
+            if (this.aa2) {
+                this.aa2 = false;
+                if (this.abn > 5) {
+                    this.aaz = true;
                 }
             }
-            if (this.aa1) {
-                this.aa1 = false;
-                this.aas.bs(this.ws.right, this.ws.bottom, this.ws);
-                this.aa0 = true;
+            if (this.aa0) {
+                this.aa0 = false;
+                this.aar.bs(this.wr.right, this.wr.bottom, this.wr);
+                this.aaz = true;
             }
             let k = new HashSet$1(CalloutAnnotationWrapper.$, 0);
             let l = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -785,55 +785,55 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             for (let q = 0; q < c.count; q++) {
                 o.add_1(c._inner[q]);
             }
-            let r = this.abj.c;
+            let r = this.abi.c;
             while (r != null) {
                 let s = r.a;
                 if (!o.contains(r.c)) {
                     n.add(r.c);
                     l.add_1(r.c);
                     let t = r.c.b;
-                    t.propertyChanged = delegateRemove(t.propertyChanged, runOn(this, this.adz));
-                    this.abj.h(r);
-                    this.abg.removeItem(r.c);
-                    this.aas.br(r.c.c);
+                    t.propertyChanged = delegateRemove(t.propertyChanged, runOn(this, this.ady));
+                    this.abi.h(r);
+                    this.abf.removeItem(r.c);
+                    this.aar.br(r.c.c);
                 }
                 r = s;
             }
             for (let u = 0; u < b.count; u++) {
-                if (!this.abg.containsKey(b._inner[u])) {
-                    this.abj.f(b._inner[u]);
+                if (!this.abf.containsKey(b._inner[u])) {
+                    this.abi.f(b._inner[u]);
                     let v = b._inner[u].b;
-                    v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.adz));
-                    this.abg.addItem(b._inner[u], this.abj.d);
+                    v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.ady));
+                    this.abf.addItem(b._inner[u], this.abi.d);
                     m.add(b._inner[u]);
                     k.add_1(b._inner[u]);
-                    this.aa0 = true;
+                    this.aaz = true;
                 }
             }
             for (let w = 0; w < c.count; w++) {
-                if (!this.abg.containsKey(c._inner[w])) {
-                    this.abj.f(c._inner[w]);
-                    this.abg.addItem(c._inner[w], this.abj.d);
+                if (!this.abf.containsKey(c._inner[w])) {
+                    this.abi.f(c._inner[w]);
+                    this.abf.addItem(c._inner[w], this.abi.d);
                     let x = c._inner[w].b;
-                    x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.adz));
+                    x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.ady));
                     m.add(c._inner[w]);
                     k.add_1(c._inner[w]);
-                    this.aa0 = true;
+                    this.aaz = true;
                 }
             }
-            if (this.aay == true) {
-                this.aay = false;
-                this.aa0 = true;
+            if (this.aax == true) {
+                this.aax = false;
+                this.aaz = true;
             }
             let y = false;
-            if (this.abl.count > 0) {
+            if (this.abk.count > 0) {
                 y = true;
-                this.abl.clear();
-                this.abi.clear();
+                this.abk.clear();
+                this.abh.clear();
             }
-            r = this.abj.c;
+            r = this.abi.c;
             while (r != null) {
-                let z = this.aav(r.c);
+                let z = this.aau(r.c);
                 if (z == null) {
                     return;
                 }
@@ -849,41 +849,41 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         ab.r = z.g;
                         ab.q = z.f;
                         if (ab.c == null) {
-                            this.aas.ad(ab, false);
+                            this.aar.ad(ab, false);
                         }
                         if (aa) {
-                            this.aas.be(ab);
+                            this.aar.be(ab);
                         }
                         else {
-                            this.aas.bo(ab);
+                            this.aar.bo(ab);
                         }
                     }
                 }
                 r = r.a;
             }
-            let ac = this.aas.ba();
-            let ad = this.aas.af();
-            if (!this.aa0 && y && (ac != 0 || ad)) {
+            let ac = this.aar.ba();
+            let ad = this.aar.af();
+            if (!this.aaz && y && (ac != 0 || ad)) {
                 {
-                    this.aa0 = true;
+                    this.aaz = true;
                 }
             }
             if (ad) {
-                if (this.aas.x()) {
-                    this.aa0 = true;
+                if (this.aar.x()) {
+                    this.aaz = true;
                 }
             }
-            if (this.aa0 && (ac != 0 || ad)) {
-                this.aa0 = false;
-                this.ab1 = 0x7FFFFFFF;
-                if (this.acu != null) {
+            if (this.aaz && (ac != 0 || ad)) {
+                this.aaz = false;
+                this.ab0 = 0x7FFFFFFF;
+                if (this.act != null) {
                     let ae = true;
                     for (let af = 0; af < this.db.series.count; af++) {
                         let ag = this.db.series._inner[af];
                         if (ag.es && typeCast(CalloutLayer.$, ag) !== null) {
                             let ah = ag;
-                            if (ah.acu == this.acu) {
-                                if (!ah.afu.equals1(this.aas.b0)) {
+                            if (ah.act == this.act) {
+                                if (!ah.aft.equals1(this.aar.b0)) {
                                     ae = false;
                                     break;
                                 }
@@ -891,21 +891,21 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         }
                     }
                     if (ae) {
-                        this.aas.bv();
+                        this.aar.bv();
                     }
                     else {
-                        this.aas.bf();
-                        this.aas.bg();
+                        this.aar.bf();
+                        this.aar.bg();
                     }
                 }
                 else {
-                    this.aas.bv();
+                    this.aar.bv();
                 }
             }
             else {
-                this.aas.bg();
+                this.aar.bg();
             }
-            let ai = this.abj.c;
+            let ai = this.abi.c;
             let aj;
             let ak;
             let al;
@@ -922,8 +922,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             let aw;
             let ax;
             let ay;
-            let az = this.aa7;
-            let a0 = this.aa9;
+            let az = this.aa6;
+            let a0 = this.aa8;
             let a1 = this.cv.bt();
             while (ai != null) {
                 let a2 = ai.c;
@@ -947,7 +947,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 ay = a4.l - a4.o;
                 let a5 = false;
                 if (a0) {
-                    if (a4.c != null && this.aas.ab(a4.c)) {
+                    if (a4.c != null && this.aar.ab(a4.c)) {
                         a5 = true;
                     }
                 }
@@ -961,8 +961,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     aw = a4.l;
                 }
                 if (a5) {
-                    at = this.adj(a2, at);
-                    let a6 = this.aas.as(a2.c.c);
+                    at = this.adi(a2, at);
+                    let a6 = this.aar.as(a2.c.c);
                     if (a6 > 0) {
                         ax += a6;
                         av -= a6;
@@ -1009,40 +1009,40 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 ai = ai.a;
             }
         }
-        adj(a, b) {
-            let c = Math.max(this.aas.as(a.c.c), this.aas.at(a.c.c));
+        adi(a, b) {
+            let c = Math.max(this.aar.as(a.c.c), this.aar.at(a.c.c));
             if (c <= 0) {
                 return b;
             }
             let d = b.length;
-            let e = this.z8.cr(b, a.b.backgroundPadding);
+            let e = this.z7.cr(b, a.b.backgroundPadding);
             let f = e.width;
             let g = f - c;
             while (f - g > 0.0001 && d > 0) {
                 d--;
                 b = b.substr(0, d) + "…";
-                e = this.z8.cr(b, a.b.backgroundPadding);
+                e = this.z7.cr(b, a.b.backgroundPadding);
                 f = e.width;
             }
             return b;
         }
-        ad1() {
-            if (this.aas != null) {
-                let a = this.abj.c;
+        ad0() {
+            if (this.aar != null) {
+                let a = this.abi.c;
                 while (a != null) {
                     let b = a.c.c;
                     if (b != null) {
-                        this.aas.br(b);
+                        this.aar.br(b);
                     }
                     a = a.a;
                 }
-                let c = this.aas;
-                c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.ady));
-                this.aas = null;
+                let c = this.aar;
+                c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.adx));
+                this.aar = null;
             }
-            this.ad0();
+            this.adz();
         }
-        aat() {
+        aas() {
             if (this.db == null) {
                 return null;
             }
@@ -1051,9 +1051,9 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 if (b.es && typeCast(CalloutLayer.$, b) !== null) {
                     let c = b;
                     if (c != this) {
-                        if (c.acu != null && c.acu == this.acu) {
-                            if (c.aas != null) {
-                                return c.aas;
+                        if (c.act != null && c.act == this.act) {
+                            if (c.aar != null) {
+                                return c.aar;
                             }
                         }
                     }
@@ -1061,14 +1061,14 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        ab4() {
+        ab3() {
             return 20000;
         }
-        ab5() {
+        ab4() {
             return 300;
         }
-        aau() {
-            switch (this.z5) {
+        aat() {
+            switch (this.z4) {
                 case 0: return 2;
                 case 2: return 1;
                 case 3: return 2;
@@ -1080,18 +1080,18 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return 2;
         }
-        ady(a) {
-            let b = this.aas.ba();
-            let c = this.ab1;
-            if (b < this.ab1) {
-                this.ab1 = b;
+        adx(a) {
+            let b = this.aar.ba();
+            let c = this.ab0;
+            if (b < this.ab0) {
+                this.ab0 = b;
                 if (c != 0x7FFFFFFF) {
-                    this.rr(false);
+                    this.rq(false);
                 }
             }
         }
-        aav(a) {
-            let b = this.aaf;
+        aau(a) {
+            let b = this.aae;
             if (a.b.l != null) {
                 b = a.b.l;
             }
@@ -1108,7 +1108,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 return null;
             }
             let e = b.ai();
-            let f = b.iy();
+            let f = b.ix();
             let g = null;
             let h = null;
             let i = false;
@@ -1159,8 +1159,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             let o = 0;
             let p = 0;
             if (i) {
-                o = g.el(this.ab0(a.b.ac), m) + k;
-                p = h.el(this.ab0(a.b.ad), n) + l;
+                o = g.el(this.abz(a.b.ac), m) + k;
+                p = h.el(this.abz(a.b.ad), n) + l;
                 let q = o;
                 let r = p;
                 let s = { $type: Point_$type, x: 0.5, y: 0.5 };
@@ -1170,8 +1170,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 p = ViewportUtils.i(u, n.e, n.d, n.c);
             }
             else {
-                o = g.el(this.ab0(a.b.ac), m) + k;
-                p = h.el(this.ab0(a.b.ad), n) + l;
+                o = g.el(this.abz(a.b.ac), m) + k;
+                p = h.el(this.abz(a.b.ad), n) + l;
             }
             let v = new QuadTreeBoundingBox();
             v.d = o;
@@ -1181,7 +1181,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             v.i = a.b;
             return v;
         }
-        ab0(a) {
+        abz(a) {
             if (typeCast(Date_$type, a) !== null) {
                 return a.getTime();
             }
@@ -1190,82 +1190,82 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        abn() {
+        abm() {
             let a = new List$1(CalloutAnnotationWrapper.$, 0);
-            for (let b = 0; b < this.abm.count; b++) {
-                if (stringIsNullOrEmpty(this.abm._inner[b].b.ao)) {
+            for (let b = 0; b < this.abl.count; b++) {
+                if (stringIsNullOrEmpty(this.abl._inner[b].b.ao)) {
                     continue;
                 }
-                if (this.abm._inner[b].c == null) {
+                if (this.abl._inner[b].c == null) {
                     let c = new LabelCollisionInfo();
-                    this.abm._inner[b].c = c;
-                    let d = this.z8.cr(this.ab6(this.abm._inner[b]), this.abm._inner[b].b.backgroundPadding);
+                    this.abl._inner[b].c = c;
+                    let d = this.z7.cr(this.ab5(this.abl._inner[b]), this.abl._inner[b].b.backgroundPadding);
                     c.o = d.height / 2;
                     c.p = d.width / 2;
                 }
-                let e = this.aav(this.abm._inner[b]);
-                if (e == null || e.d < this.ws.left || e.d > this.ws.right || e.e < this.ws.top || e.e > this.ws.bottom) {
+                let e = this.aau(this.abl._inner[b]);
+                if (e == null || e.d < this.wr.left || e.d > this.wr.right || e.e < this.wr.top || e.e > this.wr.bottom) {
                     continue;
                 }
-                a.add(this.abm._inner[b]);
+                a.add(this.abl._inner[b]);
             }
             return a;
         }
-        ab6(a) {
+        ab5(a) {
             return a.b.ao;
         }
-        xi(a) {
-            if (!super.xi(a)) {
+        xh(a) {
+            if (!super.xh(a)) {
                 return false;
             }
-            if (this.ade != null) {
-                if (a.fb) {
-                    let b = a.nc();
-                    if (!Base.equalsStatic(this.ade, b)) {
+            if (this.add != null) {
+                if (a.isFragment) {
+                    let b = a.nb();
+                    if (!Base.equalsStatic(this.add, b)) {
                         return false;
                     }
                 }
                 else {
-                    if (!Base.equalsStatic(this.ade, a.name)) {
+                    if (!Base.equalsStatic(this.add, a.name)) {
                         return false;
                     }
                 }
             }
             return true;
         }
-        qp() {
-            super.qp();
+        qo() {
+            super.qo();
             if (!this.a1.c && !this.d3()) {
                 return;
             }
-            if (this.aax) {
-                this.aax = false;
-                this.ad8();
-                this.ad3();
+            if (this.aaw) {
+                this.aaw = false;
+                this.ad7();
+                this.ad2();
             }
             if (this.d3()) {
-                this.aea(this.xd, false);
+                this.ad9(this.xc, false);
             }
             else {
-                this.aea(this.xb, false);
+                this.ad9(this.xa, false);
             }
         }
-        ad4() {
-            if (!this.aaz) {
-                this.aaz = true;
-                this.rr(true);
+        ad3() {
+            if (!this.aay) {
+                this.aay = true;
+                this.rq(true);
             }
         }
-        ad7(a, b, c) {
+        ad6(a, b, c) {
             let d = false;
-            if (this.aaz) {
-                this.aaz = false;
+            if (this.aay) {
+                this.aay = false;
                 d = true;
             }
-            a.ki = this.z0;
-            if (!a.gi && a.eb(this.abk, this.abf, this.abb, this.ab2, false)) {
-                let e = this.abk;
-                for (let f = 0; f < this.abk.count; f++) {
+            a.kh = this.zz;
+            if (!a.gh && a.eb(this.abj, this.abe, this.aba, this.ab1, false)) {
+                let e = this.abj;
+                for (let f = 0; f < this.abj.count; f++) {
                     let g = e._inner[f];
                     let h = g.b != null ? g.b.item : null;
                     let i = g.b.item != null ? g.b.item : g.b;
@@ -1277,8 +1277,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     m.b = n;
                     n.key = l;
                     let o = false;
-                    if (this.abg.containsKey(m)) {
-                        m = this.abg.item(m).c;
+                    if (this.abf.containsKey(m)) {
+                        m = this.abf.item(m).c;
                         n = m.b;
                         o = d;
                     }
@@ -1287,10 +1287,10 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                     let p = n.ac;
                     let q = n.ad;
-                    if (this.ab0(p) != this.ab0(g.d) && (!isNaN_(this.ab0(p)) || !isNaN_(this.ab0(g.d)))) {
+                    if (this.abz(p) != this.abz(g.d) && (!isNaN_(this.abz(p)) || !isNaN_(this.abz(g.d)))) {
                         n.xValue = g.d;
                     }
-                    if (this.ab0(q) != this.ab0(g.e) && (!isNaN_(this.ab0(q)) || !isNaN_(this.ab0(g.e)))) {
+                    if (this.abz(q) != this.abz(g.e) && (!isNaN_(this.abz(q)) || !isNaN_(this.abz(g.e)))) {
                         n.yValue = g.e;
                     }
                     n.itemColor = j;
@@ -1314,8 +1314,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                             this.calloutLabelUpdating(this, s);
                             if (s.c != null && !Base.equalsStatic(s.c, m.b.ao)) {
                                 let t = s.c;
-                                if (this.z0 != null) {
-                                    m.b.text = this.z0.i(t);
+                                if (this.zz != null) {
+                                    m.b.text = this.zz.i(t);
                                 }
                                 else {
                                     m.b.text = t != null ? t.toString() : "";
@@ -1353,17 +1353,17 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         }
                     }
                     if (o) {
-                        this.aec(m);
+                        this.aeb(m);
                     }
                     if (m.c == null) {
                         let v = new LabelCollisionInfo();
                         m.c = v;
-                        let w = this.z8.cr(this.ab6(m), m.b.backgroundPadding);
+                        let w = this.z7.cr(this.ab5(m), m.b.backgroundPadding);
                         v.o = w.height / 2;
                         v.p = w.width / 2;
                     }
-                    let x = this.aav(m);
-                    if (x == null || x.d < this.ws.left || x.d > this.ws.right || x.e < this.ws.top || x.e > this.ws.bottom) {
+                    let x = this.aau(m);
+                    if (x == null || x.d < this.wr.left || x.d > this.wr.right || x.e < this.wr.top || x.e > this.wr.bottom) {
                         continue;
                     }
                     m.e = x.d;
@@ -1374,25 +1374,25 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     c.add(m);
                 }
             }
-            a.ki = null;
+            a.kh = null;
         }
         b2() {
             return 1;
         }
         a2(a, b) {
-            let c = this.aas.i(a, b);
+            let c = this.aar.i(a, b);
             if (c == null) {
                 return null;
             }
             return c.y;
         }
-        gw(a, b) {
-            if (this.aas == null) {
+        gv(a, b) {
+            if (this.aar == null) {
                 return false;
             }
-            return this.aas.i(a, b) != null;
+            return this.aar.i(a, b) != null;
         }
-        aea(a, b) {
+        ad9(a, b) {
             let c = 0;
             let d = new HashSet$1(CalloutAnnotationWrapper.$, 0);
             for (c = 0; c < a.q.count; c++) {
@@ -1400,7 +1400,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 if (isNaN_(a.u._inner[c]) || isNaN_(a.v._inner[c])) {
                     continue;
                 }
-                let f = this.z8.cb.item(e);
+                let f = this.z7.cb.item(e);
                 d.add_1(e);
                 if (f.h != a.q._inner[c]) {
                     f.h = a.q._inner[c];
@@ -1413,87 +1413,87 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 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.z8.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.z8.ck(f, e, a.r._inner[c]);
+                this.z7.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.z7.ck(f, e, a.r._inner[c]);
                 f.r = { $type: Point_$type, x: a.u._inner[c], y: a.v._inner[c] };
             }
             let h = new List$1(CalloutAnnotationWrapper.$, 0);
-            for (let i of fromEnum(this.z8.cb.c)) {
+            for (let i of fromEnum(this.z7.cb.c)) {
                 if (!d.contains(i)) {
                     h.add(i);
                 }
             }
             for (let j = 0; j < h.count; j++) {
-                this.z8.cb.h(h._inner[j]);
+                this.z7.cb.h(h._inner[j]);
             }
         }
-        yu(a, b) {
-            super.yu(a, b);
+        yt(a, b) {
+            super.yt(a, b);
             if (this.d3()) {
-                this.aea(this.xd, true);
+                this.ad9(this.xc, true);
             }
             else {
-                this.aea(this.xb, false);
+                this.ad9(this.xa, false);
             }
         }
-        ga() {
+        f9() {
             return true;
         }
-        q9(a, b, c, d) {
-            super.q9(a, b, c, d);
+        q8(a, b, c, d) {
+            super.q8(a, b, c, d);
             switch (b) {
                 case CalloutLayer.$$p[35]:
-                    this.aag = null;
-                    this.z8.ci();
-                    this.rr(true);
+                    this.aaf = null;
+                    this.z7.ci();
+                    this.rq(true);
                     break;
                 case CalloutLayer.$$p[33]:
                 case CalloutLayer.$$p[34]:
-                    this.rr(true);
+                    this.rq(true);
                     break;
                 case CalloutLayer.$$p[29]:
                 case CalloutLayer.$$p[30]:
-                    if (this.ac8 != null) {
-                        this.z0 = new BindingFormatter();
-                        this.z0.j = this.ac8;
-                        this.z0.d = this.zy;
+                    if (this.ac7 != null) {
+                        this.zz = new BindingFormatter();
+                        this.zz.j = this.ac7;
+                        this.zz.d = this.zx;
                     }
                     else {
-                        this.z0 = null;
+                        this.zz = null;
                     }
                     break;
                 case CalloutLayer.$$p[21]:
                 case CalloutLayer.$$p[23]:
-                    this.rr(true);
+                    this.rq(true);
                     break;
                 case "SeriesViewer":
                     if (c != null) {
                         let e = c;
-                        e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.ad9));
+                        e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.ad8));
                     }
                     if (d != null) {
                         let f = d;
-                        f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.ad9));
+                        f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.ad8));
                     }
                     if (d == null) {
-                        this.ad1();
+                        this.ad0();
                     }
                     break;
                 case "AutoCalloutVisibilityMode":
-                    this.z2 = this.z4();
-                    this.ad2();
+                    this.z1 = this.z3();
+                    this.ad1();
                     break;
                 case "AllowedPositions":
                     if (c != null) {
                         let g = c;
-                        g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.adw));
+                        g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.adv));
                     }
                     if (d != null) {
                         let h = d;
-                        h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.adw));
+                        h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.adv));
                     }
-                    this.zx = this.zz(this.aaa);
-                    this.ad2();
+                    this.zw = this.zy(this.z9);
+                    this.ad1();
                     break;
                 case CalloutLayer.$$p[24]:
                 case CalloutLayer.$$p[25]:
@@ -1515,100 +1515,100 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 case CalloutLayer.$$p[6]:
                 case CalloutLayer.$$p[9]:
                 case CalloutLayer.$$p[7]:
-                    this.aaw = true;
-                    this.ad2();
+                    this.aav = true;
+                    this.ad1();
                     break;
                 case CalloutLayer.$$p[19]:
                 case CalloutLayer.$$p[20]:
                 case CalloutLayer.$$p[2]:
-                    this.ad2();
+                    this.ad1();
                     break;
                 case CalloutLayer.$$p[32]:
-                    this.ad2();
-                    if (this.aas != null) {
-                        this.aas.v = d;
+                    this.ad1();
+                    if (this.aar != null) {
+                        this.aar.v = d;
                     }
                     break;
                 case CalloutLayer.$$p[31]:
                     if (this.dn != null) {
-                        this.dn.deregisterColumn(this.aap);
-                        this.aap = this.dm(this.adb);
+                        this.dn.deregisterColumn(this.aao);
+                        this.aao = this.dm(this.ada);
                     }
                     break;
                 case "LabelColumn":
-                    this.ad2();
+                    this.ad1();
                     break;
                 case CalloutLayer.$$p[22]:
                     if (this.dn != null) {
-                        this.dn.deregisterColumn(this.aan);
-                        this.aan = this.dm(this.acx);
+                        this.dn.deregisterColumn(this.aam);
+                        this.aam = this.dm(this.acw);
                     }
                     break;
                 case "ContentColumn":
-                    this.ad2();
+                    this.ad1();
                     break;
                 case CalloutLayer.$$p[42]:
                     if (this.dn != null) {
-                        this.dn.deregisterColumn(this.aaq);
-                        this.aaq = stringIsNullOrEmpty(this.adr) == false ? this.dm(this.adr) : null;
+                        this.dn.deregisterColumn(this.aap);
+                        this.aap = stringIsNullOrEmpty(this.adq) == false ? this.dm(this.adq) : null;
                     }
                     break;
                 case "XColumn":
-                    this.ad2();
+                    this.ad1();
                     break;
                 case CalloutLayer.$$p[43]:
                     if (this.dn != null) {
-                        this.dn.deregisterColumn(this.aar);
-                        this.aar = this.dm(this.adu);
+                        this.dn.deregisterColumn(this.aaq);
+                        this.aaq = this.dm(this.adt);
                     }
                     break;
                 case "YColumn":
-                    this.ad2();
+                    this.ad1();
                     break;
                 case CalloutLayer.$$p[28]:
                     if (this.dn != null) {
-                        this.dn.deregisterColumn(this.aao);
-                        this.aao = this.dm(this.ac5);
+                        this.dn.deregisterColumn(this.aan);
+                        this.aan = this.dm(this.ac4);
                     }
                     break;
                 case "KeyColumn":
-                    this.ad2();
+                    this.ad1();
                     break;
                 case "FastItemsSource":
-                    this.aay = true;
+                    this.aax = true;
                     if (typeCast(IFastItemsSource_$type, c) != null) {
+                        c.deregisterColumn(this.aao);
+                        c.deregisterColumn(this.aam);
                         c.deregisterColumn(this.aap);
-                        c.deregisterColumn(this.aan);
                         c.deregisterColumn(this.aaq);
-                        c.deregisterColumn(this.aar);
-                        c.deregisterColumn(this.aao);
+                        c.deregisterColumn(this.aan);
+                        this.aao = null;
+                        this.aam = null;
                         this.aap = null;
-                        this.aan = null;
                         this.aaq = null;
-                        this.aar = null;
-                        this.aao = null;
-                        this.abm.clear();
+                        this.aan = null;
+                        this.abl.clear();
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.aap = this.dm(this.adb);
-                        this.aan = this.dm(this.acx);
-                        if (stringIsNullOrEmpty(this.adr) == false) {
-                            this.aaq = this.dm(this.adr);
+                        this.aao = this.dm(this.ada);
+                        this.aam = this.dm(this.acw);
+                        if (stringIsNullOrEmpty(this.adq) == false) {
+                            this.aap = this.dm(this.adq);
                         }
-                        this.aar = this.dm(this.adu);
-                        this.aao = this.dm(this.ac5);
+                        this.aaq = this.dm(this.adt);
+                        this.aan = this.dm(this.ac4);
                     }
-                    this.ad2();
+                    this.ad1();
                     break;
             }
         }
-        z4() {
-            if (this.z3 == 0) {
+        z3() {
+            if (this.z2 == 0) {
                 return 1;
             }
-            return this.z3;
+            return this.z2;
         }
-        zz(a) {
+        zy(a) {
             if (a == null || a.count == 0) {
                 return null;
             }
@@ -1618,38 +1618,42 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        ad9(a) {
+        ad8(a) {
             if (a.es) {
                 return;
             }
-            if ((a == this.aaf || this.aaf == null) && this.aa5) {
-                this.rr(false);
+            if ((a == this.aae || this.aae == null) && this.aa4) {
+                this.rq(false);
             }
         }
-        ad2() {
-            if (this.aax == false) {
-                this.aax = true;
-                this.rr(false);
+        ad1() {
+            if (this.aaw == false) {
+                this.aaw = true;
+                this.rq(false);
             }
         }
         ax(a, b, c) {
             let d = this.getEffectiveViewport();
             let e = this.db.wk;
-            let f = this.wt();
+            let f = this.ws();
             let g = 0;
             if (b.cp) {
                 let h = new ScalerParams(0, c, e, !b.ch, d);
-                g = (b.eo(f.height, h));
+                let i = b.eo(0, h);
+                let j = b.eo(f.height, h);
+                g = Math.abs(j - i);
                 return new AxisRange(a.c - g, a.b + g);
             }
             else {
-                let i = new ScalerParams(0, c, e, b.ch, d);
-                g = (b.eo(f.width, i));
+                let k = new ScalerParams(0, c, e, b.ch, d);
+                let l = b.eo(0, k);
+                let m = b.eo(f.width, k);
+                g = Math.abs(m - l);
                 return new AxisRange(a.c - g, a.b + g);
             }
         }
-        ad8() {
-            if (!this.aa4) {
+        ad7() {
+            if (!this.aa3) {
                 return;
             }
             if (this.c9 == null) {
@@ -1668,40 +1672,40 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 c.c2(true);
             }
         }
-        ad0() {
-            this.z8.cb.clear();
-            this.abj.g();
-            this.abg.clear();
+        adz() {
+            this.z7.cb.clear();
+            this.abi.g();
+            this.abf.clear();
         }
-        ad3() {
-            if (this.aar == null || this.aap == null) {
-                let a = this.abj.c;
+        ad2() {
+            if (this.aaq == null || this.aao == null) {
+                let a = this.abi.c;
                 while (a != null) {
-                    this.aec(a.c);
+                    this.aeb(a.c);
                     a = a.a;
                 }
                 return;
             }
-            let b = this.abh();
-            for (let c = 0; c < this.aar.count; c++) {
+            let b = this.abg();
+            for (let c = 0; c < this.aaq.count; c++) {
                 let d;
-                if (this.abm.count <= c) {
+                if (this.abl.count <= c) {
                     let e = new CalloutAnnotation();
                     d = new CalloutAnnotationWrapper();
                     d.b = e;
-                    d.b.series = this.aaf;
-                    this.abm.add(d);
+                    d.b.series = this.aae;
+                    this.abl.add(d);
                 }
                 else {
-                    d = this.abm._inner[c];
+                    d = this.abl._inner[c];
                 }
-                this.aeb(c, b);
+                this.aea(c, b);
             }
         }
     }
     CalloutLayer.$t = /*@__PURE__*/ markType(CalloutLayer, 'CalloutLayer', AnnotationLayer.$);
-    CalloutLayer.aey = /*@__PURE__*/ DependencyProperty.i("AutoCalloutVisibilityMode", AutoCalloutVisibilityMode_$type, CalloutLayer.$, /*@__PURE__*/ new PropertyMetadata(2, /*@__PURE__*/ enumGetBox(AutoCalloutVisibilityMode_$type, 0), (a, b) => a.raisePropertyChanged("AutoCalloutVisibilityMode", b.oldValue, b.newValue)));
-    CalloutLayer.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, CalloutLayer, 'raisePropertyChanged', ['AutoCalloutLabelPrecision:ab2:aed', [1, 5], 'CalloutBackground:afm:aee', [Brush.$, null], 'CalloutCollisionMode:z5:aef', [CalloutCollisionMode_$type, /*@__PURE__*/ enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:abp:aeg', [1, NaN], 'CalloutDarkTextColor:afn:aeh', [Brush.$, null], 'CalloutExpandsAxisBufferEnabled:aa4:aei', [0, false], 'CalloutExpandsAxisBufferMaxHeight:abq:aej', [1, 400], 'CalloutExpandsAxisBufferMaxWidth:abr:aek', [1, 400], 'CalloutExpandsAxisBufferMinHeight:abs:ael', [1, 50], 'CalloutExpandsAxisBufferMinWidth:abt:aem', [1, 50], 'CalloutInterpolatedValuePrecision:ab3:aen', [1, -1], 'CalloutLeaderBrush:afo:aeo', [Brush.$, null], 'CalloutLightTextColor:afp:aep', [Brush.$, null], 'CalloutOutline:afq:aeq', [Brush.$, null], 'CalloutPaddingBottom:abu:aer', [1, NaN], 'CalloutPaddingLeft:abv:aes', [1, NaN], 'CalloutPaddingRight:abw:aet', [1, NaN], 'CalloutPaddingTop:abx:aeu', [1, NaN], 'CalloutPositionPadding:aby:aev', [1, 10], 'CalloutStrokeThickness:abz:aew', [1, NaN], 'CalloutTextColor:afr:aex', [Brush.$, null], 'CollisionChannel:acu:aez', [2, null], 'ContentMemberPath:acx:ae0', [2, null], 'HighlightedValueLabelMode:aae:ae1', [HighlightedValueLabelMode_$type, /*@__PURE__*/ enumGetBox(HighlightedValueLabelMode_$type, 0)], 'IsAutoCalloutBehaviorEnabled:aa5:ae2', [0, false], 'IsCalloutOffsettingEnabled:aa6:ae3', [0, true], 'IsCustomCalloutRenderStyleEnabled:aa7:ae4', [0, false], 'IsCustomCalloutStyleEnabled:aa8:ae5', [0, false], 'KeyMemberPath:ac5:ae6', [2, null], 'LabelFormat:ac8:ae7', [2, null], 'LabelFormatSpecifiers:zy:ae8', [Array_$type, null], 'LabelMemberPath:adb:ae9', [2, null], 'ShouldTruncateOnBoundaryCollisions:aa9:afa', [0, false], 'TargetSeriesName:ade:afb', [2, null], 'TargetSeries:aaf:afc', [Series.$, null], 'TextStyle:adh:afd', [2, null], 'UseAutoContrastingLabelColors:aba:afe', [0, false], 'UseInterpolatedValueForAutoCalloutLabels:abb:aff', [0, false], 'UseItemColorForFill:abc:afg', [0, false], 'UseItemColorForOutline:abd:afh', [0, false], 'UseSeriesColorForOutline:abe:afi', [0, false], 'UseValueForAutoCalloutLabels:abf:afj', [0, true], 'XMemberPath:adr:afk', [2, null], 'YMemberPath:adu:afl', [2, null]]);
+    CalloutLayer.aex = /*@__PURE__*/ DependencyProperty.i("AutoCalloutVisibilityMode", AutoCalloutVisibilityMode_$type, CalloutLayer.$, /*@__PURE__*/ new PropertyMetadata(2, /*@__PURE__*/ enumGetBox(AutoCalloutVisibilityMode_$type, 0), (a, b) => a.raisePropertyChanged("AutoCalloutVisibilityMode", b.oldValue, b.newValue)));
+    CalloutLayer.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, CalloutLayer, 'raisePropertyChanged', ['AutoCalloutLabelPrecision:ab1:aec', [1, 5], 'CalloutBackground:afl:aed', [Brush.$, null], 'CalloutCollisionMode:z4:aee', [CalloutCollisionMode_$type, /*@__PURE__*/ enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:abo:aef', [1, NaN], 'CalloutDarkTextColor:afm:aeg', [Brush.$, null], 'CalloutExpandsAxisBufferEnabled:aa3:aeh', [0, false], 'CalloutExpandsAxisBufferMaxHeight:abp:aei', [1, 400], 'CalloutExpandsAxisBufferMaxWidth:abq:aej', [1, 400], 'CalloutExpandsAxisBufferMinHeight:abr:aek', [1, 50], 'CalloutExpandsAxisBufferMinWidth:abs:ael', [1, 50], 'CalloutInterpolatedValuePrecision:ab2:aem', [1, -1], 'CalloutLeaderBrush:afn:aen', [Brush.$, null], 'CalloutLightTextColor:afo:aeo', [Brush.$, null], 'CalloutOutline:afp:aep', [Brush.$, null], 'CalloutPaddingBottom:abt:aeq', [1, NaN], 'CalloutPaddingLeft:abu:aer', [1, NaN], 'CalloutPaddingRight:abv:aes', [1, NaN], 'CalloutPaddingTop:abw:aet', [1, NaN], 'CalloutPositionPadding:abx:aeu', [1, 10], 'CalloutStrokeThickness:aby:aev', [1, NaN], 'CalloutTextColor:afq:aew', [Brush.$, null], 'CollisionChannel:act:aey', [2, null], 'ContentMemberPath:acw:aez', [2, null], 'HighlightedValueLabelMode:aad:ae0', [HighlightedValueLabelMode_$type, /*@__PURE__*/ enumGetBox(HighlightedValueLabelMode_$type, 0)], 'IsAutoCalloutBehaviorEnabled:aa4:ae1', [0, false], 'IsCalloutOffsettingEnabled:aa5:ae2', [0, true], 'IsCustomCalloutRenderStyleEnabled:aa6:ae3', [0, false], 'IsCustomCalloutStyleEnabled:aa7:ae4', [0, false], 'KeyMemberPath:ac4:ae5', [2, null], 'LabelFormat:ac7:ae6', [2, null], 'LabelFormatSpecifiers:zx:ae7', [Array_$type, null], 'LabelMemberPath:ada:ae8', [2, null], 'ShouldTruncateOnBoundaryCollisions:aa8:ae9', [0, false], 'TargetSeriesName:add:afa', [2, null], 'TargetSeries:aae:afb', [Series.$, null], 'TextStyle:adg:afc', [2, null], 'UseAutoContrastingLabelColors:aa9:afd', [0, false], 'UseInterpolatedValueForAutoCalloutLabels:aba:afe', [0, false], 'UseItemColorForFill:abb:aff', [0, false], 'UseItemColorForOutline:abc:afg', [0, false], 'UseSeriesColorForOutline:abd:afh', [0, false], 'UseValueForAutoCalloutLabels:abe:afi', [0, true], 'XMemberPath:adq:afj', [2, null], 'YMemberPath:adt:afk', [2, null]]);
     return CalloutLayer;
 })();
 /**
@@ -1763,8 +1767,8 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
             }
         }
         ca() {
-            if (this.b7.aah != null) {
-                return this.b7.aah;
+            if (this.b7.aag != null) {
+                return this.b7.aag;
             }
             return this.e.db.getFontInfo();
         }
@@ -1810,13 +1814,13 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
             a.k(this.e, b, c);
         }
         cl(a, b) {
-            if (b != null && this.b7.abc) {
+            if (b != null && this.b7.abb) {
                 return this.cq(b);
             }
             if (a != null) {
-                return this.cq(a.vg);
+                return this.cq(a.vf);
             }
-            return this.e.vg;
+            return this.e.vf;
         }
         co() {
             return ((() => {
@@ -1833,12 +1837,12 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
             })());
         }
         cp(a, b) {
-            if (b != null && this.b7.abd) {
+            if (b != null && this.b7.abc) {
                 return this.cq(b);
             }
-            if (this.b7.abe) {
+            if (this.b7.abd) {
                 if (a != null) {
-                    return this.cq(a.vg);
+                    return this.cq(a.vf);
                 }
             }
             return ((() => {
@@ -1848,13 +1852,13 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
             })());
         }
         cn(a, b) {
-            if (b != null && this.b7.abd) {
+            if (b != null && this.b7.abc) {
                 return this.cq(b);
             }
             if (a != null) {
-                return this.cq(a.u9);
+                return this.cq(a.u8);
             }
-            return this.e.u9;
+            return this.e.u8;
         }
         ci() {
             this.cd = NaN;