igniteui-webcomponents-charts 6.3.1 → 7.0.0

package/esm2015/lib/CalloutLayer_combined.js

@@ -73,158 +73,158 @@ let CalloutLayer = /*@__PURE__*/ (() => {
         }
         constructor() {
             super();
-            this.ab0 = false;
-            this.abv = false;
-            this.abx = false;
-            this.abw = true;
-            this.aid = new Size(1, 0, 0);
-            this.abu = true;
+            this.ab1 = false;
+            this.abw = false;
+            this.aby = false;
+            this.abx = true;
+            this.aie = new Size(1, 0, 0);
+            this.abv = true;
             this.calloutStyleUpdating = null;
             this.calloutRenderStyleUpdating = null;
-            this.abg = null;
             this.abh = null;
             this.abi = null;
+            this.abj = null;
+            this.abg = null;
             this.abf = null;
-            this.abe = null;
-            this.acr = new HashSet$1(CalloutAnnotationWrapper.$, 0);
-            this.acu = new List$1(CalloutAnnotationWrapper.$, 0);
+            this.acs = new HashSet$1(CalloutAnnotationWrapper.$, 0);
             this.acv = new List$1(CalloutAnnotationWrapper.$, 0);
-            this.aa4 = null;
-            this.aas = null;
-            this.abd = null;
-            this.abp = null;
-            this.abb = null;
             this.acw = new List$1(CalloutAnnotationWrapper.$, 0);
+            this.aa5 = null;
+            this.aat = null;
+            this.abe = null;
+            this.abq = null;
+            this.abc = null;
             this.acx = new List$1(CalloutAnnotationWrapper.$, 0);
-            this.adk = 0;
+            this.acy = new List$1(CalloutAnnotationWrapper.$, 0);
+            this.adl = 0;
+            this.ac1 = -1;
             this.ac0 = -1;
-            this.acz = -1;
-            this.acs = new LinkedList$1(CalloutAnnotationWrapper.$);
-            this.acp = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
-            this.abq = null;
-            this.aib = new Rect(0, 0, 0, 1, 1);
+            this.act = new LinkedList$1(CalloutAnnotationWrapper.$);
+            this.acq = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
+            this.abr = null;
+            this.aic = new Rect(0, 0, 0, 1, 1);
+            this.ab3 = false;
+            this.ab5 = false;
+            this.adk = 0;
+            this.aib = Rect.empty;
             this.ab2 = false;
             this.ab4 = false;
-            this.adj = 0;
-            this.aia = Rect.empty;
-            this.ab1 = false;
-            this.ab3 = false;
             this.calloutContentUpdating = null;
             this.calloutLabelUpdating = null;
             this.calloutSeriesSelecting = null;
-            this.act = new List$1(SeriesPointOfInterest.$, 0);
-            this.ab6 = false;
+            this.acu = new List$1(SeriesPointOfInterest.$, 0);
             this.ab7 = false;
-            this.ac1 = 0;
-            this.ab5 = false;
-            this.aav = null;
-            this.aby = false;
-            this.abz = true;
-            this.aaw = 1;
+            this.ab8 = false;
+            this.ac2 = 0;
+            this.ab6 = false;
+            this.aaw = null;
+            this.abz = false;
+            this.ab0 = true;
+            this.aax = 1;
             FastItemObjectColumn.m();
-            this.aas = null;
-            this.aa4 = new CalloutPlacementPositionsCollection();
-            let a = this.aa4;
-            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.afv));
-            this.x6 = true;
+            this.aat = null;
+            this.aa5 = new CalloutPlacementPositionsCollection();
+            let a = this.aa5;
+            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.afw));
+            this.x7 = true;
             let b = new CalloutLayerFrame();
             let c = new CalloutLayerFrame();
             let d = new CalloutLayerFrame();
-            let e = this.km / 1000;
-            this.xx = b;
-            this.xw = c;
-            this.xy = d;
+            let e = this.kn / 1000;
+            this.xy = b;
+            this.xx = c;
+            this.xz = d;
             this.ab = CalloutLayer.$;
         }
-        afv(a, b) {
-            this.af4();
+        afw(a, b) {
+            this.af5();
         }
-        af4() {
-            this.aas = this.aau(this.aa5);
-            this.af1();
+        af5() {
+            this.aat = this.aav(this.aa6);
+            this.af2();
         }
-        afw(a, b) {
-            this.acv.clear();
-            this.r8(false);
+        afx(a, b) {
+            this.acw.clear();
+            this.r9(false);
         }
-        po(a, b, c, d) {
-            super.po(a, b, c, d);
-            let e = this.acq();
+        pp(a, b, c, d) {
+            super.pp(a, b, c, d);
+            let e = this.acr();
             switch (a) {
                 case 3:
-                    this.agd(b, e, true);
+                    this.age(b, e, true);
                     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.aba;
-                        this.acv.insert(f, h);
-                        this.agd(f, e, false);
+                        h.b.series = this.abb;
+                        this.acw.insert(f, h);
+                        this.age(f, e, false);
                     }
                     break;
                 case 0:
-                    this.acv.v(b, c);
+                    this.acw.v(b, c);
                     break;
                 case 2:
                     for (let i = b; i < b + c; i++) {
-                        this.agd(i, e, true);
+                        this.age(i, e, true);
                     }
                     break;
                 case 4:
-                    this.acv.clear();
+                    this.acw.clear();
                     for (let j = 0; j < this.dp.count; j++) {
                         let k = new CalloutAnnotation();
                         let l = new CalloutAnnotationWrapper();
                         l.b = k;
-                        l.b.series = this.aba;
-                        this.acv.add(l);
-                        this.agd(j, e, false);
+                        l.b.series = this.abb;
+                        this.acw.add(l);
+                        this.age(j, e, false);
                     }
                     break;
             }
-            this.r8(true);
+            this.r9(true);
         }
-        gl(a) {
+        gm(a) {
             return false;
         }
-        aif() {
+        aig() {
             let a = new Thickness(0, DeviceUtils.g(3));
-            if (isNaN_(this.aie.left) || isNaN_(this.aie.top) || isNaN_(this.aie.right) || isNaN_(this.aie.bottom)) {
+            if (isNaN_(this.aif.left) || isNaN_(this.aif.top) || isNaN_(this.aif.right) || isNaN_(this.aif.bottom)) {
                 a = new Thickness(0, DeviceUtils.g(3));
             }
             else {
-                a = this.aie;
+                a = this.aif;
             }
             return a;
         }
-        xe() {
-            if (!this.abu) {
-                return this.aid;
+        xf() {
+            if (!this.abv) {
+                return this.aie;
             }
             let a = 0;
             let b = 0;
-            if (!this.aca) {
-                this.aid = new Size(1, 0, 0);
-                return this.aid;
+            if (!this.acb) {
+                this.aie = new Size(1, 0, 0);
+                return this.aie;
             }
-            if (this.acc) {
-                this.ab0 = true;
+            if (this.acd) {
+                this.ab1 = true;
                 let c = new CalloutLayerFrame();
-                this.zf(c, this.cw);
-                this.ab0 = false;
-                if (this.acw != null && this.acw.count == 0) {
-                    this.aid = new Size(1, 0, 0);
-                    return this.aid;
+                this.zg(c, this.cw);
+                this.ab1 = false;
+                if (this.acx != null && this.acx.count == 0) {
+                    this.aie = new Size(1, 0, 0);
+                    return this.aie;
                 }
             }
-            let d = this.aif();
+            let d = this.aig();
             let e = -1.7976931348623157E+308;
             let f = -1.7976931348623157E+308;
-            for (let g = 0; g < this.acw.count; g++) {
-                let h = this.acw._inner[g].b.text;
-                let i = this.aa3.da(h, d, null);
+            for (let g = 0; g < this.acx.count; g++) {
+                let h = this.acx._inner[g].b.text;
+                let i = this.aa4.da(h, d, null);
                 if (!isNaN_(i.height)) {
                     f = Math.max(i.height, f);
                 }
@@ -234,29 +234,29 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             }
             a = f;
             b = e;
-            if (!isNaN_(this.adg)) {
-                a += this.adg;
-            }
-            if (!isNaN_(this.adg)) {
-                b += this.adg;
+            if (!isNaN_(this.adh)) {
+                a += this.adh;
             }
-            if (!isNaN_(this.ada)) {
-                a = Math.max(a, this.ada);
-            }
-            if (!isNaN_(this.ac8)) {
-                a = Math.min(a, this.ac8);
+            if (!isNaN_(this.adh)) {
+                b += this.adh;
             }
             if (!isNaN_(this.adb)) {
-                b = Math.max(b, this.adb);
+                a = Math.max(a, this.adb);
             }
             if (!isNaN_(this.ac9)) {
-                b = Math.min(b, this.ac9);
+                a = Math.min(a, this.ac9);
             }
-            this.abw = false;
-            this.aid = new Size(1, b, a);
-            return this.aid;
+            if (!isNaN_(this.adc)) {
+                b = Math.max(b, this.adc);
+            }
+            if (!isNaN_(this.ada)) {
+                b = Math.min(b, this.ada);
+            }
+            this.abx = false;
+            this.aie = new Size(1, b, a);
+            return this.aie;
         }
-        acq() {
+        acr() {
             let a = new Dictionary$2(String_$type, Series.$, 0);
             if (this.dc != null) {
                 for (let b = 0; b < this.dc.b9.count; b++) {
@@ -268,28 +268,28 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        agd(a, b, c) {
-            if (this.abo == null || this.abm == null) {
+        age(a, b, c) {
+            if (this.abp == null || this.abn == null) {
                 return;
             }
             let d = a;
-            if (this.abn != null) {
-                d = this.abn.item(a);
+            if (this.abo != null) {
+                d = this.abo.item(a);
             }
-            let e = this.abo.item(a);
-            let f = this.abm.item(a);
-            let g = this.acv._inner[a];
-            if (this.abl != null) {
-                if (g.b.ao != this.abl.item(a)) {
-                    g.b.key = this.abl.item(a);
+            let e = this.abp.item(a);
+            let f = this.abn.item(a);
+            let g = this.acw._inner[a];
+            if (this.abm != null) {
+                if (g.b.ao != this.abm.item(a)) {
+                    g.b.key = this.abm.item(a);
                 }
             }
-            if (this.acp.containsKey(g)) {
-                g.b = this.acp.item(g).c.b;
+            if (this.acq.containsKey(g)) {
+                g.b = this.acq.item(g).c.b;
             }
             g.b.xValue = d;
             g.b.yValue = e;
-            g.b.badgeImage = this.aex(a);
+            g.b.badgeImage = this.aey(a);
             if (this.calloutLabelUpdating != null) {
                 let h = ((() => {
                     let $ret = new CalloutLabelUpdatingEventArgs();
@@ -302,8 +302,8 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 this.calloutLabelUpdating(this, h);
                 if (h.c != null && !Base.equalsStatic(h.c, g.b.bc)) {
                     let i = h.c;
-                    if (this.aav != null) {
-                        g.b.text = this.aav.i(i);
+                    if (this.aaw != null) {
+                        g.b.text = this.aaw.i(i);
                     }
                     else {
                         g.b.text = i != null ? i.toString() : "";
@@ -311,15 +311,15 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 }
             }
             else {
-                if (this.aav != null) {
-                    g.b.text = this.aav.i(f);
+                if (this.aaw != null) {
+                    g.b.text = this.aaw.i(f);
                 }
                 else {
                     g.b.text = f != null ? f.toString() : "";
                 }
             }
-            if (this.abk != null) {
-                g.b.content = this.abk.item(a);
+            if (this.abl != null) {
+                g.b.content = this.abl.item(a);
             }
             else {
                 g.b.content = this.dp.item(a);
@@ -343,37 +343,37 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            this.age(g);
+            this.agf(g);
             if (c && g.c != null) {
-                this.agf(g.c, g);
+                this.agg(g.c, g);
             }
         }
-        age(a) {
+        agf(a) {
             let b = new Thickness(0, DeviceUtils.g(3));
-            if (isNaN_(this.aie.left) || isNaN_(this.aie.top) || isNaN_(this.aie.right) || isNaN_(this.aie.bottom)) {
+            if (isNaN_(this.aif.left) || isNaN_(this.aif.top) || isNaN_(this.aif.right) || isNaN_(this.aif.bottom)) {
                 b = new Thickness(0, DeviceUtils.g(3));
             }
             else {
-                b = this.aie;
+                b = this.aif;
             }
             let c = DeviceUtils.g(3);
-            if (isNaN_(this.ac7)) {
+            if (isNaN_(this.ac8)) {
                 c = DeviceUtils.g(3);
             }
             else {
-                c = this.ac7;
-            }
-            let d = this.aa3.c4(a.b.l, a.b.itemColor);
-            let e = this.aa3.c8(a.b.l, a.b.itemColor);
-            let f = this.aa3.c6(a.b.l, a.b.itemColor);
-            let g = this.ah2 != null && !this.acl ? this.ah2 : d;
-            let h = this.ah9 != null ? this.ah9 : null;
-            let i = this.ah7 != null ? this.ah7 : this.aa3.c7();
-            let j = this.ah5 != null ? this.ah5 : this.aa3.c5();
-            let k = this.ah8 != null && !this.acm ? this.ah8 : e;
-            let l = this.ah6 != null ? this.ah6 : f;
-            let m = isNaN_(this.adh) ? 0 : this.adh;
-            if (h == null && (this.acj || this.ah7 != null || this.ah5 != null)) {
+                c = this.ac8;
+            }
+            let d = this.aa4.c4(a.b.l, a.b.itemColor);
+            let e = this.aa4.c8(a.b.l, a.b.itemColor);
+            let f = this.aa4.c6(a.b.l, a.b.itemColor);
+            let g = this.ah3 != null && !this.acm ? this.ah3 : d;
+            let h = this.aia != null ? this.aia : null;
+            let i = this.ah8 != null ? this.ah8 : this.aa4.c7();
+            let j = this.ah6 != null ? this.ah6 : this.aa4.c5();
+            let k = this.ah9 != null && !this.acn ? this.ah9 : e;
+            let l = this.ah7 != null ? this.ah7 : f;
+            let m = isNaN_(this.adi) ? 0 : this.adi;
+            if (h == null && (this.ack || this.ah8 != null || this.ah6 != null)) {
                 let n = g;
                 if (n == null || BrushUtilCore.a(g)) {
                     n = this.dc != null ? this.dc.x7 : null;
@@ -387,16 +387,16 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 h = BrushUtil.l(n, j, i);
             }
             if (h == null) {
-                h = this.aa3.c7();
-            }
-            let o = this.ah3 != null ? this.ah3 : this.ab8 ? d : h;
-            let p = this.ah4 != null ? this.ah4 : this.ab8 ? e : h;
-            let q = !isNaN_(this.ac5) ? this.ac5 : 1;
-            let r = !isNaN_(this.ac4) ? this.ac4 : 10;
-            let s = !isNaN_(this.ac6) ? this.ac6 : 10;
-            let t = !isNaN_(this.ac3) ? this.ac3 : 5;
-            let u = !isNaN_(this.ac2) ? this.ac2 : 5;
-            let v = this.ab9;
+                h = this.aa4.c7();
+            }
+            let o = this.ah4 != null ? this.ah4 : this.ab9 ? d : h;
+            let p = this.ah5 != null ? this.ah5 : this.ab9 ? e : h;
+            let q = !isNaN_(this.ac6) ? this.ac6 : 1;
+            let r = !isNaN_(this.ac5) ? this.ac5 : 10;
+            let s = !isNaN_(this.ac7) ? this.ac7 : 10;
+            let t = !isNaN_(this.ac4) ? this.ac4 : 5;
+            let u = !isNaN_(this.ac3) ? this.ac3 : 5;
+            let v = this.aca;
             let w = a.b.bb;
             if (!v) {
                 t = 0;
@@ -405,7 +405,7 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 s = 0;
                 w = null;
             }
-            if (this.ach && this.calloutStyleUpdating != null) {
+            if (this.aci && this.calloutStyleUpdating != null) {
                 let x = new CalloutStyleUpdatingEventArgs();
                 x.item = a.b.an;
                 x.xValue = a.b.ap;
@@ -475,53 +475,43 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             a.b.badgeVisible = v;
             a.b.badgeImage = w;
         }
-        kz(a, b) {
-            let c = this.no(b);
+        k0(a, b) {
+            let c = this.np(b);
             if (c == CalloutLayer.$$p[44]) {
-                return this.k0(a, b, this.afa);
+                return this.k1(a, b, this.afb);
             }
             if (c == CalloutLayer.$$p[55]) {
-                return this.k0(a, b, this.afq);
+                return this.k1(a, b, this.afr);
             }
             if (c == CalloutLayer.$$p[56]) {
-                return this.k0(a, b, this.aft);
+                return this.k1(a, b, this.afu);
             }
             if (c == CalloutLayer.$$p[41]) {
-                return this.k0(a, b, this.ae4);
+                return this.k1(a, b, this.ae5);
             }
             if (c == CalloutLayer.$$p[35]) {
-                return this.k0(a, b, this.aev);
+                return this.k1(a, b, this.aew);
             }
-            return super.kz(a, b);
+            return super.k0(a, b);
         }
-        mo(a) {
-            let b = this.no(a);
+        mp(a) {
+            let b = this.np(a);
             if (b == CalloutLayer.$$p[44]) {
-                return this.afa;
+                return this.afb;
             }
             if (b == CalloutLayer.$$p[55]) {
-                return this.afq;
+                return this.afr;
             }
             if (b == CalloutLayer.$$p[56]) {
-                return this.aft;
+                return this.afu;
             }
             if (b == CalloutLayer.$$p[41]) {
-                return this.ae4;
+                return this.ae5;
             }
             if (b == CalloutLayer.$$p[35]) {
-                return this.aev;
-            }
-            return super.mo(a);
-        }
-        get abm() {
-            return this.abg;
-        }
-        set abm(a) {
-            if (this.abg != a) {
-                let b = this.abg;
-                this.abg = a;
-                this.raisePropertyChanged("LabelColumn", b, this.abg);
+                return this.aew;
             }
+            return super.mp(a);
         }
         get abn() {
             return this.abh;
@@ -530,7 +520,7 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             if (this.abh != a) {
                 let b = this.abh;
                 this.abh = a;
-                this.raisePropertyChanged("XColumn", b, this.abh);
+                this.raisePropertyChanged("LabelColumn", b, this.abh);
             }
         }
         get abo() {
@@ -540,7 +530,27 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             if (this.abi != a) {
                 let b = this.abi;
                 this.abi = a;
-                this.raisePropertyChanged("YColumn", b, this.abi);
+                this.raisePropertyChanged("XColumn", b, this.abi);
+            }
+        }
+        get abp() {
+            return this.abj;
+        }
+        set abp(a) {
+            if (this.abj != a) {
+                let b = this.abj;
+                this.abj = a;
+                this.raisePropertyChanged("YColumn", b, this.abj);
+            }
+        }
+        get abm() {
+            return this.abg;
+        }
+        set abm(a) {
+            if (this.abg != a) {
+                let b = this.abg;
+                this.abg = a;
+                this.raisePropertyChanged("KeyColumn", b, this.abg);
             }
         }
         get abl() {
@@ -550,91 +560,81 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             if (this.abf != a) {
                 let b = this.abf;
                 this.abf = a;
-                this.raisePropertyChanged("KeyColumn", b, this.abf);
+                this.raisePropertyChanged("ContentColumn", b, this.abf);
             }
         }
-        get abk() {
-            return this.abe;
-        }
-        set abk(a) {
-            if (this.abe != a) {
-                let b = this.abe;
-                this.abe = a;
-                this.raisePropertyChanged("ContentColumn", b, this.abe);
-            }
-        }
-        afy(a, b) {
+        afz(a, b) {
             if (b.propertyName == CalloutAnnotation.$$p[24] || b.propertyName == CalloutAnnotation.$$p[25]) {
                 let c = a.k;
-                if (!this.acr.contains(c)) {
-                    this.acr.add_1(c);
-                    this.acu.add(c);
-                    this.r8(false);
+                if (!this.acs.contains(c)) {
+                    this.acs.add_1(c);
+                    this.acv.add(c);
+                    this.r9(false);
                 }
             }
         }
         ct() {
             return new CalloutLayerView(this);
         }
-        rh(a) {
-            super.rh(a);
-            this.aa3 = a;
+        ri(a) {
+            super.ri(a);
+            this.aa4 = a;
         }
-        get aa5() {
-            return this.aa4;
+        get aa6() {
+            return this.aa5;
         }
-        set aa5(a) {
-            let b = this.aa5;
+        set aa6(a) {
+            let b = this.aa6;
             if (a != b) {
-                this.aa4 = a;
-                this.raisePropertyChanged("AllowedPositions", b, this.aa5);
+                this.aa5 = a;
+                this.raisePropertyChanged("AllowedPositions", b, this.aa6);
             }
         }
-        g0(a) {
-            if (this.aba == null) {
+        g1(a) {
+            if (this.abb == null) {
                 return true;
             }
-            if (this.aba == a) {
+            if (this.abb == a) {
                 return true;
             }
             return false;
         }
-        get aay() {
-            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.ahe));
+        get aaz() {
+            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.ahf));
         }
-        set aay(a) {
-            this.h(CalloutLayer.ahe, enumGetBox(AutoCalloutVisibilityMode_$type, a));
+        set aaz(a) {
+            this.h(CalloutLayer.ahf, enumGetBox(AutoCalloutVisibilityMode_$type, a));
         }
-        get aax() {
-            return this.aaw;
+        get aay() {
+            return this.aax;
         }
-        set aax(a) {
-            this.aaw = a;
+        set aay(a) {
+            this.aax = a;
         }
-        get abj() {
-            return this.abd;
+        get abk() {
+            return this.abe;
         }
-        set abj(a) {
-            if (this.abd != a) {
-                let b = this.abd;
-                this.abd = a;
-                this.raisePropertyChanged("CalloutBadgeImageColumn", b, this.abd);
+        set abk(a) {
+            if (this.abe != a) {
+                let b = this.abe;
+                this.abe = a;
+                this.raisePropertyChanged("CalloutBadgeImageColumn", b, this.abe);
             }
         }
-        aga() {
-            this.dp.deregisterColumn(this.abj);
-            this.abp = ImageLoadParam.a(this.adz, "{", "}");
-            if (stringIsNullOrEmpty(this.abp.value)) {
-                this.abj = null;
+        agb() {
+            this.dp.deregisterColumn(this.abk);
+            this.abq = ImageLoadParam.a(this.ad0, "{", "}");
+            if (stringIsNullOrEmpty(this.abq.value)) {
+                this.abk = null;
             }
             else {
-                this.abj = this.dn(this.abp.value);
+                this.abk = this.dn(this.abq.value);
             }
         }
-        aex(a) {
-            if (this.abj != null && this.abj.count > a) {
-                let b = this.abj.item(a);
-                let c = this.abp.b(b);
+        aey(a) {
+            if (this.abk != null && this.abk.count > a) {
+                let b = this.abk.item(a);
+                let c = this.abq.b(b);
                 return c;
             }
             else {
@@ -644,28 +644,28 @@ let CalloutLayer = /*@__PURE__*/ (() => {
         provideRenderer(a) {
             super.provideRenderer(a);
             ImageLoader.d = a;
-            if (this.aa3 != null) {
-                this.aa3.cw = a;
+            if (this.aa4 != null) {
+                this.aa4.cw = a;
             }
         }
-        get aie() {
-            return new Thickness(1, this.add, this.adf, this.ade, this.adc);
+        get aif() {
+            return new Thickness(1, this.ade, this.adg, this.adf, this.add);
         }
-        get abc() {
-            if (this.abb == null) {
-                this.abb = FontUtil.toFontInfo(this.j8, this.afg);
+        get abd() {
+            if (this.abc == null) {
+                this.abc = FontUtil.toFontInfo(this.j9, this.afh);
             }
-            return this.abb;
+            return this.abc;
         }
-        zd(a, b) {
-            if (this.aba == null || this.aba == a) {
+        ze(a, b) {
+            if (this.abb == null || this.abb == a) {
                 if (!this.a1.c) {
-                    this.r8(b);
+                    this.r9(b);
                 }
             }
         }
-        zf(a, b) {
-            super.zf(a, b);
+        zg(a, b) {
+            super.zg(a, b);
             let c = a;
             c.ac.clear();
             c.ad.clear();
@@ -693,25 +693,25 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             c.o.clear();
             c.p.clear();
             c.m.clear();
-            let d = this.acy();
+            let d = this.acz();
             let e = new List$1(CalloutAnnotationWrapper.$, 0);
             let f = Number.POSITIVE_INFINITY;
             let g = true;
-            if (this.ace) {
-                if (this.x4(this.aba)) {
-                    if (typeCast(IHasCategoryAxis_$type, this.aba) !== null) {
-                        let h = this.aba.i3() > 0 ? this.aba.i3() : this.aba.getCategoryWidth();
+            if (this.acf) {
+                if (this.x5(this.abb)) {
+                    if (typeCast(IHasCategoryAxis_$type, this.abb) !== null) {
+                        let h = this.abb.i4() > 0 ? this.abb.i4() : this.abb.getCategoryWidth();
                         if (!isNaN_(h) && !isInfinity(h) && h > 0) {
                             f = Math.min(f, h);
                         }
                     }
-                    this.af6(this.aba, c, e);
+                    this.af7(this.abb, c, e);
                 }
                 else {
                     for (let i of fromEnum(this.dc.b9)) {
-                        if (this.x4(i)) {
+                        if (this.x5(i)) {
                             if (typeCast(IHasCategoryAxis_$type, i) !== null) {
-                                let j = i.i3() > 0 ? i.i3() : i.getCategoryWidth();
+                                let j = i.i4() > 0 ? i.i4() : i.getCategoryWidth();
                                 if (!isNaN_(j) && !isInfinity(j) && j > 0) {
                                     f = Math.min(f, j);
                                 }
@@ -722,23 +722,23 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                                 }
                             }
                             let k = false;
-                            if (i.ei && this.aa9 == 0 || this.aa9 == 3 || this.aa9 == 2) {
-                                if (this.aa9 == 0 || this.aa9 == 2) {
+                            if (i.ei && this.aba == 0 || this.aba == 3 || this.aba == 2) {
+                                if (this.aba == 0 || this.aba == 2) {
                                     k = true;
                                 }
-                                i.qf((l) => {
-                                    this.af6(l, c, e);
+                                i.qg((l) => {
+                                    this.af7(l, c, e);
                                     return true;
                                 });
                             }
                             if (!k) {
-                                this.af6(i, c, e);
+                                this.af7(i, c, e);
                             }
                         }
                     }
                 }
             }
-            if (this.ace && this.aax == 2) {
+            if (this.acf && this.aay == 2) {
                 let l = 0;
                 let m = 0;
                 let n = 1.7976931348623157E+308;
@@ -791,94 +791,94 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            let v = this.adk <= 0 && e.count > 0;
-            let w = this.adk > 0 && e.count <= 0;
+            let v = this.adl <= 0 && e.count > 0;
+            let w = this.adl > 0 && e.count <= 0;
             let x = v || w;
-            let y = this.adk != e.count;
-            if (v && this.acd) {
+            let y = this.adl != e.count;
+            if (v && this.ace) {
                 return;
             }
-            if (!this.ab0) {
-                this.af5(c, d, e);
+            if (!this.ab1) {
+                this.af6(c, d, e);
             }
             let z = this.da.ix();
             let aa = this.da.iw();
-            let ab = z != this.ac0;
-            let ac = aa != this.acz;
+            let ab = z != this.ac1;
+            let ac = aa != this.ac0;
             let ad = ab || ac;
             if (ad) {
-                this.ac0 = z;
-                this.acz = aa;
+                this.ac1 = z;
+                this.ac0 = aa;
             }
-            this.adk = e.count;
-            if (this.ab0) {
+            this.adl = e.count;
+            if (this.ab1) {
                 return;
             }
-            if (!this.abv && this.aca && this.acb && e.count > 0 && e.count == this.adk && this.aax == 2) {
-                this.abv = true;
-                this.af8();
+            if (!this.abw && this.acb && this.acc && e.count > 0 && e.count == this.adl && this.aay == 2) {
+                this.abw = true;
+                this.af9();
             }
         }
-        s9(a, b) {
-            super.s9(a, b);
-            let c = b.width - this.aib.width;
-            let d = b.height - this.aib.height;
+        ta(a, b) {
+            super.ta(a, b);
+            let c = b.width - this.aic.width;
+            let d = b.height - this.aic.height;
             let e = 0;
             if (Math.abs(c) > Math.abs(d)) {
                 e = c;
-                this.ac1 = c * this.xd.width;
+                this.ac2 = c * this.xe.width;
             }
             else {
                 e = d;
-                this.ac1 = d * this.xd.height;
+                this.ac2 = d * this.xe.height;
             }
-            if (e > 0 && this.ac1 > 5) {
-                this.ab7 = true;
+            if (e > 0 && this.ac2 > 5) {
+                this.ab8 = true;
             }
-            if (e < 0 && this.ac1 > 5) {
-                this.ab6 = true;
+            if (e < 0 && this.ac2 > 5) {
+                this.ab7 = true;
             }
         }
-        s8(a, b) {
-            super.s8(a, b);
+        s9(a, b) {
+            super.s9(a, b);
             if (!a.equals1(b)) {
-                this.ab5 = true;
+                this.ab6 = true;
             }
         }
-        get aic() {
-            return this.aia;
+        get aid() {
+            return this.aib;
         }
-        set aic(a) {
-            this.aia = a;
+        set aid(a) {
+            this.aib = a;
         }
-        af5(a, b, c) {
+        af6(a, b, c) {
             if (this.dc != null) {
-                this.aib = this.dc.yr;
+                this.aic = this.dc.yr;
             }
-            if (this.xd.isEmpty) {
+            if (this.xe.isEmpty) {
                 return;
             }
-            this.aic = new Rect(0, this.xd.left, this.xd.top, this.xd.width, this.xd.height);
-            if (this.abq != null && this.aes != null && this.aes != this.abq.bd) {
-                this.af0();
+            this.aid = new Rect(0, this.xe.left, this.xe.top, this.xe.width, this.xe.height);
+            if (this.abr != null && this.aet != null && this.aet != this.abr.bd) {
+                this.af1();
             }
-            if (this.abq != null && this.abq.j != this.abs()) {
-                this.af0();
+            if (this.abr != null && this.abr.j != this.abt()) {
+                this.af1();
             }
-            if (this.abq == null) {
-                let d = this.abr();
+            if (this.abr == null) {
+                let d = this.abs();
                 if (d != null) {
-                    this.abq = d;
-                    let e = this.abq;
-                    e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.afx));
+                    this.abr = d;
+                    let e = this.abr;
+                    e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.afy));
                 }
                 else {
-                    let f = this.w4(this.cw);
+                    let f = this.w5(this.cw);
                     let g = new Array(2);
                     g[0] = 0;
                     g[1] = 3;
-                    if (this.aba != null) {
-                        if (this.aba.isVertical) {
+                    if (this.abb != null) {
+                        if (this.abb.isVertical) {
                             g = new Array(2);
                             g[0] = 2;
                             g[1] = 1;
@@ -902,21 +902,21 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                             g[1] = 1;
                         }
                     }
-                    if (this.aa0 == 4 || this.aa0 == 6) {
+                    if (this.aa1 == 4 || this.aa1 == 6) {
                         g = new Array(4);
                         g[0] = 10;
                         g[1] = 11;
                         g[2] = 8;
                         g[3] = 9;
                     }
-                    if (this.aa0 == 5) {
+                    if (this.aa1 == 5) {
                         g = new Array(4);
                         g[0] = 9;
                         g[1] = 10;
                         g[2] = 11;
                         g[3] = 8;
                     }
-                    if (this.aa0 == 7) {
+                    if (this.aa1 == 7) {
                         g = new Array(4);
                         g = new Array(4);
                         g[0] = 8;
@@ -924,32 +924,32 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                         g[2] = 11;
                         g[3] = 9;
                     }
-                    this.abq = new LabelCollisionManager(this.xd.right, this.xd.bottom, this.xd, this.aa3.k(), this.adg, this.abs(), g, this.ado(), this.adn(), this.acf, this.aas);
-                    this.abq.v = this.aci;
-                    if (this.aes != null) {
-                        this.abq.bd = this.aes;
-                        this.abq.bb = this;
+                    this.abr = new LabelCollisionManager(this.xe.right, this.xe.bottom, this.xe, this.aa4.k(), this.adh, this.abt(), g, this.adp(), this.ado(), this.acg, this.aat);
+                    this.abr.v = this.acj;
+                    if (this.aet != null) {
+                        this.abr.bd = this.aet;
+                        this.abr.bb = this;
                     }
-                    let j = this.abq;
-                    j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.afx));
-                }
-            }
-            if (this.ab6) {
-                this.ab6 = false;
-                if (this.abq.a9 > 2) {
-                    this.ab4 = true;
+                    let j = this.abr;
+                    j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.afy));
                 }
             }
             if (this.ab7) {
                 this.ab7 = false;
-                if (this.ac1 > 5) {
-                    this.ab4 = true;
+                if (this.abr.a9 > 2) {
+                    this.ab5 = true;
                 }
             }
-            if (this.ab5) {
-                this.ab5 = false;
-                this.abq.bs(this.xd.right, this.xd.bottom, this.xd);
-                this.ab4 = true;
+            if (this.ab8) {
+                this.ab8 = false;
+                if (this.ac2 > 5) {
+                    this.ab5 = true;
+                }
+            }
+            if (this.ab6) {
+                this.ab6 = false;
+                this.abr.bs(this.xe.right, this.xe.bottom, this.xe);
+                this.ab5 = true;
             }
             let k = new HashSet$1(CalloutAnnotationWrapper.$, 0);
             let l = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -962,55 +962,55 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             for (let q = 0; q < c.count; q++) {
                 o.add_1(c._inner[q]);
             }
-            let r = this.acs.c;
+            let r = this.act.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.afy));
-                    this.acs.h(r);
-                    this.acp.removeItem(r.c);
-                    this.abq.br(r.c.c);
+                    t.propertyChanged = delegateRemove(t.propertyChanged, runOn(this, this.afz));
+                    this.act.h(r);
+                    this.acq.removeItem(r.c);
+                    this.abr.br(r.c.c);
                 }
                 r = s;
             }
             for (let u = 0; u < b.count; u++) {
-                if (!this.acp.containsKey(b._inner[u])) {
-                    this.acs.f(b._inner[u]);
+                if (!this.acq.containsKey(b._inner[u])) {
+                    this.act.f(b._inner[u]);
                     let v = b._inner[u].b;
-                    v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.afy));
-                    this.acp.addItem(b._inner[u], this.acs.d);
+                    v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.afz));
+                    this.acq.addItem(b._inner[u], this.act.d);
                     m.add(b._inner[u]);
                     k.add_1(b._inner[u]);
-                    this.ab4 = true;
+                    this.ab5 = true;
                 }
             }
             for (let w = 0; w < c.count; w++) {
-                if (!this.acp.containsKey(c._inner[w])) {
-                    this.acs.f(c._inner[w]);
-                    this.acp.addItem(c._inner[w], this.acs.d);
+                if (!this.acq.containsKey(c._inner[w])) {
+                    this.act.f(c._inner[w]);
+                    this.acq.addItem(c._inner[w], this.act.d);
                     let x = c._inner[w].b;
-                    x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.afy));
+                    x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.afz));
                     m.add(c._inner[w]);
                     k.add_1(c._inner[w]);
-                    this.ab4 = true;
+                    this.ab5 = true;
                 }
             }
-            if (this.ab1 == true) {
-                this.ab1 = false;
-                this.ab4 = true;
+            if (this.ab2 == true) {
+                this.ab2 = false;
+                this.ab5 = true;
             }
             let y = false;
-            if (this.acu.count > 0) {
+            if (this.acv.count > 0) {
                 y = true;
-                this.acu.clear();
-                this.acr.clear();
+                this.acv.clear();
+                this.acs.clear();
             }
-            r = this.acs.c;
+            r = this.act.c;
             while (r != null) {
-                let z = this.abt(r.c);
+                let z = this.abu(r.c);
                 if (z == null) {
                     return;
                 }
@@ -1026,42 +1026,42 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                         ab.r = z.g;
                         ab.q = z.f;
                         if (ab.c == null) {
-                            this.abq.ad(ab, false);
+                            this.abr.ad(ab, false);
                         }
                         if (aa) {
-                            this.abq.be(ab);
+                            this.abr.be(ab);
                         }
                         else {
-                            this.abq.bo(ab);
+                            this.abr.bo(ab);
                         }
                     }
                 }
                 r = r.a;
             }
-            let ac = this.abq.ba();
-            let ad = this.abq.af();
-            if (!this.ab4 && y && (ac != 0 || ad)) {
+            let ac = this.abr.ba();
+            let ad = this.abr.af();
+            if (!this.ab5 && y && (ac != 0 || ad)) {
                 {
-                    this.ab4 = true;
+                    this.ab5 = true;
                 }
             }
             if (ad) {
-                if (this.abq.x()) {
-                    this.ab4 = true;
+                if (this.abr.x()) {
+                    this.ab5 = true;
                 }
             }
-            if (this.ab4 && (ac != 0 || ad || this.ab2)) {
-                this.ab2 = false;
-                this.ab4 = false;
-                this.adj = 0x7FFFFFFF;
-                if (this.aes != null) {
+            if (this.ab5 && (ac != 0 || ad || this.ab3)) {
+                this.ab3 = false;
+                this.ab5 = false;
+                this.adk = 0x7FFFFFFF;
+                if (this.aet != null) {
                     let ae = true;
                     for (let af = 0; af < this.dc.b9.count; af++) {
                         let ag = this.dc.b9._inner[af];
                         if (ag.ev && typeCast(CalloutLayer.$, ag) !== null) {
                             let ah = ag;
-                            if (ah.aes == this.aes) {
-                                if (!ah.aic.equals1(this.abq.b0)) {
+                            if (ah.aet == this.aet) {
+                                if (!ah.aid.equals1(this.abr.b0)) {
                                     ae = false;
                                     break;
                                 }
@@ -1069,21 +1069,21 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                         }
                     }
                     if (ae) {
-                        this.abq.bv();
+                        this.abr.bv();
                     }
                     else {
-                        this.abq.bf();
-                        this.abq.bg();
+                        this.abr.bf();
+                        this.abr.bg();
                     }
                 }
                 else {
-                    this.abq.bv();
+                    this.abr.bv();
                 }
             }
             else {
-                this.abq.bg();
+                this.abr.bg();
             }
-            let ai = this.acs.c;
+            let ai = this.act.c;
             let aj;
             let ak;
             let al;
@@ -1109,8 +1109,8 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             let a5;
             let a6 = NaN;
             let a7 = NaN;
-            let a8 = this.acg;
-            let a9 = this.aci;
+            let a8 = this.ach;
+            let a9 = this.acj;
             let ba = this.cw.b5();
             while (ai != null) {
                 let bb = ai.c;
@@ -1143,7 +1143,7 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 ay = bd.l - bd.o;
                 let be = false;
                 if (a9) {
-                    if (bd.c != null && this.abq.ab(bd.c)) {
+                    if (bd.c != null && this.abr.ab(bd.c)) {
                         be = true;
                     }
                 }
@@ -1157,8 +1157,8 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                     aw = bd.l;
                 }
                 if (be) {
-                    at = this.afi(bb, at);
-                    let bf = this.abq.as(bb.c.c);
+                    at = this.afj(bb, at);
+                    let bf = this.abr.as(bb.c.c);
                     if (bf > 0) {
                         ax += bf;
                         av -= bf;
@@ -1227,40 +1227,40 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 ai = ai.a;
             }
         }
-        afi(a, b) {
-            let c = Math.max(this.abq.as(a.c.c), this.abq.at(a.c.c));
+        afj(a, b) {
+            let c = Math.max(this.abr.as(a.c.c), this.abr.at(a.c.c));
             if (c <= 0) {
                 return b;
             }
             let d = b.length;
-            let e = this.aa3.da(b, a.b.backgroundPadding, null);
+            let e = this.aa4.da(b, a.b.backgroundPadding, null);
             let f = e.width;
             let g = f - c;
             while (f - g > 0.0001 && d > 0) {
                 d--;
                 b = b.substr(0, d) + "…";
-                e = this.aa3.da(b, a.b.backgroundPadding, null);
+                e = this.aa4.da(b, a.b.backgroundPadding, null);
                 f = e.width;
             }
             return b;
         }
-        af0() {
-            if (this.abq != null) {
-                let a = this.acs.c;
+        af1() {
+            if (this.abr != null) {
+                let a = this.act.c;
                 while (a != null) {
                     let b = a.c.c;
                     if (b != null) {
-                        this.abq.br(b);
+                        this.abr.br(b);
                     }
                     a = a.a;
                 }
-                let c = this.abq;
-                c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.afx));
-                this.abq = null;
+                let c = this.abr;
+                c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.afy));
+                this.abr = null;
             }
-            this.afz();
+            this.af0();
         }
-        abr() {
+        abs() {
             if (this.dc == null) {
                 return null;
             }
@@ -1269,9 +1269,9 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 if (b.ev && typeCast(CalloutLayer.$, b) !== null) {
                     let c = b;
                     if (c != this) {
-                        if (c.aes != null && c.aes == this.aes) {
-                            if (c.abq != null) {
-                                return c.abq;
+                        if (c.aet != null && c.aet == this.aet) {
+                            if (c.abr != null) {
+                                return c.abr;
                             }
                         }
                     }
@@ -1279,14 +1279,14 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        adn() {
+        ado() {
             return 20000;
         }
-        ado() {
+        adp() {
             return 300;
         }
-        abs() {
-            switch (this.aa0) {
+        abt() {
+            switch (this.aa1) {
                 case 0: return 2;
                 case 2: return 1;
                 case 3: return 2;
@@ -1298,18 +1298,18 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return 2;
         }
-        afx(a) {
-            let b = this.abq.ba();
-            let c = this.adj;
-            if (b < this.adj) {
-                this.adj = b;
+        afy(a) {
+            let b = this.abr.ba();
+            let c = this.adk;
+            if (b < this.adk) {
+                this.adk = b;
                 if (c != 0x7FFFFFFF) {
-                    this.r8(false);
+                    this.r9(false);
                 }
             }
         }
-        abt(a) {
-            let b = this.aba;
+        abu(a) {
+            let b = this.abb;
             if (a.b.l != null) {
                 b = a.b.l;
             }
@@ -1326,7 +1326,7 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 return null;
             }
             let e = b.ai();
-            let f = b.i5();
+            let f = b.i6();
             let g = null;
             let h = null;
             let i = false;
@@ -1338,11 +1338,11 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                     i = true;
                     g = e[j];
                 }
-                else if (e[j].du) {
+                else if (e[j].dv) {
                     i = true;
                     h = e[j];
                 }
-                else if (e[j].dy) {
+                else if (e[j].dz) {
                     h = e[j];
                 }
                 else {
@@ -1352,7 +1352,7 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             if (g == null || h == null) {
                 return null;
             }
-            if (!g.dx() || !h.dx()) {
+            if (!g.dy() || !h.dy()) {
                 return null;
             }
             let k = 0;
@@ -1370,15 +1370,15 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                     l = b.getOffsetValue();
                 }
             }
-            let m = new ScalerParams(0, this.dc.yr, g.o6, g.dn, g.o1());
+            let m = new ScalerParams(0, this.dc.yr, g.o8, g.dn, g.o3());
             m.b = f;
-            let n = new ScalerParams(0, this.dc.yr, h.o6, h.dn, h.o1());
+            let n = new ScalerParams(0, this.dc.yr, h.o8, h.dn, h.o3());
             n.b = f;
             let o = 0;
             let p = 0;
             if (i) {
-                o = g.f6(this.adi(a.b.ap), m) + k;
-                p = h.f6(this.adi(a.b.aq), n) + l;
+                o = g.f7(this.adj(a.b.ap), m) + k;
+                p = h.f7(this.adj(a.b.aq), n) + l;
                 let q = o;
                 let r = p;
                 let s = { $type: Point_$type, x: 0.5, y: 0.5 };
@@ -1388,8 +1388,8 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 p = ViewportUtils.i(u, n.e, n.d, n.c);
             }
             else {
-                o = g.f6(this.adi(a.b.ap), m) + k;
-                p = h.f6(this.adi(a.b.aq), n) + l;
+                o = g.f7(this.adj(a.b.ap), m) + k;
+                p = h.f7(this.adj(a.b.aq), n) + l;
             }
             let v = new QuadTreeBoundingBox();
             v.d = o;
@@ -1399,7 +1399,7 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             v.i = a.b;
             return v;
         }
-        adi(a) {
+        adj(a) {
             if (typeCast(Date_$type, a) !== null) {
                 return a.getTime();
             }
@@ -1408,27 +1408,27 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        acy() {
+        acz() {
             let a = new List$1(CalloutAnnotationWrapper.$, 0);
-            for (let b = 0; b < this.acv.count; b++) {
-                if (stringIsNullOrEmpty(this.acv._inner[b].b.bc)) {
+            for (let b = 0; b < this.acw.count; b++) {
+                if (stringIsNullOrEmpty(this.acw._inner[b].b.bc)) {
                     continue;
                 }
-                if (this.acv._inner[b].c == null) {
+                if (this.acw._inner[b].c == null) {
                     let c = new LabelCollisionInfo();
-                    this.acv._inner[b].c = c;
-                    let d = this.acv._inner[b];
-                    this.agf(c, d);
+                    this.acw._inner[b].c = c;
+                    let d = this.acw._inner[b];
+                    this.agg(c, d);
                 }
-                let e = this.abt(this.acv._inner[b]);
-                if (e == null || e.d < this.xd.left || e.d > this.xd.right || e.e < this.xd.top || e.e > this.xd.bottom) {
+                let e = this.abu(this.acw._inner[b]);
+                if (e == null || e.d < this.xe.left || e.d > this.xe.right || e.e < this.xe.top || e.e > this.xe.bottom) {
                     continue;
                 }
-                a.add(this.acv._inner[b]);
+                a.add(this.acw._inner[b]);
             }
             return a;
         }
-        agf(a, b) {
+        agg(a, b) {
             let c = ((() => {
                 let $ret = new CalloutBadgeInfo();
                 $ret.badgeHeight = b.b.badgeHeight;
@@ -1440,7 +1440,7 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 $ret.badgeImage = b.b.badgeImage;
                 return $ret;
             })());
-            let d = this.aa3.da(this.adp(b), b.b.backgroundPadding, c);
+            let d = this.aa4.da(this.adq(b), b.b.backgroundPadding, c);
             if (a.c != null) {
                 a.c.f = d.height / 2;
                 a.c.g = d.width / 2;
@@ -1448,61 +1448,61 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             a.o = d.height / 2;
             a.p = d.width / 2;
         }
-        adp(a) {
+        adq(a) {
             return a.b.bc;
         }
-        x4(a) {
-            if (!super.x4(a)) {
+        x5(a) {
+            if (!super.x5(a)) {
                 return false;
             }
-            if (this.afd != null) {
+            if (this.afe != null) {
                 if (a.isFragment) {
-                    let b = a.nn();
-                    if (!Base.equalsStatic(this.afd, b)) {
+                    let b = a.no();
+                    if (!Base.equalsStatic(this.afe, b)) {
                         return false;
                     }
                 }
                 else {
-                    if (!Base.equalsStatic(this.afd, a.name)) {
+                    if (!Base.equalsStatic(this.afe, a.name)) {
                         return false;
                     }
                 }
             }
             return true;
         }
-        q4() {
-            super.q4();
+        q5() {
+            super.q5();
             if (!this.a1.c && !this.d4()) {
                 return;
             }
-            if (this.abz) {
-                this.abz = false;
-                this.af7();
-                this.af2();
+            if (this.ab0) {
+                this.ab0 = false;
+                this.af8();
+                this.af3();
             }
             if (this.d4()) {
-                this.agc(this.xy, false);
+                this.agd(this.xz, false);
             }
             else {
-                this.agc(this.xw, false);
+                this.agd(this.xx, false);
             }
         }
-        af3() {
-            if (!this.ab3) {
-                this.ab3 = true;
-                this.r8(true);
+        af4() {
+            if (!this.ab4) {
+                this.ab4 = true;
+                this.r9(true);
             }
         }
-        af6(a, b, c) {
+        af7(a, b, c) {
             let d = false;
-            if (this.ab3) {
-                this.ab3 = false;
+            if (this.ab4) {
+                this.ab4 = false;
                 d = true;
             }
-            a.kr = this.aav;
-            if (!a.go && a.ed(this.act, this.aco, this.ack, this.adl, false)) {
-                let e = this.act;
-                for (let f = 0; f < this.act.count; f++) {
+            a.ks = this.aaw;
+            if (!a.gp && a.ed(this.acu, this.acp, this.acl, this.adm, false)) {
+                let e = this.acu;
+                for (let f = 0; f < this.acu.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;
@@ -1513,10 +1513,10 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                     let n = new CalloutAnnotation();
                     m.b = n;
                     n.key = l;
-                    n.badgeImage = this.aex(g.c);
+                    n.badgeImage = this.aey(g.c);
                     let o = false;
-                    if (this.acp.containsKey(m)) {
-                        m = this.acp.item(m).c;
+                    if (this.acq.containsKey(m)) {
+                        m = this.acq.item(m).c;
                         n = m.b;
                         o = d;
                     }
@@ -1525,10 +1525,10 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                     let p = n.ap;
                     let q = n.aq;
-                    if (this.adi(p) != this.adi(g.d) && (!isNaN_(this.adi(p)) || !isNaN_(this.adi(g.d)))) {
+                    if (this.adj(p) != this.adj(g.d) && (!isNaN_(this.adj(p)) || !isNaN_(this.adj(g.d)))) {
                         n.xValue = g.d;
                     }
-                    if (this.adi(q) != this.adi(g.e) && (!isNaN_(this.adi(q)) || !isNaN_(this.adi(g.e)))) {
+                    if (this.adj(q) != this.adj(g.e) && (!isNaN_(this.adj(q)) || !isNaN_(this.adj(g.e)))) {
                         n.yValue = g.e;
                     }
                     n.itemColor = j;
@@ -1553,8 +1553,8 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                             this.calloutLabelUpdating(this, s);
                             if (s.c != null && !Base.equalsStatic(s.c, m.b.bc)) {
                                 let t = s.c;
-                                if (this.aav != null) {
-                                    m.b.text = this.aav.i(t);
+                                if (this.aaw != null) {
+                                    m.b.text = this.aaw.i(t);
                                 }
                                 else {
                                     m.b.text = t != null ? t.toString() : "";
@@ -1592,15 +1592,15 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                         }
                     }
                     if (o) {
-                        this.age(m);
+                        this.agf(m);
                     }
                     if (m.c == null) {
                         let v = new LabelCollisionInfo();
                         m.c = v;
-                        this.agf(v, m);
+                        this.agg(v, m);
                     }
-                    let w = this.abt(m);
-                    if (w == null || w.d < this.xd.left || w.d > this.xd.right || w.e < this.xd.top || w.e > this.xd.bottom) {
+                    let w = this.abu(m);
+                    if (w == null || w.d < this.xe.left || w.d > this.xe.right || w.e < this.xe.top || w.e > this.xe.bottom) {
                         continue;
                     }
                     m.e = w.d;
@@ -1611,25 +1611,25 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                     c.add(m);
                 }
             }
-            a.kr = null;
+            a.ks = null;
         }
         b3() {
             return 1;
         }
         a2(a, b) {
-            let c = this.abq.i(a, b);
+            let c = this.abr.i(a, b);
             if (c == null) {
                 return null;
             }
             return c.y;
         }
-        g2(a, b) {
-            if (this.abq == null) {
+        g3(a, b) {
+            if (this.abr == null) {
                 return false;
             }
-            return this.abq.i(a, b) != null;
+            return this.abr.i(a, b) != null;
         }
-        agc(a, b) {
+        agd(a, b) {
             let c = 0;
             let d = new HashSet$1(CalloutAnnotationWrapper.$, 0);
             for (c = 0; c < a.ac.count; c++) {
@@ -1637,7 +1637,7 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 if (isNaN_(a.ag._inner[c]) || isNaN_(a.ah._inner[c])) {
                     continue;
                 }
-                let f = this.aa3.cr.item(e);
+                let f = this.aa4.cr.item(e);
                 d.add_1(e);
                 if (f.x != a.ac._inner[c]) {
                     f.x = a.ac._inner[c];
@@ -1664,87 +1664,87 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                     f.x = a.ac._inner[c];
                     let h = f.aw();
                 }
-                this.aa3.c2(f, Math.min(a.ae._inner[c], a.ae._inner[c] + a.ag._inner[c]), Math.min(a.af._inner[c], a.af._inner[c] + a.ah._inner[c]));
-                this.aa3.c3(f, e, a.ad._inner[c]);
+                this.aa4.c2(f, Math.min(a.ae._inner[c], a.ae._inner[c] + a.ag._inner[c]), Math.min(a.af._inner[c], a.af._inner[c] + a.ah._inner[c]));
+                this.aa4.c3(f, e, a.ad._inner[c]);
                 f.ar = { $type: Point_$type, x: a.ag._inner[c], y: a.ah._inner[c] };
             }
             let i = new List$1(CalloutAnnotationWrapper.$, 0);
-            for (let j of fromEnum(this.aa3.cr.c)) {
+            for (let j of fromEnum(this.aa4.cr.c)) {
                 if (!d.contains(j)) {
                     i.add(j);
                 }
             }
             for (let k = 0; k < i.count; k++) {
-                this.aa3.cr.h(i._inner[k]);
+                this.aa4.cr.h(i._inner[k]);
             }
         }
-        zi(a, b) {
-            super.zi(a, b);
+        zj(a, b) {
+            super.zj(a, b);
             if (this.d4()) {
-                this.agc(this.xy, true);
+                this.agd(this.xz, true);
             }
             else {
-                this.agc(this.xw, false);
+                this.agd(this.xx, false);
             }
         }
-        gg() {
+        gh() {
             return true;
         }
-        rq(a, b, c, d) {
-            super.rq(a, b, c, d);
+        rr(a, b, c, d) {
+            super.rr(a, b, c, d);
             switch (b) {
                 case CalloutLayer.$$p[48]:
-                    this.abb = null;
-                    this.aa3.c1();
-                    this.r8(true);
+                    this.abc = null;
+                    this.aa4.c1();
+                    this.r9(true);
                     break;
                 case CalloutLayer.$$p[46]:
                 case CalloutLayer.$$p[47]:
-                    this.r8(true);
+                    this.r9(true);
                     break;
                 case CalloutLayer.$$p[42]:
                 case CalloutLayer.$$p[43]:
-                    if (this.ae7 != null) {
-                        this.aav = new BindingFormatter();
-                        this.aav.j = this.ae7;
-                        this.aav.d = this.aat;
+                    if (this.ae8 != null) {
+                        this.aaw = new BindingFormatter();
+                        this.aaw.j = this.ae8;
+                        this.aaw.d = this.aau;
                     }
                     else {
-                        this.aav = null;
+                        this.aaw = null;
                     }
                     break;
                 case CalloutLayer.$$p[34]:
                 case CalloutLayer.$$p[36]:
-                    this.r8(true);
+                    this.r9(true);
                     break;
                 case "SeriesViewer":
                     if (c != null) {
                         let e = c;
-                        e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.agb));
+                        e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.agc));
                     }
                     if (d != null) {
                         let f = d;
-                        f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.agb));
+                        f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.agc));
                     }
                     if (d == null) {
-                        this.af0();
+                        this.af1();
                     }
                     break;
                 case "AutoCalloutVisibilityMode":
-                    this.aax = this.aaz();
-                    this.af1();
+                    this.aay = this.aa0();
+                    this.af2();
                     break;
                 case "AllowedPositions":
                     if (c != null) {
                         let g = c;
-                        g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.afv));
+                        g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.afw));
                     }
                     if (d != null) {
                         let h = d;
-                        h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.afv));
+                        h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.afw));
                     }
-                    this.aas = this.aau(this.aa5);
-                    this.af1();
+                    this.aat = this.aav(this.aa6);
+                    this.af2();
                     break;
                 case CalloutLayer.$$p[37]:
                 case CalloutLayer.$$p[38]:
@@ -1760,7 +1760,7 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 case CalloutLayer.$$p[28]:
                 case CalloutLayer.$$p[26]:
                 case "Visibility":
-                    this.af1();
+                    this.af2();
                     break;
                 case CalloutLayer.$$p[15]:
                 case CalloutLayer.$$p[21]:
@@ -1770,28 +1770,28 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 case CalloutLayer.$$p[19]:
                 case CalloutLayer.$$p[17]:
                 case CalloutLayer.$$p[32]:
-                    this.af8();
+                    this.af9();
                     break;
                 case CalloutLayer.$$p[30]:
                 case CalloutLayer.$$p[31]:
                 case CalloutLayer.$$p[33]:
                 case CalloutLayer.$$p[12]:
-                    this.af1();
+                    this.af2();
                     break;
                 case CalloutLayer.$$p[45]:
-                    this.af1();
-                    if (this.abq != null) {
-                        this.abq.v = d;
+                    this.af2();
+                    if (this.abr != null) {
+                        this.abr.v = d;
                     }
                     break;
                 case CalloutLayer.$$p[44]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.abm);
-                        this.abm = this.dn(this.afa);
+                        this.dp.deregisterColumn(this.abn);
+                        this.abn = this.dn(this.afb);
                     }
                     break;
                 case "LabelColumn":
-                    this.af1();
+                    this.af2();
                     break;
                 case CalloutLayer.$$p[8]:
                 case CalloutLayer.$$p[2]:
@@ -1803,99 +1803,99 @@ let CalloutLayer = /*@__PURE__*/ (() => {
                 case CalloutLayer.$$p[4]:
                 case CalloutLayer.$$p[3]:
                 case "CalloutBadgeImageColumn":
-                    this.af1();
+                    this.af2();
                     break;
                 case CalloutLayer.$$p[6]:
                     if (this.dp != null) {
-                        this.aga();
+                        this.agb();
                     }
                     break;
                 case CalloutLayer.$$p[35]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.abk);
-                        this.abk = this.dn(this.aev);
+                        this.dp.deregisterColumn(this.abl);
+                        this.abl = this.dn(this.aew);
                     }
                     break;
                 case "ContentColumn":
-                    this.af1();
+                    this.af2();
                     break;
                 case CalloutLayer.$$p[55]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.abn);
-                        this.abn = stringIsNullOrEmpty(this.afq) == false ? this.dn(this.afq) : null;
+                        this.dp.deregisterColumn(this.abo);
+                        this.abo = stringIsNullOrEmpty(this.afr) == false ? this.dn(this.afr) : null;
                     }
                     break;
                 case "XColumn":
-                    this.af1();
+                    this.af2();
                     break;
                 case CalloutLayer.$$p[56]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.abo);
-                        this.abo = this.dn(this.aft);
+                        this.dp.deregisterColumn(this.abp);
+                        this.abp = this.dn(this.afu);
                     }
                     break;
                 case "YColumn":
-                    this.af1();
+                    this.af2();
                     break;
                 case CalloutLayer.$$p[41]:
                     if (this.dp != null) {
-                        this.dp.deregisterColumn(this.abl);
-                        this.abl = this.dn(this.ae4);
+                        this.dp.deregisterColumn(this.abm);
+                        this.abm = this.dn(this.ae5);
                     }
                     break;
                 case "KeyColumn":
-                    this.af1();
+                    this.af2();
                     break;
                 case "FastItemsSource":
-                    this.ab1 = true;
+                    this.ab2 = true;
                     if (typeCast(IFastItemsSource_$type, c) != null) {
-                        c.deregisterColumn(this.abm);
-                        c.deregisterColumn(this.abk);
                         c.deregisterColumn(this.abn);
-                        c.deregisterColumn(this.abo);
                         c.deregisterColumn(this.abl);
-                        c.deregisterColumn(this.abj);
-                        this.abj = null;
-                        this.abm = null;
+                        c.deregisterColumn(this.abo);
+                        c.deregisterColumn(this.abp);
+                        c.deregisterColumn(this.abm);
+                        c.deregisterColumn(this.abk);
                         this.abk = null;
                         this.abn = null;
-                        this.abo = null;
                         this.abl = null;
-                        this.acv.clear();
+                        this.abo = null;
+                        this.abp = null;
+                        this.abm = null;
+                        this.acw.clear();
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.aga();
-                        this.abm = this.dn(this.afa);
-                        this.abk = this.dn(this.aev);
-                        if (stringIsNullOrEmpty(this.afq) == false) {
-                            this.abn = this.dn(this.afq);
+                        this.agb();
+                        this.abn = this.dn(this.afb);
+                        this.abl = this.dn(this.aew);
+                        if (stringIsNullOrEmpty(this.afr) == false) {
+                            this.abo = this.dn(this.afr);
                         }
-                        this.abo = this.dn(this.aft);
-                        this.abl = this.dn(this.ae4);
-                        this.acv.clear();
-                        let i = this.acq();
+                        this.abp = this.dn(this.afu);
+                        this.abm = this.dn(this.ae5);
+                        this.acw.clear();
+                        let i = this.acr();
                         if (this.dp.count > 0) {
                             for (let j = 0; j < this.dp.count; j++) {
                                 let k = new CalloutAnnotation();
                                 let l = new CalloutAnnotationWrapper();
                                 l.b = k;
-                                l.b.series = this.aba;
-                                this.acv.add(l);
-                                this.agd(j, i, false);
+                                l.b.series = this.abb;
+                                this.acw.add(l);
+                                this.age(j, i, false);
                             }
                         }
                     }
-                    this.af1();
+                    this.af2();
                     break;
             }
         }
-        aaz() {
-            if (this.aay == 0) {
+        aa0() {
+            if (this.aaz == 0) {
                 return 1;
             }
-            return this.aay;
+            return this.aaz;
         }
-        aau(a) {
+        aav(a) {
             if (a == null || a.count == 0) {
                 return null;
             }
@@ -1905,45 +1905,45 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        agb(a) {
+        agc(a) {
             if (a.ev) {
                 return;
             }
-            if ((a == this.aba || this.aba == null) && this.ace) {
-                this.r8(false);
+            if ((a == this.abb || this.abb == null) && this.acf) {
+                this.r9(false);
             }
         }
-        af1() {
-            if (this.abw) {
-                this.af7();
-                this.abw = false;
+        af2() {
+            if (this.abx) {
+                this.af8();
+                this.abx = false;
             }
-            if (this.abz == false) {
-                this.abz = true;
-                this.r8(false);
+            if (this.ab0 == false) {
+                this.ab0 = true;
+                this.r9(false);
             }
         }
         ax(a, b, c) {
             let d = this.getEffectiveViewport();
             let e = this.dc.y9;
-            let f = this.xe();
+            let f = this.xf();
             let g = 0;
-            if (b.dy) {
+            if (b.dz) {
                 let h = new ScalerParams(0, c, e, !b.dn, d);
-                let i = b.f9(0, h);
-                let j = b.f9(f.height, h);
+                let i = b.ga(0, h);
+                let j = b.ga(f.height, h);
                 g = Math.abs(j - i);
                 return new AxisRange(a.c - g, a.b + g);
             }
             else {
                 let k = new ScalerParams(0, c, e, b.dn, d);
-                let l = b.f9(0, k);
-                let m = b.f9(f.width, k);
+                let l = b.ga(0, k);
+                let m = b.ga(f.width, k);
                 g = Math.abs(m - l);
                 return new AxisRange(a.c - g, a.b + g);
             }
         }
-        af7() {
+        af8() {
             if (this.da == null) {
                 return;
             }
@@ -1955,125 +1955,125 @@ let CalloutLayer = /*@__PURE__*/ (() => {
             if (b == null) {
                 return;
             }
-            if (this.acd) {
+            if (this.ace) {
                 return;
             }
-            if (!this.abx) {
-                let c = this.aid;
-                let d = this.xe();
+            if (!this.aby) {
+                let c = this.aie;
+                let d = this.xf();
                 if (c.width == d.width && c.height == d.height) {
                     return;
                 }
             }
-            this.abu = false;
+            this.abv = false;
             for (let e of fromEnum(b)) {
-                e.kl();
-                e.ee(true);
+                e.kn();
+                e.ef(true);
             }
-            this.abu = true;
+            this.abv = true;
         }
-        af8() {
+        af9() {
             if (this.dc == null) {
                 return;
             }
-            if (this.abx) {
+            if (this.aby) {
                 return;
             }
-            if (this.acd) {
+            if (this.ace) {
                 return;
             }
-            let a = this.aid;
-            let b = this.xe();
+            let a = this.aie;
+            let b = this.xf();
             if (a.width == b.width && a.height == b.height) {
                 return;
             }
+            this.aby = true;
+            this.ab3 = true;
+            this.ab5 = true;
             this.abx = true;
-            this.ab2 = true;
-            this.ab4 = true;
-            this.abw = true;
-            this.af7();
-            this.abw = false;
-            if (this.abz == false) {
-                this.abz = true;
-                this.r8(false);
-            }
+            this.af8();
             this.abx = false;
+            if (this.ab0 == false) {
+                this.ab0 = true;
+                this.r9(false);
+            }
+            this.aby = false;
         }
-        afz() {
-            this.aa3.cr.clear();
-            this.acs.g();
-            this.acp.clear();
+        af0() {
+            this.aa4.cr.clear();
+            this.act.g();
+            this.acq.clear();
         }
-        af2() {
-            if (this.abo == null || this.abm == null) {
-                let a = this.acs.c;
+        af3() {
+            if (this.abp == null || this.abn == null) {
+                let a = this.act.c;
                 while (a != null) {
-                    this.age(a.c);
+                    this.agf(a.c);
                     a = a.a;
                 }
                 return;
             }
-            let b = this.acq();
-            for (let c = 0; c < this.abo.count; c++) {
+            let b = this.acr();
+            for (let c = 0; c < this.abp.count; c++) {
                 let d;
-                if (this.acv.count <= c) {
+                if (this.acw.count <= c) {
                     let e = new CalloutAnnotation();
                     d = new CalloutAnnotationWrapper();
                     d.b = e;
-                    d.b.series = this.aba;
-                    d.b.badgeImage = this.aex(c);
-                    this.acv.add(d);
+                    d.b.series = this.abb;
+                    d.b.badgeImage = this.aey(c);
+                    this.acw.add(d);
                 }
                 else {
-                    d = this.acv._inner[c];
+                    d = this.acw._inner[c];
                 }
-                this.agd(c, b, false);
+                this.age(c, b, false);
             }
         }
-        af9() {
-            this.ab2 = true;
-            this.ab4 = true;
-            this.af1();
+        aga() {
+            this.ab3 = true;
+            this.ab5 = true;
+            this.af2();
         }
-        ww(a, b, c) {
-            for (let d of fromEnum(this.aa3.cr.c)) {
+        wx(a, b, c) {
+            for (let d of fromEnum(this.aa4.cr.c)) {
                 let e = d.c.p;
                 let f = d.c.o;
                 let g = d.c.k - e - d.b.strokeThickness;
                 let h = d.c.l - f - d.b.strokeThickness;
                 let i = { $type: Point_$type, x: g, y: h };
-                let j = this.w2(i);
+                let j = this.w3(i);
                 let k = d.c.k + e;
                 let l = d.c.l + f;
                 let m = { $type: Point_$type, x: k, y: l };
-                let n = this.w2(m);
+                let n = this.w3(m);
                 if (a.x > j.x && a.y > j.y && a.x < n.x && a.y < n.y) {
                     return i;
                 }
             }
-            return super.ww(a, b, c);
+            return super.wx(a, b, c);
         }
-        kw(a) {
-            for (let b of fromEnum(this.aa3.cr.c)) {
+        kx(a) {
+            for (let b of fromEnum(this.aa4.cr.c)) {
                 let c = b.c.p;
                 let d = b.c.o;
                 let e = b.c.k - c;
                 let f = b.c.l - d;
-                let g = this.w2({ $type: Point_$type, x: e, y: f });
-                let h = this.w2({ $type: Point_$type, x: this.xd.left + c * 2, y: this.xd.top + d * 2 });
+                let g = this.w3({ $type: Point_$type, x: e, y: f });
+                let h = this.w3({ $type: Point_$type, x: this.xe.left + c * 2, y: this.xe.top + d * 2 });
                 if (a.x > g.x && a.y > g.y && a.x < g.x + h.x && a.y < g.y + h.y) {
-                    return new Tuple$2(CalloutAnnotationWrapper.$, CalloutView.$, b, this.aa3.cr.item(b));
+                    return new Tuple$2(CalloutAnnotationWrapper.$, CalloutView.$, b, this.aa4.cr.item(b));
                 }
             }
-            return super.kw(a);
+            return super.kx(a);
         }
         get_e6() {
             return true;
         }
     }
     CalloutLayer.$t = /*@__PURE__*/ markType(CalloutLayer, 'CalloutLayer', AnnotationLayer.$);
-    CalloutLayer.ahe = /*@__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:adl:agg', [1, 5], 'CalloutBackground:ah2:agh', [Brush.$, null], 'CalloutBadgeBackground:ah3:agi', [Brush.$, null], 'CalloutBadgeCorner:ac2:agj', [1, 0], 'CalloutBadgeGap:ac3:agk', [1, 5], 'CalloutBadgeHeight:ac4:agl', [1, 10], 'CalloutBadgeImageMemberPath:adz:agm', [2, null], 'CalloutBadgeMatchSeries:ab8:agn', [0, false], 'CalloutBadgeOutline:ah4:ago', [Brush.$, null], 'CalloutBadgeThickness:ac5:agp', [1, NaN], 'CalloutBadgeVisible:ab9:agq', [0, false], 'CalloutBadgeWidth:ac6:agr', [1, 10], 'CalloutCollisionMode:aa0:ags', [CalloutCollisionMode_$type, /*@__PURE__*/ enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:ac7:agt', [1, NaN], 'CalloutDarkTextColor:ah5:agu', [Brush.$, null], 'CalloutExpandsAxisBufferEnabled:aca:agv', [0, false], 'CalloutExpandsAxisBufferMaxHeight:ac8:agw', [1, 400], 'CalloutExpandsAxisBufferMaxWidth:ac9:agx', [1, 400], 'CalloutExpandsAxisBufferMinHeight:ada:agy', [1, 20], 'CalloutExpandsAxisBufferMinWidth:adb:agz', [1, 20], 'CalloutExpandsAxisBufferOnInitialVisibility:acb:ag0', [0, false], 'CalloutExpandsAxisBufferOnlyWhenVisible:acc:ag1', [0, false], 'CalloutInterpolatedValuePrecision:adm:ag2', [1, -1], 'CalloutLeaderBrush:ah6:ag3', [Brush.$, null], 'CalloutLightTextColor:ah7:ag4', [Brush.$, null], 'CalloutOutline:ah8:ag5', [Brush.$, null], 'CalloutPaddingBottom:adc:ag6', [1, NaN], 'CalloutPaddingLeft:add:ag7', [1, NaN], 'CalloutPaddingRight:ade:ag8', [1, NaN], 'CalloutPaddingTop:adf:ag9', [1, NaN], 'CalloutPositionPadding:adg:aha', [1, 10], 'CalloutStrokeThickness:adh:ahb', [1, NaN], 'CalloutSuspendedWhenShiftingToVisible:acd:ahc', [0, false], 'CalloutTextColor:ah9:ahd', [Brush.$, null], 'CollisionChannel:aes:ahf', [2, null], 'ContentMemberPath:aev:ahg', [2, null], 'HighlightedValueLabelMode:aa9:ahh', [HighlightedValueLabelMode_$type, /*@__PURE__*/ enumGetBox(HighlightedValueLabelMode_$type, 0)], 'IsAutoCalloutBehaviorEnabled:ace:ahi', [0, false], 'IsCalloutOffsettingEnabled:acf:ahj', [0, true], 'IsCustomCalloutRenderStyleEnabled:acg:ahk', [0, false], 'IsCustomCalloutStyleEnabled:ach:ahl', [0, false], 'KeyMemberPath:ae4:ahm', [2, null], 'LabelFormat:ae7:ahn', [2, null], 'LabelFormatSpecifiers:aat:aho', [Array_$type, null], 'LabelMemberPath:afa:ahp', [2, null], 'ShouldTruncateOnBoundaryCollisions:aci:ahq', [0, false], 'TargetSeriesName:afd:ahr', [2, null], 'TargetSeries:aba:ahs', [Series.$, null], 'TextStyle:afg:aht', [2, null], 'UseAutoContrastingLabelColors:acj:ahu', [0, false], 'UseInterpolatedValueForAutoCalloutLabels:ack:ahv', [0, false], 'UseItemColorForFill:acl:ahw', [0, false], 'UseItemColorForOutline:acm:ahx', [0, false], 'UseSeriesColorForOutline:acn:ahy', [0, false], 'UseValueForAutoCalloutLabels:aco:ahz', [0, true], 'XMemberPath:afq:ah0', [2, null], 'YMemberPath:aft:ah1', [2, null]]);
+    CalloutLayer.ahf = /*@__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:adm:agh', [1, 5], 'CalloutBackground:ah3:agi', [Brush.$, null], 'CalloutBadgeBackground:ah4:agj', [Brush.$, null], 'CalloutBadgeCorner:ac3:agk', [1, 0], 'CalloutBadgeGap:ac4:agl', [1, 5], 'CalloutBadgeHeight:ac5:agm', [1, 10], 'CalloutBadgeImageMemberPath:ad0:agn', [2, null], 'CalloutBadgeMatchSeries:ab9:ago', [0, false], 'CalloutBadgeOutline:ah5:agp', [Brush.$, null], 'CalloutBadgeThickness:ac6:agq', [1, NaN], 'CalloutBadgeVisible:aca:agr', [0, false], 'CalloutBadgeWidth:ac7:ags', [1, 10], 'CalloutCollisionMode:aa1:agt', [CalloutCollisionMode_$type, /*@__PURE__*/ enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:ac8:agu', [1, NaN], 'CalloutDarkTextColor:ah6:agv', [Brush.$, null], 'CalloutExpandsAxisBufferEnabled:acb:agw', [0, false], 'CalloutExpandsAxisBufferMaxHeight:ac9:agx', [1, 400], 'CalloutExpandsAxisBufferMaxWidth:ada:agy', [1, 400], 'CalloutExpandsAxisBufferMinHeight:adb:agz', [1, 20], 'CalloutExpandsAxisBufferMinWidth:adc:ag0', [1, 20], 'CalloutExpandsAxisBufferOnInitialVisibility:acc:ag1', [0, false], 'CalloutExpandsAxisBufferOnlyWhenVisible:acd:ag2', [0, false], 'CalloutInterpolatedValuePrecision:adn:ag3', [1, -1], 'CalloutLeaderBrush:ah7:ag4', [Brush.$, null], 'CalloutLightTextColor:ah8:ag5', [Brush.$, null], 'CalloutOutline:ah9:ag6', [Brush.$, null], 'CalloutPaddingBottom:add:ag7', [1, NaN], 'CalloutPaddingLeft:ade:ag8', [1, NaN], 'CalloutPaddingRight:adf:ag9', [1, NaN], 'CalloutPaddingTop:adg:aha', [1, NaN], 'CalloutPositionPadding:adh:ahb', [1, 10], 'CalloutStrokeThickness:adi:ahc', [1, NaN], 'CalloutSuspendedWhenShiftingToVisible:ace:ahd', [0, false], 'CalloutTextColor:aia:ahe', [Brush.$, null], 'CollisionChannel:aet:ahg', [2, null], 'ContentMemberPath:aew:ahh', [2, null], 'HighlightedValueLabelMode:aba:ahi', [HighlightedValueLabelMode_$type, /*@__PURE__*/ enumGetBox(HighlightedValueLabelMode_$type, 0)], 'IsAutoCalloutBehaviorEnabled:acf:ahj', [0, false], 'IsCalloutOffsettingEnabled:acg:ahk', [0, true], 'IsCustomCalloutRenderStyleEnabled:ach:ahl', [0, false], 'IsCustomCalloutStyleEnabled:aci:ahm', [0, false], 'KeyMemberPath:ae5:ahn', [2, null], 'LabelFormat:ae8:aho', [2, null], 'LabelFormatSpecifiers:aau:ahp', [Array_$type, null], 'LabelMemberPath:afb:ahq', [2, null], 'ShouldTruncateOnBoundaryCollisions:acj:ahr', [0, false], 'TargetSeriesName:afe:ahs', [2, null], 'TargetSeries:abb:aht', [Series.$, null], 'TextStyle:afh:ahu', [2, null], 'UseAutoContrastingLabelColors:ack:ahv', [0, false], 'UseInterpolatedValueForAutoCalloutLabels:acl:ahw', [0, false], 'UseItemColorForFill:acm:ahx', [0, false], 'UseItemColorForOutline:acn:ahy', [0, false], 'UseSeriesColorForOutline:aco:ahz', [0, false], 'UseValueForAutoCalloutLabels:acp:ah0', [0, true], 'XMemberPath:afr:ah1', [2, null], 'YMemberPath:afu:ah2', [2, null]]);
     return CalloutLayer;
 })();
 export { CalloutLayer };
@@ -2097,7 +2097,7 @@ let CalloutLayerView = /*@__PURE__*/ (() => {
             if (this.cn == null) {
                 return null;
             }
-            return this.cn.j8;
+            return this.cn.j9;
         }
         a4() {
             super.a4();
@@ -2143,8 +2143,8 @@ let CalloutLayerView = /*@__PURE__*/ (() => {
             }
         }
         cq() {
-            if (this.cn.abc != null) {
-                return this.cn.abc;
+            if (this.cn.abd != null) {
+                return this.cn.abd;
             }
             return this.f.dc.getFontInfo();
         }
@@ -2206,13 +2206,13 @@ let CalloutLayerView = /*@__PURE__*/ (() => {
             a.af(this.f, b, c);
         }
         c4(a, b) {
-            if (b != null && this.cn.acl) {
+            if (b != null && this.cn.acm) {
                 return this.c9(b);
             }
             if (a != null) {
-                return this.c9(a.v0);
+                return this.c9(a.v1);
             }
-            return this.f.v0;
+            return this.f.v1;
         }
         c7() {
             return ((() => {
@@ -2229,16 +2229,16 @@ let CalloutLayerView = /*@__PURE__*/ (() => {
             })());
         }
         c8(a, b) {
-            if (b != null && this.cn.acm) {
+            if (b != null && this.cn.acn) {
                 return this.c9(b);
             }
-            if (this.cn.acn) {
+            if (this.cn.aco) {
                 if (a != null) {
-                    return this.c9(a.v0);
+                    return this.c9(a.v1);
                 }
             }
             if (a != null) {
-                return this.c9(a.vx);
+                return this.c9(a.vy);
             }
             return ((() => {
                 let $ret = new Brush();
@@ -2247,13 +2247,13 @@ let CalloutLayerView = /*@__PURE__*/ (() => {
             })());
         }
         c6(a, b) {
-            if (b != null && this.cn.acm) {
+            if (b != null && this.cn.acn) {
                 return this.c9(b);
             }
             if (a != null) {
-                return this.c9(a.vt);
+                return this.c9(a.vu);
             }
-            return this.f.vt;
+            return this.f.vu;
         }
         c1() {
             this.ct = NaN;