igniteui-webcomponents-charts 4.7.2 → 4.8.1-alpha.0

package/esm2015/lib/XamFunnelView_combined.js

@@ -4,7 +4,7 @@ https://www.infragistics.com/legal/license/igultimate-la
 https://www.infragistics.com/legal/license/igultimate-eula
 GOVERNS THE LICENSING, INSTALLATION AND USE OF INFRAGISTICS SOFTWARE. BY DOWNLOADING AND/OR INSTALLING AND USING INFRAGISTICS SOFTWARE:  you are indicating that you have read and understand this Agreement, and agree to be legally bound by it on behalf of the yourself and your company.
 */
-import { Base, Point_$type, typeCast, runOn, delegateCombine, fromEnum, markType, String_$type, delegateRemove, EnumUtil, IEnumerable_$type, enumGetBox, markDep } from "igniteui-webcomponents-core";
+import { Base, Point_$type, typeCast, runOn, delegateCombine, fromEnum, markType, EnumUtil, String_$type, delegateRemove, IEnumerable_$type, enumGetBox, markDep } from "igniteui-webcomponents-core";
 import { IOuterLabelWidthDecider_$type } from "./IOuterLabelWidthDecider";
 import { IFunnelLabelSizeDecider_$type } from "./IFunnelLabelSizeDecider";
 import { ServiceProvider } from "./ServiceProvider";
@@ -53,6 +53,7 @@ import { IItemProvider_$type } from "./IItemProvider";
 import { SliceSelectionManager } from "./SliceSelectionManager";
 import { FunnelFrame } from "./FunnelFrame";
 import { Style } from "igniteui-webcomponents-core";
+import { Visibility_$type } from "igniteui-webcomponents-core";
 import { IChartLegend_$type } from "igniteui-webcomponents-core";
 import { DataTemplate } from "igniteui-webcomponents-core";
 import { DataUpdatedMessage } from "./DataUpdatedMessage";
@@ -63,6 +64,7 @@ import { FrameRenderCompleteMessage } from "./FrameRenderCompleteMessage";
 import { IntColumn } from "./IntColumn";
 import { PointList } from "./PointList";
 import { Convert } from "igniteui-webcomponents-core";
+import { HighlightedValueDisplayMode_$type } from "igniteui-webcomponents-core";
 import { ObservableCollection$1 } from "igniteui-webcomponents-core";
 import { ILegendSeries_$type } from "igniteui-webcomponents-core";
 import { UIElement } from "igniteui-webcomponents-core";
@@ -76,7 +78,6 @@ import { ILegendOwner_$type } from "igniteui-webcomponents-core";
 import { ILegendTemplateProvider_$type } from "igniteui-webcomponents-core";
 import { DependencyProperty } from "igniteui-webcomponents-core";
 import { FastItemsSource } from "igniteui-webcomponents-core";
-import { Visibility_$type } from "igniteui-webcomponents-core";
 import { Dictionary$2 } from "igniteui-webcomponents-core";
 import { FunnelLegendTemplates } from "./FunnelLegendTemplates";
 import { DeviceUtils } from "igniteui-webcomponents-core";
@@ -164,24 +165,24 @@ export let XamFunnelView = /*@__PURE__*/ (() => {
             }
             let d = new Polygon();
             let e = new PointCollection(0);
-            for (let f = 0; f < b.au.count; f++) {
-                let g = b.au._inner[f];
-                e.add({ $type: Point_$type, x: g.x + this.u + b.aq.x, y: g.y + b.aq.y });
+            for (let f = 0; f < b.bd.count; f++) {
+                let g = b.bd._inner[f];
+                e.add({ $type: Point_$type, x: g.x + this.u + b.a7.x, y: g.y + b.a7.y });
             }
             d.an = e;
             d.ad = a.h;
-            d._opacity = b.p;
-            d._fill = b.ad;
-            d._stroke = a.h < 1 ? b.ad : b.ag;
-            if (b.a0 != null) {
-                c.j(d, b.a0);
-                b.ad = d._fill;
-                b.ag = d._stroke;
-                b.q = d.ad;
-                b.p = d._opacity;
+            d._opacity = b.t;
+            d._fill = b.ao;
+            d._stroke = a.h < 1 ? b.ao : b.at;
+            if (b.bj != null) {
+                c.j(d, b.bj);
+                b.ao = d._fill;
+                b.at = d._stroke;
+                b.u = d.ad;
+                b.t = d._opacity;
             }
             c.u(d);
-            b.q = d.ad;
+            b.u = d.ad;
             if (b.i) {
                 let h = new TextBlock();
                 if (this.bf == null) {
@@ -190,14 +191,14 @@ export let XamFunnelView = /*@__PURE__*/ (() => {
                 }
                 h.ao = this.bf;
                 c.ad(this.m());
-                let i = b.v.toString();
+                let i = b.ab.toString();
                 let j = c.g(i);
                 let k = this.ab();
                 h.al = i;
-                h.o = b.an.y + b.aq.y - (k / 2);
-                h.n = b.an.x + this.u + b.aq.x - (j / 2);
-                b.ax = new Rect(0, h.n, h.o, j, k);
-                b.a2 = h._visibility;
+                h.o = b.a4.y + b.a7.y - (k / 2);
+                h.n = b.a4.x + this.u + b.a7.x - (j / 2);
+                b.bg = new Rect(0, h.n, h.o, j, k);
+                b.bn = h._visibility;
                 c.x(h);
             }
             if (c.d && this.t != 1) {
@@ -228,7 +229,7 @@ export let XamFunnelView = /*@__PURE__*/ (() => {
             let h = d.g(e.al);
             e.n = b;
             e.o = g;
-            c.f.b.ay = new Rect(0, b, g, h, f);
+            c.f.b.bh = new Rect(0, b, g, h, f);
             d.x(e);
             if (d.d && this.t != 1) {
                 d.z();
@@ -503,13 +504,13 @@ export let XamFunnelView = /*@__PURE__*/ (() => {
             this.as();
         }
         av(a) {
-            let b = a.bs;
-            let c = a.bn;
+            let b = a.b3;
+            let c = a.bx;
             if (!isNaN_(b) && b != 0) {
                 return;
             }
             if (window.devicePixelRatio != undefined && window.devicePixelRatio != c) {
-                a.bn = window.devicePixelRatio;
+                a.bx = window.devicePixelRatio;
             }
         }
         aw(a) {
@@ -592,7 +593,7 @@ export let XamFunnelView = /*@__PURE__*/ (() => {
             let c = 0;
             if (a.b.i) {
                 this.p.ad(this.m());
-                c = this.p.g(a.b.v.toString());
+                c = this.p.g(a.b.ab.toString());
             }
             return new Size(1, c, b ? this.ab() : this.ac());
         }
@@ -632,114 +633,118 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
     class XamFunnelController extends Base {
         constructor() {
             super();
-            this.bp = null;
+            this.br = null;
             this.ag = null;
-            this.at = null;
+            this.av = null;
+            this.cj = null;
+            this.ck = null;
             this.cf = null;
             this.cg = null;
-            this.cb = null;
-            this.cc = null;
-            this.bb = false;
-            this.bg = false;
-            this.au = null;
+            this.bd = false;
+            this.bi = false;
+            this.aw = null;
             this.aj = null;
             this.z = null;
+            this.am = null;
             this.al = null;
-            this.ao = null;
-            this.ap = null;
+            this.aq = null;
+            this.ar = null;
+            this.cp = null;
+            this.cm = null;
             this.cl = null;
-            this.ci = null;
-            this.ch = null;
-            this.a4 = false;
-            this.bv = 0;
-            this.bu = 0;
+            this.a6 = false;
+            this.by = 0;
+            this.bx = 0;
             this.w = null;
             this.v = null;
             this.t = null;
             this.p = null;
-            this.a0 = false;
-            this.a3 = false;
-            this.bt = 0;
             this.a2 = false;
-            this.bq = 0;
+            this.a5 = false;
+            this.bw = 0;
+            this.a4 = false;
+            this.bs = 0;
             this.a = null;
             this.b = null;
             this.ad = 0;
             this.m = 0;
-            this.ax = false;
-            this.bs = 0;
-            this.a5 = false;
-            this.dv = null;
-            this.du = null;
-            this.aw = false;
-            this.b5 = 0;
-            this.b6 = 0;
+            this.az = false;
+            this.bv = 0;
+            this.a7 = false;
+            this.dz = null;
+            this.dy = null;
+            this.ay = false;
+            this.b9 = 0;
+            this.ca = 0;
             this.r = null;
             this.ab = null;
             this.ah = null;
             this.g = null;
             this.e = null;
             this.f = null;
-            this.d0 = null;
-            this.d1 = null;
-            this.a7 = false;
+            this.d4 = null;
+            this.d5 = null;
+            this.a9 = false;
+            this.a3 = false;
+            this.a8 = false;
             this.a1 = false;
-            this.a6 = false;
-            this.az = false;
-            this.ck = null;
-            this.cj = null;
-            this.br = -1;
-            this.ay = false;
+            this.d9 = 1;
+            this.bt = 0.5;
+            this.co = null;
+            this.cn = null;
+            this.bu = -1;
+            this.a0 = false;
             this.l = null;
             this.o = null;
-            this.dp = null;
-            this.dn = null;
-            this.dz = null;
-            this.av = new DoubleAnimator(0, 1, 2000);
-            let a = this.av;
-            a.propertyChanged = delegateCombine(a.propertyChanged, runOn(this, this.cz));
+            this.dt = null;
+            this.ds = null;
+            this.d3 = null;
+            this.ax = new DoubleAnimator(0, 1, 2000);
+            let a = this.ax;
+            a.propertyChanged = delegateCombine(a.propertyChanged, runOn(this, this.c3));
             this.k = new FunnelFrame();
             this.j = new FunnelFrame();
             this.h = new FunnelFrame();
             this.ai = new SliceSelectionManager();
-            this.am = new DoubleColumn();
-            this.ar = new ObjectColumn();
-            this.as = new ObjectColumn();
+            this.ao = new DoubleColumn();
+            this.an = new DoubleColumn();
+            this.at = new ObjectColumn();
+            this.au = new ObjectColumn();
             this.y = new MessageChannel();
             this.x = new MessageChannel();
             this.aa = new MessageHandler();
-            this.aa.b(PropertyChangedMessage.$, runOn(this, this.de));
-            this.aa.b(DataUpdatedMessage.$, runOn(this, this.cv));
-            this.aa.b(ViewportChangedMessage.$, runOn(this, this.dl));
-            this.aa.b(ViewPropertyChangedMessage.$, runOn(this, this.dm));
-            this.aa.b(MouseMoveMessage.$, runOn(this, this.c5));
-            this.aa.b(MouseButtonMessage.$, runOn(this, this.c3));
-            this.aa.b(MouseLeaveMessage.$, runOn(this, this.c4));
-            this.aa.b(UserSelectedItemsChangedMessage.$, runOn(this, this.dk));
-            this.aa.b(LabelSizeChangedMessage.$, runOn(this, this.c1));
+            this.aa.b(PropertyChangedMessage.$, runOn(this, this.di));
+            this.aa.b(DataUpdatedMessage.$, runOn(this, this.cz));
+            this.aa.b(ViewportChangedMessage.$, runOn(this, this.dq));
+            this.aa.b(ViewPropertyChangedMessage.$, runOn(this, this.dr));
+            this.aa.b(MouseMoveMessage.$, runOn(this, this.c9));
+            this.aa.b(MouseButtonMessage.$, runOn(this, this.c7));
+            this.aa.b(MouseLeaveMessage.$, runOn(this, this.c8));
+            this.aa.b(UserSelectedItemsChangedMessage.$, runOn(this, this.dp));
+            this.aa.b(LabelSizeChangedMessage.$, runOn(this, this.c5));
             this.aa.b(ContainerSizeChangedMessage.$, (b) => this.y.i(b));
-            this.bp = (b, c) => {
-                this.bj = true;
-                this.df();
+            this.br = (b, c) => {
+                this.bl = true;
+                this.dj();
             };
         }
-        cz(a, b) {
-            this.b2 = this.av.o;
-            if (this.b2 == 1) {
-                this.a9 = false;
-                this.cw(this.h);
+        c3(a, b) {
+            this.b6 = this.ax.o;
+            if (this.b6 == 1) {
+                this.bb = false;
+                this.c0(this.h);
             }
-            if (this.a9) {
-                let c = 1 - this.b2;
-                FunnelFrame.k(this.j, this.k, this.h, this.b2);
-                this.cw(this.j);
+            if (this.bb) {
+                let c = 1 - this.b6;
+                FunnelFrame.k(this.j, this.k, this.h, this.b6);
+                this.c0(this.j);
             }
         }
-        get av() {
-            return this.au;
+        get ax() {
+            return this.aw;
         }
-        set av(a) {
-            this.au = a;
+        set ax(a) {
+            this.aw = a;
         }
         get ak() {
             return this.aj;
@@ -753,65 +758,71 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
         set aa(a) {
             this.z = a;
         }
-        get am() {
+        get ao() {
+            return this.am;
+        }
+        set ao(a) {
+            this.am = a;
+        }
+        get an() {
             return this.al;
         }
-        set am(a) {
+        set an(a) {
             this.al = a;
         }
-        get ar() {
-            if (!this.bb && this.at != null) {
-                this.bb = this.at.s(this.ao, this.cb);
+        get at() {
+            if (!this.bd && this.av != null) {
+                this.bd = this.av.s(this.aq, this.cf);
             }
-            return this.ao;
+            return this.aq;
         }
-        set ar(a) {
-            this.ao = a;
+        set at(a) {
+            this.aq = a;
         }
-        get as() {
-            if (!this.bg && this.at != null) {
-                this.bg = this.at.s(this.ap, this.cc);
+        get au() {
+            if (!this.bi && this.av != null) {
+                this.bi = this.av.s(this.ar, this.cg);
             }
-            return this.ap;
+            return this.ar;
         }
-        set as(a) {
-            this.ap = a;
+        set au(a) {
+            this.ar = a;
         }
-        get cq() {
-            return this.cl;
+        get cu() {
+            return this.cp;
         }
-        set cq(a) {
-            this.cl = a;
+        set cu(a) {
+            this.cp = a;
         }
-        get cn() {
-            return this.ci;
+        get cr() {
+            return this.cm;
         }
-        set cn(a) {
-            this.ci = a;
+        set cr(a) {
+            this.cm = a;
         }
-        get cm() {
-            return this.ch;
+        get cq() {
+            return this.cl;
         }
-        set cm(a) {
-            this.ch = a;
+        set cq(a) {
+            this.cl = a;
         }
-        get bj() {
-            return this.a4;
+        get bl() {
+            return this.a6;
         }
-        set bj(a) {
-            this.a4 = a;
+        set bl(a) {
+            this.a6 = a;
         }
-        get b4() {
-            return this.bv;
+        get b8() {
+            return this.by;
         }
-        set b4(a) {
-            this.bv = a;
+        set b8(a) {
+            this.by = a;
         }
-        get b3() {
-            return this.bu;
+        get b7() {
+            return this.bx;
         }
-        set b3(a) {
-            this.bu = a;
+        set b7(a) {
+            this.bx = a;
         }
         get y() {
             return this.w;
@@ -837,39 +848,39 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
         set q(a) {
             this.p = a;
         }
-        get bc() {
-            return this.a0;
+        get be() {
+            return this.a2;
         }
-        set bc(a) {
-            this.a0 = a;
+        set be(a) {
+            this.a2 = a;
         }
-        get bh() {
-            return this.a3;
+        get bj() {
+            return this.a5;
         }
-        set bh(a) {
-            this.a3 = a;
+        set bj(a) {
+            this.a5 = a;
         }
-        get b2() {
-            return this.bt;
+        get b6() {
+            return this.bw;
         }
-        set b2(a) {
-            this.bt = a;
+        set b6(a) {
+            this.bw = a;
         }
-        get be() {
-            return this.a2;
+        get bg() {
+            return this.a4;
         }
-        set be(a) {
-            this.a2 = a;
+        set bg(a) {
+            this.a4 = a;
         }
-        get bw() {
-            return this.bq;
+        get bz() {
+            return this.bs;
         }
-        set bw(a) {
-            this.bq = a;
+        set bz(a) {
+            this.bs = a;
         }
         get c() {
-            if ((this.a == null || this.a.count < 1) && this.at != null) {
-                this.a = this.at.d(true);
+            if ((this.a == null || this.a.count < 1) && this.av != null) {
+                this.a = this.av.d(true);
             }
             return this.a;
         }
@@ -877,8 +888,8 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
             this.a = a;
         }
         get d() {
-            if ((this.b == null || this.b.count < 1) && this.at != null) {
-                this.b = this.at.d(false);
+            if ((this.b == null || this.b.count < 1) && this.av != null) {
+                this.b = this.av.d(false);
             }
             return this.b;
         }
@@ -897,53 +908,53 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
         set n(a) {
             this.m = a;
         }
-        get a9() {
-            return this.ax;
+        get bb() {
+            return this.az;
         }
-        set a9(a) {
-            this.ax = a;
+        set bb(a) {
+            this.az = a;
         }
-        get b1() {
-            return this.bs;
+        get b5() {
+            return this.bv;
         }
-        set b1(a) {
-            this.bs = a;
+        set b5(a) {
+            this.bv = a;
         }
-        get bm() {
-            return this.a5;
+        get bo() {
+            return this.a7;
         }
-        set bm(a) {
-            this.a5 = a;
+        set bo(a) {
+            this.a7 = a;
         }
-        get dy() {
-            return this.dv;
+        get d2() {
+            return this.dz;
         }
-        set dy(a) {
-            this.dv = a;
+        set d2(a) {
+            this.dz = a;
         }
-        get dx() {
-            return this.du;
+        get d1() {
+            return this.dy;
         }
-        set dx(a) {
-            this.du = a;
+        set d1(a) {
+            this.dy = a;
         }
-        get a8() {
-            return this.aw;
+        get ba() {
+            return this.ay;
         }
-        set a8(a) {
-            this.aw = a;
+        set ba(a) {
+            this.ay = a;
         }
-        get b9() {
-            return this.b5;
+        get cd() {
+            return this.b9;
         }
-        set b9(a) {
-            this.b5 = a;
+        set cd(a) {
+            this.b9 = a;
         }
-        get ca() {
-            return this.b6;
+        get ce() {
+            return this.ca;
         }
-        set ca(a) {
-            this.b6 = a;
+        set ce(a) {
+            this.ca = a;
         }
         get s() {
             return this.r;
@@ -957,7 +968,7 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
         set ac(a) {
             let b = this.ab;
             this.ab = a;
-            this.c7(b, this.ab);
+            this.db(b, this.ab);
         }
         get ai() {
             return this.ah;
@@ -983,71 +994,83 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
         set j(a) {
             this.f = a;
         }
-        get d3() {
-            return this.d0;
+        get d7() {
+            return this.d4;
         }
-        set d3(a) {
-            this.d0 = a;
+        set d7(a) {
+            this.d4 = a;
         }
-        get d4() {
-            return this.d1;
+        get d8() {
+            return this.d5;
         }
-        set d4(a) {
-            this.d1 = a;
+        set d8(a) {
+            this.d5 = a;
         }
-        get bo() {
-            return this.a7;
+        get bq() {
+            return this.a9;
         }
-        set bo(a) {
-            this.a7 = a;
+        set bq(a) {
+            this.a9 = a;
         }
-        get bd() {
+        get bf() {
+            return this.a3;
+        }
+        set bf(a) {
+            this.a3 = a;
+        }
+        get bp() {
+            return this.a8;
+        }
+        set bp(a) {
+            this.a8 = a;
+        }
+        get bc() {
             return this.a1;
         }
-        set bd(a) {
+        set bc(a) {
             this.a1 = a;
         }
-        get bn() {
-            return this.a6;
+        get ea() {
+            return this.d9;
         }
-        set bn(a) {
-            this.a6 = a;
+        set ea(a) {
+            this.d9 = a;
         }
-        get ba() {
-            return this.az;
+        get b2() {
+            return this.bt;
         }
-        set ba(a) {
-            this.az = a;
+        set b2(a) {
+            this.bt = a;
         }
-        get cp() {
-            return this.ck;
+        get ct() {
+            return this.co;
         }
-        set cp(a) {
-            this.ck = a;
+        set ct(a) {
+            this.co = a;
         }
-        get co() {
-            return this.cj;
+        get cs() {
+            return this.cn;
         }
-        set co(a) {
-            this.cj = a;
+        set cs(a) {
+            this.cn = a;
         }
-        get bz() {
-            let a = this.br;
-            if (a < 0 && this.at != null) {
-                this.br = this.at.aa();
-                a = this.br;
+        get b3() {
+            let a = this.bu;
+            if (a < 0 && this.av != null) {
+                this.bu = this.av.aa();
+                a = this.bu;
             }
             return a < 0 ? 1 : a;
         }
-        c7(a, b) {
+        db(a, b) {
             if (a != null) {
                 let c = typeCast(MessageChannel.$, a.b("ConfigurationMessages"));
                 if (c != null) {
-                    c.h(runOn(this, this.c2));
+                    c.h(runOn(this, this.c6));
                 }
                 c = typeCast(MessageChannel.$, a.b("InteractionMessages"));
                 if (c != null) {
-                    c.h(runOn(this, this.c2));
+                    c.h(runOn(this, this.c6));
                 }
                 this.y.g();
                 this.x.g();
@@ -1055,75 +1078,75 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
             if (b != null) {
                 let d = typeCast(MessageChannel.$, b.b("ConfigurationMessages"));
                 if (d != null) {
-                    d.e(runOn(this, this.c2));
+                    d.e(runOn(this, this.c6));
                 }
                 d = typeCast(MessageChannel.$, b.b("InteractionMessages"));
                 if (d != null) {
-                    d.e(runOn(this, this.c2));
+                    d.e(runOn(this, this.c6));
                 }
                 let e = typeCast(MessageChannel.$, b.b("RenderingMessages"));
                 this.y.f(e);
                 let f = typeCast(MessageChannel.$, b.b("ModelUpdateMessages"));
                 this.x.f(f);
             }
-            this.bj = true;
+            this.bl = true;
         }
-        c2(a) {
+        c6(a) {
             this.aa.c(a);
             let b = typeCast(RenderingMessage.$, a);
             if (b != null) {
-                this.bj = b.c;
+                this.bl = b.c;
             }
-            this.df();
+            this.dj();
         }
-        bl() {
-            return this.b3 >= 0 && this.b4 >= 0;
+        bn() {
+            return this.b7 >= 0 && this.b8 >= 0;
         }
-        bf() {
-            return this.am != null && this.am.a != null && this.am.a.count > 0 && this.u != null && this.q != null && this.c != null && this.c.count > 0 && this.d != null && this.d.count > 0 && this.bl();
+        bh() {
+            return this.ao != null && this.ao.a != null && this.ao.a.count > 0 && (this.an == null || this.an.a == null || (this.an.a.count == 0 || this.an.a.count == this.ao.a.count)) && this.u != null && this.q != null && this.c != null && this.c.count > 0 && this.d != null && this.d.count > 0 && this.bn();
         }
-        df() {
-            if (!this.bj) {
+        dj() {
+            if (!this.bl) {
                 return;
             }
-            if (!this.bf()) {
-                this.cu();
+            if (!this.bh()) {
+                this.cy();
                 return;
             }
-            this.bj = false;
-            let a = this.u.decideWidth(this.aq());
-            if (a > this.b4) {
+            this.bl = false;
+            let a = this.u.decideWidth(this.as());
+            if (a > this.b8) {
                 a = 0;
             }
-            if (!this.bh) {
+            if (!this.bj) {
                 a = 0;
             }
-            let b = this.b4 - a;
+            let b = this.b8 - a;
             let c = a > 0;
-            let d = this.bc;
+            let d = this.be;
             let e = b >= 0;
             if (e || c) {
-                this.dc(e, c, d, b, a);
+                this.dg(e, c, d, b, a);
             }
         }
-        cu() {
-            if (this.bk() && this.b2 > 0) {
-                this.av.w();
+        cy() {
+            if (this.bm() && this.b6 > 0) {
+                this.ax.w();
             }
-            this.dh("LeftLabels");
-            this.dh("RightLabels");
-            this.dh("SliceArea");
-            this.ct();
+            this.dl("LeftLabels");
+            this.dl("RightLabels");
+            this.dl("SliceArea");
+            this.cx();
             this.h.b.clear();
             this.j.b.clear();
             this.k.b.clear();
         }
-        ct() {
+        cx() {
             let a = new FrameRenderCompleteMessage();
             this.y.i(a);
         }
-        dc(a, b, c, d, e) {
-            if (this.a9) {
+        dg(a, b, c, d, e) {
+            if (this.bb) {
                 let f = this.k;
                 this.k = this.j;
                 this.j = f;
@@ -1133,47 +1156,47 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                 this.k = this.h;
                 this.h = g;
             }
-            this.dd(this.h, a, b, c, d, e);
-            this.av.w();
-            this.b2 = 0;
-            if (this.bk()) {
-                FunnelFrame.k(this.j, this.k, this.h, this.b2);
-                this.cw(this.j);
-                this.a9 = true;
-                this.av.v();
+            this.dh(this.h, a, b, c, d, e);
+            this.ax.w();
+            this.b6 = 0;
+            if (this.bm()) {
+                FunnelFrame.k(this.j, this.k, this.h, this.b6);
+                this.c0(this.j);
+                this.bb = true;
+                this.ax.v();
             }
             else {
-                this.cw(this.h);
+                this.c0(this.h);
             }
         }
-        b0(a) {
+        b4(a) {
             if (isNaN_(a)) {
                 return 0;
             }
             return Math.abs(a);
         }
-        dd(a, b, c, d, e, f) {
+        dh(a, b, c, d, e, f) {
             let g = e / 2;
-            this.ay = this.bm;
-            if (this.ay) {
-                this.c0(e, g);
+            this.a0 = this.bo;
+            if (this.a0) {
+                this.c4(e, g);
             }
             else {
                 this.ak = null;
             }
             let h = this.n == 1;
-            let i = this.an();
+            let i = this.ap();
             let j = 0;
             for (let k of fromEnum(i.a)) {
-                j += this.b0(this.am.a.item(k));
+                j += this.b4(this.ao.a.item(k));
             }
             if (j == 0) {
                 h = false;
             }
-            let l = this.b3 / i.a.count;
+            let l = this.b7 / i.a.count;
             let m = 0;
             let n = 0;
-            n = this.bz / 2;
+            n = this.b3 / 2;
             a.j = f;
             a.f = d;
             a.h = c;
@@ -1183,20 +1206,20 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
             for (let p of fromEnum(i.a)) {
                 let q;
                 if (h) {
-                    q = (this.b0(this.am.a.item(p)) / j) * this.b3;
+                    q = (this.b4(this.ao.a.item(p)) / j) * this.b7;
                 }
                 else {
                     q = l;
                 }
-                let r = this.by(e, m + n);
+                let r = this.b1(e, m + n);
                 let s = m + q;
-                let t = this.by(e, s - n);
+                let t = this.b1(e, s - n);
                 let u = r / 2;
                 let v = t / 2;
                 let w = new SliceInfo();
                 let x = w.b;
-                x.o = m;
-                x.n = s;
+                x.q = m;
+                x.p = s;
                 let y = new Rect(4);
                 let z = new Rect(4);
                 let aa = 0;
@@ -1207,25 +1230,27 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                     aa = g - u;
                 }
                 let ab = m;
-                x.ad = this.ds(p);
-                x.ag = this.dt(p);
-                x.a0 = this.d2(p);
+                x.bm = this.ea;
+                x.r = this.b2;
+                x.ae(this.dw(p), this.dx(p), x.r, this.ea == 0);
+                x.bj = this.d6(p);
                 x.j = this.ai.c(p);
                 if (b) {
                     w.h = true;
-                    x.ar = { $type: Point_$type, x: g - u - aa + n, y: m - ab + n };
-                    x.as = { $type: Point_$type, x: g + u - aa - n, y: m - ab + n };
-                    x.ao = { $type: Point_$type, x: g - v - aa + n, y: s - ab - n };
-                    x.ap = { $type: Point_$type, x: g + v - aa - n, y: s - ab - n };
-                    if (this.ay) {
-                        this.cr(x, m + n, s - n, g, aa - n, ab);
+                    x.a8 = { $type: Point_$type, x: g - u - aa + n, y: m - ab + n };
+                    x.a9 = { $type: Point_$type, x: g + u - aa - n, y: m - ab + n };
+                    x.a5 = { $type: Point_$type, x: g - v - aa + n, y: s - ab - n };
+                    x.a6 = { $type: Point_$type, x: g + v - aa - n, y: s - ab - n };
+                    x.a3 = x.a9;
+                    x.a2 = x.a8;
+                    if (this.a0) {
+                        this.cv(x, m + n, s - n, g, aa - n, ab);
                     }
-                    x.x();
                 }
                 if (d) {
                     x.i = true;
-                    x.an = { $type: Point_$type, x: g - aa, y: (m + s) / 2 - ab };
-                    x.v = this.cd(p);
+                    x.a4 = { $type: Point_$type, x: g - aa, y: (m + s) / 2 - ab };
+                    x.ab = this.ch(p);
                     let ac = this.q.decideLabelSize(w, true);
                     if (ac.width > e) {
                         x.i = false;
@@ -1235,48 +1260,64 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                     }
                     y.height = ac.height;
                     y.width = ac.width;
-                    y.x = x.an.x;
-                    y.y = x.an.y;
-                    x.ax = y;
+                    y.x = x.a4.x;
+                    y.y = x.a4.y;
+                    x.bg = y;
                 }
                 else {
                     x.i = false;
-                    x.v = this.cd(p);
+                    x.ab = this.ch(p);
                 }
                 if (d || b) {
-                    x.aq = { $type: Point_$type, x: aa, y: ab };
-                    x.item = this.am.a.item(p);
-                    x.s = p;
+                    x.a7 = { $type: Point_$type, x: aa, y: ab };
+                    x.item = this.ao.a.item(p);
+                    x.w = p;
+                }
+                if (b) {
+                    if (this.an != null && this.an.a != null && !isNaN_(this.an.a.item(p))) {
+                        x.aa = this.an.a.item(p);
+                        x.af();
+                        let ad = x.s;
+                        let ae = x.a8;
+                        let af = x.a5;
+                        let ag = x.a6;
+                        let ah = (af.x - ae.x) * ad;
+                        let ai = af.y - (af.y - ae.y) * ad;
+                        x.a2 = { $type: Point_$type, x: af.x - ah, y: ai };
+                        x.a3 = { $type: Point_$type, x: ag.x + ah, y: ai };
+                        x.ah();
+                    }
+                    x.ad();
                 }
                 if (c) {
                     w.g = true;
                     w.n = { $type: Point_$type, x: 0, y: (m + s) / 2 };
-                    w.l = this.ce(p);
-                    let ad = this.q.decideLabelSize(w, false);
-                    if (ad.height > q) {
+                    w.l = this.ci(p);
+                    let aj = this.q.decideLabelSize(w, false);
+                    if (aj.height > q) {
                         w.g = false;
                     }
-                    z.height = ad.height;
-                    z.width = ad.width;
+                    z.height = aj.height;
+                    z.width = aj.width;
                     y.x = w.n.x;
                     y.y = w.n.y;
-                    x.ay = z;
+                    x.bh = z;
                 }
                 else {
                     w.g = false;
-                    w.l = this.ce(p);
+                    w.l = this.ci(p);
                 }
                 w.j = p;
                 a.b.add(w);
                 m += q;
                 o++;
             }
-            if ((this.ar != null && this.ar.a != null && this.ar.a.count > 0) || (this.as != null && this.as.a != null && this.as.a.count > 0)) {
-                this.dg(a);
+            if ((this.at != null && this.at.a != null && this.at.a.count > 0) || (this.au != null && this.au.a != null && this.au.a.count > 0)) {
+                this.dk(a);
             }
             a.b.ae();
         }
-        cr(a, b, c, d, e, f) {
+        cv(a, b, c, d, e, f) {
             let g = this.ak.b(b);
             let h = this.ak.b(c);
             let i = new PointList();
@@ -1286,7 +1327,7 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
             for (let m = k; m <= l; m++) {
                 i.add({ $type: Point_$type, x: this.ak.e._inner[m].c.x - e, y: this.ak.e._inner[m].c.y - f });
             }
-            e += this.bz;
+            e += this.b3;
             for (let n = l; n >= k; n--) {
                 let o = this.ak.e._inner[n].c;
                 j.add({ $type: Point_$type, x: d + d - o.x - e, y: o.y - f });
@@ -1294,35 +1335,35 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
             a.c = i;
             a.e = j;
         }
-        bi(a, b) {
+        bk(a, b) {
             if (a.x != b.x || a.y != b.y) {
                 return true;
             }
             return false;
         }
-        c0(a, b) {
+        c4(a, b) {
             let c;
             let d;
-            let e = 0, f = this.b3;
-            e = this.bz / 2;
+            let e = 0, f = this.b7;
+            e = this.b3 / 2;
             f -= e;
-            if (this.bd) {
-                c = { $type: Point_$type, x: b - (a * this.bw / 2), y: e };
+            if (this.bf) {
+                c = { $type: Point_$type, x: b - (a * this.bz / 2), y: e };
                 d = { $type: Point_$type, x: b - (a / 2), y: f };
             }
             else {
                 c = { $type: Point_$type, x: b - (a / 2), y: e };
-                d = { $type: Point_$type, x: b - (a * this.bw / 2), y: f };
+                d = { $type: Point_$type, x: b - (a * this.bz / 2), y: f };
             }
-            let g = this.dy.y < this.dx.y ? this.dy : this.dx;
-            let h = this.dx.y > this.dy.y ? this.dx : this.dy;
+            let g = this.d2.y < this.d1.y ? this.d2 : this.d1;
+            let h = this.d1.y > this.d2.y ? this.d1 : this.d2;
             if (g.y < 0) {
                 g.y = 0;
             }
             if (h.y > 1) {
                 h.y = 1;
             }
-            if (this.bd) {
+            if (this.bf) {
                 let i = h.x;
                 h.x = g.x;
                 g.x = i;
@@ -1330,91 +1371,91 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                 g.y = 1 - h.y;
                 h.y = 1 - i;
             }
-            let j = { $type: Point_$type, x: a * g.x, y: this.b3 * g.y };
-            let k = { $type: Point_$type, x: a * h.x, y: this.b3 * h.y };
-            if (this.ak == null || this.bi(c, this.ak.q) || this.bi(j, this.ak.r) || this.bi(k, this.ak.s) || this.bi(d, this.ak.t)) {
+            let j = { $type: Point_$type, x: a * g.x, y: this.b7 * g.y };
+            let k = { $type: Point_$type, x: a * h.x, y: this.b7 * h.y };
+            if (this.ak == null || this.bk(c, this.ak.q) || this.bk(j, this.ak.r) || this.bk(k, this.ak.s) || this.bk(d, this.ak.t)) {
                 this.ak = new Bezier(c, j, k, d, 2, b);
             }
             if (this.ak == null) {
-                this.ay = false;
+                this.a0 = false;
             }
             else {
-                this.ay = this.ak.d;
+                this.a0 = this.ak.d;
             }
         }
-        ce(a) {
-            let b = this.as;
+        ci(a) {
+            let b = this.au;
             let c = b == null ? null : b.a;
             return c == null || a >= c.count ? null : c.item(a);
         }
-        cd(a) {
-            let b = this.ar;
+        ch(a) {
+            let b = this.at;
             let c = b == null ? null : b.a;
             return c == null || a >= c.count ? null : c.item(a);
         }
-        d2(a) {
+        d6(a) {
             if (this.ai.c(a)) {
-                return this.d3;
+                return this.d7;
             }
-            if (this.ai.d(a) && this.bo) {
-                return this.d4;
+            if (this.ai.d(a) && this.bq) {
+                return this.d8;
             }
             return null;
         }
-        dt(a) {
+        dx(a) {
             return this.d.item(a % this.d.count);
         }
-        ds(a) {
+        dw(a) {
             return this.c.item(a % this.c.count);
         }
-        by(a, b) {
-            let c = a * this.bw;
-            if (this.ay) {
+        b1(a, b) {
+            let c = a * this.bz;
+            if (this.a0) {
                 let d = this.ak.b(b).c.x;
                 return ((a / 2) - d) * 2;
             }
             else {
-                if (this.bd) {
-                    return a - ((a - c) * ((this.b3 - b) / this.b3));
+                if (this.bf) {
+                    return a - ((a - c) * ((this.b7 - b) / this.b7));
                 }
                 else {
-                    return a - ((a - c) * (b / this.b3));
+                    return a - ((a - c) * (b / this.b7));
                 }
             }
         }
-        an() {
+        ap() {
             let a = new IntColumn();
-            a.b(this.am.a.count);
+            a.b(this.ao.a.count);
             a.c((b, c) => {
-                if (this.am.a.item(b) < this.am.a.item(c)) {
-                    return this.bd ? -1 : 1;
+                if (this.ao.a.item(b) < this.ao.a.item(c)) {
+                    return this.bf ? -1 : 1;
                 }
-                if (this.am.a.item(b) > this.am.a.item(c)) {
-                    return this.bd ? 1 : -1;
+                if (this.ao.a.item(b) > this.ao.a.item(c)) {
+                    return this.bf ? 1 : -1;
                 }
                 return 0;
             });
             return a;
         }
-        cw(a) {
-            this.cx(a);
+        c0(a) {
+            this.c1(a);
         }
-        cy() {
+        c2() {
             if (this.l != null) {
-                this.cx(this.l);
+                this.c1(this.l);
             }
         }
-        cx(a) {
-            this.dh("LeftLabels");
-            this.dh("RightLabels");
-            this.dh("SliceArea");
+        c1(a) {
+            this.dl("LeftLabels");
+            this.dl("RightLabels");
+            this.dl("SliceArea");
             if (a.g) {
-                this.di("LeftPanel", a.j);
-                this.di("RightPanel", 0);
+                this.dm("LeftPanel", a.j);
+                this.dm("RightPanel", 0);
             }
             else {
-                this.di("LeftPanel", 0);
-                this.di("RightPanel", a.j);
+                this.dm("LeftPanel", 0);
+                this.dm("RightPanel", a.j);
             }
             this.ag = a.b;
             for (let b of fromEnum(a.b)) {
@@ -1422,7 +1463,7 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                     let c = new RenderSliceMessage();
                     c.e = "SliceArea";
                     c.g = b.b;
-                    c.h = this.bz;
+                    c.h = this.b3;
                     this.y.i(c);
                 }
             }
@@ -1445,165 +1486,177 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
             let f = new FrameRenderCompleteMessage();
             this.y.i(f);
         }
-        di(a, b) {
+        dm(a, b) {
             let c = new SetAreaSizeMessage();
             c.e = a;
             c.i = true;
             c.m = b;
             this.y.i(c);
         }
-        bk() {
-            return this.b1 > 0;
+        bm() {
+            return this.b5 > 0;
         }
-        dh(a) {
+        dl(a) {
             let b = new ClearMessage();
             b.e = a;
             this.y.i(b);
         }
-        aq() {
-            return this.as;
+        as() {
+            return this.au;
         }
-        cv(a) {
-            this.bj = true;
+        cz(a) {
+            this.bl = true;
         }
-        b7(a) {
+        cb(a) {
             return Convert.toInt32(a);
         }
-        de(a) {
+        di(a) {
             let b = a;
             let c = b.d;
             switch (b.g) {
                 case "TextStyle":
-                    this.cp = c != null ? c.toString() : "";
+                    this.ct = c != null ? c.toString() : "";
                     let d = new PropertyChangedMessage();
                     d.g = b.g;
                     d.e = b.e;
                     d.d = c;
                     this.y.i(d);
-                    this.bj = true;
+                    this.bl = true;
                     break;
                 case "OuterLabelTextStyle":
-                    this.co = c != null ? c.toString() : "";
+                    this.cs = c != null ? c.toString() : "";
                     let e = new PropertyChangedMessage();
                     e.g = b.g;
                     e.e = b.e;
                     e.d = c;
                     this.y.i(e);
-                    this.bj = true;
+                    this.bl = true;
                     break;
                 case "ValueColumn":
-                    this.am.b(c);
-                    this.bj = true;
+                    this.ao.b(c);
+                    this.bl = true;
+                    break;
+                case "HighlightValueColumn":
+                    this.an.b(c);
+                    this.bl = true;
+                    break;
+                case "ActualHighlightValueDisplayMode":
+                    this.ea = EnumUtil.getEnumValue(HighlightedValueDisplayMode_$type, c) == 2 ? 0 : 1;
+                    this.bl = true;
+                    break;
+                case "ActualHighlightValueOpacity":
+                    this.b2 = c;
+                    this.bl = true;
                     break;
                 case "InnerLabelColumn":
-                    this.bb = false;
-                    this.cf = c;
-                    this.ar.b(c);
-                    this.bj = true;
+                    this.bd = false;
+                    this.cj = c;
+                    this.at.b(c);
+                    this.bl = true;
                     break;
                 case "InnerLabelVisibility":
-                    this.bc = c;
-                    this.bj = true;
+                    this.be = c;
+                    this.bl = true;
                     break;
                 case "OuterLabelVisibility":
-                    this.bh = c;
-                    this.bj = true;
+                    this.bj = c;
+                    this.bl = true;
                     break;
                 case "OuterLabelColumn":
-                    this.bg = false;
-                    this.cg = c;
-                    this.as.b(c);
-                    this.bj = true;
+                    this.bi = false;
+                    this.ck = c;
+                    this.au.b(c);
+                    this.bl = true;
                     break;
                 case "ValueMemberPath":
-                    this.cq = typeCast(String_$type, c);
+                    this.cu = typeCast(String_$type, c);
                     break;
                 case "OuterLabelMemberPath":
-                    this.cn = typeCast(String_$type, c);
+                    this.cr = typeCast(String_$type, c);
                     break;
                 case "InnerLabelMemberPath":
-                    this.cm = typeCast(String_$type, c);
+                    this.cq = typeCast(String_$type, c);
                     break;
                 case "BottomEdgeWidth":
-                    this.bw = c;
-                    if (this.bw > 1) {
-                        this.bw = 1;
+                    this.bz = c;
+                    if (this.bz > 1) {
+                        this.bz = 1;
                     }
-                    if (this.bw < 0.001) {
-                        this.bw = 0.001;
+                    if (this.bz < 0.001) {
+                        this.bz = 0.001;
                     }
-                    this.bj = true;
+                    this.bl = true;
                     break;
                 case "Brushes":
                     if (b.e != null) {
                         let f = b.e;
-                        f.collectionChanged = delegateRemove(f.collectionChanged, this.bp);
+                        f.collectionChanged = delegateRemove(f.collectionChanged, this.br);
                     }
                     if (c != null) {
                         let g = c;
-                        g.collectionChanged = delegateCombine(g.collectionChanged, this.bp);
+                        g.collectionChanged = delegateCombine(g.collectionChanged, this.br);
                     }
                     this.c = typeCast(BrushCollection.$, c);
-                    this.bj = true;
+                    this.bl = true;
                     break;
                 case "Outlines":
                     this.d = typeCast(BrushCollection.$, c);
-                    this.bj = true;
+                    this.bl = true;
                     break;
                 case "OuterLabelAlignment":
                     this.ae = EnumUtil.getEnumValue(OuterLabelAlignment_$type, c);
-                    this.bj = true;
+                    this.bl = true;
                     break;
                 case "FunnelSliceDisplay":
                     this.n = EnumUtil.getEnumValue(FunnelSliceDisplay_$type, c);
-                    this.bj = true;
+                    this.bl = true;
                     break;
                 case "FormatInnerLabel":
-                    this.ar.b(this.cf);
-                    this.bb = false;
-                    this.cb = c;
-                    this.bj = true;
+                    this.at.b(this.cj);
+                    this.bd = false;
+                    this.cf = c;
+                    this.bl = true;
                     break;
                 case "FormatOuterLabel":
-                    this.as.b(this.cg);
-                    this.cc = c;
-                    this.bg = false;
-                    this.bj = true;
+                    this.au.b(this.ck);
+                    this.cg = c;
+                    this.bi = false;
+                    this.bl = true;
                     break;
                 case "IsInverted":
-                    this.bd = c;
-                    this.bj = true;
+                    this.bf = c;
+                    this.bl = true;
                     break;
                 case "TransitionDuration":
-                    this.av.r = this.b7(c);
-                    this.b1 = this.av.r;
+                    this.ax.r = this.cb(c);
+                    this.b5 = this.ax.r;
                     break;
                 case "AllowSliceSelection":
-                    this.a8 = c;
+                    this.ba = c;
                     break;
                 case "SelectedSliceStyle":
-                    this.d3 = c;
-                    this.bj = true;
+                    this.d7 = c;
+                    this.bl = true;
                     break;
                 case "UnselectedSliceStyle":
-                    this.d4 = c;
-                    this.bj = true;
+                    this.d8 = c;
+                    this.bl = true;
                     break;
                 case "UseUnselectedStyle":
-                    this.bo = c;
-                    this.bj = true;
+                    this.bq = c;
+                    this.bl = true;
                     break;
                 case "UseBezierCurve":
-                    this.bm = c;
-                    this.bj = true;
+                    this.bo = c;
+                    this.bl = true;
                     break;
                 case "UpperBezierControlPoint":
-                    this.dy = c;
-                    this.bj = true;
+                    this.d2 = c;
+                    this.bl = true;
                     break;
                 case "LowerBezierControlPoint":
-                    this.dx = c;
-                    this.bj = true;
+                    this.d1 = c;
+                    this.bl = true;
                     break;
                 case "ItemProvider":
                     this.s = c;
@@ -1611,10 +1664,10 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                 case "ToolTip":
                     let h = new TooltipValueChangedMessage();
                     if (c != null) {
-                        this.ba = true;
+                        this.bc = true;
                     }
                     else {
-                        this.ba = false;
+                        this.bc = false;
                         let i = new ClearTooltipMessage();
                         this.y.i(i);
                     }
@@ -1622,24 +1675,24 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                     this.y.i(h);
                     break;
                 case "Legend":
-                    this.c6(c);
-                    this.bj = true;
+                    this.da(c);
+                    this.bl = true;
                     break;
                 case "LegendItemTemplate":
-                    this.dr = c;
-                    this.bj = true;
+                    this.dv = c;
+                    this.bl = true;
                     break;
                 case "LegendItemBadgeTemplate":
-                    this.dq = c;
-                    this.bj = true;
+                    this.du = c;
+                    this.bl = true;
                     break;
                 case "UseOuterLabelsForLegend":
-                    this.bn = c;
-                    this.bj = true;
+                    this.bp = c;
+                    this.bl = true;
                     break;
                 case "OutlineThickness":
-                    this.br = c;
-                    this.bj = true;
+                    this.bu = c;
+                    this.bl = true;
                     this.y.i(b);
                     break;
                 case "Container":
@@ -1649,7 +1702,7 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                 case "LabelTextColor":
                     if (b.g == "Container") {
                         let j = b.d;
-                        this.av.u(j);
+                        this.ax.u(j);
                     }
                     let k = new PropertyChangedMessage();
                     k.g = b.g;
@@ -1659,35 +1712,35 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                     break;
             }
         }
-        get dr() {
-            return this.dp;
+        get dv() {
+            return this.dt;
         }
-        set dr(a) {
-            this.dp = a;
+        set dv(a) {
+            this.dt = a;
         }
-        get dq() {
-            return this.dn;
+        get du() {
+            return this.ds;
         }
-        set dq(a) {
-            this.dn = a;
+        set du(a) {
+            this.ds = a;
         }
-        c6(a) {
+        da(a) {
             if (this.o != null) {
                 this.o.clearLegendItemsForSeries(this.ac.b("Model"));
             }
             this.o = a;
         }
-        dg(a) {
+        dk(a) {
             let b = new List$1(UIElement.$, 0);
             for (let c of fromEnum(a.b)) {
                 let d = new ContentControl();
                 let e = "";
-                if (c.b.v != null) {
-                    if (this.bn && c.l != null) {
+                if (c.b.ab != null) {
+                    if (this.bp && c.l != null) {
                         e = c.l.toString();
                     }
                     else {
-                        e = c.b.v.toString();
+                        e = c.b.ab.toString();
                     }
                 }
                 else if (c.l != null) {
@@ -1695,15 +1748,15 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                 }
                 let f = null;
                 let g = null;
-                if (f == null && c.b.ad != null) {
-                    f = c.b.ad;
+                if (f == null && c.b.ao != null) {
+                    f = c.b.ao;
                 }
-                if (g == null && c.b.ag != null) {
-                    g = c.b.ag;
+                if (g == null && c.b.at != null) {
+                    g = c.b.at;
                 }
                 let h = null;
                 if (this.s != null) {
-                    h = this.s.getItem(c.b.s);
+                    h = this.s.getItem(c.b.w);
                 }
                 d.content = ((() => {
                     let $ret = new FunnelSliceDataContext();
@@ -1711,12 +1764,12 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                     $ret.item = h;
                     $ret.itemBrush = f;
                     $ret.itemLabel = e;
-                    $ret.thickness = this.bz;
+                    $ret.thickness = this.b3;
                     $ret.outline = g;
                     $ret.itemOutline = g;
                     return $ret;
                 })());
-                d.ah = this.dr;
+                d.ah = this.dv;
                 b.add(d);
             }
             if (this.o != null) {
@@ -1726,131 +1779,131 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
                 }
             }
         }
-        dm(a) {
+        dr(a) {
             let b = a;
             switch (b.g) {
                 case "OuterLabelWidthDecider":
                     this.u = typeCast(IOuterLabelWidthDecider_$type, b.d);
-                    this.bj = true;
+                    this.bl = true;
                     break;
                 case "FunnelLabelSizeDecider":
                     this.q = typeCast(IFunnelLabelSizeDecider_$type, b.d);
-                    this.bj = true;
+                    this.bl = true;
                     break;
             }
         }
-        dl(a) {
+        dq(a) {
             let b = a;
-            this.b4 = b.e;
-            this.b3 = b.d;
-            this.bj = true;
+            this.b8 = b.e;
+            this.b7 = b.d;
+            this.bl = true;
         }
-        c3(a) {
+        c7(a) {
             let b = a;
             if (b.e == 1) {
                 return;
             }
             if (b.c == 1) {
-                this.ca = this.b9;
+                this.ce = this.cd;
             }
             else if (b.c == 0) {
-                let c = this.ca;
-                this.ca = -1;
+                let c = this.ce;
+                this.ce = -1;
                 if (b.f == 0) {
                 }
                 else if (b.f != 2) {
                     return;
                 }
-                if (c == this.b9) {
-                    this.c8(c);
+                if (c == this.cd) {
+                    this.dc(c);
                 }
             }
         }
-        c8(a) {
-            if (a < 0 || a > this.am.a.count - 1) {
+        dc(a) {
+            if (a < 0 || a > this.ao.a.count - 1) {
                 return;
             }
-            if (this.a8) {
-                this.ai.k(a, this.am.a.item(a));
+            if (this.ba) {
+                this.ai.k(a, this.ao.a.item(a));
                 let b = this.ai.a();
                 let c = new SelectedItemsChangedMessage();
                 c.c = b;
                 this.x.i(c);
-                this.bj = true;
+                this.bl = true;
             }
             let d = new SliceClickedMessage();
             d.c = a;
-            d.item = this.am.a.item(a);
-            d.f = this.dz;
+            d.item = this.ao.a.item(a);
+            d.f = this.d3;
             this.x.i(d);
         }
-        da(a) {
-            if (this.am != null && a >= 0 && a < this.am.a.count) {
+        de(a) {
+            if (this.ao != null && a >= 0 && a < this.ao.a.count) {
                 let b = new SliceMouseMessage();
                 b.e = a;
-                b.item = this.am.a.item(a);
+                b.item = this.ao.a.item(a);
                 b.c = 0;
-                b.i = this.dz;
+                b.i = this.d3;
                 this.x.i(b);
             }
         }
-        db(a, b) {
-            if (this.am != null && a >= 0 && a < this.am.a.count) {
+        df(a, b) {
+            if (this.ao != null && a >= 0 && a < this.ao.a.count) {
                 let c = new SliceMouseMessage();
                 c.e = a;
-                c.item = this.am.a.item(a);
+                c.item = this.ao.a.item(a);
                 c.c = 2;
-                c.i = this.dz;
+                c.i = this.d3;
                 c.h = b;
                 this.x.i(c);
             }
         }
-        c9(a) {
-            if (this.am != null && a >= 0 && a < this.am.a.count) {
+        dd(a) {
+            if (this.ao != null && a >= 0 && a < this.ao.a.count) {
                 let b = new SliceMouseMessage();
                 b.e = a;
-                b.item = this.am.a.item(a);
+                b.item = this.ao.a.item(a);
                 b.c = 1;
-                b.i = this.dz;
+                b.i = this.d3;
                 this.x.i(b);
             }
         }
-        c5(a) {
+        c9(a) {
             let b = a;
-            let c = this.b9;
-            this.b9 = this.b8(b.c);
-            if (c != this.b9) {
+            let c = this.cd;
+            this.cd = this.cc(b.c);
+            if (c != this.cd) {
                 if (c != -1) {
-                    this.da(c);
+                    this.de(c);
                 }
-                if (this.b9 != -1) {
-                    this.c9(this.b9);
+                if (this.cd != -1) {
+                    this.dd(this.cd);
                 }
             }
             else {
-                if (this.b9 != -1) {
-                    this.db(this.b9, b.c);
+                if (this.cd != -1) {
+                    this.df(this.cd, b.c);
                 }
             }
-            if (this.ba) {
-                this.dj(b.c);
+            if (this.bc) {
+                this.dn(b.c);
             }
         }
-        c4(a) {
-            let b = this.b9;
-            this.b9 = -1;
+        c8(a) {
+            let b = this.cd;
+            this.cd = -1;
             if (b != -1) {
-                this.da(b);
+                this.de(b);
             }
             let c = new ClearTooltipMessage();
             this.y.i(c);
         }
-        dj(a) {
+        dn(a) {
             let b = new FunnelDataContext();
-            if (this.s != null && this.b9 >= 0 && this.b9 < this.s.count) {
-                b.item = this.s.getItem(this.b9);
+            if (this.s != null && this.cd >= 0 && this.cd < this.s.count) {
+                b.item = this.s.getItem(this.cd);
             }
-            b.b = this.b9;
+            b.b = this.cd;
             if (b.b < 0) {
                 let c = new ClearTooltipMessage();
                 this.y.i(c);
@@ -1858,15 +1911,15 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
             }
             let d = new TooltipUpdateMessage();
             d.g = b;
-            d.i = this.dw(a, b);
+            d.i = this.d0(a, b);
             this.y.i(d);
         }
-        dw(a, b) {
+        d0(a, b) {
             let c = { $type: Point_$type, x: a.x + 10, y: a.y + 10 };
             return c;
         }
-        b8(a) {
-            if (!this.bf()) {
+        cc(a) {
+            if (!this.bh()) {
                 return -1;
             }
             let b = a.y;
@@ -1879,22 +1932,22 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
             if (e == null) {
                 return -1;
             }
-            let f = this.bx();
-            let g = this.by(f, b);
+            let f = this.b0();
+            let g = this.b1(f, b);
             let h = g / 2;
             let i = f / 2;
-            let j = new Rect(0, e.b.ar.x, e.b.ar.y, Math.max(e.b.ap.x - e.b.ar.x, 0), Math.max(e.b.ap.y - e.b.ar.y, 0));
+            let j = new Rect(0, e.b.a8.x, e.b.a8.y, Math.max(e.b.a6.x - e.b.a8.x, 0), Math.max(e.b.a6.y - e.b.a8.y, 0));
             if (c >= (i - h) && c <= (i + h)) {
-                this.dz = j;
+                this.d3 = j;
                 return e.j;
             }
             else {
                 return -1;
             }
         }
-        bx() {
+        b0() {
             let a = this.i();
-            return this.b4 - a.j;
+            return this.b8 - a.j;
         }
         af(a) {
             let b = this.i();
@@ -1906,7 +1959,7 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
         }
         i() {
             let a = null;
-            if (this.a9) {
+            if (this.bb) {
                 a = this.j;
             }
             else {
@@ -1914,35 +1967,35 @@ export let XamFunnelController = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        dk(a) {
+        dp(a) {
             let b = a;
-            this.ai.i(b.c, this.am);
-            this.bj = true;
+            this.ai.i(b.c, this.ao);
+            this.bl = true;
         }
-        c1(a) {
-            this.cs(a);
+        c5(a) {
+            this.cw(a);
         }
-        cs(a) {
+        cw(a) {
             let b = this.i();
             if (a.c == -1) {
-                this.bj = true;
+                this.bl = true;
             }
             else {
                 let c = b.b._inner[a.c];
                 if (a.b) {
                     if (a.d.width > b.j) {
-                        this.bj = true;
+                        this.bl = true;
                     }
                     if (a.d.height != a.e.height) {
-                        this.bj = true;
+                        this.bl = true;
                     }
-                    if (a.d.height > c.b.ap.y - c.b.as.y) {
-                        this.bj = true;
+                    if (a.d.height > c.b.a6.y - c.b.a9.y) {
+                        this.bl = true;
                     }
                 }
                 else {
-                    if (a.d.height > c.b.ap.y - c.b.as.y) {
-                        this.bj = true;
+                    if (a.d.height > c.b.a6.y - c.b.a9.y) {
+                        this.bl = true;
                     }
                 }
             }
@@ -1962,36 +2015,41 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
             this.as = null;
             this.ap = null;
             this.ax = null;
-            this.bt = null;
-            this.a2 = null;
-            this.a0 = null;
-            this.a1 = null;
-            this.bu = null;
-            this.bv = null;
-            this.bk = new ObservableCollection$1(Base.$, 0);
-            this.bh = new Dictionary$2(Base.$, Base.$, 0);
-            this.b2 = null;
-            this.b1 = null;
+            this.b4 = null;
+            this.a7 = null;
+            this.b5 = null;
+            this.a4 = null;
+            this.bt = 0.5;
+            this.a1 = 1;
+            this.a5 = null;
+            this.a6 = null;
+            this.b6 = null;
+            this.b7 = null;
+            this.bs = new ObservableCollection$1(Base.$, 0);
+            this.bo = new Dictionary$2(Base.$, Base.$, 0);
+            this.ce = null;
+            this.cd = null;
             this.sliceClicked = null;
             this.sliceEnter = null;
             this.sliceLeave = null;
             this.sliceHover = null;
-            this.bz = null;
-            this.bm = NaN;
-            this.bl = 1;
-            this.er = null;
-            this.es = null;
-            this.bl = 1;
-            this.bm = NaN;
-            let a = this.bk;
-            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.dt));
+            this.cb = null;
+            this.bv = NaN;
+            this.bu = 1;
+            this.fl = null;
+            this.fm = null;
+            this.bu = 1;
+            this.bv = NaN;
+            let a = this.bs;
+            a.collectionChanged = delegateCombine(a.collectionChanged, runOn(this, this.eg));
             this.ar = new MessageHandler();
-            this.ar.b(SliceClickedMessage.$, runOn(this, this.dx));
-            this.ar.b(SliceMouseMessage.$, runOn(this, this.dy));
-            this.ar.b(SelectedItemsChangedMessage.$, runOn(this, this.du));
+            this.ar.b(SliceClickedMessage.$, runOn(this, this.ek));
+            this.ar.b(SliceMouseMessage.$, runOn(this, this.el));
+            this.ar.b(SelectedItemsChangedMessage.$, runOn(this, this.eh));
             this.ap = new MessageChannel();
-            this.bt = (b, c) => this.db(c.action, c.position, c.count, c.propertyName);
-            this.dv();
+            this.b4 = (b, c) => this.dx(c.action, c.position, c.count, c.propertyName);
+            this.b5 = (b, c) => this.d2(c.action, c.position, c.count, c.propertyName);
+            this.ei();
             this.ab = XamFunnelChart.$;
             this.ax = new XamFunnelConnector(new XamFunnelView(), this);
             this.legendItemTemplate = ((() => {
@@ -2016,16 +2074,16 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
         set ar(a) {
             this.aq = a;
         }
-        dv() {
-            this.dq(XamFunnelChart.$$p[1], 0, this.bo);
-            this.dq(XamFunnelChart.$$p[6], enumGetBox(Visibility_$type, this.ez), enumGetBox(Visibility_$type, this.ez));
-            this.dq(XamFunnelChart.$$p[13], enumGetBox(OuterLabelAlignment_$type, this.au), enumGetBox(OuterLabelAlignment_$type, this.au));
-            this.dq(XamFunnelChart.$$p[4], enumGetBox(FunnelSliceDisplay_$type, this.ak), enumGetBox(FunnelSliceDisplay_$type, this.ak));
-            this.dq(XamFunnelChart.$$p[22], this.ew, this.ew);
-            this.dq(XamFunnelChart.$$p[12], this.ev, this.ev);
-            this.dw();
+        ei() {
+            this.ed(XamFunnelChart.$$p[1], 0, this.by);
+            this.ed(XamFunnelChart.$$p[10], enumGetBox(Visibility_$type, this.ft), enumGetBox(Visibility_$type, this.ft));
+            this.ed(XamFunnelChart.$$p[17], enumGetBox(OuterLabelAlignment_$type, this.au), enumGetBox(OuterLabelAlignment_$type, this.au));
+            this.ed(XamFunnelChart.$$p[4], enumGetBox(FunnelSliceDisplay_$type, this.ak), enumGetBox(FunnelSliceDisplay_$type, this.ak));
+            this.ed(XamFunnelChart.$$p[26], this.fq, this.fq);
+            this.ed(XamFunnelChart.$$p[16], this.fp, this.fp);
+            this.ej();
         }
-        dw() {
+        ej() {
             let a = new PropertyChangedMessage();
             a.g = "ItemProvider";
             a.e = null;
@@ -2038,29 +2096,29 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
         set at(a) {
             let b = this.as;
             this.as = a;
-            this.dr(b, this.as);
+            this.ee(b, this.as);
         }
-        dr(a, b) {
+        ee(a, b) {
             if (a != null) {
                 let c = typeCast(MessageChannel.$, a.b("ModelUpdateMessages"));
                 if (c != null) {
-                    c.h(runOn(this, this.dg));
+                    c.h(runOn(this, this.d4));
                 }
                 this.ap.g();
             }
             if (b != null) {
                 let d = typeCast(MessageChannel.$, b.b("ModelUpdateMessages"));
                 if (d != null) {
-                    d.e(runOn(this, this.dg));
+                    d.e(runOn(this, this.d4));
                 }
                 let e = typeCast(MessageChannel.$, b.b("ConfigurationMessages"));
                 this.ap.f(e);
             }
         }
-        dg(a) {
+        d4(a) {
             this.ar.c(a);
         }
-        db(a, b, c, d) {
+        dx(a, b, c, d) {
             let e = ((() => {
                 let $ret = new DataUpdatedMessage();
                 $ret.g = b;
@@ -2085,75 +2143,157 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
                     e.c = 4;
                     break;
             }
-            this.dq("ValueColumn", this.a7, this.a7);
-            this.dq("InnerLabelColumn", this.a3, this.a3);
-            this.dq("OuterLabelColumn", this.a4, this.a4);
+            this.ed("ValueColumn", this.bd, this.bd);
+            this.ed("InnerLabelColumn", this.a9, this.a9);
+            this.ed("OuterLabelColumn", this.ba, this.ba);
             this.ap.i(e);
         }
-        get a7() {
-            return this.a2;
+        get bd() {
+            return this.a7;
         }
-        set a7(a) {
+        set bd(a) {
+            if (this.a7 != a) {
+                let b = this.a7;
+                this.a7 = a;
+                this.ed("ValueColumn", b, this.a7);
+            }
+        }
+        d2(a, b, c, d) {
+            let e = ((() => {
+                let $ret = new DataUpdatedMessage();
+                $ret.g = b;
+                $ret.f = c;
+                $ret.i = d;
+                return $ret;
+            })());
+            switch (a) {
+                case 3:
+                    e.c = 3;
+                    break;
+                case 1:
+                    e.c = 1;
+                    break;
+                case 0:
+                    e.c = 0;
+                    break;
+                case 2:
+                    e.c = 2;
+                    break;
+                case 4:
+                    e.c = 4;
+                    break;
+            }
+            this.ed("HighlightValueColumn", this.a8, this.a8);
+            this.ap.i(e);
+        }
+        get a8() {
+            return this.a4;
+        }
+        set a8(a) {
+            if (this.a4 != a) {
+                let b = this.a4;
+                this.a4 = a;
+                this.en();
+                this.ed("HighlightValueColumn", b, this.a4);
+            }
+        }
+        get bw() {
+            return this.bt;
+        }
+        set bw(a) {
+            let b = this.bt;
+            this.bt = a;
+            if (b != this.bt) {
+                this.ed("ActualHighlightValueOpacity", b, a);
+            }
+        }
+        eo() {
+            this.bw = isNaN_(this.b0) ? 0.5 : Math.max(0, Math.min(this.b0, 1));
+        }
+        get a2() {
+            return this.a1;
+        }
+        set a2(a) {
+            this.a1 = a;
+        }
+        en() {
+            let a = this.a2;
+            if (this.a3 == 2) {
+                if (this.a8 == null || this.bd == null || this.a8.count != this.bd.count) {
+                    this.a2 = 1;
+                }
+                else {
+                    this.a2 = 2;
+                }
+            }
+            else {
+                this.a2 = 1;
+            }
             if (this.a2 != a) {
-                let b = this.a2;
-                this.a2 = a;
-                this.dq("ValueColumn", b, this.a2);
+                this.ed("ActualHighlightValueDisplayMode", enumGetBox(HighlightedValueDisplayMode_$type, a), enumGetBox(HighlightedValueDisplayMode_$type, this.a2));
             }
         }
         get a3() {
-            return this.a0;
+            return EnumUtil.getEnumValue(HighlightedValueDisplayMode_$type, this.c(XamFunnelChart.ex));
         }
         set a3(a) {
-            if (this.a0 != a) {
-                let b = this.a0;
-                this.a0 = a;
-                this.dq("InnerLabelColumn", b, this.a3);
+            this.h(XamFunnelChart.ex, enumGetBox(HighlightedValueDisplayMode_$type, a));
+            this.en();
+        }
+        get a9() {
+            return this.a5;
+        }
+        set a9(a) {
+            if (this.a5 != a) {
+                let b = this.a5;
+                this.a5 = a;
+                this.ed("InnerLabelColumn", b, this.a9);
             }
         }
-        get a4() {
-            return this.a1;
+        get ba() {
+            return this.a6;
         }
-        set a4(a) {
-            if (this.a1 != a) {
-                let b = this.a1;
-                this.a1 = a;
-                this.dq("OuterLabelColumn", b, this.a4);
+        set ba(a) {
+            if (this.a6 != a) {
+                let b = this.a6;
+                this.a6 = a;
+                this.ed("OuterLabelColumn", b, this.ba);
             }
         }
-        get bw() {
-            return this.bu;
+        get b8() {
+            return this.b6;
         }
-        set bw(a) {
-            let b = this.bu;
-            this.bu = a;
-            this.dq("FormatInnerLabel", b, a);
+        set b8(a) {
+            let b = this.b6;
+            this.b6 = a;
+            this.ed("FormatInnerLabel", b, a);
         }
-        get bx() {
-            return this.bv;
+        get b9() {
+            return this.b7;
         }
-        set bx(a) {
-            let b = this.bv;
-            this.bv = a;
-            this.dq("FormatOuterLabel", b, a);
+        set b9(a) {
+            let b = this.b7;
+            this.b7 = a;
+            this.ed("FormatOuterLabel", b, a);
         }
-        get bj() {
-            return this.bk;
+        get br() {
+            return this.bs;
         }
-        get cz() {
-            return this.b2;
+        get dk() {
+            return this.ce;
         }
-        set cz(a) {
-            let b = this.b2;
-            this.b2 = a;
-            this.dq("TextStyle", b, a);
+        set dk(a) {
+            let b = this.ce;
+            this.ce = a;
+            this.ed("TextStyle", b, a);
         }
-        get cr() {
-            return this.b1;
+        get dc() {
+            return this.cd;
         }
-        set cr(a) {
-            let b = this.b1;
-            this.b1 = a;
-            this.dq("OuterLabelTextStyle", b, a);
+        set dc(a) {
+            let b = this.cd;
+            this.cd = a;
+            this.ed("OuterLabelTextStyle", b, a);
         }
         onDetachedFromUI() {
             this.ax.e.az();
@@ -2161,18 +2301,22 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
         onAttachedToUI() {
             this.ax.e.ax(this);
         }
-        dq(a, b, c) {
-            if (this.ba(a, b, c) || this.a9(a, b, c) || this.bc(a, b, c) || this.bb(a, b, c)) {
+        ed(a, b, c) {
+            if (this.bh(a, b, c) || this.bg(a, b, c) || this.bf(a, b, c) || this.bj(a, b, c) || this.bi(a, b, c)) {
                 return;
             }
             if (a == "PixelScalingRatio") {
-                if (isNaN_(DeviceUtils.a(this.bs))) {
-                    this.bn = 1;
+                if (isNaN_(DeviceUtils.a(this.b3))) {
+                    this.bx = 1;
                 }
                 else {
-                    this.bn = DeviceUtils.a(this.bs);
+                    this.bx = DeviceUtils.a(this.b3);
                 }
             }
+            if (a == XamFunnelChart.$$p[6]) {
+                this.eo();
+                return;
+            }
             this.ap.i(((() => {
                 let $ret = new PropertyChangedMessage();
                 $ret.g = a;
@@ -2181,8 +2325,8 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
                 return $ret;
             })()));
         }
-        a9(a, b, c) {
-            if (a == XamFunnelChart.$$p[2] || a == XamFunnelChart.$$p[17]) {
+        bf(a, b, c) {
+            if (a == XamFunnelChart.$$p[2] || a == XamFunnelChart.$$p[21]) {
                 this.ap.i(((() => {
                     let $ret = new PropertyChangedMessage();
                     $ret.g = a;
@@ -2194,107 +2338,193 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
             }
             return false;
         }
-        ba(a, b, c) {
-            if (a == XamFunnelChart.$$p[8]) {
+        bh(a, b, c) {
+            if (a == XamFunnelChart.$$p[12]) {
                 if (b != null) {
                     this.az = null;
+                    if (this.a0 != null && this.highlightedItemsSource == null) {
+                        this.a0 = null;
+                    }
                 }
                 if (c != null) {
-                    this.bj.clear();
+                    this.br.clear();
                     this.az = ((() => {
                         let $ret = new FastItemsSource();
                         $ret.e = this.itemsSource;
                         return $ret;
                     })());
+                    if (this.highlightedItemsSource == null) {
+                        this.a0 = ((() => {
+                            let $ret = new FastItemsSource();
+                            $ret.e = this.itemsSource;
+                            return $ret;
+                        })());
+                    }
                 }
                 return true;
             }
             else if (a == XamFunnelChart.$$p[3]) {
                 if (b != null) {
                     let d = b;
-                    d.event = delegateRemove(d.event, this.bt);
+                    d.event = delegateRemove(d.event, this.b4);
                 }
                 if (c != null) {
                     let e = c;
-                    e.event = delegateCombine(e.event, this.bt);
+                    e.event = delegateCombine(e.event, this.b4);
                 }
-                this.de(a, b, c);
+                this.d1(a, b, c);
                 return true;
             }
-            else if (a == XamFunnelChart.$$p[26] || a == XamFunnelChart.$$p[5] || a == XamFunnelChart.$$p[14]) {
-                this.de(a, b, c);
+            else if (a == XamFunnelChart.$$p[30] || a == XamFunnelChart.$$p[9] || a == XamFunnelChart.$$p[18]) {
+                this.d1(a, b, c);
                 return false;
             }
             return false;
         }
-        a5(a, b) {
+        bg(a, b, c) {
+            if (a == XamFunnelChart.$$p[7]) {
+                if (b != null) {
+                    this.a0 = null;
+                }
+                if (c != null) {
+                    this.br.clear();
+                    this.a0 = ((() => {
+                        let $ret = new FastItemsSource();
+                        $ret.e = this.highlightedItemsSource;
+                        return $ret;
+                    })());
+                }
+                else if (this.itemsSource != null) {
+                    this.br.clear();
+                    this.a0 = ((() => {
+                        let $ret = new FastItemsSource();
+                        $ret.e = this.itemsSource;
+                        return $ret;
+                    })());
+                }
+                this.en();
+                return true;
+            }
+            else if (a == XamFunnelChart.$$p[5]) {
+                if (b != null) {
+                    let d = b;
+                    d.event = delegateRemove(d.event, this.b5);
+                }
+                if (c != null) {
+                    let e = c;
+                    e.event = delegateCombine(e.event, this.b5);
+                }
+                this.d0(a, b, c);
+                return true;
+            }
+            else if (a == XamFunnelChart.$$p[8]) {
+                this.d0(a, b, c);
+                return false;
+            }
+            return false;
+        }
+        bb(a, b) {
             return a.registerColumn(b, null, false);
         }
-        a6(a, b) {
+        bc(a, b) {
             return a.registerColumnObject(b, null, false);
         }
-        de(a, b, c) {
+        d1(a, b, c) {
             if (this.az == null) {
                 let d = typeCast(FastItemsSource.$, b);
                 if (d != null) {
-                    if (this.a7 != null) {
-                        d.deregisterColumn(this.a7);
+                    if (this.bd != null) {
+                        d.deregisterColumn(this.bd);
                     }
-                    if (this.a3 != null) {
-                        d.deregisterColumn(this.a3);
+                    if (this.a9 != null) {
+                        d.deregisterColumn(this.a9);
                     }
-                    if (this.a4 != null) {
-                        d.deregisterColumn(this.a4);
+                    if (this.ba != null) {
+                        d.deregisterColumn(this.ba);
                     }
-                    this.a7 = null;
-                    this.a3 = null;
-                    this.a4 = null;
+                    this.bd = null;
+                    this.a9 = null;
+                    this.ba = null;
                 }
                 return;
             }
             if (b != null && typeof b === 'string') {
                 switch (a) {
-                    case XamFunnelChart.$$p[26]:
-                        this.az.deregisterColumn(this.a7);
-                        this.a7 = null;
+                    case XamFunnelChart.$$p[30]:
+                        this.az.deregisterColumn(this.bd);
+                        this.bd = null;
                         break;
-                    case XamFunnelChart.$$p[5]:
-                        this.az.deregisterColumn(this.a3);
-                        this.a3 = null;
+                    case XamFunnelChart.$$p[9]:
+                        this.az.deregisterColumn(this.a9);
+                        this.a9 = null;
                         break;
-                    case XamFunnelChart.$$p[14]:
-                        this.az.deregisterColumn(this.a4);
-                        this.a4 = null;
+                    case XamFunnelChart.$$p[18]:
+                        this.az.deregisterColumn(this.ba);
+                        this.ba = null;
                         break;
                 }
             }
             if (c != null && typeCast(FastItemsSource.$, c) !== null) {
-                if (this.c9 != null) {
-                    this.a7 = this.a5(c, this.c9);
+                if (this.dv != null) {
+                    this.bd = this.bb(c, this.dv);
                 }
-                if (this.cd != null) {
-                    this.a3 = this.a6(c, this.cd);
+                if (this.cy != null) {
+                    this.a9 = this.bc(c, this.cy);
                 }
-                if (this.co != null) {
-                    this.a4 = this.a6(c, this.co);
+                if (this.c9 != null) {
+                    this.ba = this.bc(c, this.c9);
                 }
             }
             if (c != null && typeof c === 'string') {
                 switch (a) {
-                    case XamFunnelChart.$$p[26]:
-                        this.a7 = this.a5(this.az, this.c9);
+                    case XamFunnelChart.$$p[30]:
+                        this.bd = this.bb(this.az, this.dv);
                         break;
-                    case XamFunnelChart.$$p[5]:
-                        this.a3 = this.a6(this.az, this.cd);
+                    case XamFunnelChart.$$p[9]:
+                        this.a9 = this.bc(this.az, this.cy);
+                        break;
+                    case XamFunnelChart.$$p[18]:
+                        this.ba = this.bc(this.az, this.c9);
+                        break;
+                }
+            }
+        }
+        d0(a, b, c) {
+            if (this.a0 == null) {
+                let d = typeCast(FastItemsSource.$, b);
+                if (d != null) {
+                    if (this.a8 != null) {
+                        d.deregisterColumn(this.a8);
+                    }
+                    this.a8 = null;
+                }
+                this.en();
+                return;
+            }
+            if (b != null && typeof b === 'string') {
+                switch (a) {
+                    case XamFunnelChart.$$p[8]:
+                        this.a0.deregisterColumn(this.a8);
+                        this.a8 = null;
                         break;
-                    case XamFunnelChart.$$p[14]:
-                        this.a4 = this.a6(this.az, this.co);
+                }
+            }
+            if (c != null && typeCast(FastItemsSource.$, c) !== null) {
+                if (this.cr != null) {
+                    this.a8 = this.bb(c, this.cr);
+                }
+            }
+            if (c != null && typeof c === 'string') {
+                switch (a) {
+                    case XamFunnelChart.$$p[8]:
+                        this.a8 = this.bb(this.a0, this.cr);
                         break;
                 }
             }
+            this.en();
         }
-        bc(a, b, c) {
-            if (a == XamFunnelChart.$$p[6] || a == XamFunnelChart.$$p[15]) {
+        bj(a, b, c) {
+            if (a == XamFunnelChart.$$p[10] || a == XamFunnelChart.$$p[19]) {
                 let d = EnumUtil.getEnumValue(Visibility_$type, b) == 0;
                 let e = EnumUtil.getEnumValue(Visibility_$type, c) == 0;
                 this.ap.i(((() => {
@@ -2308,8 +2538,8 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
             }
             return false;
         }
-        bb(a, b, c) {
-            if (a == XamFunnelChart.$$p[20]) {
+        bi(a, b, c) {
+            if (a == XamFunnelChart.$$p[24]) {
                 let d = new PropertyChangedMessage();
                 d.g = a;
                 if (b != null) {
@@ -2323,7 +2553,7 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
             }
             return false;
         }
-        dx(a) {
+        ek(a) {
             let b = a;
             if (this.sliceClicked != null) {
                 let c = new FunnelSliceClickedEventArgs();
@@ -2335,7 +2565,7 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
                 this.sliceClicked(this, c);
             }
         }
-        dy(a) {
+        el(a) {
             let b = a;
             switch (b.c) {
                 case 1:
@@ -2380,11 +2610,11 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
                     }
             }
         }
-        du(a) {
+        eh(a) {
         }
-        dt(a, b) {
+        eg(a, b) {
         }
-        df(a, b, c, d) {
+        d3(a, b, c, d) {
             let e = new List$1(Base.$, 0);
             for (let f of fromEnum(a)) {
                 if (!d.containsKey(f)) {
@@ -2408,31 +2638,31 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
         get count() {
             return this.az != null ? this.az.count : 0;
         }
-        dd() {
+        dz() {
             this.ax.i();
         }
         provideContainer(a) {
-            let b = this.bz;
-            this.bz = a;
-            this.dq("Container", b, this.bz);
+            let b = this.cb;
+            this.cb = a;
+            this.ed("Container", b, this.cb);
         }
         notifyResized() {
             this.ax.g();
             this.ap.i(new ContainerSizeChangedMessage());
         }
-        dm(source_, a, b, c) {
-            this.di(source_, new NotifyCollectionChangedEventArgs(2, 2, c, b, a));
+        ea(source_, a, b, c) {
+            this.d6(source_, new NotifyCollectionChangedEventArgs(2, 2, c, b, a));
         }
-        dh(source_) {
-            this.di(source_, new NotifyCollectionChangedEventArgs(0, 4));
+        d5(source_) {
+            this.d6(source_, new NotifyCollectionChangedEventArgs(0, 4));
         }
-        dj(source_, a, b) {
-            this.di(source_, new NotifyCollectionChangedEventArgs(1, 0, b, a));
+        d7(source_, a, b) {
+            this.d6(source_, new NotifyCollectionChangedEventArgs(1, 0, b, a));
         }
-        dk(source_, a, b) {
-            this.di(source_, new NotifyCollectionChangedEventArgs(1, 1, b, a));
+        d8(source_, a, b) {
+            this.d6(source_, new NotifyCollectionChangedEventArgs(1, 1, b, a));
         }
-        di(s_, a) {
+        d6(s_, a) {
             if (s_.dataView && s_.dataSource) {
                 s_ = s_.dataView();
             }
@@ -2465,22 +2695,22 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
             b.f();
             let d = a == null ? 0 : a.length;
             while (d-- > 0) {
-                b.k(a[d], c.am.a.item(a[d]));
+                b.k(a[d], c.ao.a.item(a[d]));
             }
-            c.bj = true;
-            c.df();
+            c.bl = true;
+            c.dj();
         }
-        dz(a) {
+        em(a) {
             let b = this.av();
             if (b == null) {
                 return;
             }
             let c = this.ay();
-            let d = c.am.a.item(a);
+            let d = c.ao.a.item(a);
             if (d != null) {
                 c.ai.k(a, d);
-                c.bj = true;
-                c.df();
+                c.bl = true;
+                c.dj();
             }
         }
         aw() {
@@ -2493,13 +2723,13 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
                 }
             }
             a.opacity = this._opacity;
-            a.isInverted = this.bd;
-            a.selectedItems = this.bj;
+            a.isInverted = this.bk;
+            a.selectedItems = this.br;
             a.name = this.name;
-            a.viewport = new RectData(0, 0, this.ax.c.b4, this.ax.c.b3);
+            a.viewport = new RectData(0, 0, this.ax.c.b8, this.ax.c.b7);
             return a;
         }
-        b7() {
+        cl() {
             let a = this.aw();
             a.scaleByViewport();
             return a.serialize();
@@ -2509,25 +2739,25 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
         }
         forSubItems(a) {
         }
-        get bs() {
-            return this.bm;
+        get b3() {
+            return this.bv;
         }
-        set bs(a) {
+        set b3(a) {
             if (isNaN_(a) || a == 0) {
                 return;
             }
-            let b = this.bm;
-            this.bm = a;
-            this.dq("PixelScalingRatio", b, this.bm);
+            let b = this.bv;
+            this.bv = a;
+            this.ed("PixelScalingRatio", b, this.bv);
         }
-        get bn() {
-            return this.bl;
+        get bx() {
+            return this.bu;
         }
-        set bn(a) {
-            let b = this.bl;
-            this.bl = a;
-            if (this.bl != b) {
-                this.dq("ActualPixelScalingRatio", b, this.bl);
+        set bx(a) {
+            let b = this.bu;
+            this.bu = a;
+            if (this.bu != b) {
+                this.ed("ActualPixelScalingRatio", b, this.bu);
             }
         }
         get container() {
@@ -2548,29 +2778,30 @@ export let XamFunnelChart = /*@__PURE__*/ (() => {
         get hasMarkers() {
             return false;
         }
-        get et() {
-            return this.er;
+        get fn() {
+            return this.fl;
         }
-        set et(a) {
-            let b = this.et;
+        set fn(a) {
+            let b = this.fn;
             if (a != b) {
-                this.er = a;
-                this.dq("OuterLabelTextColor", b, this.et);
+                this.fl = a;
+                this.ed("OuterLabelTextColor", b, this.fn);
             }
         }
-        get eu() {
-            return this.es;
+        get fo() {
+            return this.fm;
         }
-        set eu(a) {
-            let b = this.eu;
+        set fo(a) {
+            let b = this.fo;
             if (a != b) {
-                this.es = a;
-                this.dq("LabelTextColor", b, this.eu);
+                this.fm = a;
+                this.ed("LabelTextColor", b, this.fo);
             }
         }
     }
     XamFunnelChart.$t = /*@__PURE__*/ markType(XamFunnelChart, 'XamFunnelChart', Control.$, [IItemProvider_$type, ILegendOwner_$type, ILegendTemplateProvider_$type, ILegendSeries_$type]);
-    XamFunnelChart.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, XamFunnelChart, 'dq', ['AllowSliceSelection:a8:d0', [0, false], 'BottomEdgeWidth:bo:d1', [1, 0.35], 'Brushes:ah:d2', [BrushCollection.$, null], 'FastItemsSource:az:d3', [FastItemsSource.$], 'FunnelSliceDisplay:ak:d4', [FunnelSliceDisplay_$type, /*@__PURE__*/ enumGetBox(FunnelSliceDisplay_$type, 0)], 'InnerLabelMemberPath:cd:d5', [2, null], 'InnerLabelVisibility:ez:d6', [Visibility_$type, /*@__PURE__*/ enumGetBox(Visibility_$type, 0)], 'IsInverted:bd:d7', [0, false], 'ItemsSource::d8', [IEnumerable_$type, null], 'LegendItemBadgeTemplate::d9', [DataTemplate.$, null], 'LegendItemTemplate::ea', [DataTemplate.$, null], 'Legend::eb', [IChartLegend_$type, null], 'LowerBezierControlPoint:ev:ec', [Point_$type, { $type: Point_$type, x: 0.5, y: 1 }], 'OuterLabelAlignment:au:ed', [OuterLabelAlignment_$type, /*@__PURE__*/ enumGetBox(OuterLabelAlignment_$type, 0)], 'OuterLabelMemberPath:co:ee', [2, null], 'OuterLabelVisibility:e0:ef', [Visibility_$type, /*@__PURE__*/ enumGetBox(Visibility_$type, 1)], 'OutlineThickness:bq:eh', [1, -1], 'Outlines:ai:eg', [BrushCollection.$, null], 'SelectedSliceStyle:ex:ei', [Style.$, null], 'ToolTip:b0:ej', [4, null], 'TransitionDuration:by:ek', [1, 0], 'UnselectedSliceStyle:ey:el', [Style.$, null], 'UpperBezierControlPoint:ew:em', [Point_$type, { $type: Point_$type, x: 0.5, y: 0 }], 'UseBezierCurve:be:en', [0, false], 'UseOuterLabelsForLegend:bf:eo', [0, false], 'UseUnselectedStyle:bg:ep', [0, false], 'ValueMemberPath:c9:eq', [2, null]]);
+    XamFunnelChart.ex = /*@__PURE__*/ DependencyProperty.i("HighlightValueDisplayMode", HighlightedValueDisplayMode_$type, XamFunnelChart.$, /*@__PURE__*/ new PropertyMetadata(2, /*@__PURE__*/ enumGetBox(HighlightedValueDisplayMode_$type, 0), (a, b) => a.ed("HighlightValueDisplayMode", b.oldValue, b.newValue)));
+    XamFunnelChart.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, XamFunnelChart, 'ed', ['AllowSliceSelection:be:ep', [0, false], 'BottomEdgeWidth:by:eq', [1, 0.35], 'Brushes:ah:er', [BrushCollection.$, null], 'FastItemsSource:az:es', [FastItemsSource.$], 'FunnelSliceDisplay:ak:et', [FunnelSliceDisplay_$type, /*@__PURE__*/ enumGetBox(FunnelSliceDisplay_$type, 0)], 'HighlightFastItemsSource:a0:ew', [FastItemsSource.$], 'HighlightValueOpacity:b0:ey', [1, 0.5], 'HighlightedItemsSource::eu', [IEnumerable_$type, null], 'HighlightedValueMemberPath:cr:ev', [2, null], 'InnerLabelMemberPath:cy:ez', [2, null], 'InnerLabelVisibility:ft:e0', [Visibility_$type, /*@__PURE__*/ enumGetBox(Visibility_$type, 0)], 'IsInverted:bk:e1', [0, false], 'ItemsSource::e2', [IEnumerable_$type, null], 'LegendItemBadgeTemplate::e3', [DataTemplate.$, null], 'LegendItemTemplate::e4', [DataTemplate.$, null], 'Legend::e5', [IChartLegend_$type, null], 'LowerBezierControlPoint:fp:e6', [Point_$type, { $type: Point_$type, x: 0.5, y: 1 }], 'OuterLabelAlignment:au:e7', [OuterLabelAlignment_$type, /*@__PURE__*/ enumGetBox(OuterLabelAlignment_$type, 0)], 'OuterLabelMemberPath:c9:e8', [2, null], 'OuterLabelVisibility:fu:e9', [Visibility_$type, /*@__PURE__*/ enumGetBox(Visibility_$type, 1)], 'OutlineThickness:b1:fb', [1, -1], 'Outlines:ai:fa', [BrushCollection.$, null], 'SelectedSliceStyle:fr:fc', [Style.$, null], 'ToolTip:cc:fd', [4, null], 'TransitionDuration:ca:fe', [1, 0], 'UnselectedSliceStyle:fs:ff', [Style.$, null], 'UpperBezierControlPoint:fq:fg', [Point_$type, { $type: Point_$type, x: 0.5, y: 0 }], 'UseBezierCurve:bl:fh', [0, false], 'UseOuterLabelsForLegend:bm:fi', [0, false], 'UseUnselectedStyle:bn:fj', [0, false], 'ValueMemberPath:dv:fk', [2, null]]);
     return XamFunnelChart;
 })();
 /**
@@ -2585,7 +2816,7 @@ export let XamFunnelConnector = /*@__PURE__*/ (() => {
             return this.b;
         }
         g() {
-            this.c.at.av(this.a);
+            this.c.av.av(this.a);
         }
         constructor(a, b) {
             super();
@@ -2599,7 +2830,7 @@ export let XamFunnelConnector = /*@__PURE__*/ (() => {
             c.c("ModelUpdateMessages", new MessageChannel());
             a.av(b);
             let d = new XamFunnelController();
-            d.at = a;
+            d.av = a;
             d.ac = c;
             a.i = c;
             this.b = d;
@@ -2621,7 +2852,7 @@ export let XamFunnelConnector = /*@__PURE__*/ (() => {
             }
         }
         i() {
-            this.b.df();
+            this.b.dj();
         }
     }
     XamFunnelConnector.$t = /*@__PURE__*/ markType(XamFunnelConnector, 'XamFunnelConnector');