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

package/esm2015/lib/DataLegendContent_combined.js

@@ -12,7 +12,7 @@ import { FontInfo } from "igniteui-webcomponents-core";
 import { Thickness } from "igniteui-webcomponents-core";
 import { Size } from "igniteui-webcomponents-core";
 import { Rect } from "igniteui-webcomponents-core";
-import { stringIsNullOrEmpty, stringEmpty } from "igniteui-webcomponents-core";
+import { stringIsNullOrEmpty, stringEmpty, stringContains } from "igniteui-webcomponents-core";
 import { DataLegendSeriesContext } from "igniteui-webcomponents-core";
 import { LegendItemBadgeShape_$type } from "igniteui-webcomponents-core";
 import { Control } from "igniteui-webcomponents-core";
@@ -32,7 +32,6 @@ import { Extensions } from "igniteui-webcomponents-core";
 import { TextBlock } from "igniteui-webcomponents-core";
 import { DataLegendVisualDataRow } from "./DataLegendVisualDataRow";
 import { DataLegendVisualDataColumn } from "./DataLegendVisualDataColumn";
-import { IDataLegendSeries_$type } from "igniteui-webcomponents-core";
 import { RectData } from "igniteui-webcomponents-core";
 import { AppearanceHelper } from "igniteui-webcomponents-core";
 import { FrameworkElement } from "igniteui-webcomponents-core";
@@ -45,14 +44,15 @@ import { DataLegendSummaryCalculationEmpty } from "./DataLegendSummaryCalculatio
 import { DataLegendStylingRowEventArgs } from "./DataLegendStylingRowEventArgs";
 import { DataLegendStylingColumnEventArgs } from "./DataLegendStylingColumnEventArgs";
 import { Dictionary$2 } from "igniteui-webcomponents-core";
-import { DataLegendColumn } from "./DataLegendColumn";
+import { IDataLegendSeries_$type } from "igniteui-webcomponents-core";
+import { DataLegendSeriesGroupInfo } from "./DataLegendSeriesGroupInfo";
 import { RenderingContext } from "igniteui-webcomponents-core";
 import { DataLegendRenderContext } from "./DataLegendRenderContext";
 import { Pool$1 } from "igniteui-webcomponents-core";
 import { ContentControl } from "igniteui-webcomponents-core";
 import { DataLegendSeriesValueInfo } from "igniteui-webcomponents-core";
+import { DataLegendColumn } from "./DataLegendColumn";
 import { DataLegendSummaryColumn } from "igniteui-webcomponents-core";
-import { DataLegendSeriesGroup_$type } from "igniteui-webcomponents-core";
 import { DataAbbreviator } from "./DataAbbreviator";
 import { NumberFormatSpecifier } from "igniteui-webcomponents-core";
 import { DateTimeFormatSpecifier } from "igniteui-webcomponents-core";
@@ -95,18 +95,20 @@ export let DataLegendContent = /*@__PURE__*/ (() => {
  */
 export let DataLegendRowBase = /*@__PURE__*/ (() => {
     class DataLegendRowBase extends Base {
-        constructor(a, b, c, d) {
+        constructor(a, b, c, d, e) {
             super();
-            this.e = 0;
+            this.f = 0;
+            this.c = false;
+            this.e = false;
+            this.a = false;
             this.b = false;
             this.d = false;
-            this.a = false;
-            this.c = false;
-            this.e = d;
-            this.d = b;
-            this.a = c;
-            this.c = !c && !b;
-            this.b = true;
+            this.f = e;
+            this.e = b;
+            this.b = c;
+            this.a = d;
+            this.d = !c && !b && !d;
+            this.c = true;
         }
     }
     DataLegendRowBase.$t = /*@__PURE__*/ markType(DataLegendRowBase, 'DataLegendRowBase');
@@ -117,99 +119,109 @@ export let DataLegendRowBase = /*@__PURE__*/ (() => {
  */
 export let DataLegendRowCell = /*@__PURE__*/ (() => {
     class DataLegendRowCell extends DataLegendRowBase {
-        constructor(a, b, c, d) {
-            super(a, b, c, d);
+        constructor(a, b, c, d, e) {
+            super(a, b, c, d, e);
+            this.t = 0;
+            this.g = 0;
             this.s = 0;
-            this.f = 0;
-            this.r = 0;
-            this.w = null;
-            this.v = null;
-            this.t = null;
             this.x = null;
+            this.w = null;
             this.u = null;
-            this.z = null;
+            this.y = null;
+            this.v = null;
             this.aa = null;
             this.ab = null;
-            this.g = null;
-            this.i = null;
+            this.ac = null;
             this.h = null;
-            this.al = null;
-            this.an = null;
+            this.j = null;
+            this.i = null;
             this.am = null;
+            this.ao = null;
+            this.an = null;
+            this.ah = new Size();
+            this.al = new Size();
+            this.aj = new Size();
+            this.n = false;
+            this.k = false;
+            this.ad = null;
+            this.af = null;
+            this.ae = null;
             this.ag = new Size();
             this.ak = new Size();
             this.ai = new Size();
-            this.m = false;
-            this.j = false;
-            this.ac = null;
-            this.ae = null;
-            this.ad = null;
-            this.af = new Size();
-            this.aj = new Size();
-            this.ah = new Size();
-            this.r = NaN;
-            this.al = new Thickness(0, 0);
-            this.an = new Thickness(0, 0);
+            this.s = NaN;
             this.am = new Thickness(0, 0);
-            this.ag = new Size(1, 0, 0);
-            this.ak = new Size(1, 0, 0);
-            this.ai = new Size(1, 0, 0);
-            this.m = true;
-            this.j = true;
-            if (this.c) {
-                this.z = a.bt();
-                this.ab = a.bv();
-                this.aa = a.bu();
-                this.g = a.j();
-                this.i = a.n();
-                this.h = a.m();
-            }
-            else if (this.d) {
-                let e = a.bs();
-                let f = a.k();
-                this.z = e;
-                this.ab = e;
-                this.aa = e;
-                this.g = f;
-                this.i = f;
-                this.h = f;
+            this.ao = new Thickness(0, 0);
+            this.an = new Thickness(0, 0);
+            this.ah = new Size(1, 0, 0);
+            this.al = new Size(1, 0, 0);
+            this.aj = new Size(1, 0, 0);
+            this.n = true;
+            this.k = true;
+            if (this.d) {
+                this.aa = a.bw();
+                this.ac = a.by();
+                this.ab = a.bx();
+                this.h = a.l();
+                this.j = a.p();
+                this.i = a.o();
+            }
+            else if (this.e) {
+                let f = a.bv();
+                let g = a.m();
+                this.aa = f;
+                this.ac = f;
+                this.ab = f;
+                this.h = g;
+                this.j = g;
+                this.i = g;
+            }
+            else if (this.a) {
+                let h = a.bs();
+                let i = a.j();
+                this.aa = h;
+                this.ac = h;
+                this.ab = h;
+                this.h = i;
+                this.j = i;
+                this.i = i;
             }
             else {
-                let g = a.bq();
-                let h = a.i();
-                this.z = g;
-                this.ab = g;
-                this.aa = g;
-                this.g = h;
-                this.i = h;
-                this.h = h;
-            }
-            this.ac = Rect.empty;
-            this.ae = Rect.empty;
+                let j = a.bt();
+                let k = a.k();
+                this.aa = j;
+                this.ac = j;
+                this.ab = j;
+                this.h = k;
+                this.j = k;
+                this.i = k;
+            }
             this.ad = Rect.empty;
-        }
-        k() {
-            return this.ag.width > 0 && this.ag.height > 0;
-        }
-        n() {
-            return this.ai.width > 0 && this.ai.height > 0;
-        }
-        p() {
-            return this.ak.width > 0 && this.ak.height > 0;
+            this.af = Rect.empty;
+            this.ae = Rect.empty;
         }
         l() {
-            return this.t != null;
+            return this.ah.width > 0 && this.ah.height > 0;
         }
         o() {
-            return this.u != null;
+            return this.aj.width > 0 && this.aj.height > 0;
         }
         q() {
-            return !stringIsNullOrEmpty(this.x) && this.ak.width > 0 && this.ak.height > 0;
+            return this.al.width > 0 && this.al.height > 0;
         }
-        y() {
-            this.af = new Size(1, 0, 0);
-            this.aj = new Size(1, 0, 0);
-            this.ah = new Size(1, 0, 0);
+        m() {
+            return this.u != null;
+        }
+        p() {
+            return this.v != null;
+        }
+        r() {
+            return !stringIsNullOrEmpty(this.y) && this.al.width > 0 && this.al.height > 0;
+        }
+        z() {
+            this.ag = new Size(1, 0, 0);
+            this.ak = new Size(1, 0, 0);
+            this.ai = new Size(1, 0, 0);
         }
     }
     DataLegendRowCell.$t = /*@__PURE__*/ markType(DataLegendRowCell, 'DataLegendRowCell', DataLegendRowBase.$);
@@ -220,61 +232,70 @@ export let DataLegendRowCell = /*@__PURE__*/ (() => {
  */
 export let DataLegendRowInfo = /*@__PURE__*/ (() => {
     class DataLegendRowInfo extends DataLegendRowBase {
-        o(a) {
-            if (this.k == null) {
+        r(a) {
+            if (this.l == null) {
                 return;
             }
-            for (let b = 0; b < this.k.count; b++) {
-                a(this.k._inner[b]);
+            for (let b = 0; b < this.l.count; b++) {
+                a(this.l._inner[b]);
             }
         }
-        constructor(a, b, c, d) {
-            super(a, b, c, d);
-            this.k = null;
-            this.j = false;
-            this.m = null;
-            this.f = null;
+        constructor(a, b, c, d, e) {
+            super(a, b, c, d, e);
+            this.l = null;
+            this.k = false;
+            this.p = null;
             this.g = null;
-            this.n = null;
+            this.h = null;
             this.q = null;
-            this.i = null;
-            this.p = null;
-            this.t = new Size();
-            this.l = null;
-            this.h = 0;
-            this.w = null;
-            this.v = null;
-            this.x = null;
-            this.u = new Size();
-            this.r = null;
+            this.t = null;
+            this.j = null;
+            this.x = new Size();
+            this.aa = null;
+            this.o = null;
             this.s = null;
-            this.f = new Array(0);
-            this.k = new List$1(DataLegendRowCell.$, 0);
-            this.j = this.c;
-            this.w = new Thickness(0, 0);
-            this.v = new Thickness(0, 0);
-            this.x = new Thickness(0, 0);
-            this.t = new Size(1, 0, 0);
-            this.u = new Size(1, 0, 0);
-            if (this.c) {
-                this.q = a.bt();
-                this.i = a.l();
-            }
-            else if (this.d) {
-                let e = a.bs();
-                let f = a.k();
-                this.q = e;
-                this.i = f;
+            this.w = new Size();
+            this.m = null;
+            this.i = 0;
+            this.n = null;
+            this.z = null;
+            this.y = null;
+            this.u = null;
+            this.v = null;
+            this.g = new Array(0);
+            this.l = new List$1(DataLegendRowCell.$, 0);
+            this.k = this.d;
+            this.z = new Thickness(0, 0);
+            this.y = new Thickness(0, 0);
+            this.aa = new Thickness(0, 0);
+            this.w = new Size(1, 0, 0);
+            this.x = new Size(1, 0, 0);
+            if (this.d) {
+                this.t = a.bw();
+                this.j = a.n();
+            }
+            else if (this.e) {
+                let f = a.bv();
+                let g = a.m();
+                this.t = f;
+                this.j = g;
+            }
+            else if (this.a) {
+                let h = a.bs();
+                let i = a.j();
+                this.t = h;
+                this.j = i;
             }
             else {
-                let g = a.bq();
-                let h = a.i();
-                this.q = g;
-                this.i = h;
+                let j = a.bt();
+                let k = a.k();
+                this.t = j;
+                this.j = k;
             }
-            this.s = Rect.empty;
-            this.r = Rect.empty;
-            this.h = 7;
+            this.v = Rect.empty;
+            this.u = Rect.empty;
+            this.i = 7;
+            this.n = "None";
         }
     }
     DataLegendRowInfo.$t = /*@__PURE__*/ markType(DataLegendRowInfo, 'DataLegendRowInfo', DataLegendRowBase.$);
@@ -285,173 +306,216 @@ export let DataLegendRowInfo = /*@__PURE__*/ (() => {
  */
 export let XamDataLegend = /*@__PURE__*/ (() => {
     class XamDataLegend extends Control {
-        get cm() {
-            return this.ci;
+        get co() {
+            return this.ck;
         }
-        set cm(a) {
-            let b = this.ci;
-            this.ci = a;
-            if (b != this.ci) {
-                this.fy("ActualCursorPositionX", b, this.ci);
+        set co(a) {
+            let b = this.ck;
+            this.ck = a;
+            if (b != this.ck) {
+                this.f7("ActualCursorPositionX", b, this.ck);
             }
         }
-        get cn() {
-            return this.cj;
+        get cp() {
+            return this.cl;
         }
-        set cn(a) {
-            let b = this.cj;
-            this.cj = a;
-            if (b != this.cj) {
-                this.fy("ActualCursorPositionY", b, this.cj);
+        set cp(a) {
+            let b = this.cl;
+            this.cl = a;
+            if (b != this.cl) {
+                this.f7("ActualCursorPositionY", b, this.cl);
             }
         }
-        get co() {
-            return this.ck;
+        get cq() {
+            return this.cm;
         }
-        set co(a) {
-            let b = this.ck;
-            this.ck = a;
-            this.fy("ActualPixelScalingRatio", b, this.ck);
+        set cq(a) {
+            let b = this.cm;
+            this.cm = a;
+            this.f7("ActualPixelScalingRatio", b, this.cm);
         }
-        get bt() {
-            return this.bj;
+        get bw() {
+            return this.bl;
         }
-        set bt(a) {
-            let b = this.bj;
+        set bw(a) {
+            let b = this.bl;
             if (typeof a === 'string') {
-                a = FontUtil.getFontInfoFromString(this.a5.aj, a);
+                a = FontUtil.getFontInfoFromString(this.a6.al, a);
             }
-            this.bj = a;
-            if (b != this.bj) {
-                this.fy("ValueTextStyle", b, this.bj);
+            else if (a == null || a.c()) {
+                a = this.a6.p();
+            }
+            this.bl = a;
+            if (b != this.bl) {
+                this.f7("ValueTextStyle", b, this.bl);
             }
         }
-        get bl() {
-            return this.bb;
+        get bo() {
+            return this.bd;
         }
-        set bl(a) {
-            let b = this.bb;
+        set bo(a) {
+            let b = this.bd;
             if (typeof a === 'string') {
-                a = FontUtil.getFontInfoFromString(this.a5.aj, a);
+                a = FontUtil.getFontInfoFromString(this.a6.al, a);
             }
-            this.bb = a;
-            if (b != this.bb) {
-                this.fy("HeaderTextStyle", b, this.bb);
+            else if (a == null || a.c()) {
+                a = this.a6.k();
+            }
+            this.bd = a;
+            if (b != this.bd) {
+                this.f7("HeaderTextStyle", b, this.bd);
             }
         }
-        get bo() {
-            return this.be;
+        get bn() {
+            return this.bc;
         }
-        set bo(a) {
-            let b = this.be;
+        set bn(a) {
+            let b = this.bc;
             if (typeof a === 'string') {
-                a = FontUtil.getFontInfoFromString(this.a5.aj, a);
+                a = FontUtil.getFontInfoFromString(this.a6.al, a);
             }
-            this.be = a;
-            if (b != this.be) {
-                this.fy("SummaryTitleTextStyle", b, this.be);
+            else if (a == null || a.c()) {
+                a = this.a6.j();
+            }
+            this.bc = a;
+            if (b != this.bc) {
+                this.f7("GroupTextStyle", b, this.bc);
             }
         }
-        get bq() {
+        get br() {
             return this.bg;
         }
-        set bq(a) {
+        set br(a) {
             let b = this.bg;
             if (typeof a === 'string') {
-                a = FontUtil.getFontInfoFromString(this.a5.aj, a);
+                a = FontUtil.getFontInfoFromString(this.a6.al, a);
+            }
+            else if (a == null || a.c()) {
+                a = this.a6.m();
             }
             this.bg = a;
             if (b != this.bg) {
-                this.fy("SummaryValueTextStyle", b, this.bg);
+                this.f7("SummaryTitleTextStyle", b, this.bg);
             }
         }
-        get bn() {
-            return this.bd;
+        get bt() {
+            return this.bi;
         }
-        set bn(a) {
-            let b = this.bd;
+        set bt(a) {
+            let b = this.bi;
             if (typeof a === 'string') {
-                a = FontUtil.getFontInfoFromString(this.a5.aj, a);
+                a = FontUtil.getFontInfoFromString(this.a6.al, a);
             }
-            this.bd = a;
-            if (b != this.bd) {
-                this.fy("SummaryLabelTextStyle", b, this.bd);
+            else if (a == null || a.c()) {
+                a = this.a6.p();
+            }
+            this.bi = a;
+            if (b != this.bi) {
+                this.f7("SummaryValueTextStyle", b, this.bi);
             }
         }
-        get bp() {
+        get bq() {
             return this.bf;
         }
-        set bp(a) {
+        set bq(a) {
             let b = this.bf;
             if (typeof a === 'string') {
-                a = FontUtil.getFontInfoFromString(this.a5.aj, a);
+                a = FontUtil.getFontInfoFromString(this.a6.al, a);
+            }
+            else if (a == null || a.c()) {
+                a = this.a6.l();
             }
             this.bf = a;
             if (b != this.bf) {
-                this.fy("SummaryUnitsTextStyle", b, this.bf);
+                this.f7("SummaryLabelTextStyle", b, this.bf);
             }
         }
         get bs() {
-            return this.bi;
+            return this.bh;
         }
         set bs(a) {
-            let b = this.bi;
+            let b = this.bh;
             if (typeof a === 'string') {
-                a = FontUtil.getFontInfoFromString(this.a5.aj, a);
+                a = FontUtil.getFontInfoFromString(this.a6.al, a);
             }
-            this.bi = a;
-            if (b != this.bi) {
-                this.fy("UnitsTextStyle", b, this.bi);
+            else if (a == null || a.c()) {
+                a = this.a6.o();
+            }
+            this.bh = a;
+            if (b != this.bh) {
+                this.f7("SummaryUnitsTextStyle", b, this.bh);
             }
         }
-        get br() {
-            return this.bh;
+        get bv() {
+            return this.bk;
         }
-        set br(a) {
-            let b = this.bh;
+        set bv(a) {
+            let b = this.bk;
             if (typeof a === 'string') {
-                a = FontUtil.getFontInfoFromString(this.a5.aj, a);
+                a = FontUtil.getFontInfoFromString(this.a6.al, a);
             }
-            this.bh = a;
-            if (b != this.bh) {
-                this.fy("TitleTextStyle", b, this.bh);
+            else if (a == null || a.c()) {
+                a = this.a6.o();
+            }
+            this.bk = a;
+            if (b != this.bk) {
+                this.f7("UnitsTextStyle", b, this.bk);
             }
         }
-        get bm() {
-            return this.bc;
+        get bu() {
+            return this.bj;
         }
-        set bm(a) {
-            let b = this.bc;
+        set bu(a) {
+            let b = this.bj;
             if (typeof a === 'string') {
-                a = FontUtil.getFontInfoFromString(this.a5.aj, a);
+                a = FontUtil.getFontInfoFromString(this.a6.al, a);
             }
-            this.bc = a;
-            if (b != this.bc) {
-                this.fy("LabelTextStyle", b, this.bc);
+            else if (a == null || a.c()) {
+                a = this.a6.n();
+            }
+            this.bj = a;
+            if (b != this.bj) {
+                this.f7("TitleTextStyle", b, this.bj);
+            }
+        }
+        get bp() {
+            return this.be;
+        }
+        set bp(a) {
+            let b = this.be;
+            if (typeof a === 'string') {
+                a = FontUtil.getFontInfoFromString(this.a6.al, a);
+            }
+            else if (a == null || a.c()) {
+                a = this.a6.l();
+            }
+            this.be = a;
+            if (b != this.be) {
+                this.f7("LabelTextStyle", b, this.be);
             }
         }
         get pixelScalingRatio() {
-            return this.cl;
+            return this.cn;
         }
         set pixelScalingRatio(a) {
-            let b = this.cl;
-            this.cl = a;
-            this.fy("PixelScalingRatio", b, this.cl);
+            let b = this.cn;
+            this.cn = a;
+            this.f7("PixelScalingRatio", b, this.cn);
         }
         exportSerializedVisualData() {
             let a = this.exportVisualData();
             return a.serialize();
         }
-        cq(a, b) {
+        cs(a, b) {
             let c = Math.max(b.left, a);
             let d = Math.max(b.right, a);
             let e = Math.max(b.right, a);
             return Math.min(b.top, a);
         }
-        cp(a, b) {
+        cr(a, b) {
             return Math.min(b.left, a);
         }
-        ib(a, b) {
+        is(a, b) {
             let c = Rect.l_op_Equality(a, null) || a.isEmpty || !Extensions.b(a);
             let d = Rect.l_op_Equality(b, null) || b.isEmpty || !Extensions.b(b);
             if (c) {
@@ -473,116 +537,110 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
             let a = new DataLegendVisualData();
             a.width = this.ao.d;
             a.height = this.ao.c;
-            if (this.a5 == null) {
+            if (this.a6 == null) {
                 return a;
             }
             let b = -1;
             let c = -1;
             let d = -1;
             let e = -1;
-            let f = this.a5.ad;
-            let g = this.a5.ab;
-            let h = this.a5.af;
-            let i = this.a5.ae;
+            let f = this.a6.af;
+            let g = this.a6.ad;
+            let h = this.a6.ah;
+            let i = this.a6.ag;
             if (f.count < this.ao.b.count) {
                 return a;
             }
-            if (Rect.l_op_Equality(this.ic, null) || this.ic.isEmpty) {
+            if (Rect.l_op_Equality(this.it, null) || this.it.isEmpty) {
                 a.viewport = null;
             }
             else {
-                a.viewport = new RectData(0, 0, this.ic.width, this.ic.height);
+                a.viewport = new RectData(0, 0, this.it.width, this.it.height);
             }
             for (let j = 0; j < this.ao.b.count; j++) {
                 let k = this.ao.b._inner[j];
                 let l = new DataLegendVisualDataRow();
-                l.seriesIndex = k.e;
-                l.rowMarginTop = k.w.top;
-                l.rowMarginBottom = k.w.bottom;
-                l.rowMarginRight = k.w.right;
-                l.rowMarginLeft = k.w.left;
+                l.seriesIndex = k.f;
+                l.rowMarginTop = k.z.top;
+                l.rowMarginBottom = k.z.bottom;
+                l.rowMarginRight = k.z.right;
+                l.rowMarginLeft = k.z.left;
                 let m = Rect.empty;
-                if (k.b) {
-                    if (Extensions.b(k.s) && f.count > (b + 1)) {
+                if (k.c) {
+                    if (Extensions.b(k.v) && f.count > (b + 1)) {
                         b++;
                         let n = f._inner[b];
-                        let o = this.bk(n, k.i);
+                        let o = this.bm(n, k.j);
                         let p = new DataLegendVisualDataColumn();
-                        p.bounds = RectData.b(k.s);
+                        p.bounds = RectData.b(k.v);
                         p.text = n.al;
-                        p.textColor = AppearanceHelper.b(k.q);
-                        p.marginTop = k.x.top;
-                        p.marginLeft = k.x.left;
-                        p.marginRight = k.x.right;
-                        p.marginBottom = k.x.bottom;
-                        this.f8(p, o);
+                        p.textColor = AppearanceHelper.b(k.t);
+                        p.marginTop = k.aa.top;
+                        p.marginLeft = k.aa.left;
+                        p.marginRight = k.aa.right;
+                        p.marginBottom = k.aa.bottom;
+                        this.gh(p, o);
                         l.columns.add(p);
-                        m = this.ib(m, k.s);
+                        m = this.is(m, k.v);
                     }
-                    for (let q of fromEnum(k.k)) {
-                        if (Extensions.b(q.ac) && g.count > (c + 1)) {
+                    for (let q of fromEnum(k.l)) {
+                        if (Extensions.b(q.ad) && g.count > (c + 1)) {
                             c++;
                             let r = g._inner[c];
-                            let s = this.bk(r, q.g);
+                            let s = this.bm(r, q.h);
                             let t = new DataLegendVisualDataColumn();
-                            t.bounds = RectData.b(q.ac);
+                            t.bounds = RectData.b(q.ad);
                             t.text = r.al;
-                            t.textColor = AppearanceHelper.b(q.z);
-                            t.marginTop = q.al.top;
-                            t.marginLeft = q.al.left;
-                            t.marginRight = q.al.right;
-                            t.marginBottom = q.al.bottom;
-                            this.f8(t, s);
+                            t.textColor = AppearanceHelper.b(q.aa);
+                            t.marginTop = q.am.top;
+                            t.marginLeft = q.am.left;
+                            t.marginRight = q.am.right;
+                            t.marginBottom = q.am.bottom;
+                            this.gh(t, s);
                             l.columns.add(t);
-                            m = this.ib(m, q.ac);
+                            m = this.is(m, q.ad);
                         }
-                        if (Extensions.b(q.ae) && h.count > (d + 1)) {
+                        if (Extensions.b(q.af) && h.count > (d + 1)) {
                             d++;
                             let u = h._inner[d];
-                            let v = this.bk(u, q.i);
+                            let v = this.bm(u, q.j);
                             let w = new DataLegendVisualDataColumn();
-                            w.bounds = RectData.b(q.ae);
+                            w.bounds = RectData.b(q.af);
                             w.text = u.al;
-                            w.textColor = AppearanceHelper.b(q.ab);
-                            w.marginTop = q.an.top;
-                            w.marginLeft = q.an.left;
-                            w.marginRight = q.an.right;
-                            w.marginBottom = q.an.bottom;
-                            this.f8(w, v);
+                            w.textColor = AppearanceHelper.b(q.ac);
+                            w.marginTop = q.ao.top;
+                            w.marginLeft = q.ao.left;
+                            w.marginRight = q.ao.right;
+                            w.marginBottom = q.ao.bottom;
+                            this.gh(w, v);
                             l.columns.add(w);
-                            m = this.ib(m, q.ae);
+                            m = this.is(m, q.af);
                         }
-                        if (Extensions.b(q.ad) && i.count > (e + 1)) {
+                        if (Extensions.b(q.ae) && i.count > (e + 1)) {
                             e++;
                             let x = i._inner[e];
-                            let y = this.bk(x, q.h);
+                            let y = this.bm(x, q.i);
                             let z = new DataLegendVisualDataColumn();
-                            z.bounds = RectData.b(q.ad);
-                            z.text = q.m ? q.u : null;
-                            z.textColor = AppearanceHelper.b(q.aa);
-                            z.marginTop = q.am.top;
-                            z.marginLeft = q.am.left;
-                            z.marginRight = q.am.right;
-                            z.marginBottom = q.am.bottom;
-                            this.f8(z, y);
+                            z.bounds = RectData.b(q.ae);
+                            z.text = q.n ? q.v : null;
+                            z.textColor = AppearanceHelper.b(q.ab);
+                            z.marginTop = q.an.top;
+                            z.marginLeft = q.an.left;
+                            z.marginRight = q.an.right;
+                            z.marginBottom = q.an.bottom;
+                            this.gh(z, y);
                             l.columns.add(z);
-                            m = this.ib(m, q.ad);
+                            m = this.is(m, q.ae);
                         }
                     }
-                    if (k.j) {
-                        m = this.ib(m, k.r);
-                        l.badgeBounds = RectData.b(k.r);
-                        l.badgeMarginTop = k.v.top;
-                        l.badgeMarginBottom = k.v.bottom;
-                        l.badgeMarginRight = k.v.right;
-                        l.badgeMarginLeft = k.v.left;
-                        if (k.e >= 0 && k.e < this.cd.count) {
-                            let aa = this.cd._inner[k.e];
-                            l.badgeShape = aa.getDataLegendBadgeShapeAndMarker();
-                        }
-                        else {
-                            l.badgeShape = "None";
-                        }
+                    if (k.k) {
+                        m = this.is(m, k.u);
+                        l.badgeBounds = RectData.b(k.u);
+                        l.badgeMarginTop = k.y.top;
+                        l.badgeMarginBottom = k.y.bottom;
+                        l.badgeMarginRight = k.y.right;
+                        l.badgeMarginLeft = k.y.left;
+                        l.badgeShape = k.n;
                     }
                     l.rowBounds = RectData.b(m);
                 }
@@ -590,22 +648,22 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        f8(a, b) {
+        gh(a, b) {
             if (b != null) {
-                if (b.p != null) {
-                    a.fontFamily = b.p;
+                if (b.q != null) {
+                    a.fontFamily = b.q;
                 }
-                if (!isNaN_(b.e)) {
-                    a.fontSize = b.e;
+                if (!isNaN_(b.f)) {
+                    a.fontSize = b.f;
                 }
-                a.fontWeight = stringIsNullOrEmpty(b.u) ? "Normal" : b.u;
-                a.fontStyle = stringIsNullOrEmpty(b.s) ? "Normal" : b.s;
-                if (b.q != null) {
-                    a.fontStretch = b.s;
+                a.fontWeight = stringIsNullOrEmpty(b.v) ? "Normal" : b.v;
+                a.fontStyle = stringIsNullOrEmpty(b.t) ? "Normal" : b.t;
+                if (b.r != null) {
+                    a.fontStretch = b.t;
                 }
             }
         }
-        bk(a, b) {
+        bm(a, b) {
             let c = a.dataContext;
             if (c != null) {
                 b = a.dataContext;
@@ -614,10 +672,10 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                 return b;
             }
             else {
-                return FontUtil.toFontInfo(this.a5.aj, b.fontString);
+                return FontUtil.toFontInfo(this.a6.al, b.fontString);
             }
         }
-        a0(a) {
+        a1(a) {
             if (this.calculateColumnSummary != null) {
                 let b = new DataLegendSummaryEventArgs(a.a, a.d);
                 b.summaryValue = a.c;
@@ -628,8 +686,8 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
             }
             return a;
         }
-        a6() {
-            switch (this.a1) {
+        a7() {
+            switch (this.a2) {
                 case 0:
                 case 1: return new DataLegendSummaryCalculationTotal();
                 case 2: return new DataLegendSummaryCalculationAverage();
@@ -639,123 +697,133 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                 default: return new DataLegendSummaryCalculationEmpty();
             }
         }
-        gc(a) {
+        gm(a) {
             if (this.styleSummaryRow != null) {
-                let b = this.ay(a);
+                let b = this.az(a);
                 this.styleSummaryRow(this, b);
-                this.f9(a, b);
+                this.gi(a, b);
             }
-            if (a.b && a.k != null && this.styleSummaryColumn != null) {
-                for (let c = 0; c < a.k.count; c++) {
-                    let d = this.ax(a.k._inner[c]);
-                    d.d = a.e;
-                    d.f = a.m;
+            if (a.c && a.l != null && this.styleSummaryColumn != null) {
+                for (let c = 0; c < a.l.count; c++) {
+                    let d = this.ay(a.l._inner[c]);
+                    d.d = a.f;
+                    d.g = a.p;
                     d.c = c;
+                    d.e = a.o;
                     this.styleSummaryColumn(this, d);
-                    this.gd(a.k._inner[c], d);
+                    this.gn(a.l._inner[c], d);
                 }
             }
         }
-        gb(a) {
+        gl(a) {
             if (this.styleSeriesRow != null) {
-                let b = this.ay(a);
+                let b = this.az(a);
                 this.styleSeriesRow(this, b);
-                this.f9(a, b);
+                this.gi(a, b);
             }
-            if (a.b && a.k != null && this.styleSeriesColumn != null) {
-                for (let c = 0; c < a.k.count; c++) {
-                    let d = this.ax(a.k._inner[c]);
-                    d.d = a.e;
-                    d.f = a.m;
+            if (a.c && a.l != null && this.styleSeriesColumn != null) {
+                for (let c = 0; c < a.l.count; c++) {
+                    let d = this.ay(a.l._inner[c]);
+                    d.d = a.f;
+                    d.g = a.p;
                     d.c = c;
+                    d.e = a.o;
                     this.styleSeriesColumn(this, d);
-                    this.gd(a.k._inner[c], d);
+                    this.gn(a.l._inner[c], d);
                 }
             }
         }
-        ga(a) {
+        gk(a) {
             if (this.styleHeaderRow != null) {
-                let b = this.ay(a);
+                let b = this.az(a);
                 this.styleHeaderRow(this, b);
-                this.f9(a, b);
+                this.gi(a, b);
             }
         }
-        ay(a) {
+        gj(a) {
+            if (this.styleGroupRow != null) {
+                let b = this.az(a);
+                this.styleGroupRow(this, b);
+                this.gi(a, b);
+            }
+        }
+        az(a) {
             let b = new DataLegendStylingRowEventArgs();
-            b.f = a.n;
             b.g = a.q;
-            b.a = a.h;
-            b.b = a.j;
-            b.c = a.b;
-            b.d = a.e;
-            b.e = a.m;
+            b.h = a.t;
+            b.e = a.o;
+            b.a = a.i;
+            b.b = a.k;
+            b.c = a.c;
+            b.d = a.f;
+            b.f = a.p;
             return b;
         }
-        f9(a, b) {
-            a.n = b.f;
+        gi(a, b) {
             a.q = b.g;
-            a.h = b.a;
-            a.j = b.b;
-            a.b = b.c;
+            a.t = b.h;
+            a.i = b.a;
+            a.k = b.b;
+            a.c = b.c;
         }
-        ax(a) {
+        ay(a) {
             let b = new DataLegendStylingColumnEventArgs();
-            b.e = a.t;
-            b.k = a.z;
-            b.g = a.u;
+            b.f = a.u;
             b.l = a.aa;
-            b.j = a.x;
+            b.h = a.v;
             b.m = a.ab;
-            b.b = a.r;
+            b.k = a.y;
+            b.n = a.ac;
+            b.b = a.s;
+            b.j = a.x;
             b.i = a.w;
-            b.h = a.v;
-            b.a = a.f;
+            b.a = a.g;
             return b;
         }
-        gd(a, b) {
-            a.z = b.k;
-            a.t = b.e;
-            a.j = !stringIsNullOrEmpty(a.t);
-            a.u = b.g;
+        gn(a, b) {
             a.aa = b.l;
-            a.m = !stringIsNullOrEmpty(a.u);
-            a.x = b.j;
+            a.u = b.f;
+            a.k = !stringIsNullOrEmpty(a.u);
+            a.v = b.h;
             a.ab = b.m;
+            a.n = !stringIsNullOrEmpty(a.v);
+            a.y = b.k;
+            a.ac = b.n;
         }
-        f1(a, b, c) {
+        ga(a, b, c) {
             switch (a) {
-                case XamDataLegend.$$p[19]:
-                    this.bx = c;
+                case XamDataLegend.$$p[23]:
+                    this.b0 = c;
                     break;
-                case XamDataLegend.$$p[15]:
+                case XamDataLegend.$$p[19]:
                 case XamDataLegend.$$p[3]:
-                    this.gh();
+                    this.gr();
                     break;
-                case XamDataLegend.$$p[14]:
+                case XamDataLegend.$$p[18]:
                 case XamDataLegend.$$p[2]:
-                    this.gg();
+                    this.gq();
                     break;
-                case XamDataLegend.$$p[32]:
+                case XamDataLegend.$$p[36]:
                     let d = c;
                     let e = b;
-                    this.fz(e, d);
+                    this.f8(e, d);
                     break;
-                case XamDataLegend.$$p[30]:
-                    if (this.b1(this.targetCursorPositionX)) {
-                        this.cm = this.targetCursorPositionX;
+                case XamDataLegend.$$p[34]:
+                    if (this.b5(this.targetCursorPositionX)) {
+                        this.co = this.targetCursorPositionX;
                     }
                     break;
-                case XamDataLegend.$$p[31]:
-                    if (this.b1(this.targetCursorPositionY)) {
-                        this.cn = this.targetCursorPositionY;
+                case XamDataLegend.$$p[35]:
+                    if (this.b5(this.targetCursorPositionY)) {
+                        this.cp = this.targetCursorPositionY;
                     }
                     break;
-                case XamDataLegend.$$p[46]:
-                case XamDataLegend.$$p[45]:
-                    if (!stringIsNullOrEmpty(this.e6)) {
+                case XamDataLegend.$$p[50]:
+                case XamDataLegend.$$p[49]:
+                    if (!stringIsNullOrEmpty(this.fc)) {
                         this.ak = ((() => {
                             let $ret = new BindingFormatter();
-                            $ret.j = this.e6;
+                            $ret.j = this.fc;
                             $ret.d = this.ah;
                             return $ret;
                         })());
@@ -764,12 +832,12 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                         this.ak = null;
                     }
                     break;
-                case XamDataLegend.$$p[7]:
-                case XamDataLegend.$$p[6]:
-                    if (!stringIsNullOrEmpty(this.dd)) {
+                case XamDataLegend.$$p[11]:
+                case XamDataLegend.$$p[10]:
+                    if (!stringIsNullOrEmpty(this.dk)) {
                         this.ai = ((() => {
                             let $ret = new BindingFormatter();
-                            $ret.j = this.dd;
+                            $ret.j = this.dk;
                             $ret.d = this.ag;
                             return $ret;
                         })());
@@ -779,71 +847,71 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                     }
                     break;
                 case "PixelScalingRatio":
-                    if (isNaN_(this.co)) {
-                        this.a5.aw();
+                    if (isNaN_(this.cq)) {
+                        this.a6.ay();
                     }
                     else {
-                        this.co = this.pixelScalingRatio;
+                        this.cq = this.pixelScalingRatio;
                     }
                     break;
                 case "ActualPixelScalingRatio":
-                    this.a5.a7(c);
+                    this.a6.a9(c);
                     break;
             }
-            this.f3();
+            this.gc();
         }
-        fy(a, b, c) {
-            this.f1(a, b, c);
+        f7(a, b, c) {
+            this.ga(a, b, c);
             if (this.propertyChanged != null) {
                 this.propertyChanged(this, new PropertyChangedEventArgs(a));
             }
         }
-        fz(a, b) {
-            this.a7 = b;
+        f8(a, b) {
+            this.a8 = b;
             if (a != null) {
                 a.detachDataLegend(this);
             }
             if (b != null) {
                 b.attachDataLegend(this);
                 if (isNaN_(this.targetCursorPositionX)) {
-                    this.cm = -1;
+                    this.co = -1;
                 }
                 if (isNaN_(this.targetCursorPositionY)) {
-                    this.cn = -1;
+                    this.cp = -1;
                 }
             }
         }
-        gh() {
-            this.cb = this.cc(this.includedSeries);
-            this.ca = this.cc(this.excludedSeries);
+        gr() {
+            this.cf = this.cg(this.includedSeries);
+            this.ce = this.cg(this.excludedSeries);
         }
-        gg() {
-            this.b9 = this.cc(this.includedColumns);
-            this.b8 = this.cc(this.excludedColumns);
-            if (this.b9 != null) {
-                let a = new List$1(String_$type, 1, this.b9.keys);
+        gq() {
+            this.cc = this.cg(this.includedColumns);
+            this.cb = this.cg(this.excludedColumns);
+            if (this.cc != null) {
+                let a = new List$1(String_$type, 1, this.cc.keys);
                 for (let b of fromEnum(a)) {
                     let c = b + ":";
-                    let d = this.b9.item(b);
-                    if (!this.b9.containsKey(c)) {
-                        this.b9.addItem(c, d);
+                    let d = this.cc.item(b);
+                    if (!this.cc.containsKey(c)) {
+                        this.cc.addItem(c, d);
                     }
                 }
-                this.fh(this.b9);
+                this.fo(this.cc);
             }
-            if (this.b8 != null) {
-                let e = new List$1(String_$type, 1, this.b8.keys);
+            if (this.cb != null) {
+                let e = new List$1(String_$type, 1, this.cb.keys);
                 for (let f of fromEnum(e)) {
                     let g = f + ":";
-                    let h = this.b8.item(f);
-                    if (!this.b8.containsKey(g)) {
-                        this.b8.addItem(g, h);
+                    let h = this.cb.item(f);
+                    if (!this.cb.containsKey(g)) {
+                        this.cb.addItem(g, h);
                     }
                 }
-                this.fh(this.b8);
+                this.fo(this.cb);
             }
         }
-        fh(a) {
+        fo(a) {
             let b = new List$1(String_$type, 1, a.keys);
             for (let c of fromEnum(b)) {
                 let d = a.item(c);
@@ -863,7 +931,7 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                 }
             }
         }
-        cc(a) {
+        cg(a) {
             if (a == null) {
                 return null;
             }
@@ -876,259 +944,275 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        b1(a) {
+        b5(a) {
             return a >= 0 && a <= 1;
         }
         notifyCursorPositionChanged(a) {
             let b = !isNaN_(this.targetCursorPositionX) || !isNaN_(this.targetCursorPositionY);
-            let c = !isNaN_(a.x) && this.b1(a.x);
-            let d = !isNaN_(a.y) && this.b1(a.y);
+            let c = !isNaN_(a.x) && this.b5(a.x);
+            let d = !isNaN_(a.y) && this.b5(a.y);
             if (!b && c && d) {
-                this.cm = a.x;
-                this.cn = a.y;
+                this.co = a.x;
+                this.cp = a.y;
             }
         }
         notifySizeChanged() {
-            this.a5.a5();
+            this.a6.a7();
         }
         notifyVisualPropertiesChanged(a) {
         }
         notifySeriesCollectionChanged() {
-            this.f3();
+            this.gc();
         }
         notifySeriesDataChanged() {
-            if (this.bx) {
-                this.f3();
+            if (this.b0) {
+                this.gc();
             }
         }
         constructor() {
             super();
-            this.bw = false;
-            this.ci = NaN;
-            this.cj = NaN;
-            this.ck = 1;
-            this.bx = false;
-            this.bj = null;
-            this.bb = null;
-            this.be = null;
-            this.bg = null;
+            this.bz = false;
+            this.ck = NaN;
+            this.cl = NaN;
+            this.cm = 1;
+            this.b0 = false;
+            this.bl = null;
             this.bd = null;
-            this.bf = null;
-            this.a7 = null;
+            this.bc = null;
+            this.bg = null;
             this.bi = null;
+            this.bf = null;
             this.bh = null;
-            this.bc = null;
-            this.cl = NaN;
+            this.a8 = null;
+            this.bk = null;
+            this.bj = null;
+            this.be = null;
+            this.cn = NaN;
             this.calculateColumnSummary = null;
             this.styleHeaderRow = null;
+            this.styleGroupRow = null;
             this.styleSeriesRow = null;
             this.styleSummaryRow = null;
             this.styleSeriesColumn = null;
             this.styleSummaryColumn = null;
             this.propertyChanged = null;
-            this.b9 = null;
-            this.b8 = null;
+            this.cc = null;
             this.cb = null;
-            this.ca = null;
-            this.a5 = null;
-            this.ic = null;
+            this.cf = null;
+            this.ce = null;
+            this.a6 = null;
+            this.it = null;
             this._externalObject = null;
-            this.bu = false;
-            this.bv = false;
+            this.bx = false;
+            this.by = false;
+            this.cj = null;
+            this.cd = new Dictionary$2(String_$type, DataLegendSeriesGroupInfo.$, 0);
             this.ao = new DataLegendContent();
-            this.cd = null;
-            this.ce = new List$1(DataLegendSeriesContext.$, 0);
-            this.b7 = new Dictionary$2(Number_$type, DataLegendColumn.$, 0);
-            this.cs = 0;
+            this.cu = 0;
             this.ak = null;
             this.al = null;
-            this.cy = "";
+            this.c0 = "";
             this.ai = null;
             this.aj = null;
-            this.ic = Rect.empty;
-            this.bx = true;
+            this.it = Rect.empty;
+            this.b0 = true;
             this.ab = XamDataLegend.$;
-            this.a5 = this.a4();
+            this.a6 = this.a5();
         }
         updatePropertyByName(a, b) {
             switch (a) {
-                case XamDataLegend.$$p[15]:
+                case XamDataLegend.$$p[19]:
                     this.includedSeries = b;
                     break;
                 case XamDataLegend.$$p[3]:
                     this.excludedSeries = b;
                     break;
-                case XamDataLegend.$$p[14]:
+                case XamDataLegend.$$p[18]:
                     this.includedColumns = b;
                     break;
                 case XamDataLegend.$$p[2]:
                     this.excludedColumns = b;
                     break;
-                case XamDataLegend.$$p[39]:
+                case XamDataLegend.$$p[43]:
                     this.an = EnumUtil.getEnumValue(DataAbbreviationMode_$type, b);
                     break;
-                case XamDataLegend.$$p[42]:
-                    this.cu = typeGetValue(b);
+                case XamDataLegend.$$p[46]:
+                    this.cw = typeGetValue(b);
                     break;
-                case XamDataLegend.$$p[43]:
-                    this.cv = typeGetValue(b);
+                case XamDataLegend.$$p[47]:
+                    this.cx = typeGetValue(b);
                     break;
-                case XamDataLegend.$$p[44]:
-                    this.a3 = EnumUtil.getEnumValue(DataLegendValueMode_$type, b);
+                case XamDataLegend.$$p[48]:
+                    this.a4 = EnumUtil.getEnumValue(DataLegendValueMode_$type, b);
                     break;
-                case XamDataLegend.$$p[40]:
-                    this.ey = b;
+                case XamDataLegend.$$p[44]:
+                    this.e4 = b;
                     break;
-                case XamDataLegend.$$p[47]:
-                    this.b4 = b;
+                case XamDataLegend.$$p[51]:
+                    this.b8 = b;
                     break;
-                case XamDataLegend.$$p[46]:
-                    this.e6 = b;
+                case XamDataLegend.$$p[50]:
+                    this.fc = b;
                     break;
-                case XamDataLegend.$$p[45]:
+                case XamDataLegend.$$p[49]:
                     this.ah = b;
                     break;
-                case XamDataLegend.$$p[48]:
-                    this.is = b;
-                    break;
-                case XamDataLegend.$$p[49]:
-                    this.b5 = b;
+                case XamDataLegend.$$p[52]:
+                    this.i9 = b;
                     break;
                 case XamDataLegend.$$p[53]:
-                    this.ff = b;
+                    this.b9 = b;
                     break;
-                case XamDataLegend.$$p[52]:
-                    this.b6 = b;
+                case XamDataLegend.$$p[57]:
+                    this.fl = b;
                     break;
-                case XamDataLegend.$$p[51]:
-                    this.it = b;
+                case XamDataLegend.$$p[56]:
+                    this.ca = b;
                     break;
-                case XamDataLegend.$$p[50]:
-                    this.ia = b;
+                case XamDataLegend.$$p[55]:
+                    this.ja = b;
+                    break;
+                case XamDataLegend.$$p[54]:
+                    this.ir = b;
                     break;
                 case "ValueTextStyle":
-                    this.bt = b;
+                    this.bw = b;
                     break;
-                case XamDataLegend.$$p[7]:
-                    this.dd = b;
+                case XamDataLegend.$$p[11]:
+                    this.dk = b;
                     break;
-                case XamDataLegend.$$p[6]:
+                case XamDataLegend.$$p[10]:
                     this.ag = b;
                     break;
-                case XamDataLegend.$$p[4]:
-                    this.c9 = b;
+                case XamDataLegend.$$p[8]:
+                    this.dg = b;
                     break;
-                case XamDataLegend.$$p[5]:
+                case XamDataLegend.$$p[9]:
                     this.ap = EnumUtil.getEnumValue(DataLegendHeaderDateMode_$type, b);
                     break;
-                case XamDataLegend.$$p[8]:
+                case XamDataLegend.$$p[12]:
                     this.aq = EnumUtil.getEnumValue(DataLegendHeaderTimeMode_$type, b);
                     break;
-                case XamDataLegend.$$p[13]:
-                    this.di = b;
+                case XamDataLegend.$$p[17]:
+                    this.dq = b;
                     break;
-                case XamDataLegend.$$p[11]:
-                    this.h1 = b;
+                case XamDataLegend.$$p[15]:
+                    this.ih = b;
                     break;
-                case XamDataLegend.$$p[12]:
-                    this.ik = b;
+                case XamDataLegend.$$p[16]:
+                    this.i2 = b;
                     break;
-                case XamDataLegend.$$p[9]:
-                    this.ij = b;
+                case XamDataLegend.$$p[13]:
+                    this.i1 = b;
                     break;
-                case XamDataLegend.$$p[10]:
-                    this.b0 = b;
+                case XamDataLegend.$$p[14]:
+                    this.b4 = b;
                     break;
                 case "HeaderTextStyle":
-                    this.bl = b;
+                    this.bo = b;
                     break;
-                case XamDataLegend.$$p[23]:
-                    this.h5 = b;
+                case XamDataLegend.$$p[6]:
+                    this.ig = b;
+                    break;
+                case XamDataLegend.$$p[7]:
+                    this.i0 = b;
+                    break;
+                case XamDataLegend.$$p[4]:
+                    this.iz = b;
+                    break;
+                case XamDataLegend.$$p[5]:
+                    this.b2 = b;
+                    break;
+                case "GroupTextStyle":
+                    this.bn = b;
+                    break;
+                case XamDataLegend.$$p[27]:
+                    this.il = b;
                     break;
                 case "SummaryTitleTextStyle":
-                    this.bo = b;
+                    this.br = b;
+                    break;
+                case XamDataLegend.$$p[30]:
+                    this.a2 = EnumUtil.getEnumValue(DataLegendSummaryType_$type, b);
+                    break;
+                case XamDataLegend.$$p[29]:
+                    this.ef = b;
+                    break;
+                case XamDataLegend.$$p[28]:
+                    this.i5 = b;
                     break;
                 case XamDataLegend.$$p[26]:
-                    this.a1 = EnumUtil.getEnumValue(DataLegendSummaryType_$type, b);
-                    break;
-                case XamDataLegend.$$p[25]:
-                    this.d9 = b;
+                    this.i4 = b;
                     break;
-                case XamDataLegend.$$p[24]:
+                case XamDataLegend.$$p[33]:
                     this.io = b;
                     break;
-                case XamDataLegend.$$p[22]:
-                    this.im = b;
-                    break;
-                case XamDataLegend.$$p[29]:
-                    this.h7 = b;
-                    break;
                 case "SummaryValueTextStyle":
-                    this.bq = b;
+                    this.bt = b;
                     break;
-                case XamDataLegend.$$p[21]:
-                    this.d4 = b;
+                case XamDataLegend.$$p[25]:
+                    this.ea = b;
                     break;
-                case XamDataLegend.$$p[20]:
-                    this.h4 = b;
+                case XamDataLegend.$$p[24]:
+                    this.ik = b;
                     break;
                 case "SummaryLabelTextStyle":
-                    this.bn = b;
+                    this.bq = b;
                     break;
-                case XamDataLegend.$$p[28]:
-                    this.ef = b;
+                case XamDataLegend.$$p[32]:
+                    this.el = b;
                     break;
-                case XamDataLegend.$$p[27]:
-                    this.h6 = b;
+                case XamDataLegend.$$p[31]:
+                    this.im = b;
                     break;
                 case "SummaryUnitsTextStyle":
-                    this.bp = b;
+                    this.bs = b;
                     break;
                 case XamDataLegend.$$p[0]:
-                    this.ii = b;
+                    this.iy = b;
                     break;
                 case XamDataLegend.$$p[1]:
-                    this.a8 = EnumUtil.getEnumValue(LegendItemBadgeShape_$type, b);
+                    this.a9 = EnumUtil.getEnumValue(LegendItemBadgeShape_$type, b);
                     break;
-                case XamDataLegend.$$p[35]:
-                    this.a2 = EnumUtil.getEnumValue(DataLegendUnitsMode_$type, b);
-                    break;
-                case XamDataLegend.$$p[38]:
-                    this.es = b;
+                case XamDataLegend.$$p[39]:
+                    this.a3 = EnumUtil.getEnumValue(DataLegendUnitsMode_$type, b);
                     break;
-                case XamDataLegend.$$p[36]:
-                    this.h9 = b;
+                case XamDataLegend.$$p[42]:
+                    this.ey = b;
                     break;
-                case XamDataLegend.$$p[37]:
+                case XamDataLegend.$$p[40]:
                     this.iq = b;
                     break;
+                case XamDataLegend.$$p[41]:
+                    this.i7 = b;
+                    break;
                 case "UnitsTextStyle":
-                    this.bs = b;
+                    this.bv = b;
                     break;
-                case XamDataLegend.$$p[34]:
-                    this.ip = b;
+                case XamDataLegend.$$p[38]:
+                    this.i6 = b;
                     break;
-                case XamDataLegend.$$p[33]:
-                    this.h8 = b;
+                case XamDataLegend.$$p[37]:
+                    this.ip = b;
                     break;
                 case "TitleTextStyle":
-                    this.br = b;
+                    this.bu = b;
                     break;
-                case XamDataLegend.$$p[16]:
+                case XamDataLegend.$$p[20]:
                     this.ar = EnumUtil.getEnumValue(DataLegendLabelMode_$type, b);
                     break;
-                case XamDataLegend.$$p[17]:
-                    this.h2 = b;
+                case XamDataLegend.$$p[21]:
+                    this.ii = b;
                     break;
-                case XamDataLegend.$$p[18]:
-                    this.il = b;
+                case XamDataLegend.$$p[22]:
+                    this.i3 = b;
                     break;
                 case "LabelTextStyle":
-                    this.bm = b;
+                    this.bp = b;
                     break;
             }
         }
-        a4() {
+        a5() {
             return new DataLegendView(this);
         }
         destroy() {
@@ -1141,84 +1225,102 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
             this._externalObject = a;
         }
         flush() {
-            this.a5.at();
+            this.a6.av();
         }
         onAttachedToUI() {
-            this.a5.a3();
+            this.a6.a5();
         }
         onDetachedFromUI() {
-            this.a5.a6();
+            this.a6.a8();
         }
         ensureIndirectContainer(a, b) {
-            if (this.a5.aj == null) {
-                this.a5.a4(a, true);
+            if (this.a6.al == null) {
+                this.a6.a6(a, true);
             }
         }
         provideContainer(a) {
-            this.a5.a4(a, false);
+            this.a6.a6(a, false);
         }
-        f3() {
-            if (this.bu) {
+        gc() {
+            if (this.bx) {
                 return;
             }
-            this.bu = this.a5.y();
+            this.bx = this.a6.aa();
         }
         get shouldOnDemandRender() {
-            return this.bv;
+            return this.by;
         }
         set shouldOnDemandRender(a) {
-            this.bv = a;
+            this.by = a;
         }
         doRender(a, b) {
-            if (this.ic.isEmpty) {
+            if (this.it.isEmpty) {
                 let c = this.getDesiredSize();
-                this.ic = new Rect(0, 0, 0, c.width, c.height);
+                this.it = new Rect(0, 0, 0, c.width, c.height);
             }
-            this.f4(this.ao, true);
-            this.a5.a9(a, b);
+            this.gd(true);
+            this.a6.bb(a, b);
         }
         ensureUpdated() {
             let a = this.getDesiredSize();
         }
-        fq() {
-            if (!this.bu) {
+        fx() {
+            if (!this.bx) {
                 if (this.ao == null) {
-                    this.f3();
+                    this.gc();
                 }
                 else {
                     return;
                 }
             }
-            this.gf();
+            this.gp();
         }
         getDesiredSize() {
-            this.fq();
+            this.fx();
             if (this.ao == null) {
                 return new Size(1, 0, 0);
             }
             return new Size(1, this.ao.d, this.ao.c);
         }
-        gf() {
-            if (this.a7 == null || this.a7.isDetached) {
-                this.fn();
+        gp() {
+            this.fu();
+            if (this.a8 == null || this.a8.isDetached || !this.b3()) {
                 return;
             }
-            let a = this.a7;
+            let a = this.a8;
             let b = a.getDataLegendSeries();
-            let c = this.cg(b);
-            this.fs(c);
+            this.fy(b);
+            this.fn(b, "");
+            this.cj = new List$1(String_$type, 0);
+            for (let c of fromEnum(this.cd.keys)) {
+                let d = this.cd.item(c);
+                this.f1(d);
+                for (let e of fromEnum(d.b)) {
+                    if (!this.cj.contains(e.h) && !stringContains(e.h, "Highlight") && !stringContains(e.h, "Overlay")) {
+                        this.cj.add(e.h);
+                    }
+                }
+            }
+            for (let f of fromEnum(this.cd.keys)) {
+                let g = this.cd.item(f);
+                if (g.c.count > 0) {
+                    this.f0(g);
+                }
+            }
+            this.bz = this.b6();
+            this.ft(this.ao);
         }
-        cg(a) {
+        fy(a) {
             let b = new Dictionary$2(Number_$type, List$1.$.specialize(IDataLegendSeries_$type), 0);
             for (let c = 0; c < a.length; c++) {
-                let d = a[c].title == null ? null : a[c].title.toString();
-                let e = this.cb == null || this.cb.containsKey(a[c].dataLegendKey) || this.cb.containsKey(a[c].index.toString()) || this.cb.containsKey(d);
-                let f = this.ca != null && (this.ca.containsKey(a[c].dataLegendKey) || this.ca.containsKey(a[c].index.toString()) || this.ca.containsKey(d));
-                if (a[c].isValueOverlay && (!e || this.cb == null)) {
+                if (a[c].legendItemVisibility != 0) {
                     continue;
                 }
+                let d = a[c].title == null ? null : a[c].title.toString();
+                let e = this.cf == null || this.cf.containsKey(a[c].dataLegendKey) || this.cf.containsKey(a[c].parentKey) || this.cf.containsKey(a[c].parentTitle) || this.cf.containsKey(a[c].index.toString()) || this.cf.containsKey(a[c].group) || this.cf.containsKey(d);
+                let f = this.ce != null && (this.ce.containsKey(a[c].dataLegendKey) || this.ce.containsKey(a[c].parentKey) || this.ce.containsKey(a[c].parentTitle) || this.ce.containsKey(a[c].index.toString()) || this.ce.containsKey(a[c].group) || this.ce.containsKey(d));
                 if (e && !f) {
-                    let g = this.ct(a[c]);
+                    let g = this.cv(a[c]);
                     if (!b.containsKey(g)) {
                         b.addItem(g, new List$1(IDataLegendSeries_$type, 0));
                     }
@@ -1233,167 +1335,171 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                     i.add(k);
                 }
             }
-            return i;
+            this.cd = new Dictionary$2(String_$type, DataLegendSeriesGroupInfo.$, 0);
+            for (let l of fromEnum(i)) {
+                let m = l.group;
+                if (!this.cd.containsKey(m)) {
+                    this.cd.addItem(m, ((() => {
+                        let $ret = new DataLegendSeriesGroupInfo();
+                        $ret.f = m;
+                        return $ret;
+                    })()));
+                }
+                this.cd.item(m).c.add(l);
+            }
         }
-        ct(a) {
-            if (this.cb == null) {
+        cv(a) {
+            if (this.cf == null) {
                 return a.index;
             }
             let b = a.dataLegendKey;
-            if (this.cb.containsKey(b)) {
-                return this.cb.item(b);
+            if (this.cf.containsKey(b)) {
+                return this.cf.item(b);
             }
             let c = a.index.toString();
-            if (this.cb.containsKey(c)) {
-                return this.cb.item(c);
+            if (this.cf.containsKey(c)) {
+                return this.cf.item(c);
             }
             let d = a.title == null ? null : a.title.toString();
-            if (this.cb.containsKey(d)) {
-                return this.cb.item(d);
+            if (this.cf.containsKey(d)) {
+                return this.cf.item(d);
             }
             return a.index;
         }
-        fp() {
-            this.bu = false;
-            if (!this.a5.x) {
+        fw() {
+            this.bx = false;
+            if (!this.a6.z) {
                 return;
             }
             let a = new Size(1, 0, 0);
             if (this.ao != null) {
                 a = new Size(1, this.ao.d, this.ao.c);
             }
-            this.gf();
+            this.gp();
             let b = new Size(1, 0, 0);
             if (this.ao != null) {
                 b = new Size(1, this.ao.d, this.ao.c);
             }
             if (!a.equals(b)) {
-                this.a5.ao(b.width, b.height);
+                this.a6.aq(b.width, b.height);
             }
-            this.f4(this.ao, this.bv);
+            this.gd(this.by);
         }
-        ft(message_) {
+        f2(message_) {
         }
-        f4(a, b) {
-            let c = new DataLegendRenderContext();
-            for (let d = 0; d < a.b.count; d++) {
-                let e = a.b._inner[d];
-                this.f6(a, e, c);
+        gd(a) {
+            let b = new DataLegendRenderContext();
+            for (let c = 0; c < this.ao.b.count; c++) {
+                let d = this.ao.b._inner[c];
+                this.gf(d, b);
             }
-            this.a5.p.count = c.b;
-            this.a5.q.count = c.c;
-            this.a5.s.count = c.e;
-            this.a5.r.count = c.d;
-            this.a5.o.count = c.a;
-            if (!b) {
-                this.a5.as(a);
+            this.a6.r.count = b.b;
+            this.a6.s.count = b.c;
+            this.a6.u.count = b.e;
+            this.a6.t.count = b.d;
+            this.a6.q.count = b.a;
+            if (!a) {
+                this.a6.au(this.ao);
             }
         }
-        f6(a, b, c) {
-            if (b.t.width > 0 && b.t.height > 0 && !b.a && !b.d && b.j) {
-                let d = this.a5.p.item(c.b);
-                c.b += 1;
-                this.f5(d, a, b, c);
+        gf(a, b) {
+            if (a.w.width > 0 && a.w.height > 0 && !a.b && !a.e && !a.a && a.k) {
+                let c = this.a6.r.item(b.b);
+                b.b += 1;
+                this.ge(c, a, b);
             }
-            this.a5.bb();
-            if (!b.s.isEmpty && b.s.width > 0 && b.s.height > 0) {
-                let e = this.a5.q.item(c.c);
-                c.c += 1;
-                this.f7(e, b.n, b.q, b.i, b.s);
+            this.a6.bd();
+            if (!a.v.isEmpty && a.v.width > 0 && a.v.height > 0) {
+                let d = this.a6.s.item(b.c);
+                b.c += 1;
+                this.gg(d, a.q, a.t, a.j, a.v);
             }
-            for (let f of fromEnum(b.k)) {
-                if (!f.ae.isEmpty && f.q()) {
-                    let g = this.a5.s.item(c.e);
-                    c.e += 1;
-                    this.f7(g, f.x, f.ab, f.i, f.ae);
+            for (let e of fromEnum(a.l)) {
+                if (!e.af.isEmpty && e.r()) {
+                    let f = this.a6.u.item(b.e);
+                    b.e += 1;
+                    this.gg(f, e.y, e.ac, e.j, e.af);
                 }
-                if (!f.ad.isEmpty && f.o() && f.m) {
-                    let h = this.a5.r.item(c.d);
-                    c.d += 1;
-                    this.f7(h, f.u, f.aa, f.h, f.ad);
+                if (!e.ae.isEmpty && e.p() && e.n) {
+                    let g = this.a6.t.item(b.d);
+                    b.d += 1;
+                    this.gg(g, e.v, e.ab, e.i, e.ae);
                 }
-                if (!f.ac.isEmpty && f.l() && f.j) {
-                    let i = this.a5.o.item(c.a);
-                    c.a += 1;
-                    this.f7(i, f.t, f.z, f.g, f.ac);
+                if (!e.ad.isEmpty && e.m() && e.k) {
+                    let h = this.a6.q.item(b.a);
+                    b.a += 1;
+                    this.gg(h, e.u, e.aa, e.h, e.ad);
                 }
             }
-            this.a5.ap();
+            this.a6.ar();
         }
-        f7(a, b, c, d, e) {
+        gg(a, b, c, d, e) {
             a.al = b;
-            this.a5.ba(a, e.left, e.top);
-            this.a5.aq(a, d);
-            this.a5.ar(a, d);
+            this.a6.bc(a, e.left, e.top);
+            this.a6.as(a, d);
+            this.a6.at(a, d);
             a.ao = c;
         }
-        f5(a, b, c, d) {
-            a.ah = c.p;
-            a.content = c.l;
-            a.width = c.t.width;
-            a.height = c.t.height;
-            this.a5.ba(a, c.r.left, c.r.top);
+        ge(a, b, c) {
+            a.ah = b.s;
+            a.content = b.m;
+            a.width = b.w.width;
+            a.height = b.w.height;
+            this.a6.bc(a, b.u.left, b.u.top);
         }
-        by(a, b) {
+        b1(a, b) {
             if (b == null) {
                 return false;
             }
             return a.containsKey(b);
         }
-        fs(a) {
-            if (this.bz()) {
-                this.ao.f();
-                this.cd = a;
-                this.ce.clear();
-                this.cs = 0;
-                this.b7.clear();
-            }
-            else {
-                return;
-            }
-            for (let b = 0; b < a.count; b++) {
-                let c = a._inner[b];
+        f1(a) {
+            a.a.clear();
+            a.b.clear();
+            a.d = 0;
+            for (let b = 0; b < a.c.count; b++) {
+                let c = a.c._inner[b];
                 let d = b;
-                let e = c.getDataLegendResolvedWorldPositionX(this.cm);
-                let f = c.getDataLegendResolvedWorldPositionY(this.cn);
+                let e = c.getDataLegendResolvedWorldPositionX(this.co);
+                let f = c.getDataLegendResolvedWorldPositionY(this.cp);
                 let g = typeCast(DataLegendSeriesContext.$, c.getDataLegendSeriesContextAt(e, f));
                 if (g != null) {
                     let h = new List$1(DataLegendSeriesValueInfo.$, 0);
-                    for (let i = 0; i < g.f.count; i++) {
-                        let j = g.f._inner[i];
-                        let k = this.b9 == null || this.by(this.b9, j.q) || this.by(this.b9, j.p) || this.by(this.b9, j.r) || this.by(this.b9, "ALL");
-                        let l = this.b8 != null && (this.by(this.b8, j.q) || this.by(this.b8, j.p) || this.by(this.b8, j.r) || this.by(this.b8, "ALL"));
-                        let m = this.b9 == null && this.b8 == null && j.k;
+                    for (let i = 0; i < g.e.count; i++) {
+                        let j = g.e._inner[i];
+                        let k = this.cc == null || this.b1(this.cc, j.r) || this.b1(this.cc, j.q) || this.b1(this.cc, j.s) || this.b1(this.cc, "ALL");
+                        let l = this.cb != null && (this.b1(this.cb, j.r) || this.b1(this.cb, j.q) || this.b1(this.cb, j.s) || this.b1(this.cb, "ALL"));
+                        let m = this.cc == null && this.cb == null && j.k;
                         if (k && (!l && !m)) {
                             j.o = h.count;
                             h.add(j);
-                            if (!this.b7.containsKey(j.o)) {
-                                this.b7.addItem(j.o, new DataLegendColumn());
+                            if (!a.a.containsKey(j.o)) {
+                                a.a.addItem(j.o, new DataLegendColumn());
                             }
-                            this.b7.item(j.o).i = j.o;
-                            this.b7.item(j.o).d.q(d, j.s);
-                            this.b7.item(j.o).b.q(d, j.r);
-                            this.b7.item(j.o).e.q(d, j.l);
-                            this.b7.item(j.o).c.q(d, j);
-                            this.b7.item(j.o).h.add(d);
+                            a.a.item(j.o).i = j.o;
+                            a.a.item(j.o).d.q(d, j.t);
+                            a.a.item(j.o).b.q(d, j.s);
+                            a.a.item(j.o).e.q(d, j.l);
+                            a.a.item(j.o).c.q(d, j);
+                            a.a.item(j.o).h.add(d);
                         }
                     }
-                    g.f = h;
-                    this.ce.add(g);
-                    this.cs = Math.max(this.cs, g.f.count);
+                    g.e = h;
+                    a.b.add(g);
+                    a.d = Math.max(a.d, g.e.count);
                 }
             }
-            for (let n of fromEnum(this.b7.values)) {
+            for (let n of fromEnum(a.a.values)) {
                 n.f.clear();
                 n.a.clear();
                 let o = n.e.p(n.h);
-                let p = this.cf(o);
+                let p = this.ch(o);
                 for (let q = 0; q < p.count; q++) {
                     let r = p._inner[q];
                     let s = n.h._inner[q];
                     n.a.q(s, r);
                     let t = n.c.item(s);
-                    let u = this.d2(r, t);
+                    let u = this.d8(r, t);
                     n.f.q(s, u);
                     let v = !stringIsNullOrEmpty(r.l);
                     if (v) {
@@ -1401,32 +1507,34 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            this.fi(this.ao, a);
-            for (let w = 0; w < a.count; w++) {
-                this.ge(a._inner[w], this.a8);
-                this.fj(this.ao, a._inner[w], w);
+        }
+        f0(a) {
+            if (this.cd.count >= 1 && this.b2) {
+                this.fp(a.f);
             }
-            this.fk(this.ao, a);
-            this.bw = this.b2();
-            this.fm(this.ao);
+            for (let b = 0; b < a.c.count; b++) {
+                this.go(a.c._inner[b], this.a9);
+                this.fq(a, b);
+            }
+            this.fr(a);
         }
-        b2() {
+        b6() {
             let a = false;
             for (let b = 0; b < this.ao.b.count; b++) {
                 let c = this.ao.b._inner[b];
-                if (c.c && c.j && c.h != 7) {
+                if (c.d && c.k && c.i != 7) {
                     a = true;
                     break;
                 }
             }
             return a;
         }
-        fm(a) {
+        ft(a) {
             let b = 0;
             let c = 0;
             for (let d = 0; d < a.b.count; d++) {
                 let e = a.b._inner[d];
-                this.fu(e);
+                this.f3(e);
             }
             let f = 0;
             let g = new Size(1, 0, 0);
@@ -1435,46 +1543,46 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
             let j = new Dictionary$2(Number_$type, Size.$, 0);
             let k = new Dictionary$2(Number_$type, Size.$, 0);
             for (let l of fromEnum(a.b)) {
-                for (let m = 0; m < l.k.count; m++) {
-                    let n = l.k._inner[m];
+                for (let m = 0; m < l.l.count; m++) {
+                    let n = l.l._inner[m];
                     if (!i.containsKey(m)) {
                         i.addItem(m, new Size(1, 0, 0));
                     }
-                    i.item(m, this.ih(i.item(m), n.ak, n.an));
+                    i.item(m, this.ix(i.item(m), n.al, n.ao));
                     if (!j.containsKey(m)) {
                         j.addItem(m, new Size(1, 0, 0));
                     }
-                    j.item(m, this.ih(j.item(m), n.ai, n.am));
+                    j.item(m, this.ix(j.item(m), n.aj, n.an));
                     if (!k.containsKey(m)) {
                         k.addItem(m, new Size(1, 0, 0));
                     }
-                    k.item(m, this.ih(k.item(m), n.ag, n.al));
+                    k.item(m, this.ix(k.item(m), n.ah, n.am));
                 }
             }
             for (let o = 0; o < a.b.count; o++) {
                 let p = a.b._inner[o];
-                h = this.ig(h, p.t, p.v);
-                g = this.ih(g, p.u, p.x);
-                for (let q = 0; q < p.k.count; q++) {
-                    p.k._inner[q].aj = i.item(q);
-                    p.k._inner[q].ah = j.item(q);
-                    p.k._inner[q].af = k.item(q);
+                h = this.iw(h, p.w, p.y);
+                g = this.ix(g, p.x, p.aa);
+                for (let q = 0; q < p.l.count; q++) {
+                    p.l._inner[q].ak = i.item(q);
+                    p.l._inner[q].ai = j.item(q);
+                    p.l._inner[q].ag = k.item(q);
                 }
-                if (p.d) {
-                    let r = p.u.width + p.x.left + p.x.right;
-                    f = Math.max(f, r + p.w.left);
+                if (p.e || p.a) {
+                    let r = p.x.width + p.aa.left + p.aa.right;
+                    f = Math.max(f, r + p.z.left);
                 }
-                else if (p.c) {
-                    let s = p.u.width + p.x.left + p.x.right;
-                    let t = p.t.width + p.v.left + p.v.right;
-                    f = Math.max(f, s + p.w.left + t);
+                else if (p.d) {
+                    let s = p.x.width + p.aa.left + p.aa.right;
+                    let t = p.w.width + p.y.left + p.y.right;
+                    f = Math.max(f, s + p.z.left + t);
                 }
             }
             let u = 0;
             let v = 0;
             for (let w = 0; w < a.b.count; w++) {
                 let x = a.b._inner[w];
-                let y = this.id(v, x, f, g, h);
+                let y = this.iu(v, x, f, g, h);
                 v = y.height;
                 u = Math.max(u, y.width);
             }
@@ -1483,166 +1591,175 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
             a.d = b;
             a.c = c;
         }
-        ig(a, b, c) {
+        iw(a, b, c) {
             return new Size(1, Math.max(a.width, b.width + c.left + c.right), Math.max(a.height, b.height + c.top + c.bottom));
         }
-        ih(a, b, c) {
+        ix(a, b, c) {
             return new Size(1, Math.max(a.width, b.width + c.left + c.right), Math.max(a.height, b.height + c.top + c.bottom));
         }
-        id(a, b, c, d, e) {
+        iu(a, b, c, d, e) {
             let f = 0;
             let g = 0;
-            g = Math.max(b.t.height, g);
-            g = Math.max(b.u.height, g);
-            for (let h of fromEnum(b.k)) {
-                g = Math.max(h.ak.height, g);
-                if (h.m) {
-                    g = Math.max(h.ai.height, g);
+            g = Math.max(b.w.height, g);
+            g = Math.max(b.x.height, g);
+            for (let h of fromEnum(b.l)) {
+                g = Math.max(h.al.height, g);
+                if (h.n) {
+                    g = Math.max(h.aj.height, g);
                 }
-                if (h.j) {
-                    g = Math.max(h.ag.height, g);
+                if (h.k) {
+                    g = Math.max(h.ah.height, g);
                 }
             }
-            f += b.w.left;
-            a += b.w.top;
-            if (!b.a && !b.d && this.bw) {
-                f += b.v.left;
+            f += b.z.left;
+            a += b.z.top;
+            if (!b.b && !b.e && !b.a && this.bz) {
+                f += b.y.left;
                 let i = 0;
-                if (g > b.t.height) {
-                    i = (g - b.t.height) / 2;
+                if (g > b.w.height) {
+                    i = (g - b.w.height) / 2;
                 }
-                b.r = new Rect(0, f, a + i, b.t.width, b.t.height);
-                f += (b.r.width) + b.v.right;
+                b.u = new Rect(0, f, a + i, b.w.width, b.w.height);
+                f += (b.u.width) + b.y.right;
             }
             else {
-                b.r = new Rect(0, 0, 0, 0, 0);
+                b.u = new Rect(0, 0, 0, 0, 0);
             }
-            f += b.x.left;
+            f += b.aa.left;
             let j = 0;
-            if (g > b.u.height) {
-                j = (g - b.u.height) / 2;
-            }
-            b.s = new Rect(0, f, a + j, b.u.width + b.x.right, b.u.height);
-            f = Math.max(c, b.s.right);
-            for (let k of fromEnum(b.k)) {
-                let l = " C=" + k.s + " SR=" + numberToString2(f, "000");
-                if ((k.l() && k.j) && k.af.width > 0) {
+            if (g > b.x.height) {
+                j = (g - b.x.height) / 2;
+            }
+            b.v = new Rect(0, f, a + j, b.x.width + b.aa.right, b.x.height);
+            f = Math.max(c, b.v.right);
+            for (let k of fromEnum(b.l)) {
+                let l = " C=" + k.t + " SR=" + numberToString2(f, "000");
+                if ((k.m() && k.k) && k.ag.width > 0) {
                     let m = 0;
-                    if (g > k.ag.height) {
-                        m = (g - k.ag.height) / 2;
+                    if (g > k.ah.height) {
+                        m = (g - k.ah.height) / 2;
                     }
-                    k.ac = new Rect(0, f + k.al.left, a + m, k.ag.width, k.ag.height);
-                    f += k.af.width;
-                    l += " label L=" + numberToString2(k.ac.left, "000") + " R=" + numberToString2(k.ac.right, "000");
-                }
-                if (k.q()) {
-                    l += " v MW=" + numberToString2(k.aj.width, "000");
-                    f += k.an.left;
-                    f += (k.aj.width - (k.ak.width + k.an.right));
+                    k.ad = new Rect(0, f + k.am.left, a + m, k.ah.width, k.ah.height);
+                    f += k.ag.width;
+                    l += " label L=" + numberToString2(k.ad.left, "000") + " R=" + numberToString2(k.ad.right, "000");
+                }
+                if (k.r()) {
+                    l += " v MW=" + numberToString2(k.ak.width, "000");
+                    f += k.ao.left;
+                    f += (k.ak.width - (k.al.width + k.ao.right));
                     let n = 0;
-                    if (g > k.ak.height) {
-                        n = (g - k.ak.height) / 2;
+                    if (g > k.al.height) {
+                        n = (g - k.al.height) / 2;
                     }
-                    k.ae = new Rect(0, f, a + n, k.ak.width, k.ak.height);
-                    l += " v ML=" + numberToString2(k.an.left, "00") + " MR=" + numberToString2(k.an.right, "00");
-                    l += " v BL=" + numberToString2(k.ae.left, "000") + " BR=" + numberToString2(k.ae.right, "000");
-                    f += k.ae.width;
-                    f += k.an.right;
+                    k.af = new Rect(0, f, a + n, k.al.width, k.al.height);
+                    l += " v ML=" + numberToString2(k.ao.left, "00") + " MR=" + numberToString2(k.ao.right, "00");
+                    l += " v BL=" + numberToString2(k.af.left, "000") + " BR=" + numberToString2(k.af.right, "000");
+                    f += k.af.width;
+                    f += k.ao.right;
                 }
-                if ((k.o() && k.m) && k.ah.width > 0) {
+                if ((k.p() && k.n) && k.ai.width > 0) {
                     let o = 0;
-                    if (g > k.ai.height) {
-                        o = (g - k.ai.height) / 2;
+                    if (g > k.aj.height) {
+                        o = (g - k.aj.height) / 2;
                     }
-                    k.ad = new Rect(0, f + k.am.left, a + o, k.ai.width, k.ai.height);
-                    f += k.ah.width;
-                    l += " unit L=" + numberToString2(k.ad.left, "000") + " R=" + numberToString2(k.ad.right, "000");
+                    k.ae = new Rect(0, f + k.an.left, a + o, k.aj.width, k.aj.height);
+                    f += k.ai.width;
+                    l += " unit L=" + numberToString2(k.ae.left, "000") + " R=" + numberToString2(k.ae.right, "000");
                 }
-                this.ft("maxRight " + numberToString2(c, "0") + l);
+                this.f2("maxRight " + numberToString2(c, "0") + l);
             }
-            f += b.w.right;
+            f += b.z.right;
             a += g;
-            a += b.w.bottom;
+            a += b.z.bottom;
             return new Size(1, f, a);
         }
-        fu(a) {
-            a.u = a.n == null ? new Size(1, 0, 0) : this.a5.bw(a.n, a.i);
-            for (let b of fromEnum(a.k)) {
-                b.ak = b.x == null ? new Size(1, 0, 0) : this.a5.bw(b.x, b.i);
-                b.ai = b.u == null ? new Size(1, 0, 0) : this.a5.bw(b.u, b.h);
-                b.ag = b.t == null ? new Size(1, 0, 0) : this.a5.bw(b.t, b.g);
+        f3(a) {
+            a.x = a.q == null ? new Size(1, 0, 0) : this.a6.bz(a.q, a.j);
+            for (let b of fromEnum(a.l)) {
+                b.al = b.y == null ? new Size(1, 0, 0) : this.a6.bz(b.y, b.j);
+                b.aj = b.v == null ? new Size(1, 0, 0) : this.a6.bz(b.v, b.i);
+                b.ah = b.u == null ? new Size(1, 0, 0) : this.a6.bz(b.u, b.h);
             }
         }
-        d1(a, b, c, d) {
-            if (this.a2 == 2) {
+        d7(a, b, c, d, e) {
+            if (this.a3 == 2) {
                 return null;
             }
-            let e = "";
-            if (stringIsNullOrEmpty(this.es)) {
-                e = b;
+            let f = "";
+            if (stringIsNullOrEmpty(this.ey)) {
+                f = c;
             }
             else {
-                e = this.es;
+                f = this.ey;
             }
-            if (d) {
-                if (stringIsNullOrEmpty(e)) {
-                    e = c;
+            if (e) {
+                if (stringIsNullOrEmpty(f)) {
+                    f = d;
                 }
                 else {
-                    e = c + e;
+                    f = d + f;
                 }
             }
-            let f = this.b7.item(a).d;
-            let g = this.b7.item(a).g;
-            if (g && stringIsNullOrEmpty(e)) {
-                e = " ";
+            let g = a.a.item(b).d;
+            let h = a.a.item(b).g;
+            if (h && stringIsNullOrEmpty(f)) {
+                f = " ";
             }
-            else if (f.count > 0 && stringIsNullOrEmpty(e)) {
-                e = " ";
+            else if (g.count > 0 && stringIsNullOrEmpty(f)) {
+                f = " ";
             }
-            else if (!d) {
+            else if (!e) {
                 return null;
             }
-            return e;
+            return f;
         }
-        dy(a, b, c) {
+        d5(a, b, c, d) {
             if (this.ar == 2) {
                 return null;
             }
-            let d = this.cs > 1;
-            let e = this.ar == 1;
-            let f = this.b7.item(a).b.count > 0;
-            if (f && (d || e)) {
-                if (stringIsNullOrEmpty(b)) {
+            let e = a.d > 1;
+            let f = this.ar == 1;
+            let g = a.a.item(b).b.count > 0;
+            if (g && (e || f)) {
+                if (stringIsNullOrEmpty(c)) {
                     return " ";
                 }
-                else if (c) {
-                    return b;
+                else if (d) {
+                    return c;
                 }
             }
             return null;
         }
-        fk(a, b) {
-            if (this.a1 == 5) {
+        fr(a) {
+            if (this.a2 == 5) {
                 return;
             }
-            if (b == null || b.count <= 1) {
+            if (a.c == null || a.c.count <= 1) {
                 return;
             }
-            let c = new Dictionary$2(Number_$type, DataLegendSummaryColumn.$, 0);
-            let d = 0;
-            let e = new List$1(DataLegendSeriesGroup_$type, 0);
-            for (let f of fromEnum(this.ce)) {
-                d = Math.max(d, f.f.count);
-                if (!e.contains(f.b)) {
-                    e.add(f.b);
-                }
-                for (let g = 0; g < f.f.count; g++) {
-                    let h = f.f._inner[g];
-                    if (!c.containsKey(g)) {
-                        c.addItem(g, new DataLegendSummaryColumn());
+            let b = new Dictionary$2(Number_$type, DataLegendSummaryColumn.$, 0);
+            let c = 0;
+            let d = false;
+            let e = new List$1(String_$type, 0);
+            for (let f of fromEnum(a.b)) {
+                c = Math.max(c, f.e.count);
+                if (!e.contains(f.h)) {
+                    e.add(f.h);
+                }
+                if (this.a2 == 0) {
+                    if (e.count > 1) {
+                        return;
+                    }
+                }
+                if (stringContains(f.h, "Geographic") || stringContains(f.h, "Scatter") || stringContains(f.h, "Shape") || stringContains(f.h, "Polar") || stringContains(f.h, "Financial") || stringContains(f.h, "Indicator")) {
+                    d = true;
+                }
+                for (let g = 0; g < f.e.count; g++) {
+                    let h = f.e._inner[g];
+                    if (!b.containsKey(g)) {
+                        b.addItem(g, new DataLegendSummaryColumn());
                     }
-                    let i = c.item(g);
+                    let i = b.item(g);
                     i.n = h.n;
                     i.m = h.m;
                     i.e = h.e;
@@ -1650,13 +1767,10 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                     i.f = h.f;
                     i.f = h.g;
                     i.d = h.d;
-                    i.y = h.y;
-                    i.aj(h.l);
-                    i.ah(h.r);
+                    i.z = h.z;
+                    i.ak(h.l);
                     i.ai(h.s);
-                    if (stringIsNullOrEmpty(i.u)) {
-                        i.u = h.u;
-                    }
+                    i.aj(h.t);
                     if (stringIsNullOrEmpty(i.v)) {
                         i.v = h.v;
                     }
@@ -1666,88 +1780,93 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                     if (stringIsNullOrEmpty(i.x)) {
                         i.x = h.x;
                     }
+                    if (stringIsNullOrEmpty(i.y)) {
+                        i.y = h.y;
+                    }
+                    if (stringIsNullOrEmpty(i.r)) {
+                        i.r = h.r;
+                    }
                     if (stringIsNullOrEmpty(i.q)) {
                         i.q = h.q;
                     }
-                    if (stringIsNullOrEmpty(i.p)) {
-                        i.p = h.p;
-                    }
                 }
             }
-            if (this.a1 == 0) {
-                for (let j = 0; j < b.count; j++) {
-                    let k = b._inner[j];
-                    if (!k.isSummarizationSupported) {
-                        return;
-                    }
-                }
-                if (e.count > 1) {
+            if (this.a2 == 0) {
+                if (d) {
                     return;
                 }
-                if (!e.contains(0)) {
+                let j = this.cj.count > 1;
+                if (j) {
                     return;
                 }
+                for (let k = 0; k < a.c.count; k++) {
+                    let l = a.c._inner[k];
+                    if (!l.isSummarizationSupported) {
+                        return;
+                    }
+                }
             }
-            let l = this.a6();
-            let m = new DataLegendRowInfo(this.a5, true, false, -1);
-            m.n = this.d9 != null ? this.d9 : l.title;
-            m.q = this.h5 || m.q;
-            m.i = this.bo || m.i;
-            for (let n = 0; n < d; n++) {
-                let o = c.item(n);
-                let p = l.calculate(o.ab, o.q);
-                p = this.a0(p);
-                let q = this.an;
-                let r = q == 0 || q == 2 || q == 8;
-                let s = -1;
-                for (let t of fromEnum(this.b7.item(n).a.values)) {
-                    if (t.b()) {
-                        s = Math.max(s, t.h);
-                        if (r) {
-                            q = t.a;
+            let m = this.a7();
+            let n = new DataLegendRowInfo(this.a6, true, false, false, -1);
+            n.q = this.ef != null ? this.ef : m.title;
+            n.t = this.il || n.t;
+            n.j = this.br || n.j;
+            n.o = a.f;
+            for (let o = 0; o < c; o++) {
+                let p = b.item(o);
+                let q = m.calculate(p.ac, p.r);
+                q = this.a1(q);
+                let r = this.an;
+                let s = r == 0 || r == 2 || r == 8;
+                let t = -1;
+                for (let u of fromEnum(a.a.item(o).a.values)) {
+                    if (u.b()) {
+                        t = Math.max(t, u.h);
+                        if (s) {
+                            r = u.a;
                         }
                     }
                 }
-                let u = this.cv >= 0 ? this.cv : s;
-                let v = this.cu >= 0 ? this.cu : s;
-                let w = this.am(p.c, q, u, v);
-                w.i = u;
-                w.h = v;
-                let x = this.d2(w, o);
-                let y = new DataLegendRowCell(this.a5, true, false, -1);
-                y.s = m.k.count;
-                y.t = this.dy(y.s, " ", o.b);
-                if (!stringIsNullOrEmpty(this.d4)) {
-                    y.t = this.d4;
-                }
-                if (p.e != null) {
-                    y.t = p.e;
-                }
-                y.j = !stringIsNullOrEmpty(y.t);
-                y.z = this.h4 || y.z;
-                y.g = this.bn || y.g;
-                y.x = x;
-                y.i = this.bq || y.i;
-                y.ab = this.h3(this.h7, y.ab, null);
-                y.r = p.c;
-                y.f = w.a;
-                y.w = o.q;
-                y.v = o.p;
-                let z = o.aa.length >= 1 ? o.aa[0] : " ";
-                y.u = this.d1(y.s, z, w.l, o.d);
-                if (p.f != null) {
-                    y.u = p.f;
-                }
-                y.m = !stringIsNullOrEmpty(y.u);
-                y.aa = this.h6 || y.aa;
-                y.h = this.bp || y.h;
-                m.k.add(y);
-            }
-            this.gc(m);
-            if (m.b) {
-                this.fl(m);
-                this.f0(m);
-                a.e(m);
+                let v = this.cx >= 0 ? this.cx : t;
+                let w = this.cw >= 0 ? this.cw : t;
+                let x = this.am(q.c, r, v, w);
+                x.i = v;
+                x.h = w;
+                let y = this.d8(x, p);
+                let z = new DataLegendRowCell(this.a6, true, false, false, -1);
+                z.t = n.l.count;
+                z.u = this.d5(a, z.t, " ", p.b);
+                if (!stringIsNullOrEmpty(this.ea)) {
+                    z.u = this.ea;
+                }
+                if (q.e != null) {
+                    z.u = q.e;
+                }
+                z.k = !stringIsNullOrEmpty(z.u);
+                z.aa = this.ik || z.aa;
+                z.h = this.bq || z.h;
+                z.y = y;
+                z.j = this.bt || z.j;
+                z.ac = this.ij(this.io, z.ac, null);
+                z.s = q.c;
+                z.g = x.a;
+                z.x = p.r;
+                z.w = p.q;
+                let aa = p.ab.length >= 1 ? p.ab[0] : " ";
+                z.v = this.d7(a, z.t, aa, x.l, p.d);
+                if (q.f != null) {
+                    z.v = q.f;
+                }
+                z.n = !stringIsNullOrEmpty(z.v);
+                z.ab = this.im || z.ab;
+                z.i = this.bs || z.i;
+                n.l.add(z);
+            }
+            this.gm(n);
+            if (n.c) {
+                this.fs(n);
+                this.f9(n);
+                this.ao.e(n);
             }
         }
         am(a, b, c, d) {
@@ -1755,64 +1874,64 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                 b = this.an;
             }
             if (d < 0) {
-                d = this.cu;
+                d = this.cw;
             }
             if (c < 0) {
-                c = this.cv;
+                c = this.cx;
             }
             return DataAbbreviator.a(a, b, c, d);
         }
-        cr(a, b, c, d) {
+        ct(a, b, c, d) {
             return this.am(a, b, c, d).d;
         }
-        c8(a, b, c, d) {
+        da(a, b, c, d) {
             return this.am(a, b, c, d).l;
         }
-        c7(a, b, c, d) {
+        c9(a, b, c, d) {
             let e = this.am(a, b, c, d);
             return e.m + e.l;
         }
-        cf(a) {
-            let b = this.cv;
-            let c = this.cu;
+        ch(a) {
+            let b = this.cx;
+            let c = this.cw;
             let d = this.an;
             let e = DataAbbreviator.h(a, d, b, c);
             return e;
         }
-        ch(a) {
-            let b = new List$1(Number_$type, 0);
-            if (a < 0) {
-                return b;
+        ci(a, b) {
+            let c = new List$1(Number_$type, 0);
+            if (b < 0) {
+                return c;
             }
-            for (let c = 0; c < this.ce.count; c++) {
-                let d = this.ce._inner[c];
-                if (d.f.count > a) {
-                    let e = d.f._inner[a].l;
-                    if (!isNaN_(e)) {
-                        b.add(e);
+            for (let d = 0; d < a.b.count; d++) {
+                let e = a.b._inner[d];
+                if (e.e.count > b) {
+                    let f = e.e._inner[b].l;
+                    if (!isNaN_(f)) {
+                        c.add(f);
                     }
                 }
             }
-            return b;
+            return c;
         }
-        fl(a) {
+        fs(a) {
         }
-        h3(a, b, c) {
+        ij(a, b, c) {
             if (a != null) {
                 return a;
             }
-            if (this.b6 && c != null) {
+            if (this.ca && c != null) {
                 return c;
             }
             return b;
         }
-        dz(a, b) {
+        d6(a, b) {
             return stringIsNullOrEmpty(a) ? b : a;
         }
-        d2(a, b) {
+        d8(a, b) {
             let c = a.d;
             if (b == null || isNaN_(c) || isInfinity(c)) {
-                return this.ff;
+                return this.fl;
             }
             let d;
             let e = b.d ? a.d : a.g;
@@ -1820,28 +1939,28 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                 d = this.ak.i(e);
             }
             else {
-                let f = this.a3;
+                let f = this.a4;
                 if (f == 0) {
                     f = 1;
                 }
                 let g = new NumberFormatSpecifier();
-                g.useGrouping = this.b4;
-                g.locale = this.dz(this.ey, null);
-                g.currencyCode = this.e0;
+                g.useGrouping = this.b8;
+                g.locale = this.d6(this.e4, null);
+                g.currencyCode = this.e6;
                 if (b.d) {
                     g.minimumFractionDigits = a.i;
                     g.maximumFractionDigits = a.h;
                     if (b.n >= 0 && b.n > a.i) {
                         g.minimumFractionDigits = b.n;
                     }
-                    else if (this.cv >= 0) {
-                        g.minimumFractionDigits = this.cv;
+                    else if (this.cx >= 0) {
+                        g.minimumFractionDigits = this.cx;
                     }
                     if (b.m >= 0 && b.m > a.h) {
                         g.maximumFractionDigits = b.m;
                     }
-                    else if (this.cu >= 0) {
-                        g.maximumFractionDigits = this.cu;
+                    else if (this.cw >= 0) {
+                        g.maximumFractionDigits = this.cw;
                     }
                 }
                 else {
@@ -1861,80 +1980,83 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                 this.al.d = [g];
                 d = this.al.i(e);
                 if (e > 0) {
-                    d = b.w + d;
+                    d = b.x + d;
                 }
                 else if (e < 0) {
-                    d = b.u + d;
+                    d = b.v + d;
                 }
                 if (e >= 0) {
-                    d += b.x;
+                    d += b.y;
                 }
                 else {
-                    d += b.v;
+                    d += b.w;
                 }
             }
             return d;
         }
-        fj(a, b, c) {
-            if (this.b5 == false) {
+        fq(a, b) {
+            if (this.b9 == false) {
                 return;
             }
-            let d = this.ce._inner[c];
-            let e = this.d0(b);
-            let f = new DataLegendRowInfo(this.a5, false, false, c);
-            f.f = d.a();
-            f.m = e;
-            f.n = e;
-            f.q = this.h8 || f.q;
-            f.i = this.br || f.i;
-            for (let g = 0; g < d.f.count; g++) {
-                let h = d.f._inner[g];
-                let i = this.b7.item(g).a.item(c);
-                let j = this.b7.item(g).f.item(c);
-                let k = new DataLegendRowCell(this.a5, false, false, c);
-                k.s = f.k.count;
-                k.i = this.bt || k.i;
-                k.x = j;
-                k.ab = this.h3(this.ia, k.ab, h.y);
+            let c = a.b._inner[b];
+            let d = a.c._inner[b];
+            let e = d.getDataLegendSeriesTitle();
+            let f = new DataLegendRowInfo(this.a6, false, false, false, b);
+            f.g = c.a();
+            f.p = e;
+            f.o = a.f;
+            f.q = e;
+            f.t = this.ip || f.t;
+            f.j = this.bu || f.j;
+            for (let g = 0; g < c.e.count; g++) {
+                let h = c.e._inner[g];
+                let i = a.a.item(g).a.item(b);
+                let j = a.a.item(g).f.item(b);
+                let k = new DataLegendRowCell(this.a6, false, false, false, b);
+                k.t = f.l.count;
+                k.j = this.bw || k.j;
+                k.y = j;
+                k.ac = this.ij(this.ir, k.ac, h.z);
+                k.x = h.r;
                 k.w = h.q;
-                k.v = h.p;
-                k.r = h.l;
-                k.f = i.a;
-                k.u = this.d1(k.s, h.s, i.l, h.d);
-                k.m = !stringIsNullOrEmpty(k.u);
-                k.aa = this.h9 || k.aa;
-                k.h = this.bs || k.h;
-                k.t = this.dy(k.s, h.r, h.b);
-                k.j = !stringIsNullOrEmpty(k.t);
-                k.z = this.h2 || k.z;
-                k.g = this.bm || k.g;
-                f.k.add(k);
-            }
-            f.h = this.a9(b);
-            this.fl(f);
-            this.f0(f);
-            this.gb(f);
-            if (f.b) {
-                if (f.j) {
-                    this.ge(b, f.h);
-                    let l = this.gi(b);
-                    let m = this.cx(b);
-                    f.p = l;
-                    f.l = m;
-                }
-                a.e(f);
-            }
-        }
-        cx(a) {
+                k.s = h.l;
+                k.g = i.a;
+                k.v = this.d7(a, k.t, h.t, i.l, h.d);
+                k.n = !stringIsNullOrEmpty(k.v);
+                k.ab = this.iq || k.ab;
+                k.i = this.bv || k.i;
+                k.u = this.d5(a, k.t, h.s, h.b);
+                k.k = !stringIsNullOrEmpty(k.u);
+                k.aa = this.ii || k.aa;
+                k.h = this.bp || k.h;
+                f.l.add(k);
+            }
+            f.i = this.ba(d);
+            f.n = d.getDataLegendBadgeShapeAndMarker();
+            this.fs(f);
+            this.f9(f);
+            this.gl(f);
+            if (f.c) {
+                if (f.k) {
+                    this.go(d, f.i);
+                    let l = this.gs(d);
+                    let m = this.cz(d);
+                    f.s = l;
+                    f.m = m;
+                }
+                this.ao.e(f);
+            }
+        }
+        cz(a) {
             return a.getDataLegendBadgeContext();
         }
-        a9(a) {
-            if (this.a8 != 0) {
-                return this.a8;
+        ba(a) {
+            if (this.a9 != 0) {
+                return this.a9;
             }
             return a.legendItemBadgeShape;
         }
-        ge(a, b) {
+        go(a, b) {
             if (b == 0) {
                 return;
             }
@@ -1942,41 +2064,55 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                 a.legendItemBadgeShape = b;
             }
         }
-        bz() {
-            return !isNaN_(this.cm) && !isNaN_(this.cn);
+        b3() {
+            return !isNaN_(this.co) && !isNaN_(this.cp);
         }
-        gi(a) {
+        gs(a) {
             return a.getDataLegendBadge();
         }
-        d0(a) {
-            return a.getDataLegendSeriesTitle();
-        }
-        fi(a, b) {
-            if (this.b0 == false) {
+        fn(a, b) {
+            if (this.b4 == false) {
                 return;
             }
-            let c = this.dx(b);
+            let c = this.d4(a);
             if (c == null) {
-                c = this.cy;
+                c = this.c0;
             }
             else {
-                this.cy = c;
+                this.c0 = c;
             }
             if (stringIsNullOrEmpty(c)) {
                 return;
             }
-            let d = new DataLegendRowInfo(this.a5, false, true, -1);
-            d.n = c;
-            d.q = this.h1 || d.q;
-            d.i = this.bl || d.i;
-            this.fl(d);
-            this.f0(d);
-            this.ga(d);
-            if (d.b) {
-                a.e(d);
+            let d = new DataLegendRowInfo(this.a6, false, true, false, -1);
+            d.q = c;
+            d.t = this.ih || d.t;
+            d.j = this.bo || d.j;
+            d.o = b;
+            this.fs(d);
+            this.f9(d);
+            this.gk(d);
+            if (d.c) {
+                this.ao.e(d);
+            }
+        }
+        fp(a) {
+            if (stringIsNullOrEmpty(a)) {
+                return;
+            }
+            let b = new DataLegendRowInfo(this.a6, false, false, true, -1);
+            b.q = a;
+            b.t = this.ig || b.t;
+            b.j = this.bn || b.j;
+            b.o = a;
+            this.fs(b);
+            this.f9(b);
+            this.gj(b);
+            if (b.c) {
+                this.ao.e(b);
             }
         }
-        ir(a) {
+        i8(a) {
             let b = new Thickness(0, 0);
             if (a.top >= 0) {
                 b.top = a.top;
@@ -1992,38 +2128,42 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
             }
             return b;
         }
-        f0(a) {
-            if (a.c) {
-                a.x = this.ir(this.ip);
-                a.w = this.ir(this.is);
+        f9(a) {
+            if (a.d) {
+                a.aa = this.i8(this.i6);
+                a.z = this.i8(this.i9);
+            }
+            else if (a.b) {
+                a.aa = this.i8(this.i2);
+                a.z = this.i8(this.i1);
             }
             else if (a.a) {
-                a.x = this.ir(this.ik);
-                a.w = this.ir(this.ij);
+                a.aa = this.i8(this.i0);
+                a.z = this.i8(this.iz);
             }
             else {
-                a.x = this.ir(this.io);
-                a.w = this.ir(this.im);
+                a.aa = this.i8(this.i5);
+                a.z = this.i8(this.i4);
             }
-            for (let b of fromEnum(a.k)) {
-                b.an = this.ir(this.it);
-                b.am = this.ir(this.iq);
-                b.al = this.ir(this.il);
+            for (let b of fromEnum(a.l)) {
+                b.ao = this.i8(this.ja);
+                b.an = this.i8(this.i7);
+                b.am = this.i8(this.i3);
             }
-            if (a.c) {
-                a.v = this.ir(this.ii);
-                a.t = new Size(1, 20, 15);
+            if (a.d) {
+                a.y = this.i8(this.iy);
+                a.w = new Size(1, 20, 15);
             }
         }
-        dx(a) {
-            if (this.di != null) {
-                return this.di;
+        d4(a) {
+            if (this.dq != null) {
+                return this.dq;
             }
             let b = true;
             let c = null;
-            for (let d = 0; d < a.count; d++) {
-                let e = a._inner[d];
-                let f = this.dv(e);
+            for (let d = 0; d < a.length; d++) {
+                let e = a[d];
+                let f = this.d2(e);
                 if (f == null) {
                     continue;
                 }
@@ -2042,12 +2182,12 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        dv(a) {
-            if (this.bz()) {
-                let b = a.getDataLegendAxisLabelFromCursorPosition(this.cm, this.cn);
+        d2(a) {
+            if (this.b3()) {
+                let b = a.getDataLegendAxisLabelFromCursorPosition(this.co, this.cp);
                 if (typeCast(Date_$type, b) !== null) {
                     let c = b;
-                    b = this.dw(c);
+                    b = this.d3(c);
                 }
                 return b == null ? "" : b.toString();
             }
@@ -2055,7 +2195,7 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                 return null;
             }
         }
-        dw(a) {
+        d3(a) {
             if (this.ai != null) {
                 let b = this.ai.i(a);
                 return b;
@@ -2102,7 +2242,7 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                 if (e == 5) {
                     c.timeStyle = null;
                 }
-                c.locale = this.dz(this.c9, "en-US");
+                c.locale = this.d6(this.dg, "en-US");
                 if (this.aj == null) {
                     this.aj = new BindingFormatter();
                 }
@@ -2112,11 +2252,14 @@ export let XamDataLegend = /*@__PURE__*/ (() => {
                 return f;
             }
         }
-        fn() {
+        fu() {
+            if (this.ao != null) {
+                this.ao.f();
+            }
         }
     }
     XamDataLegend.$t = /*@__PURE__*/ markType(XamDataLegend, 'XamDataLegend', Control.$, [INotifyPropertyChanged_$type, IDataLegend_$type, IOnDemandRender_$type]);
-    XamDataLegend.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, XamDataLegend, 'fy', ['BadgeMargin:ii:gj', [Thickness.$, /*@__PURE__*/ new Thickness(1, 0, 0, 0, 0)], 'BadgeShape:a8:gk', [LegendItemBadgeShape_$type, /*@__PURE__*/ enumGetBox(LegendItemBadgeShape_$type, 0)], 'ExcludedColumns::gl', [Array_$type, null], 'ExcludedSeries::gm', [Array_$type, null], 'HeaderFormatCulture:c9:gn', [2, /*@__PURE__*/ stringEmpty()], 'HeaderFormatDate:ap:go', [DataLegendHeaderDateMode_$type, /*@__PURE__*/ enumGetBox(DataLegendHeaderDateMode_$type, 0)], 'HeaderFormatSpecifiers:ag:gp', [Array_$type, null], 'HeaderFormatString:dd:gq', [2, null], 'HeaderFormatTime:aq:gr', [DataLegendHeaderTimeMode_$type, /*@__PURE__*/ enumGetBox(DataLegendHeaderTimeMode_$type, 0)], 'HeaderRowMargin:ij:gs', [Thickness.$, /*@__PURE__*/ new Thickness(0, 5)], 'HeaderRowVisible:b0:gt', [0, true], 'HeaderTextColor:h1:gu', [Brush.$, null], 'HeaderTextMargin:ik:gv', [Thickness.$, /*@__PURE__*/ new Thickness(1, 2, 0, 0, 0)], 'HeaderText:di:gw', [2, null], 'IncludedColumns::gx', [Array_$type, null], 'IncludedSeries::gy', [Array_$type, null], 'LabelDisplayMode:ar:gz', [DataLegendLabelMode_$type, /*@__PURE__*/ enumGetBox(DataLegendLabelMode_$type, 0)], 'LabelTextColor:h2:g0', [Brush.$, null], 'LabelTextMargin:il:g1', [Thickness.$, /*@__PURE__*/ new Thickness(1, 12, 0, 0, 0)], 'ShouldUpdateWhenSeriesDataChanges:b3:g2', [0, true], 'SummaryLabelTextColor:h4:g3', [Brush.$, null], 'SummaryLabelText:d4:g4', [2, null], 'SummaryRowMargin:im:g5', [Thickness.$, /*@__PURE__*/ new Thickness(0, 5)], 'SummaryTitleTextColor:h5:g6', [Brush.$, null], 'SummaryTitleTextMargin:io:g7', [Thickness.$, /*@__PURE__*/ new Thickness(1, 2, 0, 4, 0)], 'SummaryTitleText:d9:g8', [2, null], 'SummaryType:a1:g9', [DataLegendSummaryType_$type, /*@__PURE__*/ enumGetBox(DataLegendSummaryType_$type, 0)], 'SummaryUnitsTextColor:h6:ha', [Brush.$, null], 'SummaryUnitsText:ef:hb', [2, null], 'SummaryValueTextColor:h7:hc', [Brush.$, null], 'TargetCursorPositionX::hd', [1, NaN], 'TargetCursorPositionY::he', [1, NaN], 'Target::hf', [4, null], 'TitleTextColor:h8:hg', [Brush.$, null], 'TitleTextMargin:ip:hh', [Thickness.$, /*@__PURE__*/ new Thickness(1, 0, 0, 4, 0)], 'UnitsDisplayMode:a2:hi', [DataLegendUnitsMode_$type, /*@__PURE__*/ enumGetBox(DataLegendUnitsMode_$type, 0)], 'UnitsTextColor:h9:hj', [Brush.$, null], 'UnitsTextMargin:iq:hk', [Thickness.$, /*@__PURE__*/ new Thickness(1, 0, 0, 0, 0)], 'UnitsText:es:hl', [2, null], 'ValueFormatAbbreviation:an:hm', [DataAbbreviationMode_$type, /*@__PURE__*/ enumGetBox(DataAbbreviationMode_$type, 0)], 'ValueFormatCulture:ey:hn', [2, /*@__PURE__*/ stringEmpty()], 'ValueFormatCurrencyCode:e0:ho', [2, null], 'ValueFormatMaxFractions:cu:hp', [1, -1], 'ValueFormatMinFractions:cv:hq', [1, -1], 'ValueFormatMode:a3:hr', [DataLegendValueMode_$type, /*@__PURE__*/ enumGetBox(DataLegendValueMode_$type, 0)], 'ValueFormatSpecifiers:ah:hs', [Array_$type, null], 'ValueFormatString:e6:ht', [2, null], 'ValueFormatUseGrouping:b4:hu', [0, true], 'ValueRowMargin:is:hv', [Thickness.$, /*@__PURE__*/ new Thickness(0, 5)], 'ValueRowVisible:b5:hw', [0, true], 'ValueTextColor:ia:hx', [Brush.$, null], 'ValueTextMargin:it:hy', [Thickness.$, /*@__PURE__*/ new Thickness(1, 2, 0, 2, 0)], 'ValueTextUseSeriesColors:b6:hz', [0, false], 'ValueTextWhenMissingData:ff:h0', [2, "N/A"]]);
+    XamDataLegend.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, XamDataLegend, 'f7', ['BadgeMargin:iy:gt', [Thickness.$, /*@__PURE__*/ new Thickness(1, 0, 0, 0, 0)], 'BadgeShape:a9:gu', [LegendItemBadgeShape_$type, /*@__PURE__*/ enumGetBox(LegendItemBadgeShape_$type, 0)], 'ExcludedColumns::gv', [Array_$type, null], 'ExcludedSeries::gw', [Array_$type, null], 'GroupRowMargin:iz:gx', [Thickness.$, /*@__PURE__*/ new Thickness(0, 5)], 'GroupRowVisible:b2:gy', [0, false], 'GroupTextColor:ig:gz', [Brush.$, null], 'GroupTextMargin:i0:g0', [Thickness.$, /*@__PURE__*/ new Thickness(1, 2, 0, 0, 0)], 'HeaderFormatCulture:dg:g1', [2, /*@__PURE__*/ stringEmpty()], 'HeaderFormatDate:ap:g2', [DataLegendHeaderDateMode_$type, /*@__PURE__*/ enumGetBox(DataLegendHeaderDateMode_$type, 0)], 'HeaderFormatSpecifiers:ag:g3', [Array_$type, null], 'HeaderFormatString:dk:g4', [2, null], 'HeaderFormatTime:aq:g5', [DataLegendHeaderTimeMode_$type, /*@__PURE__*/ enumGetBox(DataLegendHeaderTimeMode_$type, 0)], 'HeaderRowMargin:i1:g6', [Thickness.$, /*@__PURE__*/ new Thickness(0, 5)], 'HeaderRowVisible:b4:g7', [0, true], 'HeaderTextColor:ih:g8', [Brush.$, null], 'HeaderTextMargin:i2:g9', [Thickness.$, /*@__PURE__*/ new Thickness(1, 2, 0, 0, 0)], 'HeaderText:dq:ha', [2, null], 'IncludedColumns::hb', [Array_$type, null], 'IncludedSeries::hc', [Array_$type, null], 'LabelDisplayMode:ar:hd', [DataLegendLabelMode_$type, /*@__PURE__*/ enumGetBox(DataLegendLabelMode_$type, 0)], 'LabelTextColor:ii:he', [Brush.$, null], 'LabelTextMargin:i3:hf', [Thickness.$, /*@__PURE__*/ new Thickness(1, 12, 0, 0, 0)], 'ShouldUpdateWhenSeriesDataChanges:b7:hg', [0, true], 'SummaryLabelTextColor:ik:hh', [Brush.$, null], 'SummaryLabelText:ea:hi', [2, null], 'SummaryRowMargin:i4:hj', [Thickness.$, /*@__PURE__*/ new Thickness(0, 5)], 'SummaryTitleTextColor:il:hk', [Brush.$, null], 'SummaryTitleTextMargin:i5:hl', [Thickness.$, /*@__PURE__*/ new Thickness(1, 2, 0, 4, 0)], 'SummaryTitleText:ef:hm', [2, null], 'SummaryType:a2:hn', [DataLegendSummaryType_$type, /*@__PURE__*/ enumGetBox(DataLegendSummaryType_$type, 0)], 'SummaryUnitsTextColor:im:ho', [Brush.$, null], 'SummaryUnitsText:el:hp', [2, null], 'SummaryValueTextColor:io:hq', [Brush.$, null], 'TargetCursorPositionX::hr', [1, NaN], 'TargetCursorPositionY::hs', [1, NaN], 'Target::ht', [4, null], 'TitleTextColor:ip:hu', [Brush.$, null], 'TitleTextMargin:i6:hv', [Thickness.$, /*@__PURE__*/ new Thickness(1, 0, 0, 4, 0)], 'UnitsDisplayMode:a3:hw', [DataLegendUnitsMode_$type, /*@__PURE__*/ enumGetBox(DataLegendUnitsMode_$type, 0)], 'UnitsTextColor:iq:hx', [Brush.$, null], 'UnitsTextMargin:i7:hy', [Thickness.$, /*@__PURE__*/ new Thickness(1, 0, 0, 0, 0)], 'UnitsText:ey:hz', [2, null], 'ValueFormatAbbreviation:an:h0', [DataAbbreviationMode_$type, /*@__PURE__*/ enumGetBox(DataAbbreviationMode_$type, 0)], 'ValueFormatCulture:e4:h1', [2, /*@__PURE__*/ stringEmpty()], 'ValueFormatCurrencyCode:e6:h2', [2, null], 'ValueFormatMaxFractions:cw:h3', [1, -1], 'ValueFormatMinFractions:cx:h4', [1, -1], 'ValueFormatMode:a4:h5', [DataLegendValueMode_$type, /*@__PURE__*/ enumGetBox(DataLegendValueMode_$type, 0)], 'ValueFormatSpecifiers:ah:h6', [Array_$type, null], 'ValueFormatString:fc:h7', [2, null], 'ValueFormatUseGrouping:b8:h8', [0, true], 'ValueRowMargin:i9:h9', [Thickness.$, /*@__PURE__*/ new Thickness(0, 5)], 'ValueRowVisible:b9:ia', [0, true], 'ValueTextColor:ir:ib', [Brush.$, null], 'ValueTextMargin:ja:ic', [Thickness.$, /*@__PURE__*/ new Thickness(1, 2, 0, 2, 0)], 'ValueTextUseSeriesColors:ca:id', [0, false], 'ValueTextWhenMissingData:fl:ie', [2, "N/A"]]);
     return XamDataLegend;
 })();
 /**
@@ -2126,260 +2269,261 @@ export let DataLegendView = /*@__PURE__*/ (() => {
     class DataLegendView extends Base {
         constructor(a) {
             super();
-            this.ab = null;
             this.ad = null;
             this.af = null;
+            this.ah = null;
+            this.ag = null;
             this.ae = null;
-            this.ac = null;
-            this.o = null;
             this.q = null;
             this.s = null;
+            this.u = null;
+            this.t = null;
             this.r = null;
-            this.p = null;
             this.a = null;
-            this.ak = null;
-            this.aj = null;
-            this.t = null;
+            this.am = null;
+            this.al = null;
+            this.v = null;
             this.b = null;
-            this.ag = 1;
-            this.w = false;
-            this.am = -1;
-            this.al = -1;
-            this.z = new Dictionary$2(FontInfo.$, Tuple$2.$.specialize(Number_$type, FontInfo.$), 0);
-            this.v = false;
-            this.aa = new List$1(FrameworkElement.$, 0);
-            this.ah = 0;
-            this.f = null;
-            this.h = null;
+            this.ai = 1;
+            this.y = false;
+            this.ao = -1;
+            this.an = -1;
+            this.ab = new Dictionary$2(FontInfo.$, Tuple$2.$.specialize(Number_$type, FontInfo.$), 0);
+            this.x = false;
+            this.ac = new List$1(FrameworkElement.$, 0);
+            this.aj = 0;
             this.g = null;
-            this.d = null;
+            this.i = null;
+            this.h = null;
             this.e = null;
+            this.f = null;
+            this.d = null;
             this.c = null;
-            this.u = null;
+            this.w = null;
             this.a = a;
-            this.q = ((() => {
+            this.s = ((() => {
                 let $ret = new Pool$1(TextBlock.$);
-                $ret.create = runOn(this, this.bn);
-                $ret.activate = runOn(this, this.bc);
-                $ret.disactivate = runOn(this, this.be);
-                $ret.destroy = runOn(this, this.bd);
+                $ret.create = runOn(this, this.bp);
+                $ret.activate = runOn(this, this.be);
+                $ret.disactivate = runOn(this, this.bg);
+                $ret.destroy = runOn(this, this.bf);
                 return $ret;
             })());
-            this.s = ((() => {
+            this.u = ((() => {
                 let $ret = new Pool$1(TextBlock.$);
-                $ret.create = runOn(this, this.bp);
-                $ret.activate = runOn(this, this.bi);
-                $ret.disactivate = runOn(this, this.bk);
-                $ret.destroy = runOn(this, this.bj);
+                $ret.create = runOn(this, this.br);
+                $ret.activate = runOn(this, this.bk);
+                $ret.disactivate = runOn(this, this.bm);
+                $ret.destroy = runOn(this, this.bl);
                 return $ret;
             })());
-            this.r = ((() => {
+            this.t = ((() => {
                 let $ret = new Pool$1(TextBlock.$);
-                $ret.create = runOn(this, this.bo);
-                $ret.activate = runOn(this, this.bf);
-                $ret.disactivate = runOn(this, this.bh);
-                $ret.destroy = runOn(this, this.bg);
+                $ret.create = runOn(this, this.bq);
+                $ret.activate = runOn(this, this.bh);
+                $ret.disactivate = runOn(this, this.bj);
+                $ret.destroy = runOn(this, this.bi);
                 return $ret;
             })());
-            this.p = ((() => {
+            this.r = ((() => {
                 let $ret = new Pool$1(ContentControl.$);
-                $ret.create = runOn(this, this.bl);
-                $ret.activate = runOn(this, this.a0);
-                $ret.disactivate = runOn(this, this.a2);
-                $ret.destroy = runOn(this, this.a1);
+                $ret.create = runOn(this, this.bn);
+                $ret.activate = runOn(this, this.a2);
+                $ret.disactivate = runOn(this, this.a4);
+                $ret.destroy = runOn(this, this.a3);
                 return $ret;
             })());
-            this.o = ((() => {
+            this.q = ((() => {
                 let $ret = new Pool$1(TextBlock.$);
-                $ret.create = runOn(this, this.bm);
-                $ret.activate = runOn(this, this.ax);
-                $ret.disactivate = runOn(this, this.az);
-                $ret.destroy = runOn(this, this.ay);
+                $ret.create = runOn(this, this.bo);
+                $ret.activate = runOn(this, this.az);
+                $ret.disactivate = runOn(this, this.a1);
+                $ret.destroy = runOn(this, this.a0);
                 return $ret;
             })());
-            this.ab = new List$1(TextBlock.$, 0);
             this.ad = new List$1(TextBlock.$, 0);
             this.af = new List$1(TextBlock.$, 0);
-            this.ae = new List$1(TextBlock.$, 0);
-            this.ac = new List$1(ContentControl.$, 0);
+            this.ah = new List$1(TextBlock.$, 0);
+            this.ag = new List$1(TextBlock.$, 0);
+            this.ae = new List$1(ContentControl.$, 0);
         }
-        at() {
-            this.a.fp();
+        av() {
+            this.a.fw();
         }
-        bn() {
+        bp() {
             let a = new TextBlock();
-            this.ad.add(a);
+            this.af.add(a);
             return a;
         }
-        bc(a) {
+        be(a) {
             a._visibility = 0;
         }
-        be(a) {
+        bg(a) {
             a._visibility = 1;
         }
-        bd(a) {
-            this.ad.remove(a);
+        bf(a) {
+            this.af.remove(a);
         }
-        bp() {
+        br() {
             let a = new TextBlock();
-            this.af.add(a);
+            this.ah.add(a);
             return a;
         }
-        bi(a) {
+        bk(a) {
             a._visibility = 0;
         }
-        bk(a) {
+        bm(a) {
             a._visibility = 1;
         }
-        bj(a) {
-            this.af.remove(a);
+        bl(a) {
+            this.ah.remove(a);
         }
-        bo() {
+        bq() {
             let a = new TextBlock();
-            this.ae.add(a);
+            this.ag.add(a);
             return a;
         }
-        bf(a) {
+        bh(a) {
             a._visibility = 0;
         }
-        bh(a) {
+        bj(a) {
             a._visibility = 1;
         }
-        bg(a) {
-            this.ae.remove(a);
+        bi(a) {
+            this.ag.remove(a);
         }
-        bm() {
+        bo() {
             let a = new TextBlock();
-            this.ab.add(a);
+            this.ad.add(a);
             return a;
         }
-        ax(a) {
+        az(a) {
             a._visibility = 0;
         }
-        az(a) {
+        a1(a) {
             a._visibility = 1;
         }
-        ay(a) {
-            this.ab.remove(a);
+        a0(a) {
+            this.ad.remove(a);
         }
-        bl() {
+        bn() {
             let a = new ContentControl();
-            this.ac.add(a);
+            this.ae.add(a);
             return a;
         }
-        a0(a) {
+        a2(a) {
             a._visibility = 0;
         }
-        a2(a) {
+        a4(a) {
             a._visibility = 1;
         }
-        a1(a) {
+        a3(a) {
         }
-        aw() {
+        ay() {
             let a = this.a.pixelScalingRatio;
-            let b = this.a.co;
+            let b = this.a.cq;
             if (!isNaN_(a) && a != 0) {
                 return;
             }
             if (window.devicePixelRatio != undefined && window.devicePixelRatio != b) {
-                this.a.co = window.devicePixelRatio;
+                this.a.cq = window.devicePixelRatio;
             }
         }
-        a5() {
-            this.aw();
-            let a = Math.round(this.aj.rootWrapper.width());
-            let b = Math.round(this.aj.rootWrapper.height());
-            this.a.ic = new Rect(0, 0, 0, a, b);
+        a7() {
+            this.ay();
+            let a = Math.round(this.al.rootWrapper.width());
+            let b = Math.round(this.al.rootWrapper.height());
+            this.a.it = new Rect(0, 0, 0, a, b);
             if (this.b != null) {
-                this.b.bl = this.a.ic;
+                this.b.bl = this.a.it;
             }
-            this.a.f3();
+            this.a.gc();
         }
-        an() {
+        ap() {
             if (this.b != null) {
                 this.b.ao = null;
                 this.b.av();
                 this.b = null;
             }
         }
-        get x() {
-            return this.aj != null;
+        get z() {
+            return this.al != null;
         }
-        a4(a, b) {
+        a6(a, b) {
             if (a == null) {
-                this.ak = null;
-                this.aj = null;
-                this.t = null;
-                this.an();
+                this.am = null;
+                this.al = null;
+                this.v = null;
+                this.ap();
                 return;
             }
-            this.ag = (isNaN_(this.a.pixelScalingRatio) ? this.a.co : this.a.pixelScalingRatio);
+            this.ai = (isNaN_(this.a.pixelScalingRatio) ? this.a.cq : this.a.pixelScalingRatio);
             let c = a;
-            this.aj = c;
-            let d = this.ag;
+            this.al = c;
+            let d = this.ai;
             let e = Math.round(c.rootWrapper.width());
             let f = Math.round(c.rootWrapper.height());
             let g = e * d;
             let h = f * d;
-            this.aj.rootWrapper.setStyleProperty("position", "relative");
-            let i = this.aj.createElement("canvas");
+            this.al.rootWrapper.setStyleProperty("position", "relative");
+            let i = this.al.createElement("canvas");
             i.setStyleProperty("position", "absolute");
-            this.aj.append(i);
-            this.am = truncate(Math.round(g));
-            this.al = truncate(Math.round(h));
+            this.al.append(i);
+            this.ao = truncate(Math.round(g));
+            this.an = truncate(Math.round(h));
             i.setAttribute("width", g.toString());
             i.setAttribute("height", h.toString());
             i.setStyleProperty("width", e.toString() + "px");
             i.setStyleProperty("height", f.toString() + "px");
-            this.a.ic = new Rect(0, 0, 0, e, f);
-            this.ak = i;
-            let j = this.aj.get2DCanvasContext(this.ak);
-            this.t = new RenderingContext(new CanvasViewRenderer(), j);
-            this.an();
+            this.a.it = new Rect(0, 0, 0, e, f);
+            this.am = i;
+            let j = this.al.get2DCanvasContext(this.am);
+            this.v = new RenderingContext(new CanvasViewRenderer(), j);
+            this.ap();
             if (TypeRegistrar.isRegistered("CanvasGestureDOMEventProxy")) {
-                this.b = typeCast(EventProxy.$, TypeRegistrar.create("CanvasGestureDOMEventProxy", this.aj.rootWrapper, this.aj, false));
+                this.b = typeCast(EventProxy.$, TypeRegistrar.create("CanvasGestureDOMEventProxy", this.al.rootWrapper, this.al, false));
             }
             if (this.b != null) {
             }
         }
-        av(a, b) {
-            this.a5();
+        ax(a, b) {
+            this.a7();
         }
-        au(a) {
+        aw(a) {
         }
-        a8() {
-            let a = this.a.ic.width;
-            let b = this.a.ic.height;
-            let c = Math.round(a * this.ag);
-            let d = Math.round(b * this.ag);
-            if (this.am != c || this.al != d) {
-                this.ak.setAttribute("width", c.toString());
-                this.ak.setAttribute("height", d.toString());
-                this.ak.setStyleProperty("width", a.toString() + "px");
-                this.ak.setStyleProperty("height", b.toString() + "px");
-                this.am = truncate(Math.round(c));
-                this.al = truncate(Math.round(d));
-            }
-            this.a9(this.t, this.ag);
-        }
-        a9(a, b) {
-            if (this.t == null) {
-                this.w = true;
-                this.t = a;
+        ba() {
+            let a = this.a.it.width;
+            let b = this.a.it.height;
+            let c = Math.round(a * this.ai);
+            let d = Math.round(b * this.ai);
+            if (this.ao != c || this.an != d) {
+                this.am.setAttribute("width", c.toString());
+                this.am.setAttribute("height", d.toString());
+                this.am.setStyleProperty("width", a.toString() + "px");
+                this.am.setStyleProperty("height", b.toString() + "px");
+                this.ao = truncate(Math.round(c));
+                this.an = truncate(Math.round(d));
+            }
+            this.bb(this.v, this.ai);
+        }
+        bb(a, b) {
+            if (this.v == null) {
+                this.y = true;
+                this.v = a;
             }
             if (a.d && b != 1) {
                 a.aa();
                 a.ab(b, b);
             }
-            if (a == this.t) {
+            if (a == this.v) {
                 if (!a.e) {
-                    a.l(this.a.ic.left, this.a.ic.top, this.a.ic.width, this.a.ic.height);
+                    a.l(this.a.it.left, this.a.it.top, this.a.it.width, this.a.it.height);
                 }
             }
             let c = new DataTemplatePassInfo();
             c.passID = "LegendItem";
-            for (let d = 0; d < this.ac.count; d++) {
-                let e = this.ac._inner[d];
+            for (let d = 0; d < this.ae.count; d++) {
+                let e = this.ae._inner[d];
                 if (e == null) {
                     continue;
                 }
@@ -2389,7 +2533,7 @@ export let DataLegendView = /*@__PURE__*/ (() => {
                 }
                 let g = new DataTemplateMeasureInfo();
                 g.passInfo = c;
-                g.context = this.t.h();
+                g.context = this.v.h();
                 g.width = e.width;
                 g.height = e.height;
                 g.data = e.content;
@@ -2409,23 +2553,23 @@ export let DataLegendView = /*@__PURE__*/ (() => {
                 f.render(h);
                 a.z();
             }
-            for (let i = 0; i < this.ad.count; i++) {
-                let j = this.ad._inner[i];
+            for (let i = 0; i < this.af.count; i++) {
+                let j = this.af._inner[i];
                 a.ad(j.dataContext);
                 a.x(j);
             }
-            for (let k = 0; k < this.ab.count; k++) {
-                let l = this.ab._inner[k];
+            for (let k = 0; k < this.ad.count; k++) {
+                let l = this.ad._inner[k];
                 a.ad(l.dataContext);
                 a.x(l);
             }
-            for (let m = 0; m < this.af.count; m++) {
-                let n = this.af._inner[m];
+            for (let m = 0; m < this.ah.count; m++) {
+                let n = this.ah._inner[m];
                 a.ad(n.dataContext);
                 a.x(n);
             }
-            for (let o = 0; o < this.ae.count; o++) {
-                let p = this.ae._inner[o];
+            for (let o = 0; o < this.ag.count; o++) {
+                let p = this.ag._inner[o];
                 a.ad(p.dataContext);
                 a.x(p);
             }
@@ -2433,199 +2577,217 @@ export let DataLegendView = /*@__PURE__*/ (() => {
                 a.z();
             }
         }
-        y() {
-            if (this.aj != null) {
-                this.aj.setTimeout(runOn(this.a, this.a.fp), 0);
+        aa() {
+            if (this.al != null) {
+                this.al.setTimeout(runOn(this.a, this.a.fw), 0);
                 return true;
             }
             return false;
         }
-        bw(a, b) {
-            this.t.ad(b);
+        bz(a, b) {
+            this.v.ad(b);
             let c = new TextBlock();
             c.al = a;
-            let d = this.t.ah(c, this.ai(b), true);
+            let d = this.v.ah(c, this.ak(b), true);
             return new Size(1, d.c, d.b);
         }
-        ai(a) {
-            if (this.z.containsKey(a)) {
-                let b = this.z.item(a);
-                if (b.d.i == a.i) {
+        ak(a) {
+            if (this.ab.containsKey(a)) {
+                let b = this.ab.item(a);
+                if (b.d.j == a.j) {
                     return b.c;
                 }
             }
-            let c = FontUtil.getCurrentFontHeight(this.aj, a);
+            let c = FontUtil.getCurrentFontHeight(this.al, a);
             let d = new Tuple$2(Number_$type, FontInfo.$, c, a);
-            this.z.item(a, d);
+            this.ab.item(a, d);
             return c;
         }
-        ba(a, b, c) {
-            if (this.v) {
-                this.aa.add(a);
+        bc(a, b, c) {
+            if (this.x) {
+                this.ac.add(a);
             }
             a.n = b;
             a.o = c;
         }
-        as(a) {
-            this.a8();
+        au(a) {
+            this.ba();
         }
-        aq(a, b) {
+        as(a, b) {
             a.dataContext = b;
         }
-        bv() {
+        by() {
             return FontDefaults.dataLegendFontBrush;
         }
-        bt() {
+        bw() {
+            return FontDefaults.dataLegendFontBrush;
+        }
+        bx() {
             return FontDefaults.dataLegendFontBrush;
         }
         bu() {
             return FontDefaults.dataLegendFontBrush;
         }
-        br() {
+        bv() {
             return FontDefaults.dataLegendFontBrush;
         }
-        bs() {
+        bt() {
             return FontDefaults.dataLegendFontBrush;
         }
-        bq() {
+        bs() {
             return FontDefaults.dataLegendFontBrush;
         }
-        l() {
-            if (this.f == null) {
-                this.f = ((() => {
+        n() {
+            if (this.g == null) {
+                this.g = ((() => {
                     let $ret = new FontInfo();
-                    $ret.p = FontDefaults.dataLegendFontFamily;
-                    $ret.e = FontDefaults.dataLegendFontSize;
-                    $ret.s = FontDefaults.dataLegendFontStyle;
-                    $ret.u = FontDefaults.dataLegendFontWeight;
-                    $ret.q = FontDefaults.dataLegendFontStretch;
-                    $ret.t = FontDefaults.dataLegendFontVariant;
+                    $ret.q = FontDefaults.dataLegendFontFamily;
+                    $ret.f = FontDefaults.dataLegendFontSize;
+                    $ret.t = FontDefaults.dataLegendFontStyle;
+                    $ret.v = FontDefaults.dataLegendFontWeight;
+                    $ret.r = FontDefaults.dataLegendFontStretch;
+                    $ret.u = FontDefaults.dataLegendFontVariant;
                     return $ret;
                 })());
             }
-            return this.f;
+            return this.g;
         }
-        n() {
+        p() {
+            if (this.i == null) {
+                this.i = ((() => {
+                    let $ret = new FontInfo();
+                    $ret.q = FontDefaults.dataLegendFontFamily;
+                    $ret.f = FontDefaults.dataLegendFontSize;
+                    $ret.t = FontDefaults.dataLegendFontStyle;
+                    $ret.v = FontDefaults.dataLegendFontWeight;
+                    $ret.r = FontDefaults.dataLegendFontStretch;
+                    $ret.u = FontDefaults.dataLegendFontVariant;
+                    return $ret;
+                })());
+            }
+            return this.i;
+        }
+        o() {
             if (this.h == null) {
                 this.h = ((() => {
                     let $ret = new FontInfo();
-                    $ret.p = FontDefaults.dataLegendFontFamily;
-                    $ret.e = FontDefaults.dataLegendFontSize;
-                    $ret.s = FontDefaults.dataLegendFontStyle;
-                    $ret.u = FontDefaults.dataLegendFontWeight;
-                    $ret.q = FontDefaults.dataLegendFontStretch;
-                    $ret.t = FontDefaults.dataLegendFontVariant;
+                    $ret.q = FontDefaults.dataLegendFontFamily;
+                    $ret.f = FontDefaults.dataLegendFontSize;
+                    $ret.t = FontDefaults.dataLegendFontStyle;
+                    $ret.v = FontDefaults.dataLegendFontWeight;
+                    $ret.r = FontDefaults.dataLegendFontStretch;
+                    $ret.u = FontDefaults.dataLegendFontVariant;
                     return $ret;
                 })());
             }
             return this.h;
         }
-        m() {
-            if (this.g == null) {
-                this.g = ((() => {
+        l() {
+            if (this.e == null) {
+                this.e = ((() => {
                     let $ret = new FontInfo();
-                    $ret.p = FontDefaults.dataLegendFontFamily;
-                    $ret.e = FontDefaults.dataLegendFontSize;
-                    $ret.s = FontDefaults.dataLegendFontStyle;
-                    $ret.u = FontDefaults.dataLegendFontWeight;
-                    $ret.q = FontDefaults.dataLegendFontStretch;
-                    $ret.t = FontDefaults.dataLegendFontVariant;
+                    $ret.q = FontDefaults.dataLegendFontFamily;
+                    $ret.f = FontDefaults.dataLegendFontSize;
+                    $ret.t = FontDefaults.dataLegendFontStyle;
+                    $ret.v = FontDefaults.dataLegendFontWeight;
+                    $ret.r = FontDefaults.dataLegendFontStretch;
+                    $ret.u = FontDefaults.dataLegendFontVariant;
                     return $ret;
                 })());
             }
-            return this.g;
+            return this.e;
         }
-        j() {
-            if (this.d == null) {
-                this.d = ((() => {
+        m() {
+            if (this.f == null) {
+                this.f = ((() => {
                     let $ret = new FontInfo();
-                    $ret.p = FontDefaults.dataLegendFontFamily;
-                    $ret.e = FontDefaults.dataLegendFontSize;
-                    $ret.s = FontDefaults.dataLegendFontStyle;
-                    $ret.u = FontDefaults.dataLegendFontWeight;
-                    $ret.q = FontDefaults.dataLegendFontStretch;
-                    $ret.t = FontDefaults.dataLegendFontVariant;
+                    $ret.q = FontDefaults.dataLegendFontFamily;
+                    $ret.f = FontDefaults.dataLegendFontSize;
+                    $ret.t = FontDefaults.dataLegendFontStyle;
+                    $ret.v = FontDefaults.dataLegendFontWeight;
+                    $ret.r = FontDefaults.dataLegendFontStretch;
+                    $ret.u = FontDefaults.dataLegendFontVariant;
                     return $ret;
                 })());
             }
-            return this.d;
+            return this.f;
         }
         k() {
-            if (this.e == null) {
-                this.e = ((() => {
+            if (this.d == null) {
+                this.d = ((() => {
                     let $ret = new FontInfo();
-                    $ret.p = FontDefaults.dataLegendFontFamily;
-                    $ret.e = FontDefaults.dataLegendFontSize;
-                    $ret.s = FontDefaults.dataLegendFontStyle;
-                    $ret.u = FontDefaults.dataLegendFontWeight;
-                    $ret.q = FontDefaults.dataLegendFontStretch;
-                    $ret.t = FontDefaults.dataLegendFontVariant;
+                    $ret.q = FontDefaults.dataLegendFontFamily;
+                    $ret.f = FontDefaults.dataLegendFontSize;
+                    $ret.t = FontDefaults.dataLegendFontStyle;
+                    $ret.v = FontDefaults.dataLegendHeaderFontWeight;
+                    $ret.r = FontDefaults.dataLegendFontStretch;
+                    $ret.u = FontDefaults.dataLegendFontVariant;
                     return $ret;
                 })());
             }
-            return this.e;
+            return this.d;
         }
-        i() {
+        j() {
             if (this.c == null) {
                 this.c = ((() => {
                     let $ret = new FontInfo();
-                    $ret.p = FontDefaults.dataLegendFontFamily;
-                    $ret.e = FontDefaults.dataLegendFontSize;
-                    $ret.s = FontDefaults.dataLegendFontStyle;
-                    $ret.u = FontDefaults.dataLegendHeaderFontWeight;
-                    $ret.q = FontDefaults.dataLegendFontStretch;
-                    $ret.t = FontDefaults.dataLegendFontVariant;
+                    $ret.q = FontDefaults.dataLegendFontFamily;
+                    $ret.f = FontDefaults.dataLegendFontSize;
+                    $ret.t = FontDefaults.dataLegendFontStyle;
+                    $ret.v = FontDefaults.dataLegendFontWeight;
+                    $ret.r = FontDefaults.dataLegendFontStretch;
+                    $ret.u = FontDefaults.dataLegendFontVariant;
                     return $ret;
                 })());
             }
             return this.c;
         }
-        ao(a, b) {
+        aq(a, b) {
             let model_ = this.a;
             let ext_ = model_.externalObject;
             if (ext_ != null) {
                 let width_ = a;
                 let height_ = b;
-                this.aj.rootWrapper.setStyleProperty("min-height", b + "px");
-                this.aj.rootWrapper.setStyleProperty("min-width", a + "px");
+                this.al.rootWrapper.setStyleProperty("min-height", b + "px");
+                this.al.rootWrapper.setStyleProperty("min-width", a + "px");
                 this.a.notifySizeChanged();
             }
         }
-        a7(a) {
-            this.ag = a;
+        a9(a) {
+            this.ai = a;
         }
-        a3() {
+        a5() {
             if (this.b != null) {
-                let a = this.aj.rootWrapper;
+                let a = this.al.rootWrapper;
                 this.b.at(a, "");
             }
         }
-        a6() {
+        a8() {
             if (this.b != null) {
-                let a = this.aj.rootWrapper;
+                let a = this.al.rootWrapper;
                 this.b.bh(a, "");
             }
         }
-        ar(a, b) {
+        at(a, b) {
             a.ag = true;
-            let c = this.t.ah(a, this.ai(b), true);
+            let c = this.v.ah(a, this.ak(b), true);
         }
-        bb() {
-            this.aa.clear();
-            this.v = true;
-            this.ah = 0;
+        bd() {
+            this.ac.clear();
+            this.x = true;
+            this.aj = 0;
         }
-        ap() {
-            for (let a = 0; a < this.aa.count; a++) {
-                this.ah = Math.max(this.ah, this.aa._inner[a].ah);
+        ar() {
+            for (let a = 0; a < this.ac.count; a++) {
+                this.aj = Math.max(this.aj, this.ac._inner[a].ah);
             }
-            if (this.ah > 0) {
-                for (let b = 0; b < this.aa.count; b++) {
-                    this.aa._inner[b].ah = this.ah;
+            if (this.aj > 0) {
+                for (let b = 0; b < this.ac.count; b++) {
+                    this.ac._inner[b].ah = this.aj;
                 }
             }
-            this.v = false;
-            this.ah = 0;
+            this.x = false;
+            this.aj = 0;
         }
     }
     DataLegendView.$t = /*@__PURE__*/ markType(DataLegendView, 'DataLegendView');