igniteui-webcomponents-charts 3.2.3 → 3.5.0

package/esm2015/lib/CalloutLayer_combined.js

@@ -61,108 +61,108 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             super();
             this.calloutStyleUpdating = null;
             this.calloutRenderStyleUpdating = null;
-            this.rs = null;
-            this.rt = null;
+            this.rw = null;
+            this.rx = null;
+            this.ry = null;
+            this.rv = null;
             this.ru = null;
-            this.rr = null;
-            this.rq = null;
-            this.sk = new HashSet$1(CalloutAnnotationWrapper.$, 0);
-            this.sn = new List$1(CalloutAnnotationWrapper.$, 0);
-            this.so = new List$1(CalloutAnnotationWrapper.$, 0);
-            this.ri = null;
-            this.q8 = null;
-            this.ro = null;
-            this.sl = new LinkedList$1(CalloutAnnotationWrapper.$);
-            this.si = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
-            this.r0 = null;
-            this.vu = new Rect(0, 0, 0, 1, 1);
-            this.r7 = false;
-            this.sz = 0;
-            this.vt = Rect.empty;
-            this.r5 = false;
-            this.r6 = false;
+            this.so = new HashSet$1(CalloutAnnotationWrapper.$, 0);
+            this.sr = new List$1(CalloutAnnotationWrapper.$, 0);
+            this.ss = new List$1(CalloutAnnotationWrapper.$, 0);
+            this.rm = null;
+            this.rc = null;
+            this.rs = null;
+            this.sp = new LinkedList$1(CalloutAnnotationWrapper.$);
+            this.sm = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
+            this.r4 = null;
+            this.vy = new Rect(0, 0, 0, 1, 1);
+            this.sb = false;
+            this.s3 = 0;
+            this.vx = Rect.empty;
+            this.r9 = false;
+            this.sa = false;
             this.calloutContentUpdating = null;
             this.calloutLabelUpdating = null;
             this.calloutSeriesSelecting = null;
-            this.sm = new List$1(SeriesPointOfInterest.$, 0);
-            this.r9 = false;
-            this.sa = false;
-            this.sq = 0;
-            this.r8 = false;
-            this.r4 = true;
-            this.ra = 1;
+            this.sq = new List$1(SeriesPointOfInterest.$, 0);
+            this.sd = false;
+            this.se = false;
+            this.su = 0;
+            this.sc = false;
+            this.r8 = true;
+            this.re = 1;
             FastItemObjectColumn.m();
-            this.q8 = null;
-            this.ri = new CalloutPlacementPositionsCollection();
-            let a = this.ri;
-            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.ue));
-            this.qe = true;
+            this.rc = null;
+            this.rm = new CalloutPlacementPositionsCollection();
+            let a = this.rm;
+            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.ui));
+            this.qi = true;
             let b = new CalloutLayerFrame();
             let c = new CalloutLayerFrame();
             let d = new CalloutLayerFrame();
-            let e = this.hm / 1000;
-            this.p6 = b;
-            this.p5 = c;
-            this.p7 = d;
+            let e = this.ho / 1000;
+            this.qa = b;
+            this.p9 = c;
+            this.qb = d;
             this.ab = CalloutLayer.$;
         }
         get_c8() {
             return true;
         }
-        ue(a, b) {
-            this.un();
+        ui(a, b) {
+            this.ur();
         }
-        un() {
-            this.q8 = this.q9(this.rj);
-            this.uk();
+        ur() {
+            this.rc = this.rd(this.rn);
+            this.uo();
         }
-        uf(a, b) {
-            this.so.clear();
-            this.mi(false);
+        uj(a, b) {
+            this.ss.clear();
+            this.ml(false);
         }
-        k0(a, b, c, d) {
-            super.k0(a, b, c, d);
-            let e = this.sj();
+        k3(a, b, c, d) {
+            super.k3(a, b, c, d);
+            let e = this.sn();
             switch (a) {
                 case 3:
-                    this.us(b, e);
+                    this.uw(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.rn;
-                        this.so.insert(f, h);
-                        this.us(f, e);
+                        h.b.series = this.rr;
+                        this.ss.insert(f, h);
+                        this.uw(f, e);
                     }
                     break;
                 case 0:
-                    this.so.v(b, c);
+                    this.ss.v(b, c);
                     break;
                 case 2:
                     for (let i = b; i < b + c; i++) {
-                        this.us(i, e);
+                        this.uw(i, e);
                     }
                     break;
                 case 4:
-                    this.so.clear();
+                    this.ss.clear();
                     for (let j = 0; j < this.ck.count; j++) {
                         let k = new CalloutAnnotation();
                         let l = new CalloutAnnotationWrapper();
                         l.b = k;
-                        l.b.series = this.rn;
-                        this.so.add(l);
-                        this.us(j, e);
+                        l.b.series = this.rr;
+                        this.ss.add(l);
+                        this.uw(j, e);
                     }
                     break;
             }
-            this.mi(true);
+            this.ml(true);
         }
-        eo(a) {
+        ep(a) {
             return false;
         }
-        sj() {
+        sn() {
             let a = new Dictionary$2(String_$type, Series.$, 0);
             if (this.cd != null) {
                 for (let b = 0; b < this.cd.series.count; b++) {
@@ -174,46 +174,46 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        us(a, b) {
-            if (this.rz == null || this.rx == null) {
+        uw(a, b) {
+            if (this.r3 == null || this.r1 == null) {
                 return;
             }
             let c = a;
-            if (this.ry != null) {
-                c = this.ry.item(a);
-            }
-            let d = this.rz.item(a);
-            let e = this.rx.item(a);
-            let f = this.so._inner[a];
-            if (this.rw != null) {
-                if (f.b.ab != this.rw.item(a)) {
-                    f.b.key = this.rw.item(a);
+            if (this.r2 != null) {
+                c = this.r2.item(a);
+            }
+            let d = this.r3.item(a);
+            let e = this.r1.item(a);
+            let f = this.ss._inner[a];
+            if (this.r0 != null) {
+                if (f.b.ab != this.r0.item(a)) {
+                    f.b.key = this.r0.item(a);
                 }
             }
-            if (this.si.containsKey(f)) {
-                f.b = this.si.item(f).c.b;
+            if (this.sm.containsKey(f)) {
+                f.b = this.sm.item(f).c.b;
             }
             f.b.xValue = c;
             f.b.yValue = d;
             if (this.calloutLabelUpdating != null) {
                 let g = ((() => {
                     let $ret = new CalloutLabelUpdatingEventArgs();
-                    $ret.c = c;
-                    $ret.d = d;
+                    $ret.d = c;
+                    $ret.e = d;
                     $ret.item = this.ck.item(a);
                     return $ret;
                 })());
                 this.calloutLabelUpdating(this, g);
-                if (g.b != null && !Base.equalsStatic(g.b, f.b.ao)) {
-                    let h = g.b;
+                if (g.c != null && !Base.equalsStatic(g.c, f.b.ao)) {
+                    let h = g.c;
                     f.b.text = h != null ? h.toString() : "";
                 }
             }
             else {
                 f.b.text = e != null ? e.toString() : "";
             }
-            if (this.rv != null) {
-                f.b.content = this.rv.item(a);
+            if (this.rz != null) {
+                f.b.content = this.rz.item(a);
             }
             else {
                 f.b.content = this.ck.item(a);
@@ -236,29 +236,29 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            this.ut(f);
+            this.ux(f);
         }
-        ut(a) {
+        ux(a) {
             let b = new Thickness(0, DeviceUtils.g(3));
-            if (isNaN_(this.vw.left) || isNaN_(this.vw.top) || isNaN_(this.vw.right) || isNaN_(this.vw.bottom)) {
+            if (isNaN_(this.v0.left) || isNaN_(this.v0.top) || isNaN_(this.v0.right) || isNaN_(this.v0.bottom)) {
                 b = new Thickness(0, DeviceUtils.g(3));
             }
             else {
-                b = this.vw;
+                b = this.v0;
             }
             let c = DeviceUtils.g(3);
-            if (isNaN_(this.sr)) {
+            if (isNaN_(this.sv)) {
                 c = DeviceUtils.g(3);
             }
             else {
-                c = this.sr;
-            }
-            let d = this.vp != null ? this.vp : this.rh.ci(a.b.l);
-            let e = this.vs != null ? this.vs : this.rh.cl();
-            let f = this.vr != null ? this.vr : this.rh.ck(a.b.l);
-            let g = this.vq != null ? this.vq : this.rh.cj(a.b.l);
-            let h = isNaN_(this.sx) ? 0 : this.sx;
-            if (this.se && this.calloutStyleUpdating != null) {
+                c = this.sv;
+            }
+            let d = this.vt != null ? this.vt : this.rl.ci(a.b.l);
+            let e = this.vw != null ? this.vw : this.rl.cl();
+            let f = this.vv != null ? this.vv : this.rl.ck(a.b.l);
+            let g = this.vu != null ? this.vu : this.rl.cj(a.b.l);
+            let h = isNaN_(this.s1) ? 0 : this.s1;
+            if (this.si && this.calloutStyleUpdating != null) {
                 let i = new CalloutStyleUpdatingEventArgs();
                 i.item = a.b.aa;
                 i.xValue = a.b.ac;
@@ -284,132 +284,132 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             a.b.leaderBrush = g;
             a.b.strokeThickness = h;
         }
-        hw(a, b) {
-            let c = this.jq(b);
+        hy(a, b) {
+            let c = this.js(b);
             if (c == CalloutLayer.$$p[21]) {
-                return this.hx(a, b, this.ty);
+                return this.hz(a, b, this.t2);
             }
             if (c == CalloutLayer.$$p[28]) {
-                return this.hx(a, b, this.t9);
+                return this.hz(a, b, this.ud);
             }
             if (c == CalloutLayer.$$p[29]) {
-                return this.hx(a, b, this.uc);
+                return this.hz(a, b, this.ug);
             }
             if (c == CalloutLayer.$$p[20]) {
-                return this.hx(a, b, this.tv);
+                return this.hz(a, b, this.tz);
             }
             if (c == CalloutLayer.$$p[15]) {
-                return this.hx(a, b, this.to);
+                return this.hz(a, b, this.ts);
             }
-            return super.hw(a, b);
+            return super.hy(a, b);
         }
-        get rx() {
-            return this.rs;
+        get r1() {
+            return this.rw;
         }
-        set rx(a) {
-            if (this.rs != a) {
-                let b = this.rs;
-                this.rs = a;
-                this.raisePropertyChanged("LabelColumn", b, this.rs);
+        set r1(a) {
+            if (this.rw != a) {
+                let b = this.rw;
+                this.rw = a;
+                this.raisePropertyChanged("LabelColumn", b, this.rw);
             }
         }
-        get ry() {
-            return this.rt;
+        get r2() {
+            return this.rx;
         }
-        set ry(a) {
-            if (this.rt != a) {
-                let b = this.rt;
-                this.rt = a;
-                this.raisePropertyChanged("XColumn", b, this.rt);
+        set r2(a) {
+            if (this.rx != a) {
+                let b = this.rx;
+                this.rx = a;
+                this.raisePropertyChanged("XColumn", b, this.rx);
             }
         }
-        get rz() {
-            return this.ru;
+        get r3() {
+            return this.ry;
         }
-        set rz(a) {
-            if (this.ru != a) {
-                let b = this.ru;
-                this.ru = a;
-                this.raisePropertyChanged("YColumn", b, this.ru);
+        set r3(a) {
+            if (this.ry != a) {
+                let b = this.ry;
+                this.ry = a;
+                this.raisePropertyChanged("YColumn", b, this.ry);
             }
         }
-        get rw() {
-            return this.rr;
+        get r0() {
+            return this.rv;
         }
-        set rw(a) {
-            if (this.rr != a) {
-                let b = this.rr;
-                this.rr = a;
-                this.raisePropertyChanged("KeyColumn", b, this.rr);
+        set r0(a) {
+            if (this.rv != a) {
+                let b = this.rv;
+                this.rv = a;
+                this.raisePropertyChanged("KeyColumn", b, this.rv);
             }
         }
-        get rv() {
-            return this.rq;
+        get rz() {
+            return this.ru;
         }
-        set rv(a) {
-            if (this.rq != a) {
-                let b = this.rq;
-                this.rq = a;
-                this.raisePropertyChanged("ContentColumn", b, this.rq);
+        set rz(a) {
+            if (this.ru != a) {
+                let b = this.ru;
+                this.ru = a;
+                this.raisePropertyChanged("ContentColumn", b, this.ru);
             }
         }
-        uh(a, b) {
+        ul(a, b) {
             if (b.propertyName == CalloutAnnotation.$$p[14] || b.propertyName == CalloutAnnotation.$$p[15]) {
                 let c = a.k;
-                if (!this.sk.contains(c)) {
-                    this.sk.add_1(c);
-                    this.sn.add(c);
-                    this.mi(false);
+                if (!this.so.contains(c)) {
+                    this.so.add_1(c);
+                    this.sr.add(c);
+                    this.ml(false);
                 }
             }
         }
         bx() {
             return new CalloutLayerView(this);
         }
-        lz(a) {
-            super.lz(a);
-            this.rh = a;
+        l2(a) {
+            super.l2(a);
+            this.rl = a;
         }
-        get rj() {
-            return this.ri;
+        get rn() {
+            return this.rm;
         }
-        set rj(a) {
-            let b = this.rj;
+        set rn(a) {
+            let b = this.rn;
             if (a != b) {
-                this.ri = a;
-                this.raisePropertyChanged("AllowedPositions", b, this.rj);
+                this.rm = a;
+                this.raisePropertyChanged("AllowedPositions", b, this.rn);
             }
         }
-        get rc() {
-            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.u8));
+        get rg() {
+            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.vc));
         }
-        set rc(a) {
-            this.h(CalloutLayer.u8, enumGetBox(AutoCalloutVisibilityMode_$type, a));
+        set rg(a) {
+            this.h(CalloutLayer.vc, enumGetBox(AutoCalloutVisibilityMode_$type, a));
         }
-        get rb() {
-            return this.ra;
+        get rf() {
+            return this.re;
         }
-        set rb(a) {
-            this.ra = a;
+        set rf(a) {
+            this.re = a;
         }
-        get vw() {
-            return new Thickness(1, this.st, this.sv, this.su, this.ss);
+        get v0() {
+            return new Thickness(1, this.sx, this.sz, this.sy, this.sw);
         }
-        get rp() {
-            if (this.ro == null) {
-                this.ro = FontUtil.toFontInfo(this.g9, this.t3);
+        get rt() {
+            if (this.rs == null) {
+                this.rs = FontUtil.toFontInfo(this.hb, this.t7);
             }
-            return this.ro;
+            return this.rs;
         }
-        qp(a, b) {
-            if (this.rn == null || this.rn == a) {
+        qt(a, b) {
+            if (this.rr == null || this.rr == a) {
                 if (!this.as.c) {
-                    this.mi(b);
+                    this.ml(b);
                 }
             }
         }
-        qr(a, b) {
-            super.qr(a, b);
+        qv(a, b) {
+            super.qv(a, b);
             let c = a;
             c.q.clear();
             c.r.clear();
@@ -428,27 +428,27 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             c.v.clear();
             c.s.clear();
             c.t.clear();
-            let d = this.sp();
+            let d = this.st();
             let e = new List$1(CalloutAnnotationWrapper.$, 0);
             let f = true;
-            if (this.sb) {
-                if (this.qc(this.rn)) {
-                    this.up(this.rn, c, e);
+            if (this.sf) {
+                if (this.qg(this.rr)) {
+                    this.ut(this.rr, c, e);
                 }
                 else {
                     for (let g of fromEnum(this.cd.series)) {
-                        if (this.qc(g)) {
+                        if (this.qg(g)) {
                             if (!g.dc) {
                                 if (!g.isVertical) {
                                     f = false;
                                 }
                             }
-                            this.up(g, c, e);
+                            this.ut(g, c, e);
                         }
                     }
                 }
             }
-            if (this.sb && this.rb == 2) {
+            if (this.sf && this.rf == 2) {
                 let h = 0;
                 let i = 0;
                 let j = 1.7976931348623157E+308;
@@ -487,65 +487,65 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            this.uo(c, d, e);
+            this.us(c, d, e);
         }
-        m6(a, b) {
-            super.m6(a, b);
-            let c = b.width - this.vu.width;
-            let d = b.height - this.vu.height;
+        m9(a, b) {
+            super.m9(a, b);
+            let c = b.width - this.vy.width;
+            let d = b.height - this.vy.height;
             let e = 0;
             if (Math.abs(c) > Math.abs(d)) {
                 e = c;
-                this.sq = c * this.pz.width;
+                this.su = c * this.p3.width;
             }
             else {
                 e = d;
-                this.sq = d * this.pz.height;
+                this.su = d * this.p3.height;
             }
-            if (e > 0 && this.sq > 5) {
-                this.sa = true;
+            if (e > 0 && this.su > 5) {
+                this.se = true;
             }
-            if (e < 0 && this.sq > 5) {
-                this.r9 = true;
+            if (e < 0 && this.su > 5) {
+                this.sd = true;
             }
         }
-        m5(a, b) {
-            super.m5(a, b);
+        m8(a, b) {
+            super.m8(a, b);
             if (!a.equals1(b)) {
-                this.r8 = true;
+                this.sc = true;
             }
         }
-        get vv() {
-            return this.vt;
+        get vz() {
+            return this.vx;
         }
-        set vv(a) {
-            this.vt = a;
+        set vz(a) {
+            this.vx = a;
         }
-        uo(a, b, c) {
+        us(a, b, c) {
             if (this.cd != null) {
-                this.vu = this.cd.sf;
+                this.vy = this.cd.s9;
             }
-            if (this.pz.isEmpty) {
+            if (this.p3.isEmpty) {
                 return;
             }
-            this.vv = new Rect(0, this.pz.left, this.pz.top, this.pz.width, this.pz.height);
-            if (this.r0 != null && this.tl != null && this.tl != this.r0.ap) {
-                this.uj();
+            this.vz = new Rect(0, this.p3.left, this.p3.top, this.p3.width, this.p3.height);
+            if (this.r4 != null && this.tp != null && this.tp != this.r4.ap) {
+                this.un();
             }
-            if (this.r0 == null) {
-                let d = this.r1();
+            if (this.r4 == null) {
+                let d = this.r5();
                 if (d != null) {
-                    this.r0 = d;
-                    let e = this.r0;
-                    e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.ug));
+                    this.r4 = d;
+                    let e = this.r4;
+                    e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.uk));
                 }
                 else {
-                    let f = this.pr(this.b0);
+                    let f = this.pv(this.b0);
                     let g = new Array(2);
                     g[0] = 0;
                     g[1] = 3;
-                    if (this.rn != null) {
-                        if (this.rn.isVertical) {
+                    if (this.rr != null) {
+                        if (this.rr.isVertical) {
                             g = new Array(2);
                             g[0] = 2;
                             g[1] = 1;
@@ -569,31 +569,31 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                             g[1] = 1;
                         }
                     }
-                    this.r0 = new LabelCollisionManager(this.pz.right, this.pz.bottom, this.pz, this.rh.j(), this.sw, this.r2(), g, this.s3(), this.s2(), this.sc, this.q8);
-                    if (this.tl != null) {
-                        this.r0.ap = this.tl;
-                        this.r0.an = this;
+                    this.r4 = new LabelCollisionManager(this.p3.right, this.p3.bottom, this.p3, this.rl.j(), this.s0, this.r6(), g, this.s7(), this.s6(), this.sg, this.rc);
+                    if (this.tp != null) {
+                        this.r4.ap = this.tp;
+                        this.r4.an = this;
                     }
-                    let j = this.r0;
-                    j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.ug));
+                    let j = this.r4;
+                    j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.uk));
                 }
             }
-            if (this.r9) {
-                this.r9 = false;
-                if (this.r0.al > 2) {
-                    this.r7 = true;
+            if (this.sd) {
+                this.sd = false;
+                if (this.r4.al > 2) {
+                    this.sb = true;
                 }
             }
-            if (this.sa) {
-                this.sa = false;
-                if (this.sq > 5) {
-                    this.r7 = true;
+            if (this.se) {
+                this.se = false;
+                if (this.su > 5) {
+                    this.sb = true;
                 }
             }
-            if (this.r8) {
-                this.r8 = false;
-                this.r0.a3(this.pz.right, this.pz.bottom, this.pz);
-                this.r7 = true;
+            if (this.sc) {
+                this.sc = false;
+                this.r4.a3(this.p3.right, this.p3.bottom, this.p3);
+                this.sb = true;
             }
             let k = new HashSet$1(CalloutAnnotationWrapper.$, 0);
             let l = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -606,54 +606,54 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             for (let q = 0; q < c.count; q++) {
                 o.add_1(c._inner[q]);
             }
-            let r = this.sl.c;
+            let r = this.sp.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.uh));
-                    this.sl.h(r);
-                    this.si.removeItem(r.c);
-                    this.r0.a2(r.c.c);
+                    t.propertyChanged = delegateRemove(t.propertyChanged, runOn(this, this.ul));
+                    this.sp.h(r);
+                    this.sm.removeItem(r.c);
+                    this.r4.a2(r.c.c);
                 }
                 r = s;
             }
             for (let u = 0; u < b.count; u++) {
-                if (!this.si.containsKey(b._inner[u])) {
-                    this.sl.f(b._inner[u]);
+                if (!this.sm.containsKey(b._inner[u])) {
+                    this.sp.f(b._inner[u]);
                     let v = b._inner[u].b;
-                    v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.uh));
-                    this.si.addItem(b._inner[u], this.sl.d);
+                    v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.ul));
+                    this.sm.addItem(b._inner[u], this.sp.d);
                     m.add(b._inner[u]);
                     k.add_1(b._inner[u]);
-                    this.r7 = true;
+                    this.sb = true;
                 }
             }
             for (let w = 0; w < c.count; w++) {
-                if (!this.si.containsKey(c._inner[w])) {
-                    this.sl.f(c._inner[w]);
-                    this.si.addItem(c._inner[w], this.sl.d);
+                if (!this.sm.containsKey(c._inner[w])) {
+                    this.sp.f(c._inner[w]);
+                    this.sm.addItem(c._inner[w], this.sp.d);
                     let x = c._inner[w].b;
-                    x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.uh));
+                    x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.ul));
                     m.add(c._inner[w]);
                     k.add_1(c._inner[w]);
-                    this.r7 = true;
+                    this.sb = true;
                 }
             }
-            if (this.r5 == true) {
-                this.r5 = false;
-                this.r7 = true;
+            if (this.r9 == true) {
+                this.r9 = false;
+                this.sb = true;
             }
-            if (this.sn.count > 0) {
-                this.r7 = true;
-                this.sn.clear();
-                this.sk.clear();
+            if (this.sr.count > 0) {
+                this.sb = true;
+                this.sr.clear();
+                this.so.clear();
             }
-            r = this.sl.c;
+            r = this.sp.c;
             while (r != null) {
-                let y = this.r3(r.c);
+                let y = this.r7(r.c);
                 if (y == null) {
                     return;
                 }
@@ -669,36 +669,36 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         aa.n = y.e;
                         aa.m = y.d;
                         if (aa.b == null) {
-                            this.r0.t(aa, false);
+                            this.r4.t(aa, false);
                         }
                         if (z) {
-                            this.r0.aq(aa);
+                            this.r4.aq(aa);
                         }
                         else {
-                            this.r0.az(aa);
+                            this.r4.az(aa);
                         }
                     }
                 }
                 r = r.a;
             }
-            let ab = this.r0.am();
-            let ac = this.r0.u();
+            let ab = this.r4.am();
+            let ac = this.r4.u();
             if (ac) {
-                if (this.r0.q()) {
-                    this.r7 = true;
+                if (this.r4.q()) {
+                    this.sb = true;
                 }
             }
-            if (this.r7 && (ab != 0 || ac)) {
-                this.r7 = false;
-                this.sz = 0x7FFFFFFF;
-                if (this.tl != null) {
+            if (this.sb && (ab != 0 || ac)) {
+                this.sb = false;
+                this.s3 = 0x7FFFFFFF;
+                if (this.tp != null) {
                     let ad = true;
                     for (let ae = 0; ae < this.cd.series.count; ae++) {
                         let af = this.cd.series._inner[ae];
                         if (af.dc && typeCast(CalloutLayer.$, af) !== null) {
                             let ag = af;
-                            if (ag.tl == this.tl) {
-                                if (!ag.vv.equals1(this.r0.a5)) {
+                            if (ag.tp == this.tp) {
+                                if (!ag.vz.equals1(this.r4.a5)) {
                                     ad = false;
                                     break;
                                 }
@@ -706,21 +706,21 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         }
                     }
                     if (ad) {
-                        this.r0.a4();
+                        this.r4.a4();
                     }
                     else {
-                        this.r0.ar();
-                        this.r0.as();
+                        this.r4.ar();
+                        this.r4.as();
                     }
                 }
                 else {
-                    this.r0.a4();
+                    this.r4.a4();
                 }
             }
             else {
-                this.r0.as();
+                this.r4.as();
             }
-            let ah = this.sl.c;
+            let ah = this.sp.c;
             let ai;
             let aj;
             let ak;
@@ -737,7 +737,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             let av;
             let aw;
             let ax;
-            let ay = this.sd;
+            let ay = this.sh;
             while (ah != null) {
                 let az = ah.c;
                 let a0 = az.b;
@@ -799,23 +799,23 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 ah = ah.a;
             }
         }
-        uj() {
-            if (this.r0 != null) {
-                let a = this.sl.c;
+        un() {
+            if (this.r4 != null) {
+                let a = this.sp.c;
                 while (a != null) {
                     let b = a.c.c;
                     if (b != null) {
-                        this.r0.a2(b);
+                        this.r4.a2(b);
                     }
                     a = a.a;
                 }
-                let c = this.r0;
-                c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.ug));
-                this.r0 = null;
+                let c = this.r4;
+                c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.uk));
+                this.r4 = null;
             }
-            this.ui();
+            this.um();
         }
-        r1() {
+        r5() {
             if (this.cd == null) {
                 return null;
             }
@@ -824,9 +824,9 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 if (b.dc && typeCast(CalloutLayer.$, b) !== null) {
                     let c = b;
                     if (c != this) {
-                        if (c.tl != null && c.tl == this.tl) {
-                            if (c.r0 != null) {
-                                return c.r0;
+                        if (c.tp != null && c.tp == this.tp) {
+                            if (c.r4 != null) {
+                                return c.r4;
                             }
                         }
                     }
@@ -834,14 +834,14 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        s2() {
+        s6() {
             return 20000;
         }
-        s3() {
+        s7() {
             return 300;
         }
-        r2() {
-            switch (this.re) {
+        r6() {
+            switch (this.ri) {
                 case 0: return 2;
                 case 2: return 1;
                 case 3: return 2;
@@ -849,15 +849,15 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return 2;
         }
-        ug(a) {
-            let b = this.r0.am();
-            if (b < this.sz) {
-                this.sz = b;
-                this.mi(false);
+        uk(a) {
+            let b = this.r4.am();
+            if (b < this.s3) {
+                this.s3 = b;
+                this.ml(false);
             }
         }
-        r3(a) {
-            let b = this.rn;
+        r7(a) {
+            let b = this.rr;
             if (a.b.l != null) {
                 b = a.b.l;
             }
@@ -874,7 +874,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 return null;
             }
             let e = b.ag();
-            let f = b.gc();
+            let f = b.ge();
             let g = null;
             let h = null;
             let i = false;
@@ -903,27 +903,27 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             let k = 0;
             let l = 0;
             if (g.ca && g.categoryMode != 0) {
-                if (b.dp) {
+                if (b.dq) {
                     k = b.getOffsetValue();
                 }
-                else if (b.dg) {
+                else if (b.dh) {
                     k = b.getOffsetValue();
                 }
             }
             if (h.ca && h.categoryMode != 0) {
-                if (b.dg) {
+                if (b.dh) {
                     l = b.getOffsetValue();
                 }
             }
-            let m = new ScalerParams(0, this.cd.sf, g.kc, g.cg, g.j7());
+            let m = new ScalerParams(0, this.cd.s9, g.kc, g.cg, g.j7());
             m.b = f;
-            let n = new ScalerParams(0, this.cd.sf, h.kc, h.cg, h.j7());
+            let n = new ScalerParams(0, this.cd.s9, h.kc, h.cg, h.j7());
             n.b = f;
             let o = 0;
             let p = 0;
             if (i) {
-                o = g.ei(this.sy(a.b.ac), m) + k;
-                p = h.ei(this.sy(a.b.ad), n) + l;
+                o = g.ei(this.s2(a.b.ac), m) + k;
+                p = h.ei(this.s2(a.b.ad), n) + l;
                 let q = o;
                 let r = p;
                 let s = { $type: Point_$type, x: 0.5, y: 0.5 };
@@ -933,8 +933,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 p = ViewportUtils.f(u, n.e, n.d);
             }
             else {
-                o = g.ei(this.sy(a.b.ac), m) + k;
-                p = h.ei(this.sy(a.b.ad), n) + l;
+                o = g.ei(this.s2(a.b.ac), m) + k;
+                p = h.ei(this.s2(a.b.ad), n) + l;
             }
             let v = new QuadTreeBoundingBox();
             v.b = o;
@@ -944,7 +944,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             v.g = a.b;
             return v;
         }
-        sy(a) {
+        s2(a) {
             if (typeCast(Date_$type, a) !== null) {
                 return a.getTime();
             }
@@ -953,80 +953,80 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        sp() {
+        st() {
             let a = new List$1(CalloutAnnotationWrapper.$, 0);
-            for (let b = 0; b < this.so.count; b++) {
-                if (stringIsNullOrEmpty(this.so._inner[b].b.ao)) {
+            for (let b = 0; b < this.ss.count; b++) {
+                if (stringIsNullOrEmpty(this.ss._inner[b].b.ao)) {
                     continue;
                 }
-                if (this.so._inner[b].c == null) {
+                if (this.ss._inner[b].c == null) {
                     let c = new LabelCollisionInfo();
-                    this.so._inner[b].c = c;
-                    let d = this.rh.cn(this.s4(this.so._inner[b]), this.so._inner[b].b.backgroundPadding);
+                    this.ss._inner[b].c = c;
+                    let d = this.rl.cn(this.s8(this.ss._inner[b]), this.ss._inner[b].b.backgroundPadding);
                     c.k = d.height / 2;
                     c.l = d.width / 2;
                 }
-                let e = this.r3(this.so._inner[b]);
-                if (e == null || e.b < this.pz.left || e.b > this.pz.right || e.c < this.pz.top || e.c > this.pz.bottom) {
+                let e = this.r7(this.ss._inner[b]);
+                if (e == null || e.b < this.p3.left || e.b > this.p3.right || e.c < this.p3.top || e.c > this.p3.bottom) {
                     continue;
                 }
-                a.add(this.so._inner[b]);
+                a.add(this.ss._inner[b]);
             }
             return a;
         }
-        s4(a) {
+        s8(a) {
             return a.b.ao;
         }
-        qc(a) {
-            if (!super.qc(a)) {
+        qg(a) {
+            if (!super.qg(a)) {
                 return false;
             }
-            if (this.t0 != null) {
-                if (a.du) {
-                    let b = a.jp();
-                    if (!Base.equalsStatic(this.t0, b)) {
+            if (this.t4 != null) {
+                if (a.dv) {
+                    let b = a.jr();
+                    if (!Base.equalsStatic(this.t4, b)) {
                         return false;
                     }
                 }
                 else {
-                    if (!Base.equalsStatic(this.t0, a.name)) {
+                    if (!Base.equalsStatic(this.t4, a.name)) {
                         return false;
                     }
                 }
             }
             return true;
         }
-        ls() {
-            super.ls();
+        lv() {
+            super.lv();
             if (!this.as.c && !this.cv()) {
                 return;
             }
-            if (this.r4) {
-                this.r4 = false;
-                this.ul();
+            if (this.r8) {
+                this.r8 = false;
+                this.up();
             }
             if (this.cv()) {
-                this.ur(this.p7, false);
+                this.uv(this.qb, false);
             }
             else {
-                this.ur(this.p5, false);
+                this.uv(this.p9, false);
             }
         }
-        um() {
-            if (!this.r6) {
-                this.r6 = true;
-                this.mi(true);
+        uq() {
+            if (!this.sa) {
+                this.sa = true;
+                this.ml(true);
             }
         }
-        up(a, b, c) {
+        ut(a, b, c) {
             let d = false;
-            if (this.r6) {
-                this.r6 = false;
+            if (this.sa) {
+                this.sa = false;
                 d = true;
             }
-            if (a.c1(this.sm, this.sh, this.sf, this.s0)) {
-                let e = this.sm;
-                for (let f = 0; f < this.sm.count; f++) {
+            if (!a.er && a.c1(this.sq, this.sl, this.sj, this.s4)) {
+                let e = this.sq;
+                for (let f = 0; f < this.sq.count; f++) {
                     let g = e._inner[f];
                     let h = g.a != null ? g.a.item : null;
                     let i = g.a.item != null ? g.a.item : g.a;
@@ -1037,8 +1037,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     l.b = m;
                     m.key = k;
                     let n = false;
-                    if (this.si.containsKey(l)) {
-                        l = this.si.item(l).c;
+                    if (this.sm.containsKey(l)) {
+                        l = this.sm.item(l).c;
                         m = l.b;
                         n = d;
                     }
@@ -1047,10 +1047,10 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                     let o = m.ac;
                     let p = m.ad;
-                    if (this.sy(o) != this.sy(g.b)) {
+                    if (this.s2(o) != this.s2(g.b)) {
                         m.xValue = g.b;
                     }
-                    if (this.sy(p) != this.sy(g.c)) {
+                    if (this.s2(p) != this.s2(g.c)) {
                         m.yValue = g.c;
                     }
                     m.series = a;
@@ -1063,14 +1063,16 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         if (this.calloutLabelUpdating != null) {
                             let r = ((() => {
                                 let $ret = new CalloutLabelUpdatingEventArgs();
-                                $ret.c = m.ac;
-                                $ret.d = m.ad;
+                                $ret.d = m.ac;
+                                $ret.e = m.ad;
                                 $ret.item = h;
+                                $ret.a = a;
+                                $ret.f = a.name;
                                 return $ret;
                             })());
                             this.calloutLabelUpdating(this, r);
-                            if (r.b != null && !Base.equalsStatic(r.b, l.b.ao)) {
-                                let s = r.b;
+                            if (r.c != null && !Base.equalsStatic(r.c, l.b.ao)) {
+                                let s = r.c;
                                 l.b.text = s != null ? s.toString() : "";
                             }
                         }
@@ -1105,17 +1107,17 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         }
                     }
                     if (n) {
-                        this.ut(l);
+                        this.ux(l);
                     }
                     if (l.c == null) {
                         let u = new LabelCollisionInfo();
                         l.c = u;
-                        let v = this.rh.cn(this.s4(l), l.b.backgroundPadding);
+                        let v = this.rl.cn(this.s8(l), l.b.backgroundPadding);
                         u.k = v.height / 2;
                         u.l = v.width / 2;
                     }
-                    let w = this.r3(l);
-                    if (w == null || w.b < this.pz.left || w.b > this.pz.right || w.c < this.pz.top || w.c > this.pz.bottom) {
+                    let w = this.r7(l);
+                    if (w == null || w.b < this.p3.left || w.b > this.p3.right || w.c < this.p3.top || w.c > this.p3.bottom) {
                         continue;
                     }
                     l.e = w.b;
@@ -1128,19 +1130,19 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             return 1;
         }
         at(a, b) {
-            let c = this.r0.f(a, b);
+            let c = this.r4.f(a, b);
             if (c == null) {
                 return null;
             }
             return c.u;
         }
-        ev(a, b) {
-            if (this.r0 == null) {
+        ex(a, b) {
+            if (this.r4 == null) {
                 return false;
             }
-            return this.r0.f(a, b) != null;
+            return this.r4.f(a, b) != null;
         }
-        ur(a, b) {
+        uv(a, b) {
             let c = 0;
             let d = new HashSet$1(CalloutAnnotationWrapper.$, 0);
             for (c = 0; c < a.q.count; c++) {
@@ -1148,7 +1150,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 if (isNaN_(a.u._inner[c]) || isNaN_(a.v._inner[c])) {
                     continue;
                 }
-                let f = this.rh.b8.item(e);
+                let f = this.rl.b8.item(e);
                 d.add_1(e);
                 if (f.h != a.q._inner[c]) {
                     f.h = a.q._inner[c];
@@ -1161,75 +1163,75 @@ 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.rh.cg(f, Math.min(a.s._inner[c], a.s._inner[c] + a.u._inner[c]), Math.min(a.t._inner[c], a.t._inner[c] + a.v._inner[c]));
-                this.rh.ch(f, e, a.r._inner[c]);
+                this.rl.cg(f, Math.min(a.s._inner[c], a.s._inner[c] + a.u._inner[c]), Math.min(a.t._inner[c], a.t._inner[c] + a.v._inner[c]));
+                this.rl.ch(f, e, a.r._inner[c]);
                 f.r = { $type: Point_$type, x: a.u._inner[c], y: a.v._inner[c] };
             }
             let h = new List$1(CalloutAnnotationWrapper.$, 0);
-            for (let i of fromEnum(this.rh.b8.c)) {
+            for (let i of fromEnum(this.rl.b8.c)) {
                 if (!d.contains(i)) {
                     h.add(i);
                 }
             }
             for (let j = 0; j < h.count; j++) {
-                this.rh.b8.h(h._inner[j]);
+                this.rl.b8.h(h._inner[j]);
             }
         }
-        qu(a, b) {
-            super.qu(a, b);
+        qy(a, b) {
+            super.qy(a, b);
             if (this.cv()) {
-                this.ur(this.p7, true);
+                this.uv(this.qb, true);
             }
             else {
-                this.ur(this.p5, false);
+                this.uv(this.p9, false);
             }
         }
-        em() {
+        en() {
             return true;
         }
-        l4(a, b, c, d) {
-            super.l4(a, b, c, d);
+        l7(a, b, c, d) {
+            super.l7(a, b, c, d);
             switch (b) {
                 case CalloutLayer.$$p[24]:
-                    this.ro = null;
-                    this.rh.cf();
-                    this.mi(true);
+                    this.rs = null;
+                    this.rl.cf();
+                    this.ml(true);
                     break;
                 case CalloutLayer.$$p[22]:
                 case CalloutLayer.$$p[23]:
-                    this.mi(true);
+                    this.ml(true);
                     break;
                 case CalloutLayer.$$p[14]:
-                    this.mi(true);
+                    this.ml(true);
                     break;
                 case "SeriesViewer":
                     if (c != null) {
                         let e = c;
-                        e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.uq));
+                        e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.uu));
                     }
                     if (d != null) {
                         let f = d;
-                        f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.uq));
+                        f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.uu));
                     }
                     if (d == null) {
-                        this.uj();
+                        this.un();
                     }
                     break;
                 case "AutoCalloutVisibilityMode":
-                    this.rb = this.rd();
-                    this.uk();
+                    this.rf = this.rh();
+                    this.uo();
                     break;
                 case "AllowedPositions":
                     if (c != null) {
                         let g = c;
-                        g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.ue));
+                        g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.ui));
                     }
                     if (d != null) {
                         let h = d;
-                        h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.ue));
+                        h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.ui));
                     }
-                    this.q8 = this.q9(this.rj);
-                    this.uk();
+                    this.rc = this.rd(this.rn);
+                    this.uo();
                     break;
                 case CalloutLayer.$$p[16]:
                 case CalloutLayer.$$p[17]:
@@ -1246,88 +1248,88 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 case CalloutLayer.$$p[7]:
                 case CalloutLayer.$$p[12]:
                 case CalloutLayer.$$p[13]:
-                    this.uk();
+                    this.uo();
                     break;
                 case CalloutLayer.$$p[21]:
                     if (this.ck != null) {
-                        this.ck.deregisterColumn(this.rx);
-                        this.rx = this.cj(this.ty);
+                        this.ck.deregisterColumn(this.r1);
+                        this.r1 = this.cj(this.t2);
                     }
                     break;
                 case "LabelColumn":
-                    this.uk();
+                    this.uo();
                     break;
                 case CalloutLayer.$$p[15]:
                     if (this.ck != null) {
-                        this.ck.deregisterColumn(this.rv);
-                        this.rv = this.cj(this.to);
+                        this.ck.deregisterColumn(this.rz);
+                        this.rz = this.cj(this.ts);
                     }
                     break;
                 case "ContentColumn":
-                    this.uk();
+                    this.uo();
                     break;
                 case CalloutLayer.$$p[28]:
                     if (this.ck != null) {
-                        this.ck.deregisterColumn(this.ry);
-                        this.ry = stringIsNullOrEmpty(this.t9) == false ? this.cj(this.t9) : null;
+                        this.ck.deregisterColumn(this.r2);
+                        this.r2 = stringIsNullOrEmpty(this.ud) == false ? this.cj(this.ud) : null;
                     }
                     break;
                 case "XColumn":
-                    this.uk();
+                    this.uo();
                     break;
                 case CalloutLayer.$$p[29]:
                     if (this.ck != null) {
-                        this.ck.deregisterColumn(this.rz);
-                        this.rz = this.cj(this.uc);
+                        this.ck.deregisterColumn(this.r3);
+                        this.r3 = this.cj(this.ug);
                     }
                     break;
                 case "YColumn":
-                    this.uk();
+                    this.uo();
                     break;
                 case CalloutLayer.$$p[20]:
                     if (this.ck != null) {
-                        this.ck.deregisterColumn(this.rw);
-                        this.rw = this.cj(this.tv);
+                        this.ck.deregisterColumn(this.r0);
+                        this.r0 = this.cj(this.tz);
                     }
                     break;
                 case "KeyColumn":
-                    this.uk();
+                    this.uo();
                     break;
                 case "FastItemsSource":
-                    this.r5 = true;
+                    this.r9 = true;
                     if (typeCast(IFastItemsSource_$type, c) != null) {
-                        c.deregisterColumn(this.rx);
-                        c.deregisterColumn(this.rv);
-                        c.deregisterColumn(this.ry);
+                        c.deregisterColumn(this.r1);
                         c.deregisterColumn(this.rz);
-                        c.deregisterColumn(this.rw);
-                        this.rx = null;
-                        this.rv = null;
-                        this.ry = null;
+                        c.deregisterColumn(this.r2);
+                        c.deregisterColumn(this.r3);
+                        c.deregisterColumn(this.r0);
+                        this.r1 = null;
                         this.rz = null;
-                        this.rw = null;
-                        this.so.clear();
+                        this.r2 = null;
+                        this.r3 = null;
+                        this.r0 = null;
+                        this.ss.clear();
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.rx = this.cj(this.ty);
-                        this.rv = this.cj(this.to);
-                        if (stringIsNullOrEmpty(this.t9) == false) {
-                            this.ry = this.cj(this.t9);
+                        this.r1 = this.cj(this.t2);
+                        this.rz = this.cj(this.ts);
+                        if (stringIsNullOrEmpty(this.ud) == false) {
+                            this.r2 = this.cj(this.ud);
                         }
-                        this.rz = this.cj(this.uc);
-                        this.rw = this.cj(this.tv);
+                        this.r3 = this.cj(this.ug);
+                        this.r0 = this.cj(this.tz);
                     }
-                    this.uk();
+                    this.uo();
                     break;
             }
         }
-        rd() {
-            if (this.rc == 0) {
+        rh() {
+            if (this.rg == 0) {
                 return 1;
             }
-            return this.rc;
+            return this.rg;
         }
-        q9(a) {
+        rd(a) {
             if (a == null || a.count == 0) {
                 return null;
             }
@@ -1337,54 +1339,54 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        uq(a) {
+        uu(a) {
             if (a.dc) {
                 return;
             }
-            if ((a == this.rn || this.rn == null) && this.sb) {
-                this.mi(false);
+            if ((a == this.rr || this.rr == null) && this.sf) {
+                this.ml(false);
             }
         }
-        uk() {
-            if (this.r4 == false) {
-                this.r4 = true;
-                this.mi(false);
+        uo() {
+            if (this.r8 == false) {
+                this.r8 = true;
+                this.ml(false);
             }
         }
-        ui() {
-            this.rh.b8.clear();
-            this.sl.g();
-            this.si.clear();
+        um() {
+            this.rl.b8.clear();
+            this.sp.g();
+            this.sm.clear();
         }
-        ul() {
-            if (this.rz == null || this.rx == null) {
-                let a = this.sl.c;
+        up() {
+            if (this.r3 == null || this.r1 == null) {
+                let a = this.sp.c;
                 while (a != null) {
-                    this.ut(a.c);
+                    this.ux(a.c);
                     a = a.a;
                 }
                 return;
             }
-            let b = this.sj();
-            for (let c = 0; c < this.rz.count; c++) {
+            let b = this.sn();
+            for (let c = 0; c < this.r3.count; c++) {
                 let d;
-                if (this.so.count <= c) {
+                if (this.ss.count <= c) {
                     let e = new CalloutAnnotation();
                     d = new CalloutAnnotationWrapper();
                     d.b = e;
-                    d.b.series = this.rn;
-                    this.so.add(d);
+                    d.b.series = this.rr;
+                    this.ss.add(d);
                 }
                 else {
-                    d = this.so._inner[c];
+                    d = this.ss._inner[c];
                 }
-                this.us(c, b);
+                this.uw(c, b);
             }
         }
     }
     CalloutLayer.$t = /*@__PURE__*/ markType(CalloutLayer, 'CalloutLayer', AnnotationLayer.$);
-    CalloutLayer.u8 = /*@__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:s0:uu', [1, 5], 'CalloutBackground:vp:uv', [Brush.$, null], 'CalloutCollisionMode:re:uw', [CalloutCollisionMode_$type, /*@__PURE__*/ enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:sr:ux', [1, NaN], 'CalloutInterpolatedValuePrecision:s1:uy', [1, -1], 'CalloutLeaderBrush:vq:uz', [Brush.$, null], 'CalloutOutline:vr:u0', [Brush.$, null], 'CalloutPaddingBottom:ss:u1', [1, NaN], 'CalloutPaddingLeft:st:u2', [1, NaN], 'CalloutPaddingRight:su:u3', [1, NaN], 'CalloutPaddingTop:sv:u4', [1, NaN], 'CalloutPositionPadding:sw:u5', [1, 10], 'CalloutStrokeThickness:sx:u6', [1, NaN], 'CalloutTextColor:vs:u7', [Brush.$, null], 'CollisionChannel:tl:u9', [2, null], 'ContentMemberPath:to:va', [2, null], 'IsAutoCalloutBehaviorEnabled:sb:vb', [0, false], 'IsCalloutOffsettingEnabled:sc:vc', [0, true], 'IsCustomCalloutRenderStyleEnabled:sd:vd', [0, false], 'IsCustomCalloutStyleEnabled:se:ve', [0, false], 'KeyMemberPath:tv:vf', [2, null], 'LabelMemberPath:ty:vg', [2, null], 'TargetSeriesName:t0:vh', [2, null], 'TargetSeries:rn:vi', [Series.$, null], 'TextStyle:t3:vj', [2, null], 'UseInterpolatedValueForAutoCalloutLabels:sf:vk', [0, false], 'UseSeriesColorForOutline:sg:vl', [0, false], 'UseValueForAutoCalloutLabels:sh:vm', [0, true], 'XMemberPath:t9:vn', [2, null], 'YMemberPath:uc:vo', [2, null]]);
+    CalloutLayer.vc = /*@__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:s4:uy', [1, 5], 'CalloutBackground:vt:uz', [Brush.$, null], 'CalloutCollisionMode:ri:u0', [CalloutCollisionMode_$type, /*@__PURE__*/ enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:sv:u1', [1, NaN], 'CalloutInterpolatedValuePrecision:s5:u2', [1, -1], 'CalloutLeaderBrush:vu:u3', [Brush.$, null], 'CalloutOutline:vv:u4', [Brush.$, null], 'CalloutPaddingBottom:sw:u5', [1, NaN], 'CalloutPaddingLeft:sx:u6', [1, NaN], 'CalloutPaddingRight:sy:u7', [1, NaN], 'CalloutPaddingTop:sz:u8', [1, NaN], 'CalloutPositionPadding:s0:u9', [1, 10], 'CalloutStrokeThickness:s1:va', [1, NaN], 'CalloutTextColor:vw:vb', [Brush.$, null], 'CollisionChannel:tp:vd', [2, null], 'ContentMemberPath:ts:ve', [2, null], 'IsAutoCalloutBehaviorEnabled:sf:vf', [0, false], 'IsCalloutOffsettingEnabled:sg:vg', [0, true], 'IsCustomCalloutRenderStyleEnabled:sh:vh', [0, false], 'IsCustomCalloutStyleEnabled:si:vi', [0, false], 'KeyMemberPath:tz:vj', [2, null], 'LabelMemberPath:t2:vk', [2, null], 'TargetSeriesName:t4:vl', [2, null], 'TargetSeries:rr:vm', [Series.$, null], 'TextStyle:t7:vn', [2, null], 'UseInterpolatedValueForAutoCalloutLabels:sj:vo', [0, false], 'UseSeriesColorForOutline:sk:vp', [0, false], 'UseValueForAutoCalloutLabels:sl:vq', [0, true], 'XMemberPath:ud:vr', [2, null], 'YMemberPath:ug:vs', [2, null]]);
     return CalloutLayer;
 })();
 /**
@@ -1446,8 +1448,8 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
             }
         }
         b7() {
-            if (this.b4.rp != null) {
-                return this.b4.rp;
+            if (this.b4.rt != null) {
+                return this.b4.rt;
             }
             return this.e.cd.getFontInfo();
         }
@@ -1470,7 +1472,7 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
         cb() {
             let a = this.b7();
             if (isNaN_(this.ca)) {
-                let b = FontUtil.getCurrentFontHeight(this.e.cd.cq.j.ae, a);
+                let b = FontUtil.getCurrentFontHeight(this.e.cd.cu.j.ae, a);
                 this.ca = b;
             }
             return this.ca;
@@ -1494,9 +1496,9 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
         }
         ci(a) {
             if (a != null) {
-                return this.cm(a.o4);
+                return this.cm(a.o8);
             }
-            return this.e.o4;
+            return this.e.o8;
         }
         cl() {
             return ((() => {
@@ -1506,9 +1508,9 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
             })());
         }
         ck(a) {
-            if (this.b4.sg) {
+            if (this.b4.sk) {
                 if (a != null) {
-                    return this.cm(a.o4);
+                    return this.cm(a.o8);
                 }
             }
             return ((() => {
@@ -1519,9 +1521,9 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
         }
         cj(a) {
             if (a != null) {
-                return this.cm(a.oz);
+                return this.cm(a.o3);
             }
-            return this.e.oz;
+            return this.e.o3;
         }
         cf() {
             this.ca = NaN;