igniteui-webcomponents-charts 4.7.0 → 4.7.2-beta.0

package/esm2015/lib/CalloutLayer_combined.js

@@ -57,116 +57,119 @@ import { TranslateTransform } from "igniteui-webcomponents-core";
  */
 export let CalloutLayer = /*@__PURE__*/ (() => {
     class CalloutLayer extends AnnotationLayer {
-        get_d2() {
+        bg() {
+            return new CalloutLayer();
+        }
+        get_d3() {
             return true;
         }
         constructor() {
             super();
             this.calloutStyleUpdating = null;
             this.calloutRenderStyleUpdating = null;
-            this.xk = null;
             this.xl = null;
             this.xm = null;
+            this.xn = null;
+            this.xk = null;
             this.xj = null;
-            this.xi = null;
-            this.yc = new HashSet$1(CalloutAnnotationWrapper.$, 0);
-            this.yf = new List$1(CalloutAnnotationWrapper.$, 0);
+            this.yd = new HashSet$1(CalloutAnnotationWrapper.$, 0);
             this.yg = new List$1(CalloutAnnotationWrapper.$, 0);
-            this.xa = null;
-            this.w0 = null;
-            this.xg = null;
-            this.yd = new LinkedList$1(CalloutAnnotationWrapper.$);
-            this.ya = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
-            this.xs = null;
-            this.abm = new Rect(0, 0, 0, 1, 1);
-            this.xz = false;
-            this.yr = 0;
-            this.abl = Rect.empty;
-            this.xx = false;
+            this.yh = new List$1(CalloutAnnotationWrapper.$, 0);
+            this.xb = null;
+            this.w1 = null;
+            this.xh = null;
+            this.ye = new LinkedList$1(CalloutAnnotationWrapper.$);
+            this.yb = new Dictionary$2(CalloutAnnotationWrapper.$, LinkedListNode$1.$.specialize(CalloutAnnotationWrapper.$), 0);
+            this.xt = null;
+            this.abn = new Rect(0, 0, 0, 1, 1);
+            this.x0 = false;
+            this.ys = 0;
+            this.abm = Rect.empty;
             this.xy = false;
+            this.xz = false;
             this.calloutContentUpdating = null;
             this.calloutLabelUpdating = null;
             this.calloutSeriesSelecting = null;
-            this.ye = new List$1(SeriesPointOfInterest.$, 0);
-            this.x1 = false;
+            this.yf = new List$1(SeriesPointOfInterest.$, 0);
             this.x2 = false;
-            this.yi = 0;
-            this.x0 = false;
-            this.xw = true;
-            this.w2 = 1;
+            this.x3 = false;
+            this.yj = 0;
+            this.x1 = false;
+            this.xx = true;
+            this.w3 = 1;
             FastItemObjectColumn.m();
-            this.w0 = null;
-            this.xa = new CalloutPlacementPositionsCollection();
-            let a = this.xa;
-            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.z6));
-            this.un = true;
+            this.w1 = null;
+            this.xb = new CalloutPlacementPositionsCollection();
+            let a = this.xb;
+            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.z7));
+            this.uo = true;
             let b = new CalloutLayerFrame();
             let c = new CalloutLayerFrame();
             let d = new CalloutLayerFrame();
-            let e = this.ji / 1000;
-            this.uf = b;
-            this.ue = c;
-            this.ug = d;
+            let e = this.jj / 1000;
+            this.ug = b;
+            this.uf = c;
+            this.uh = d;
             this.ab = CalloutLayer.$;
         }
-        z6(a, b) {
-            this.aaf();
+        z7(a, b) {
+            this.aag();
         }
-        aaf() {
-            this.w0 = this.w1(this.xb);
-            this.aac();
+        aag() {
+            this.w1 = this.w2(this.xc);
+            this.aad();
         }
-        z7(a, b) {
-            this.yg.clear();
-            this.pp(false);
+        z8(a, b) {
+            this.yh.clear();
+            this.pq(false);
         }
-        no(a, b, c, d) {
-            super.no(a, b, c, d);
-            let e = this.yb();
+        np(a, b, c, d) {
+            super.np(a, b, c, d);
+            let e = this.yc();
             switch (a) {
                 case 3:
-                    this.aak(b, e);
+                    this.aal(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.xf;
-                        this.yg.insert(f, h);
-                        this.aak(f, e);
+                        h.b.series = this.xg;
+                        this.yh.insert(f, h);
+                        this.aal(f, e);
                     }
                     break;
                 case 0:
-                    this.yg.v(b, c);
+                    this.yh.v(b, c);
                     break;
                 case 2:
                     for (let i = b; i < b + c; i++) {
-                        this.aak(i, e);
+                        this.aal(i, e);
                     }
                     break;
                 case 4:
-                    this.yg.clear();
-                    for (let j = 0; j < this.c6.count; j++) {
+                    this.yh.clear();
+                    for (let j = 0; j < this.c7.count; j++) {
                         let k = new CalloutAnnotation();
                         let l = new CalloutAnnotationWrapper();
                         l.b = k;
-                        l.b.series = this.xf;
-                        this.yg.add(l);
-                        this.aak(j, e);
+                        l.b.series = this.xg;
+                        this.yh.add(l);
+                        this.aal(j, e);
                     }
                     break;
             }
-            this.pp(true);
+            this.pq(true);
         }
-        fp(a) {
+        fq(a) {
             return false;
         }
-        yb() {
+        yc() {
             let a = new Dictionary$2(String_$type, Series.$, 0);
-            if (this.cy != null) {
-                for (let b = 0; b < this.cy.series.count; b++) {
-                    let c = this.cy.series._inner[b];
+            if (this.cz != null) {
+                for (let b = 0; b < this.cz.series.count; b++) {
+                    let c = this.cz.series._inner[b];
                     if (c.name != null && !a.containsKey(c.name)) {
                         a.addItem(c.name, c);
                     }
@@ -174,24 +177,24 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        aak(a, b) {
-            if (this.xr == null || this.xp == null) {
+        aal(a, b) {
+            if (this.xs == null || this.xq == null) {
                 return;
             }
             let c = a;
-            if (this.xq != null) {
-                c = this.xq.item(a);
-            }
-            let d = this.xr.item(a);
-            let e = this.xp.item(a);
-            let f = this.yg._inner[a];
-            if (this.xo != null) {
-                if (f.b.ab != this.xo.item(a)) {
-                    f.b.key = this.xo.item(a);
+            if (this.xr != null) {
+                c = this.xr.item(a);
+            }
+            let d = this.xs.item(a);
+            let e = this.xq.item(a);
+            let f = this.yh._inner[a];
+            if (this.xp != null) {
+                if (f.b.ab != this.xp.item(a)) {
+                    f.b.key = this.xp.item(a);
                 }
             }
-            if (this.ya.containsKey(f)) {
-                f.b = this.ya.item(f).c.b;
+            if (this.yb.containsKey(f)) {
+                f.b = this.yb.item(f).c.b;
             }
             f.b.xValue = c;
             f.b.yValue = d;
@@ -200,7 +203,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     let $ret = new CalloutLabelUpdatingEventArgs();
                     $ret.d = c;
                     $ret.e = d;
-                    $ret.item = this.c6.item(a);
+                    $ret.item = this.c7.item(a);
                     return $ret;
                 })());
                 this.calloutLabelUpdating(this, g);
@@ -212,18 +215,18 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             else {
                 f.b.text = e != null ? e.toString() : "";
             }
-            if (this.xn != null) {
-                f.b.content = this.xn.item(a);
+            if (this.xo != null) {
+                f.b.content = this.xo.item(a);
             }
             else {
-                f.b.content = this.c6.item(a);
+                f.b.content = this.c7.item(a);
             }
             if (this.calloutSeriesSelecting != null) {
                 let i = ((() => {
                     let $ret = new CalloutSeriesSelectingEventArgs();
                     $ret.c = c;
                     $ret.d = d;
-                    $ret.item = this.c6.item(a);
+                    $ret.item = this.c7.item(a);
                     return $ret;
                 })());
                 this.calloutSeriesSelecting(this, i);
@@ -236,29 +239,29 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            this.aal(f);
+            this.aam(f);
         }
-        aal(a) {
+        aam(a) {
             let b = new Thickness(0, DeviceUtils.g(3));
-            if (isNaN_(this.abo.left) || isNaN_(this.abo.top) || isNaN_(this.abo.right) || isNaN_(this.abo.bottom)) {
+            if (isNaN_(this.abp.left) || isNaN_(this.abp.top) || isNaN_(this.abp.right) || isNaN_(this.abp.bottom)) {
                 b = new Thickness(0, DeviceUtils.g(3));
             }
             else {
-                b = this.abo;
+                b = this.abp;
             }
             let c = DeviceUtils.g(3);
-            if (isNaN_(this.yj)) {
+            if (isNaN_(this.yk)) {
                 c = DeviceUtils.g(3);
             }
             else {
-                c = this.yj;
-            }
-            let d = this.abh != null ? this.abh : this.w9.cl(a.b.l);
-            let e = this.abk != null ? this.abk : this.w9.co();
-            let f = this.abj != null ? this.abj : this.w9.cn(a.b.l);
-            let g = this.abi != null ? this.abi : this.w9.cm(a.b.l);
-            let h = isNaN_(this.yp) ? 0 : this.yp;
-            if (this.x6 && this.calloutStyleUpdating != null) {
+                c = this.yk;
+            }
+            let d = this.abi != null ? this.abi : this.xa.cl(a.b.l);
+            let e = this.abl != null ? this.abl : this.xa.co();
+            let f = this.abk != null ? this.abk : this.xa.cn(a.b.l);
+            let g = this.abj != null ? this.abj : this.xa.cm(a.b.l);
+            let h = isNaN_(this.yq) ? 0 : this.yq;
+            if (this.x7 && this.calloutStyleUpdating != null) {
                 let i = new CalloutStyleUpdatingEventArgs();
                 i.item = a.b.aa;
                 i.xValue = a.b.ac;
@@ -284,34 +287,24 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             a.b.leaderBrush = g;
             a.b.strokeThickness = h;
         }
-        ju(a, b) {
-            let c = this.lv(b);
+        jv(a, b) {
+            let c = this.lw(b);
             if (c == CalloutLayer.$$p[21]) {
-                return this.jv(a, b, this.zq);
+                return this.jw(a, b, this.zr);
             }
             if (c == CalloutLayer.$$p[28]) {
-                return this.jv(a, b, this.z1);
+                return this.jw(a, b, this.z2);
             }
             if (c == CalloutLayer.$$p[29]) {
-                return this.jv(a, b, this.z4);
+                return this.jw(a, b, this.z5);
             }
             if (c == CalloutLayer.$$p[20]) {
-                return this.jv(a, b, this.zn);
+                return this.jw(a, b, this.zo);
             }
             if (c == CalloutLayer.$$p[15]) {
-                return this.jv(a, b, this.zg);
-            }
-            return super.ju(a, b);
-        }
-        get xp() {
-            return this.xk;
-        }
-        set xp(a) {
-            if (this.xk != a) {
-                let b = this.xk;
-                this.xk = a;
-                this.raisePropertyChanged("LabelColumn", b, this.xk);
+                return this.jw(a, b, this.zh);
             }
+            return super.jv(a, b);
         }
         get xq() {
             return this.xl;
@@ -320,7 +313,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             if (this.xl != a) {
                 let b = this.xl;
                 this.xl = a;
-                this.raisePropertyChanged("XColumn", b, this.xl);
+                this.raisePropertyChanged("LabelColumn", b, this.xl);
             }
         }
         get xr() {
@@ -330,7 +323,27 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             if (this.xm != a) {
                 let b = this.xm;
                 this.xm = a;
-                this.raisePropertyChanged("YColumn", b, this.xm);
+                this.raisePropertyChanged("XColumn", b, this.xm);
+            }
+        }
+        get xs() {
+            return this.xn;
+        }
+        set xs(a) {
+            if (this.xn != a) {
+                let b = this.xn;
+                this.xn = a;
+                this.raisePropertyChanged("YColumn", b, this.xn);
+            }
+        }
+        get xp() {
+            return this.xk;
+        }
+        set xp(a) {
+            if (this.xk != a) {
+                let b = this.xk;
+                this.xk = a;
+                this.raisePropertyChanged("KeyColumn", b, this.xk);
             }
         }
         get xo() {
@@ -340,76 +353,66 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             if (this.xj != a) {
                 let b = this.xj;
                 this.xj = a;
-                this.raisePropertyChanged("KeyColumn", b, this.xj);
-            }
-        }
-        get xn() {
-            return this.xi;
-        }
-        set xn(a) {
-            if (this.xi != a) {
-                let b = this.xi;
-                this.xi = a;
-                this.raisePropertyChanged("ContentColumn", b, this.xi);
+                this.raisePropertyChanged("ContentColumn", b, this.xj);
             }
         }
-        z9(a, b) {
+        aaa(a, b) {
             if (b.propertyName == CalloutAnnotation.$$p[14] || b.propertyName == CalloutAnnotation.$$p[15]) {
                 let c = a.k;
-                if (!this.yc.contains(c)) {
-                    this.yc.add_1(c);
-                    this.yf.add(c);
-                    this.pp(false);
+                if (!this.yd.contains(c)) {
+                    this.yd.add_1(c);
+                    this.yg.add(c);
+                    this.pq(false);
                 }
             }
         }
-        cg() {
+        ch() {
             return new CalloutLayerView(this);
         }
-        o0(a) {
-            super.o0(a);
-            this.w9 = a;
+        o1(a) {
+            super.o1(a);
+            this.xa = a;
         }
-        get xb() {
-            return this.xa;
+        get xc() {
+            return this.xb;
         }
-        set xb(a) {
-            let b = this.xb;
+        set xc(a) {
+            let b = this.xc;
             if (a != b) {
-                this.xa = a;
-                this.raisePropertyChanged("AllowedPositions", b, this.xb);
+                this.xb = a;
+                this.raisePropertyChanged("AllowedPositions", b, this.xc);
             }
         }
-        get w4() {
-            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.aa0));
+        get w5() {
+            return EnumUtil.getEnumValue(AutoCalloutVisibilityMode_$type, this.c(CalloutLayer.aa1));
         }
-        set w4(a) {
-            this.h(CalloutLayer.aa0, enumGetBox(AutoCalloutVisibilityMode_$type, a));
+        set w5(a) {
+            this.h(CalloutLayer.aa1, enumGetBox(AutoCalloutVisibilityMode_$type, a));
         }
-        get w3() {
-            return this.w2;
+        get w4() {
+            return this.w3;
         }
-        set w3(a) {
-            this.w2 = a;
+        set w4(a) {
+            this.w3 = a;
         }
-        get abo() {
-            return new Thickness(1, this.yl, this.yn, this.ym, this.yk);
+        get abp() {
+            return new Thickness(1, this.ym, this.yo, this.yn, this.yl);
         }
-        get xh() {
-            if (this.xg == null) {
-                this.xg = FontUtil.toFontInfo(this.i4, this.zv);
+        get xi() {
+            if (this.xh == null) {
+                this.xh = FontUtil.toFontInfo(this.i5, this.zw);
             }
-            return this.xg;
+            return this.xh;
         }
-        vs(a, b) {
-            if (this.xf == null || this.xf == a) {
+        vt(a, b) {
+            if (this.xg == null || this.xg == a) {
                 if (!this.at.c) {
-                    this.pp(b);
+                    this.pq(b);
                 }
             }
         }
-        vu(a, b) {
-            super.vu(a, b);
+        vv(a, b) {
+            super.vv(a, b);
             let c = a;
             c.q.clear();
             c.r.clear();
@@ -428,27 +431,27 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             c.v.clear();
             c.s.clear();
             c.t.clear();
-            let d = this.yh();
+            let d = this.yi();
             let e = new List$1(CalloutAnnotationWrapper.$, 0);
             let f = true;
-            if (this.x3) {
-                if (this.ul(this.xf)) {
-                    this.aah(this.xf, c, e);
+            if (this.x4) {
+                if (this.um(this.xg)) {
+                    this.aai(this.xg, c, e);
                 }
                 else {
-                    for (let g of fromEnum(this.cy.series)) {
-                        if (this.ul(g)) {
-                            if (!g.d6) {
+                    for (let g of fromEnum(this.cz.series)) {
+                        if (this.um(g)) {
+                            if (!g.d7) {
                                 if (!g.isVertical) {
                                     f = false;
                                 }
                             }
-                            this.aah(g, c, e);
+                            this.aai(g, c, e);
                         }
                     }
                 }
             }
-            if (this.x3 && this.w3 == 2) {
+            if (this.x4 && this.w4 == 2) {
                 let h = 0;
                 let i = 0;
                 let j = 1.7976931348623157E+308;
@@ -487,65 +490,65 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            this.aag(c, d, e);
+            this.aah(c, d, e);
         }
-        qn(a, b) {
-            super.qn(a, b);
-            let c = b.width - this.abm.width;
-            let d = b.height - this.abm.height;
+        qo(a, b) {
+            super.qo(a, b);
+            let c = b.width - this.abn.width;
+            let d = b.height - this.abn.height;
             let e = 0;
             if (Math.abs(c) > Math.abs(d)) {
                 e = c;
-                this.yi = c * this.tw.width;
+                this.yj = c * this.tx.width;
             }
             else {
                 e = d;
-                this.yi = d * this.tw.height;
+                this.yj = d * this.tx.height;
             }
-            if (e > 0 && this.yi > 5) {
-                this.x2 = true;
+            if (e > 0 && this.yj > 5) {
+                this.x3 = true;
             }
-            if (e < 0 && this.yi > 5) {
-                this.x1 = true;
+            if (e < 0 && this.yj > 5) {
+                this.x2 = true;
             }
         }
-        qm(a, b) {
-            super.qm(a, b);
+        qn(a, b) {
+            super.qn(a, b);
             if (!a.equals1(b)) {
-                this.x0 = true;
+                this.x1 = true;
             }
         }
-        get abn() {
-            return this.abl;
+        get abo() {
+            return this.abm;
         }
-        set abn(a) {
-            this.abl = a;
+        set abo(a) {
+            this.abm = a;
         }
-        aag(a, b, c) {
-            if (this.cy != null) {
-                this.abm = this.cy.tn;
+        aah(a, b, c) {
+            if (this.cz != null) {
+                this.abn = this.cz.tn;
             }
-            if (this.tw.isEmpty) {
+            if (this.tx.isEmpty) {
                 return;
             }
-            this.abn = new Rect(0, this.tw.left, this.tw.top, this.tw.width, this.tw.height);
-            if (this.xs != null && this.zd != null && this.zd != this.xs.ap) {
-                this.aab();
+            this.abo = new Rect(0, this.tx.left, this.tx.top, this.tx.width, this.tx.height);
+            if (this.xt != null && this.ze != null && this.ze != this.xt.ap) {
+                this.aac();
             }
-            if (this.xs == null) {
-                let d = this.xt();
+            if (this.xt == null) {
+                let d = this.xu();
                 if (d != null) {
-                    this.xs = d;
-                    let e = this.xs;
-                    e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.z8));
+                    this.xt = d;
+                    let e = this.xt;
+                    e.labelsMoved = delegateCombine(e.labelsMoved, runOn(this, this.z9));
                 }
                 else {
-                    let f = this.to(this.cj);
+                    let f = this.tp(this.ck);
                     let g = new Array(2);
                     g[0] = 0;
                     g[1] = 3;
-                    if (this.xf != null) {
-                        if (this.xf.isVertical) {
+                    if (this.xg != null) {
+                        if (this.xg.isVertical) {
                             g = new Array(2);
                             g[0] = 2;
                             g[1] = 1;
@@ -553,10 +556,10 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                     else {
                         let h = false;
-                        if (this.cy != null && this.cy.series.count > 0) {
+                        if (this.cz != null && this.cz.series.count > 0) {
                             h = true;
-                            for (let i of fromEnum(this.cy.series)) {
-                                if (!i.d6) {
+                            for (let i of fromEnum(this.cz.series)) {
+                                if (!i.d7) {
                                     if (!i.isVertical) {
                                         h = false;
                                     }
@@ -569,31 +572,31 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                             g[1] = 1;
                         }
                     }
-                    this.xs = new LabelCollisionManager(this.tw.right, this.tw.bottom, this.tw, this.w9.j(), this.yo, this.xu(), g, this.yv(), this.yu(), this.x4, this.w0);
-                    if (this.zd != null) {
-                        this.xs.ap = this.zd;
-                        this.xs.an = this;
+                    this.xt = new LabelCollisionManager(this.tx.right, this.tx.bottom, this.tx, this.xa.j(), this.yp, this.xv(), g, this.yw(), this.yv(), this.x5, this.w1);
+                    if (this.ze != null) {
+                        this.xt.ap = this.ze;
+                        this.xt.an = this;
                     }
-                    let j = this.xs;
-                    j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.z8));
-                }
-            }
-            if (this.x1) {
-                this.x1 = false;
-                if (this.xs.al > 2) {
-                    this.xz = true;
+                    let j = this.xt;
+                    j.labelsMoved = delegateCombine(j.labelsMoved, runOn(this, this.z9));
                 }
             }
             if (this.x2) {
                 this.x2 = false;
-                if (this.yi > 5) {
-                    this.xz = true;
+                if (this.xt.al > 2) {
+                    this.x0 = true;
                 }
             }
-            if (this.x0) {
-                this.x0 = false;
-                this.xs.a3(this.tw.right, this.tw.bottom, this.tw);
-                this.xz = true;
+            if (this.x3) {
+                this.x3 = false;
+                if (this.yj > 5) {
+                    this.x0 = true;
+                }
+            }
+            if (this.x1) {
+                this.x1 = false;
+                this.xt.a3(this.tx.right, this.tx.bottom, this.tx);
+                this.x0 = true;
             }
             let k = new HashSet$1(CalloutAnnotationWrapper.$, 0);
             let l = new HashSet$1(CalloutAnnotationWrapper.$, 0);
@@ -606,54 +609,54 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             for (let q = 0; q < c.count; q++) {
                 o.add_1(c._inner[q]);
             }
-            let r = this.yd.c;
+            let r = this.ye.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.z9));
-                    this.yd.h(r);
-                    this.ya.removeItem(r.c);
-                    this.xs.a2(r.c.c);
+                    t.propertyChanged = delegateRemove(t.propertyChanged, runOn(this, this.aaa));
+                    this.ye.h(r);
+                    this.yb.removeItem(r.c);
+                    this.xt.a2(r.c.c);
                 }
                 r = s;
             }
             for (let u = 0; u < b.count; u++) {
-                if (!this.ya.containsKey(b._inner[u])) {
-                    this.yd.f(b._inner[u]);
+                if (!this.yb.containsKey(b._inner[u])) {
+                    this.ye.f(b._inner[u]);
                     let v = b._inner[u].b;
-                    v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.z9));
-                    this.ya.addItem(b._inner[u], this.yd.d);
+                    v.propertyChanged = delegateCombine(v.propertyChanged, runOn(this, this.aaa));
+                    this.yb.addItem(b._inner[u], this.ye.d);
                     m.add(b._inner[u]);
                     k.add_1(b._inner[u]);
-                    this.xz = true;
+                    this.x0 = true;
                 }
             }
             for (let w = 0; w < c.count; w++) {
-                if (!this.ya.containsKey(c._inner[w])) {
-                    this.yd.f(c._inner[w]);
-                    this.ya.addItem(c._inner[w], this.yd.d);
+                if (!this.yb.containsKey(c._inner[w])) {
+                    this.ye.f(c._inner[w]);
+                    this.yb.addItem(c._inner[w], this.ye.d);
                     let x = c._inner[w].b;
-                    x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.z9));
+                    x.propertyChanged = delegateCombine(x.propertyChanged, runOn(this, this.aaa));
                     m.add(c._inner[w]);
                     k.add_1(c._inner[w]);
-                    this.xz = true;
+                    this.x0 = true;
                 }
             }
-            if (this.xx == true) {
-                this.xx = false;
-                this.xz = true;
+            if (this.xy == true) {
+                this.xy = false;
+                this.x0 = true;
             }
-            if (this.yf.count > 0) {
-                this.xz = true;
-                this.yf.clear();
-                this.yc.clear();
+            if (this.yg.count > 0) {
+                this.x0 = true;
+                this.yg.clear();
+                this.yd.clear();
             }
-            r = this.yd.c;
+            r = this.ye.c;
             while (r != null) {
-                let y = this.xv(r.c);
+                let y = this.xw(r.c);
                 if (y == null) {
                     return;
                 }
@@ -669,36 +672,36 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         aa.n = y.e;
                         aa.m = y.d;
                         if (aa.b == null) {
-                            this.xs.t(aa, false);
+                            this.xt.t(aa, false);
                         }
                         if (z) {
-                            this.xs.aq(aa);
+                            this.xt.aq(aa);
                         }
                         else {
-                            this.xs.az(aa);
+                            this.xt.az(aa);
                         }
                     }
                 }
                 r = r.a;
             }
-            let ab = this.xs.am();
-            let ac = this.xs.u();
+            let ab = this.xt.am();
+            let ac = this.xt.u();
             if (ac) {
-                if (this.xs.q()) {
-                    this.xz = true;
+                if (this.xt.q()) {
+                    this.x0 = true;
                 }
             }
-            if (this.xz && (ab != 0 || ac)) {
-                this.xz = false;
-                this.yr = 0x7FFFFFFF;
-                if (this.zd != null) {
+            if (this.x0 && (ab != 0 || ac)) {
+                this.x0 = false;
+                this.ys = 0x7FFFFFFF;
+                if (this.ze != null) {
                     let ad = true;
-                    for (let ae = 0; ae < this.cy.series.count; ae++) {
-                        let af = this.cy.series._inner[ae];
-                        if (af.d6 && typeCast(CalloutLayer.$, af) !== null) {
+                    for (let ae = 0; ae < this.cz.series.count; ae++) {
+                        let af = this.cz.series._inner[ae];
+                        if (af.d7 && typeCast(CalloutLayer.$, af) !== null) {
                             let ag = af;
-                            if (ag.zd == this.zd) {
-                                if (!ag.abn.equals1(this.xs.a5)) {
+                            if (ag.ze == this.ze) {
+                                if (!ag.abo.equals1(this.xt.a5)) {
                                     ad = false;
                                     break;
                                 }
@@ -706,21 +709,21 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         }
                     }
                     if (ad) {
-                        this.xs.a4();
+                        this.xt.a4();
                     }
                     else {
-                        this.xs.ar();
-                        this.xs.as();
+                        this.xt.ar();
+                        this.xt.as();
                     }
                 }
                 else {
-                    this.xs.a4();
+                    this.xt.a4();
                 }
             }
             else {
-                this.xs.as();
+                this.xt.as();
             }
-            let ah = this.yd.c;
+            let ah = this.ye.c;
             let ai;
             let aj;
             let ak;
@@ -737,7 +740,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             let av;
             let aw;
             let ax;
-            let ay = this.x5;
+            let ay = this.x6;
             while (ah != null) {
                 let az = ah.c;
                 let a0 = az.b;
@@ -799,34 +802,34 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 ah = ah.a;
             }
         }
-        aab() {
-            if (this.xs != null) {
-                let a = this.yd.c;
+        aac() {
+            if (this.xt != null) {
+                let a = this.ye.c;
                 while (a != null) {
                     let b = a.c.c;
                     if (b != null) {
-                        this.xs.a2(b);
+                        this.xt.a2(b);
                     }
                     a = a.a;
                 }
-                let c = this.xs;
-                c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.z8));
-                this.xs = null;
+                let c = this.xt;
+                c.labelsMoved = delegateRemove(c.labelsMoved, runOn(this, this.z9));
+                this.xt = null;
             }
-            this.aaa();
+            this.aab();
         }
-        xt() {
-            if (this.cy == null) {
+        xu() {
+            if (this.cz == null) {
                 return null;
             }
-            for (let a = 0; a < this.cy.series.count; a++) {
-                let b = this.cy.series._inner[a];
-                if (b.d6 && typeCast(CalloutLayer.$, b) !== null) {
+            for (let a = 0; a < this.cz.series.count; a++) {
+                let b = this.cz.series._inner[a];
+                if (b.d7 && typeCast(CalloutLayer.$, b) !== null) {
                     let c = b;
                     if (c != this) {
-                        if (c.zd != null && c.zd == this.zd) {
-                            if (c.xs != null) {
-                                return c.xs;
+                        if (c.ze != null && c.ze == this.ze) {
+                            if (c.xt != null) {
+                                return c.xt;
                             }
                         }
                     }
@@ -834,14 +837,14 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        yu() {
+        yv() {
             return 20000;
         }
-        yv() {
+        yw() {
             return 300;
         }
-        xu() {
-            switch (this.w6) {
+        xv() {
+            switch (this.w7) {
                 case 0: return 2;
                 case 2: return 1;
                 case 3: return 2;
@@ -849,22 +852,22 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return 2;
         }
-        z8(a) {
-            let b = this.xs.am();
-            if (b < this.yr) {
-                this.yr = b;
-                this.pp(false);
+        z9(a) {
+            let b = this.xt.am();
+            if (b < this.ys) {
+                this.ys = b;
+                this.pq(false);
             }
         }
-        xv(a) {
-            let b = this.xf;
+        xw(a) {
+            let b = this.xg;
             if (a.b.l != null) {
                 b = a.b.l;
             }
             if (b == null) {
-                for (let c = 0; c < this.cy.series.count; c++) {
-                    let d = this.cy.series._inner[c];
-                    if (!d.d6) {
+                for (let c = 0; c < this.cz.series.count; c++) {
+                    let d = this.cz.series._inner[c];
+                    if (!d.d7) {
                         b = d;
                         break;
                     }
@@ -874,7 +877,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 return null;
             }
             let e = b.ag();
-            let f = b.h2();
+            let f = b.h3();
             let g = null;
             let h = null;
             let i = false;
@@ -903,27 +906,27 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             let k = 0;
             let l = 0;
             if (g.cb && g.categoryMode != 0) {
-                if (b.ek) {
+                if (b.el) {
                     k = b.getOffsetValue();
                 }
-                else if (b.ec) {
+                else if (b.ed) {
                     k = b.getOffsetValue();
                 }
             }
             if (h.cb && h.categoryMode != 0) {
-                if (b.ec) {
+                if (b.ed) {
                     l = b.getOffsetValue();
                 }
             }
-            let m = new ScalerParams(0, this.cy.tn, g.kd, g.ch, g.j8());
+            let m = new ScalerParams(0, this.cz.tn, g.kd, g.ch, g.j8());
             m.b = f;
-            let n = new ScalerParams(0, this.cy.tn, h.kd, h.ch, h.j8());
+            let n = new ScalerParams(0, this.cz.tn, h.kd, h.ch, h.j8());
             n.b = f;
             let o = 0;
             let p = 0;
             if (i) {
-                o = g.ej(this.yq(a.b.ac), m) + k;
-                p = h.ej(this.yq(a.b.ad), n) + l;
+                o = g.ej(this.yr(a.b.ac), m) + k;
+                p = h.ej(this.yr(a.b.ad), n) + l;
                 let q = o;
                 let r = p;
                 let s = { $type: Point_$type, x: 0.5, y: 0.5 };
@@ -933,8 +936,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 p = ViewportUtils.f(u, n.e, n.d);
             }
             else {
-                o = g.ej(this.yq(a.b.ac), m) + k;
-                p = h.ej(this.yq(a.b.ad), n) + l;
+                o = g.ej(this.yr(a.b.ac), m) + k;
+                p = h.ej(this.yr(a.b.ad), n) + l;
             }
             let v = new QuadTreeBoundingBox();
             v.b = o;
@@ -944,7 +947,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             v.g = a.b;
             return v;
         }
-        yq(a) {
+        yr(a) {
             if (typeCast(Date_$type, a) !== null) {
                 return a.getTime();
             }
@@ -953,80 +956,80 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        yh() {
+        yi() {
             let a = new List$1(CalloutAnnotationWrapper.$, 0);
-            for (let b = 0; b < this.yg.count; b++) {
-                if (stringIsNullOrEmpty(this.yg._inner[b].b.ao)) {
+            for (let b = 0; b < this.yh.count; b++) {
+                if (stringIsNullOrEmpty(this.yh._inner[b].b.ao)) {
                     continue;
                 }
-                if (this.yg._inner[b].c == null) {
+                if (this.yh._inner[b].c == null) {
                     let c = new LabelCollisionInfo();
-                    this.yg._inner[b].c = c;
-                    let d = this.w9.cq(this.yw(this.yg._inner[b]), this.yg._inner[b].b.backgroundPadding);
+                    this.yh._inner[b].c = c;
+                    let d = this.xa.cq(this.yx(this.yh._inner[b]), this.yh._inner[b].b.backgroundPadding);
                     c.k = d.height / 2;
                     c.l = d.width / 2;
                 }
-                let e = this.xv(this.yg._inner[b]);
-                if (e == null || e.b < this.tw.left || e.b > this.tw.right || e.c < this.tw.top || e.c > this.tw.bottom) {
+                let e = this.xw(this.yh._inner[b]);
+                if (e == null || e.b < this.tx.left || e.b > this.tx.right || e.c < this.tx.top || e.c > this.tx.bottom) {
                     continue;
                 }
-                a.add(this.yg._inner[b]);
+                a.add(this.yh._inner[b]);
             }
             return a;
         }
-        yw(a) {
+        yx(a) {
             return a.b.ao;
         }
-        ul(a) {
-            if (!super.ul(a)) {
+        um(a) {
+            if (!super.um(a)) {
                 return false;
             }
-            if (this.zs != null) {
-                if (a.ep) {
-                    let b = a.lu();
-                    if (!Base.equalsStatic(this.zs, b)) {
+            if (this.zt != null) {
+                if (a.eq) {
+                    let b = a.lv();
+                    if (!Base.equalsStatic(this.zt, b)) {
                         return false;
                     }
                 }
                 else {
-                    if (!Base.equalsStatic(this.zs, a.name)) {
+                    if (!Base.equalsStatic(this.zt, a.name)) {
                         return false;
                     }
                 }
             }
             return true;
         }
-        oo() {
-            super.oo();
-            if (!this.at.c && !this.dj()) {
+        op() {
+            super.op();
+            if (!this.at.c && !this.dk()) {
                 return;
             }
-            if (this.xw) {
-                this.xw = false;
-                this.aad();
+            if (this.xx) {
+                this.xx = false;
+                this.aae();
             }
-            if (this.dj()) {
-                this.aaj(this.ug, false);
+            if (this.dk()) {
+                this.aak(this.uh, false);
             }
             else {
-                this.aaj(this.ue, false);
+                this.aak(this.uf, false);
             }
         }
-        aae() {
-            if (!this.xy) {
-                this.xy = true;
-                this.pp(true);
+        aaf() {
+            if (!this.xz) {
+                this.xz = true;
+                this.pq(true);
             }
         }
-        aah(a, b, c) {
+        aai(a, b, c) {
             let d = false;
-            if (this.xy) {
-                this.xy = false;
+            if (this.xz) {
+                this.xz = false;
                 d = true;
             }
-            if (!a.fs && a.ds(this.ye, this.x9, this.x7, this.ys)) {
-                let e = this.ye;
-                for (let f = 0; f < this.ye.count; f++) {
+            if (!a.ft && a.dt(this.yf, this.ya, this.x8, this.yt)) {
+                let e = this.yf;
+                for (let f = 0; f < this.yf.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 +1040,8 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     l.b = m;
                     m.key = k;
                     let n = false;
-                    if (this.ya.containsKey(l)) {
-                        l = this.ya.item(l).c;
+                    if (this.yb.containsKey(l)) {
+                        l = this.yb.item(l).c;
                         m = l.b;
                         n = d;
                     }
@@ -1047,10 +1050,10 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                     }
                     let o = m.ac;
                     let p = m.ad;
-                    if (this.yq(o) != this.yq(g.b)) {
+                    if (this.yr(o) != this.yr(g.b)) {
                         m.xValue = g.b;
                     }
-                    if (this.yq(p) != this.yq(g.c)) {
+                    if (this.yr(p) != this.yr(g.c)) {
                         m.yValue = g.c;
                     }
                     m.series = a;
@@ -1107,17 +1110,17 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                         }
                     }
                     if (n) {
-                        this.aal(l);
+                        this.aam(l);
                     }
                     if (l.c == null) {
                         let u = new LabelCollisionInfo();
                         l.c = u;
-                        let v = this.w9.cq(this.yw(l), l.b.backgroundPadding);
+                        let v = this.xa.cq(this.yx(l), l.b.backgroundPadding);
                         u.k = v.height / 2;
                         u.l = v.width / 2;
                     }
-                    let w = this.xv(l);
-                    if (w == null || w.b < this.tw.left || w.b > this.tw.right || w.c < this.tw.top || w.c > this.tw.bottom) {
+                    let w = this.xw(l);
+                    if (w == null || w.b < this.tx.left || w.b > this.tx.right || w.c < this.tx.top || w.c > this.tx.bottom) {
                         continue;
                     }
                     l.e = w.b;
@@ -1126,23 +1129,23 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 }
             }
         }
-        bx() {
+        by() {
             return 1;
         }
         au(a, b) {
-            let c = this.xs.f(a, b);
+            let c = this.xt.f(a, b);
             if (c == null) {
                 return null;
             }
             return c.u;
         }
-        f4(a, b) {
-            if (this.xs == null) {
+        f5(a, b) {
+            if (this.xt == null) {
                 return false;
             }
-            return this.xs.f(a, b) != null;
+            return this.xt.f(a, b) != null;
         }
-        aaj(a, b) {
+        aak(a, b) {
             let c = 0;
             let d = new HashSet$1(CalloutAnnotationWrapper.$, 0);
             for (c = 0; c < a.q.count; c++) {
@@ -1150,7 +1153,7 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 if (isNaN_(a.u._inner[c]) || isNaN_(a.v._inner[c])) {
                     continue;
                 }
-                let f = this.w9.cb.item(e);
+                let f = this.xa.cb.item(e);
                 d.add_1(e);
                 if (f.h != a.q._inner[c]) {
                     f.h = a.q._inner[c];
@@ -1159,79 +1162,79 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 f.e = a.o._inner[c];
                 f.m = a.f._inner[c];
                 f.p = a.p._inner[c];
-                f.o = f.e > 0 ? a.i._inner[c] : this.cj.bt();
+                f.o = f.e > 0 ? a.i._inner[c] : this.ck.bt();
                 f.n = a.h._inner[c];
                 f.x = new Thickness(1, a.k._inner[c], a.m._inner[c], a.l._inner[c], a.j._inner[c]);
                 f.d = a.g._inner[c];
-                this.w9.cj(f, Math.min(a.s._inner[c], a.s._inner[c] + a.u._inner[c]), Math.min(a.t._inner[c], a.t._inner[c] + a.v._inner[c]));
-                this.w9.ck(f, e, a.r._inner[c]);
+                this.xa.cj(f, Math.min(a.s._inner[c], a.s._inner[c] + a.u._inner[c]), Math.min(a.t._inner[c], a.t._inner[c] + a.v._inner[c]));
+                this.xa.ck(f, e, a.r._inner[c]);
                 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.w9.cb.c)) {
+            for (let i of fromEnum(this.xa.cb.c)) {
                 if (!d.contains(i)) {
                     h.add(i);
                 }
             }
             for (let j = 0; j < h.count; j++) {
-                this.w9.cb.h(h._inner[j]);
+                this.xa.cb.h(h._inner[j]);
             }
         }
-        vx(a, b) {
-            super.vx(a, b);
-            if (this.dj()) {
-                this.aaj(this.ug, true);
+        vy(a, b) {
+            super.vy(a, b);
+            if (this.dk()) {
+                this.aak(this.uh, true);
             }
             else {
-                this.aaj(this.ue, false);
+                this.aak(this.uf, false);
             }
         }
-        fm() {
+        fn() {
             return true;
         }
-        o8(a, b, c, d) {
-            super.o8(a, b, c, d);
+        o9(a, b, c, d) {
+            super.o9(a, b, c, d);
             switch (b) {
                 case CalloutLayer.$$p[24]:
-                    this.xg = null;
-                    this.w9.ci();
-                    this.pp(true);
+                    this.xh = null;
+                    this.xa.ci();
+                    this.pq(true);
                     break;
                 case CalloutLayer.$$p[22]:
                 case CalloutLayer.$$p[23]:
-                    this.pp(true);
+                    this.pq(true);
                     break;
                 case CalloutLayer.$$p[14]:
-                    this.pp(true);
+                    this.pq(true);
                     break;
                 case "SeriesViewer":
                     if (c != null) {
                         let e = c;
-                        e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.aai));
+                        e.seriesAnimating = delegateRemove(e.seriesAnimating, runOn(this, this.aaj));
                     }
                     if (d != null) {
                         let f = d;
-                        f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.aai));
+                        f.seriesAnimating = delegateCombine(f.seriesAnimating, runOn(this, this.aaj));
                     }
                     if (d == null) {
-                        this.aab();
+                        this.aac();
                     }
                     break;
                 case "AutoCalloutVisibilityMode":
-                    this.w3 = this.w5();
-                    this.aac();
+                    this.w4 = this.w6();
+                    this.aad();
                     break;
                 case "AllowedPositions":
                     if (c != null) {
                         let g = c;
-                        g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.z6));
+                        g.collectionChanged = delegateRemove(g.collectionChanged, runOn(this, this.z7));
                     }
                     if (d != null) {
                         let h = d;
-                        h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.z6));
+                        h.collectionChanged = delegateCombine(h.collectionChanged, runOn(this, this.z7));
                     }
-                    this.w0 = this.w1(this.xb);
-                    this.aac();
+                    this.w1 = this.w2(this.xc);
+                    this.aad();
                     break;
                 case CalloutLayer.$$p[16]:
                 case CalloutLayer.$$p[17]:
@@ -1248,88 +1251,88 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
                 case CalloutLayer.$$p[7]:
                 case CalloutLayer.$$p[12]:
                 case CalloutLayer.$$p[13]:
-                    this.aac();
+                    this.aad();
                     break;
                 case CalloutLayer.$$p[21]:
-                    if (this.c6 != null) {
-                        this.c6.deregisterColumn(this.xp);
-                        this.xp = this.c5(this.zq);
+                    if (this.c7 != null) {
+                        this.c7.deregisterColumn(this.xq);
+                        this.xq = this.c6(this.zr);
                     }
                     break;
                 case "LabelColumn":
-                    this.aac();
+                    this.aad();
                     break;
                 case CalloutLayer.$$p[15]:
-                    if (this.c6 != null) {
-                        this.c6.deregisterColumn(this.xn);
-                        this.xn = this.c5(this.zg);
+                    if (this.c7 != null) {
+                        this.c7.deregisterColumn(this.xo);
+                        this.xo = this.c6(this.zh);
                     }
                     break;
                 case "ContentColumn":
-                    this.aac();
+                    this.aad();
                     break;
                 case CalloutLayer.$$p[28]:
-                    if (this.c6 != null) {
-                        this.c6.deregisterColumn(this.xq);
-                        this.xq = stringIsNullOrEmpty(this.z1) == false ? this.c5(this.z1) : null;
+                    if (this.c7 != null) {
+                        this.c7.deregisterColumn(this.xr);
+                        this.xr = stringIsNullOrEmpty(this.z2) == false ? this.c6(this.z2) : null;
                     }
                     break;
                 case "XColumn":
-                    this.aac();
+                    this.aad();
                     break;
                 case CalloutLayer.$$p[29]:
-                    if (this.c6 != null) {
-                        this.c6.deregisterColumn(this.xr);
-                        this.xr = this.c5(this.z4);
+                    if (this.c7 != null) {
+                        this.c7.deregisterColumn(this.xs);
+                        this.xs = this.c6(this.z5);
                     }
                     break;
                 case "YColumn":
-                    this.aac();
+                    this.aad();
                     break;
                 case CalloutLayer.$$p[20]:
-                    if (this.c6 != null) {
-                        this.c6.deregisterColumn(this.xo);
-                        this.xo = this.c5(this.zn);
+                    if (this.c7 != null) {
+                        this.c7.deregisterColumn(this.xp);
+                        this.xp = this.c6(this.zo);
                     }
                     break;
                 case "KeyColumn":
-                    this.aac();
+                    this.aad();
                     break;
                 case "FastItemsSource":
-                    this.xx = true;
+                    this.xy = true;
                     if (typeCast(IFastItemsSource_$type, c) != null) {
-                        c.deregisterColumn(this.xp);
-                        c.deregisterColumn(this.xn);
                         c.deregisterColumn(this.xq);
-                        c.deregisterColumn(this.xr);
                         c.deregisterColumn(this.xo);
-                        this.xp = null;
-                        this.xn = null;
+                        c.deregisterColumn(this.xr);
+                        c.deregisterColumn(this.xs);
+                        c.deregisterColumn(this.xp);
                         this.xq = null;
-                        this.xr = null;
                         this.xo = null;
-                        this.yg.clear();
+                        this.xr = null;
+                        this.xs = null;
+                        this.xp = null;
+                        this.yh.clear();
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.xp = this.c5(this.zq);
-                        this.xn = this.c5(this.zg);
-                        if (stringIsNullOrEmpty(this.z1) == false) {
-                            this.xq = this.c5(this.z1);
+                        this.xq = this.c6(this.zr);
+                        this.xo = this.c6(this.zh);
+                        if (stringIsNullOrEmpty(this.z2) == false) {
+                            this.xr = this.c6(this.z2);
                         }
-                        this.xr = this.c5(this.z4);
-                        this.xo = this.c5(this.zn);
+                        this.xs = this.c6(this.z5);
+                        this.xp = this.c6(this.zo);
                     }
-                    this.aac();
+                    this.aad();
                     break;
             }
         }
-        w5() {
-            if (this.w4 == 0) {
+        w6() {
+            if (this.w5 == 0) {
                 return 1;
             }
-            return this.w4;
+            return this.w5;
         }
-        w1(a) {
+        w2(a) {
             if (a == null || a.count == 0) {
                 return null;
             }
@@ -1339,54 +1342,54 @@ export let CalloutLayer = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        aai(a) {
-            if (a.d6) {
+        aaj(a) {
+            if (a.d7) {
                 return;
             }
-            if ((a == this.xf || this.xf == null) && this.x3) {
-                this.pp(false);
+            if ((a == this.xg || this.xg == null) && this.x4) {
+                this.pq(false);
             }
         }
-        aac() {
-            if (this.xw == false) {
-                this.xw = true;
-                this.pp(false);
+        aad() {
+            if (this.xx == false) {
+                this.xx = true;
+                this.pq(false);
             }
         }
-        aaa() {
-            this.w9.cb.clear();
-            this.yd.g();
-            this.ya.clear();
+        aab() {
+            this.xa.cb.clear();
+            this.ye.g();
+            this.yb.clear();
         }
-        aad() {
-            if (this.xr == null || this.xp == null) {
-                let a = this.yd.c;
+        aae() {
+            if (this.xs == null || this.xq == null) {
+                let a = this.ye.c;
                 while (a != null) {
-                    this.aal(a.c);
+                    this.aam(a.c);
                     a = a.a;
                 }
                 return;
             }
-            let b = this.yb();
-            for (let c = 0; c < this.xr.count; c++) {
+            let b = this.yc();
+            for (let c = 0; c < this.xs.count; c++) {
                 let d;
-                if (this.yg.count <= c) {
+                if (this.yh.count <= c) {
                     let e = new CalloutAnnotation();
                     d = new CalloutAnnotationWrapper();
                     d.b = e;
-                    d.b.series = this.xf;
-                    this.yg.add(d);
+                    d.b.series = this.xg;
+                    this.yh.add(d);
                 }
                 else {
-                    d = this.yg._inner[c];
+                    d = this.yh._inner[c];
                 }
-                this.aak(c, b);
+                this.aal(c, b);
             }
         }
     }
     CalloutLayer.$t = /*@__PURE__*/ markType(CalloutLayer, 'CalloutLayer', AnnotationLayer.$);
-    CalloutLayer.aa0 = /*@__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:ys:aam', [1, 5], 'CalloutBackground:abh:aan', [Brush.$, null], 'CalloutCollisionMode:w6:aao', [CalloutCollisionMode_$type, /*@__PURE__*/ enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:yj:aap', [1, NaN], 'CalloutInterpolatedValuePrecision:yt:aaq', [1, -1], 'CalloutLeaderBrush:abi:aar', [Brush.$, null], 'CalloutOutline:abj:aas', [Brush.$, null], 'CalloutPaddingBottom:yk:aat', [1, NaN], 'CalloutPaddingLeft:yl:aau', [1, NaN], 'CalloutPaddingRight:ym:aav', [1, NaN], 'CalloutPaddingTop:yn:aaw', [1, NaN], 'CalloutPositionPadding:yo:aax', [1, 10], 'CalloutStrokeThickness:yp:aay', [1, NaN], 'CalloutTextColor:abk:aaz', [Brush.$, null], 'CollisionChannel:zd:aa1', [2, null], 'ContentMemberPath:zg:aa2', [2, null], 'IsAutoCalloutBehaviorEnabled:x3:aa3', [0, false], 'IsCalloutOffsettingEnabled:x4:aa4', [0, true], 'IsCustomCalloutRenderStyleEnabled:x5:aa5', [0, false], 'IsCustomCalloutStyleEnabled:x6:aa6', [0, false], 'KeyMemberPath:zn:aa7', [2, null], 'LabelMemberPath:zq:aa8', [2, null], 'TargetSeriesName:zs:aa9', [2, null], 'TargetSeries:xf:aba', [Series.$, null], 'TextStyle:zv:abb', [2, null], 'UseInterpolatedValueForAutoCalloutLabels:x7:abc', [0, false], 'UseSeriesColorForOutline:x8:abd', [0, false], 'UseValueForAutoCalloutLabels:x9:abe', [0, true], 'XMemberPath:z1:abf', [2, null], 'YMemberPath:z4:abg', [2, null]]);
+    CalloutLayer.aa1 = /*@__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:yt:aan', [1, 5], 'CalloutBackground:abi:aao', [Brush.$, null], 'CalloutCollisionMode:w7:aap', [CalloutCollisionMode_$type, /*@__PURE__*/ enumGetBox(CalloutCollisionMode_$type, 3)], 'CalloutCornerRadius:yk:aaq', [1, NaN], 'CalloutInterpolatedValuePrecision:yu:aar', [1, -1], 'CalloutLeaderBrush:abj:aas', [Brush.$, null], 'CalloutOutline:abk:aat', [Brush.$, null], 'CalloutPaddingBottom:yl:aau', [1, NaN], 'CalloutPaddingLeft:ym:aav', [1, NaN], 'CalloutPaddingRight:yn:aaw', [1, NaN], 'CalloutPaddingTop:yo:aax', [1, NaN], 'CalloutPositionPadding:yp:aay', [1, 10], 'CalloutStrokeThickness:yq:aaz', [1, NaN], 'CalloutTextColor:abl:aa0', [Brush.$, null], 'CollisionChannel:ze:aa2', [2, null], 'ContentMemberPath:zh:aa3', [2, null], 'IsAutoCalloutBehaviorEnabled:x4:aa4', [0, false], 'IsCalloutOffsettingEnabled:x5:aa5', [0, true], 'IsCustomCalloutRenderStyleEnabled:x6:aa6', [0, false], 'IsCustomCalloutStyleEnabled:x7:aa7', [0, false], 'KeyMemberPath:zo:aa8', [2, null], 'LabelMemberPath:zr:aa9', [2, null], 'TargetSeriesName:zt:aba', [2, null], 'TargetSeries:xg:abb', [Series.$, null], 'TextStyle:zw:abc', [2, null], 'UseInterpolatedValueForAutoCalloutLabels:x8:abd', [0, false], 'UseSeriesColorForOutline:x9:abe', [0, false], 'UseValueForAutoCalloutLabels:ya:abf', [0, true], 'XMemberPath:z2:abg', [2, null], 'YMemberPath:z5:abh', [2, null]]);
     return CalloutLayer;
 })();
 /**
@@ -1448,10 +1451,10 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
             }
         }
         ca() {
-            if (this.b7.xh != null) {
-                return this.b7.xh;
+            if (this.b7.xi != null) {
+                return this.b7.xi;
             }
-            return this.e.cy.getFontInfo();
+            return this.e.cz.getFontInfo();
         }
         an(a) {
             super.an(a);
@@ -1472,7 +1475,7 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
         ce() {
             let a = this.ca();
             if (isNaN_(this.cd)) {
-                let b = FontUtil.getCurrentFontHeight(this.e.cy.cv.j.ae, a);
+                let b = FontUtil.getCurrentFontHeight(this.e.cz.cv.j.ae, a);
                 this.cd = b;
             }
             return this.cd;
@@ -1496,9 +1499,9 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
         }
         cl(a) {
             if (a != null) {
-                return this.cp(a.sx);
+                return this.cp(a.sy);
             }
-            return this.e.sx;
+            return this.e.sy;
         }
         co() {
             return ((() => {
@@ -1508,9 +1511,9 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
             })());
         }
         cn(a) {
-            if (this.b7.x8) {
+            if (this.b7.x9) {
                 if (a != null) {
-                    return this.cp(a.sx);
+                    return this.cp(a.sy);
                 }
             }
             return ((() => {
@@ -1521,9 +1524,9 @@ export let CalloutLayerView = /*@__PURE__*/ (() => {
         }
         cm(a) {
             if (a != null) {
-                return this.cp(a.ss);
+                return this.cp(a.st);
             }
-            return this.e.ss;
+            return this.e.st;
         }
         ci() {
             this.cd = NaN;