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

package/esm2015/lib/TreemapHighlightingManager_combined.js

@@ -31,15 +31,16 @@ import { Thickness } from "igniteui-webcomponents-core";
 import { TreemapNodeVisualData } from "./TreemapNodeVisualData";
 import { TreemapLabelVisualData } from "./TreemapLabelVisualData";
 import { RectangleVisualData } from "igniteui-webcomponents-core";
+import { AppearanceHelper } from "igniteui-webcomponents-core";
 import { PointData } from "igniteui-webcomponents-core";
 import { SizeData } from "igniteui-webcomponents-core";
-import { AppearanceHelper } from "igniteui-webcomponents-core";
 import { HashSet$1 } from "igniteui-webcomponents-core";
 import { TreemapOrientation_$type } from "./TreemapOrientation";
 import { Size } from "igniteui-webcomponents-core";
 import { AreaInfo } from "./AreaInfo";
 import { Dictionary$2 } from "igniteui-webcomponents-core";
 import { DoubleAnimator } from "igniteui-webcomponents-core";
+import { TreemapHighlightedValueDisplayMode_$type } from "./TreemapHighlightedValueDisplayMode";
 import { BrushCollection } from "igniteui-webcomponents-core";
 import { TreemapFillScaleMode_$type } from "./TreemapFillScaleMode";
 import { TreemapLabelVerticalFitMode_$type } from "./TreemapLabelVerticalFitMode";
@@ -57,7 +58,7 @@ import { BrushCollectionUtil } from "igniteui-webcomponents-core";
 import { TreemapValueMappingMode_$type } from "./TreemapValueMappingMode";
 import { TreemapNodePointerEventArgs } from "./TreemapNodePointerEventArgs";
 import { TreemapNodeStyleMappingTargetType_$type } from "./TreemapNodeStyleMappingTargetType";
-import { stringReplace, stringIsNullOrEmpty } from "igniteui-webcomponents-core";
+import { stringIsNullOrEmpty, stringReplace } from "igniteui-webcomponents-core";
 /**
  * @hidden
  */
@@ -65,7 +66,7 @@ export let TreemapHighlightingManager = /*@__PURE__*/ (() => {
     class TreemapHighlightingManager extends HighlightingManager {
         isCrossContextHighlight(a) {
             let b = a;
-            return b.as == 3;
+            return b.au == 3;
         }
     }
     TreemapHighlightingManager.$t = /*@__PURE__*/ markType(TreemapHighlightingManager, 'TreemapHighlightingManager', HighlightingManager.$);
@@ -96,14 +97,14 @@ export let TreemapView = /*@__PURE__*/ (() => {
             this.a4 = null;
             this.i = ((() => {
                 let $ret = new FontInfo();
-                $ret.p = FontDefaults.treemapFontFamily;
-                $ret.e = DeviceUtils.f(FontDefaults.treemapFontSize);
+                $ret.q = FontDefaults.treemapFontFamily;
+                $ret.f = DeviceUtils.f(FontDefaults.treemapFontSize);
                 return $ret;
             })());
             this.h = ((() => {
                 let $ret = new FontInfo();
-                $ret.p = FontDefaults.treemapFontFamily;
-                $ret.e = DeviceUtils.f(FontDefaults.treemapFontSize);
+                $ret.q = FontDefaults.treemapFontFamily;
+                $ret.f = DeviceUtils.f(FontDefaults.treemapFontSize);
                 return $ret;
             })());
             this.r = null;
@@ -115,14 +116,14 @@ export let TreemapView = /*@__PURE__*/ (() => {
             })());
             this.f = ((() => {
                 let $ret = new FontInfo();
-                $ret.p = FontDefaults.treemapFontFamily;
-                $ret.e = DeviceUtils.f(FontDefaults.treemapFontSize);
+                $ret.q = FontDefaults.treemapFontFamily;
+                $ret.f = DeviceUtils.f(FontDefaults.treemapFontSize);
                 return $ret;
             })());
             this.e = ((() => {
                 let $ret = new FontInfo();
-                $ret.p = FontDefaults.treemapHeaderFontFamily;
-                $ret.e = DeviceUtils.f(FontDefaults.treemapHeaderFontSize);
+                $ret.q = FontDefaults.treemapHeaderFontFamily;
+                $ret.f = DeviceUtils.f(FontDefaults.treemapHeaderFontSize);
                 return $ret;
             })());
             this.o = true;
@@ -152,14 +153,14 @@ export let TreemapView = /*@__PURE__*/ (() => {
         ag() {
             if (this.p) {
                 this.p = false;
-                this.a.h4();
+                this.a.i1();
             }
         }
         q() {
             return true;
         }
         ay() {
-            this.w = this.a.c1;
+            this.w = this.a.dg;
             this.a2();
         }
         au(a) {
@@ -179,7 +180,7 @@ export let TreemapView = /*@__PURE__*/ (() => {
             let b = this.ae.rootWrapper.width();
             let c = this.ae.rootWrapper.height();
             this.ar();
-            this.w = (isNaN_(this.a.dx) ? this.a.c1 : this.a.dx);
+            this.w = (isNaN_(this.a.ee) ? this.a.dg : this.a.ee);
             let d = this.w;
             let e = Math.round(a.rootWrapper.width());
             let f = Math.round(a.rootWrapper.height());
@@ -196,7 +197,7 @@ export let TreemapView = /*@__PURE__*/ (() => {
             i.setStyleProperty("width", e.toString() + "px");
             i.setStyleProperty("height", f.toString() + "px");
             this.n = i.listen("contextmenu", (j) => j.preventDefault());
-            this.a.jg = new Rect(0, 0, 0, e, f);
+            this.a.kb = new Rect(0, 0, 0, e, f);
             this.af = i;
             let j = this.ad.get2DCanvasContext(this.af);
             this.m = new RenderingContext(new CanvasViewRenderer(), j);
@@ -206,7 +207,7 @@ export let TreemapView = /*@__PURE__*/ (() => {
             this.a0();
             this.c = new CanvasGestureDOMEventProxy(this.af, this.ad, true);
             this.c.ao = (k) => true;
-            this.c.bl = this.a.jg;
+            this.c.bl = this.a.kb;
             let k = this.c;
             k.onMouseOver = delegateCombine(k.onMouseOver, runOn(this, this.am));
             let l = this.c;
@@ -219,24 +220,24 @@ export let TreemapView = /*@__PURE__*/ (() => {
             o.onMouseLeave = delegateCombine(o.onMouseLeave, runOn(this, this.al));
         }
         al(a) {
-            this.a.ht(a);
+            this.a.iq(a);
         }
         ao(a) {
             this.b.e(a, this.r, this);
         }
         ak(a) {
-            this.a.hs(a);
+            this.a.ip(a);
         }
         ar() {
             if (this.ac == null) {
                 this.ac = (a) => {
-                    let b = this.a.dx;
-                    let c = this.a.c1;
+                    let b = this.a.ee;
+                    let c = this.a.dg;
                     if (!isNaN_(b) && b != 0) {
                         return;
                     }
                     if (window.devicePixelRatio != undefined && window.devicePixelRatio != c) {
-                        this.a.c1 = window.devicePixelRatio;
+                        this.a.dg = window.devicePixelRatio;
                     }
                 };
                 let e_ = this.ac;
@@ -266,22 +267,22 @@ export let TreemapView = /*@__PURE__*/ (() => {
         }
         aj(a) {
             if (this.c.al) {
-                this.a.hx(a);
+                this.a.iu(a);
             }
             else {
-                this.a.hr(a);
+                this.a.io(a);
             }
         }
         an(a) {
             if (this.c.al) {
-                this.a.hy(a);
+                this.a.iv(a);
             }
             else {
-                this.a.hv(a);
+                this.a.is(a);
             }
         }
         am(a, b, c) {
-            this.a.hu(a);
+            this.a.ir(a);
         }
         aq() {
         }
@@ -311,7 +312,7 @@ export let TreemapView = /*@__PURE__*/ (() => {
         as() {
             let a = this.ae.rootWrapper.width();
             let b = this.ae.rootWrapper.height();
-            this.a.jg = new Rect(0, 0, 0, a, b);
+            this.a.kb = new Rect(0, 0, 0, a, b);
             this.ar();
         }
         ap() {
@@ -323,8 +324,8 @@ export let TreemapView = /*@__PURE__*/ (() => {
             if (this.m == null) {
                 return;
             }
-            let a = this.a.jg.width;
-            let b = this.a.jg.height;
+            let a = this.a.kb.width;
+            let b = this.a.kb.height;
             let c = Math.round(a * this.w);
             let d = Math.round(b * this.w);
             if (this.t != c || this.s != d) {
@@ -339,7 +340,7 @@ export let TreemapView = /*@__PURE__*/ (() => {
                 this.m.aa();
                 this.m.ab(this.w, this.w);
             }
-            this.b.f(this.m, this.a.jg, this.r, this.u);
+            this.b.f(this.m, this.a.kb, this.r, this.u);
             if (this.m.d && this.w != 1) {
                 this.m.z();
             }
@@ -515,19 +516,21 @@ export let TreemapViewRenderer = /*@__PURE__*/ (() => {
             return a;
         }
         g(a) {
-            a.u = 0;
+            a.x = 0;
         }
         i(a) {
-            a.u = 1;
+            a.x = 1;
         }
         h(a) {
             this.c.remove(a);
         }
         d(a) {
-            if (a.c.count != 3) {
+            if (a.c.count != 5) {
                 a.c.add1(new Rectangle());
                 a.c.add1(new Rectangle());
                 a.c.add1(new TextBlock());
+                a.c.add1(new Rectangle());
+                a.c.add1(new Rectangle());
             }
         }
         f(a, b, c, d) {
@@ -539,69 +542,91 @@ export let TreemapViewRenderer = /*@__PURE__*/ (() => {
                     let g = f.c._inner[0];
                     let h = f.c._inner[1];
                     let i = f.c._inner[2];
-                    g._fill = f.j;
-                    g._stroke = f.m;
-                    g.ad = f.g;
-                    g.width = f.n.width;
-                    g.height = f.n.height;
-                    g.n = f.n.left;
-                    g.o = f.n.top;
+                    let j = f.c._inner[3];
+                    let k = f.c._inner[4];
+                    g._fill = f.l;
+                    g._opacity = f.d;
+                    g.width = f.p.width;
+                    g.height = f.p.height;
+                    g.n = f.p.left;
+                    g.o = f.p.top;
+                    j._fill = f.l;
+                    j.width = !f.q.isEmpty ? f.q.width : 0;
+                    j.height = !f.q.isEmpty ? f.q.height : 0;
+                    j.n = !f.q.isEmpty ? f.q.left : 0;
+                    j.o = !f.q.isEmpty ? f.q.top : 0;
+                    k._fill = null;
+                    k._stroke = f.o;
+                    k.ad = f.i;
+                    k.width = f.p.width;
+                    k.height = f.p.height;
+                    k.n = f.p.left;
+                    k.o = f.p.top;
                     a.ad(f.a);
-                    let j = a.g(f.h);
+                    let l = a.g(f.j);
                     if (f.b) {
-                        i.al = f.h;
-                        switch (f.i) {
+                        i.al = f.j;
+                        switch (f.k) {
                             case 0:
-                                i.n = f.n.left + f.p.left;
+                                i.n = f.p.left + f.s.left;
                                 break;
                             case 1:
                             case 3:
-                                i.n = f.n.left + f.n.width / 2 - f.e / 2;
+                                i.n = f.p.left + f.p.width / 2 - f.f / 2;
                                 break;
                             case 2:
-                                i.n = Math.max(f.n.left + f.p.left, f.n.right - (j + f.p.right));
+                                i.n = Math.max(f.p.left + f.s.left, f.p.right - (l + f.s.right));
                                 break;
                         }
-                        switch (f.q) {
+                        switch (f.t) {
                             case 0:
-                                i.o = f.n.top + f.p.top;
+                                i.o = f.p.top + f.s.top;
                                 break;
                             case 1:
                             case 3:
-                                i.o = f.n.top + f.n.height / 2 - f.d / 2;
+                                i.o = f.p.top + f.p.height / 2 - f.e / 2;
                                 break;
                             case 2:
-                                i.o = Math.max(f.n.top + f.p.top, f.n.bottom - (d + f.p.bottom));
+                                i.o = Math.max(f.p.top + f.s.top, f.p.bottom - (d + f.s.bottom));
                                 break;
                         }
-                        i.ao = f.l;
+                        i.ao = f.n;
                     }
                     else {
-                        h._fill = f.k;
-                        h._stroke = f.m;
-                        h.ad = f.g;
-                        h.width = f.n.width;
-                        h.height = f.d;
-                        h.n = f.n.left;
-                        h.o = f.n.top;
-                        if (f.t == 0) {
-                            h.width = j + f.o.left + f.o.right;
+                        h._fill = f.m;
+                        h._stroke = f.o;
+                        h.ad = f.i;
+                        h.width = f.p.width;
+                        h.height = f.e;
+                        h.n = f.p.left;
+                        h.o = f.p.top;
+                        if (f.w == 0) {
+                            h.width = l + f.r.left + f.r.right;
                         }
-                        i.n = f.n.left + f.o.left;
-                        i.o = f.n.top + f.o.top;
-                        i.al = f.h;
-                        i.ao = f.l;
+                        i.n = f.p.left + f.r.left;
+                        i.o = f.p.top + f.r.top;
+                        i.al = f.j;
+                        i.ao = f.n;
+                    }
+                    a.ae(f.h);
+                    if (f.b) {
+                        a.l(g.n, g.o, g.width, g.height);
                     }
-                    a.ae(f.f);
                     a.w(g);
-                    if (f.t != 0) {
+                    if (!f.q.isEmpty) {
+                        a.w(j);
+                    }
+                    if (k.ad > 0) {
+                        a.w(k);
+                    }
+                    if (f.u == 0) {
                         if (!f.b) {
                             a.w(h);
                         }
                     }
                     a.aa();
-                    a.af(f.n);
-                    if (f.t == 0) {
+                    a.af(f.p);
+                    if (f.w == 0) {
                         if (!f.b) {
                             a.w(h);
                         }
@@ -619,21 +644,27 @@ export let TreemapViewRenderer = /*@__PURE__*/ (() => {
                     let f = e.c._inner[0];
                     let g = e.c._inner[1];
                     let h = e.c._inner[2];
-                    let i = new TreemapNodeVisualData();
-                    i.c = new RectangleVisualData(1, "NodePath", f);
-                    i.b = new RectangleVisualData(1, "HeaderRect", g);
-                    let j = new TreemapLabelVisualData();
-                    j.labelPosition = new PointData(h.n, h.o);
+                    let i = e.c._inner[3];
+                    let j = e.c._inner[4];
+                    let k = new TreemapNodeVisualData();
+                    k.d = new RectangleVisualData(1, "NodePath", f);
+                    k.d.appearance.stroke = AppearanceHelper.b(j._stroke);
+                    k.d.appearance.strokeExtended = AppearanceHelper.a(j._stroke);
+                    k.d.appearance.strokeThickness = j.ad;
+                    k.b = new RectangleVisualData(1, "HeaderRect", g);
+                    k.c = new RectangleVisualData(1, "HighlightRect", i);
+                    let l = new TreemapLabelVisualData();
+                    l.labelPosition = new PointData(h.n, h.o);
                     if (e.b) {
-                        j.labelSize = new SizeData(c.ab(h.al), c.aa(h.al));
+                        l.labelSize = new SizeData(c.ab(h.al), c.aa(h.al));
                     }
                     else {
-                        j.labelSize = new SizeData(c.z(h.al), c.y(h.al));
+                        l.labelSize = new SizeData(c.z(h.al), c.y(h.al));
                     }
-                    j.labelValue = h.al;
-                    j.appearance = AppearanceHelper.c(h, e.a);
-                    i.a = j;
-                    a.nodes.add(i);
+                    l.labelValue = h.al;
+                    l.appearance = AppearanceHelper.c(h, e.a);
+                    k.a = l;
+                    a.nodes.add(k);
                 }
             }
         }
@@ -1421,42 +1452,42 @@ export let TreemapTreeData = /*@__PURE__*/ (() => {
             this.a = new TreemapTreeNode();
         }
         e(a) {
-            this.b.addItem(a.j, a);
-            this.d.add(a.j);
-            if (a.l == null) {
+            this.b.addItem(a.l, a);
+            this.d.add(a.l);
+            if (a.n == null) {
                 this.a.b.add(a);
             }
-            else if (this.b.containsKey(a.l)) {
-                this.b.item(a.l).b.add(a);
+            else if (this.b.containsKey(a.n)) {
+                this.b.item(a.n).b.add(a);
             }
             else {
                 let b;
-                if (!((() => { let c = this.c.tryGetValue(a.l, b); b = c.p1; return c.ret; })())) {
+                if (!((() => { let c = this.c.tryGetValue(a.n, b); b = c.p1; return c.ret; })())) {
                     b = new List$1(TreemapTreeNode.$, 0);
-                    this.c.item(a.l, b);
+                    this.c.item(a.n, b);
                 }
                 b.add(a);
             }
-            if (this.c.containsKey(a.j)) {
-                for (let c of fromEnum(this.c.item(a.j))) {
+            if (this.c.containsKey(a.l)) {
+                for (let c of fromEnum(this.c.item(a.l))) {
                     a.b.add(c);
                 }
-                this.c.removeItem(a.j);
+                this.c.removeItem(a.l);
             }
         }
         g(a) {
-            if (isNaN_(a.f)) {
+            if (isNaN_(a.h)) {
                 if (a.b.count > 0) {
                     a.d = 0;
                 }
                 for (let b = 0; b < a.b.count; b++) {
                     let c = a.b._inner[b];
                     this.g(c);
-                    if (isNaN_(c.f)) {
+                    if (isNaN_(c.h)) {
                         a.d = a.d + c.d;
                     }
                     else {
-                        a.d = a.d + c.f;
+                        a.d = a.d + c.h;
                     }
                 }
             }
@@ -1475,28 +1506,32 @@ export let TreemapTreeNode = /*@__PURE__*/ (() => {
     class TreemapTreeNode extends Base {
         constructor() {
             super();
-            this.j = null;
             this.l = null;
+            this.n = null;
             this.b = null;
             this.c = null;
+            this.h = 0;
+            this.g = 0;
             this.f = 0;
-            this.h = null;
+            this.j = null;
             this.d = 0;
+            this.m = null;
             this.k = null;
-            this.i = null;
-            this.g = 0;
+            this.i = 0;
             this.a = false;
             this.b = new List$1(TreemapTreeNode.$, 0);
+            this.h = NaN;
+            this.g = NaN;
             this.f = NaN;
-            this.h = null;
+            this.j = null;
             this.c = new List$1(TreemapNodeStyleMapping.$, 0);
             this.d = 0;
         }
         e() {
-            if (isNaN_(this.f)) {
+            if (isNaN_(this.h)) {
                 return this.d;
             }
-            return this.f;
+            return this.h;
         }
     }
     TreemapTreeNode.$t = /*@__PURE__*/ markType(TreemapTreeNode, 'TreemapTreeNode');
@@ -1512,104 +1547,115 @@ export let Treemap = /*@__PURE__*/ (() => {
             this.g = null;
             this.f = null;
             this.e = null;
-            this.bk = false;
-            this.ao = null;
-            this.je = null;
-            this.aw = null;
-            this.er = null;
-            this.eq = "Root";
-            this.el = " : ";
-            this.ep = null;
-            this.eo = null;
-            this.em = null;
-            this.en = null;
-            this.b0 = null;
+            this.bq = false;
+            this.aq = null;
+            this.j9 = null;
+            this.ay = null;
+            this.fd = null;
+            this.fc = "Root";
+            this.e6 = " : ";
+            this.fb = null;
+            this.fa = null;
+            this.e7 = null;
+            this.e9 = null;
+            this.b9 = null;
+            this.b8 = null;
+            this.e8 = null;
+            this.cr = NaN;
+            this.k = 0;
             this.a = new BrushCollection();
-            this.ae = new TreemapNodeStyleMappingCollection();
+            this.ag = new TreemapNodeStyleMappingCollection();
             this.c = 0;
-            this.bl = false;
-            this.eb = 10;
-            this.b8 = NaN;
-            this.b7 = NaN;
-            this.n = 0;
-            this.k = 0;
-            this.iq = null;
-            this.ij = null;
-            this.ih = null;
-            this.ip = null;
-            this.im = null;
-            this.ii = null;
-            this.ir = null;
-            this.ig = null;
-            this.il = null;
-            this.ik = null;
-            this.a1 = null;
-            this.a0 = null;
+            this.br = false;
+            this.ew = 10;
+            this.cl = NaN;
+            this.ck = NaN;
+            this.p = 0;
+            this.m = 0;
+            this.jl = null;
+            this.jf = null;
+            this.jd = null;
+            this.jk = null;
+            this.ji = null;
+            this.je = null;
+            this.jm = null;
+            this.jc = null;
+            this.jh = null;
+            this.jg = null;
+            this.a5 = null;
+            this.a4 = null;
             this.h = 0;
-            this.cb = DeviceUtils.g(5);
-            this.cd = DeviceUtils.g(3);
-            this.cc = DeviceUtils.g(5);
-            this.ca = DeviceUtils.g(3);
-            this.cm = DeviceUtils.g(10);
-            this.co = DeviceUtils.g(10);
-            this.cn = DeviceUtils.g(10);
-            this.cl = DeviceUtils.g(10);
-            this.cg = DeviceUtils.g(5);
-            this.ci = DeviceUtils.g(3);
-            this.ch = DeviceUtils.g(5);
-            this.cf = DeviceUtils.g(3);
-            this.cr = DeviceUtils.g(0);
-            this.cv = DeviceUtils.g(0);
-            this.ct = DeviceUtils.g(0);
-            this.cp = DeviceUtils.g(0);
-            this.cs = DeviceUtils.g(3);
-            this.cw = DeviceUtils.g(3);
-            this.cu = DeviceUtils.g(3);
+            this.co = DeviceUtils.g(5);
             this.cq = DeviceUtils.g(3);
-            this.ic = 1;
-            this.jh = 1;
-            this.b9 = NaN;
-            this.io = null;
-            this.cy = NaN;
-            this.ck = NaN;
-            this.ai = 0;
-            this.r = 0;
-            this.cj = DeviceUtils.g(3);
-            this.ed = 500;
-            this.cz = 0;
-            this.ea = null;
-            this.ay = null;
+            this.cp = DeviceUtils.g(5);
+            this.cn = DeviceUtils.g(3);
+            this.c1 = DeviceUtils.g(10);
+            this.c3 = DeviceUtils.g(10);
+            this.c2 = DeviceUtils.g(10);
+            this.c0 = DeviceUtils.g(10);
+            this.cv = DeviceUtils.g(5);
+            this.cx = DeviceUtils.g(3);
+            this.cw = DeviceUtils.g(5);
+            this.cu = DeviceUtils.g(3);
+            this.c6 = DeviceUtils.g(0);
+            this.da = DeviceUtils.g(0);
+            this.c8 = DeviceUtils.g(0);
+            this.c4 = DeviceUtils.g(0);
+            this.c7 = DeviceUtils.g(3);
+            this.db = DeviceUtils.g(3);
+            this.c9 = DeviceUtils.g(3);
+            this.c5 = DeviceUtils.g(3);
+            this.i9 = 1;
+            this.kc = 1;
+            this.cm = NaN;
+            this.jj = null;
+            this.dd = NaN;
+            this.cz = NaN;
+            this.ak = 0;
+            this.t = 0;
+            this.cy = DeviceUtils.g(3);
+            this.ey = 500;
+            this.de = 0;
+            this.eu = null;
+            this.a0 = null;
+            this.ev = null;
+            this.a1 = null;
+            this.bf = null;
             this.ba = null;
-            this.a6 = null;
+            this.be = null;
+            this.bc = null;
+            this.bd = null;
+            this.bb = null;
+            this.dc = NaN;
+            this.cd = 1;
+            this.ct = NaN;
+            this.cc = 0.5;
+            this.ex = 300;
+            this.at = 1;
+            this.as = 1;
+            this.cs = NaN;
             this.a9 = null;
-            this.a7 = null;
-            this.a8 = null;
-            this.cx = NaN;
-            this.b3 = 1;
-            this.ce = NaN;
-            this.b2 = 0.5;
-            this.ec = 300;
-            this.ar = 1;
-            this.aq = 1;
-            this.a5 = null;
-            this.ax = null;
-            this.ap = null;
-            this.bj = false;
+            this.az = null;
+            this.ar = null;
             this.bp = false;
-            this.bs = false;
-            this.bo = false;
-            this.ak = null;
-            this.q = null;
-            this.b4 = NaN;
-            this.b6 = DeviceUtils.g(1);
-            this.b5 = 1;
-            this.propertyChanged = null;
-            this.w = null;
-            this.t = null;
-            this.ej = null;
-            this.an = null;
+            this.bw = false;
+            this.b0 = false;
+            this.bv = false;
             this.am = null;
-            this.jd = null;
+            this.s = null;
+            this.ce = NaN;
+            this.cj = DeviceUtils.g(1);
+            this.ci = 1;
+            this.cf = 0.3;
+            this.ch = 0.2;
+            this.cg = 1;
+            this.propertyChanged = null;
+            this.y = null;
+            this.v = null;
+            this.e4 = null;
+            this.ap = null;
+            this.ao = null;
+            this.j8 = null;
             this.nodeStyling = null;
             this.nodeRenderStyling = null;
             this.nodePointerOver = null;
@@ -1619,41 +1665,42 @@ export let Treemap = /*@__PURE__*/ (() => {
             this.nodePointerReleased = null;
             let a = new TreemapView();
             a.a = this;
-            this.q = new SquarifiedCalculator();
-            this.ao = a;
-            this.ao.ax();
-            this.ea = (b, c) => this.ha(c.action, c.position, c.count, c.propertyName);
-            this.je = Rect.empty;
+            this.s = new SquarifiedCalculator();
+            this.aq = a;
+            this.aq.ax();
+            this.eu = (b, c) => this.h4(c.action, c.position, c.count, c.propertyName);
+            this.ev = (b, c) => this.h4(c.action, c.position, c.count, c.propertyName);
+            this.j9 = Rect.empty;
             this.g = new TreemapFrame();
             this.f = new TreemapFrame();
             this.e = new TreemapFrame();
-            this.bp = true;
-            this.aw = new DoubleAnimator(0, 1, this.ei);
-            this.aw.b = EasingFunctions.cubicEase;
-            let b = this.aw;
-            b.propertyChanged = delegateCombine(b.propertyChanged, runOn(this, this.g8));
-            this.ax = new DoubleAnimator(0, 1, this.eg);
-            let c = this.ax;
-            c.propertyChanged = delegateCombine(c.propertyChanged, runOn(this, this.hf));
-            let d = this.ae;
-            d.collectionChanged = delegateCombine(d.collectionChanged, runOn(this, this.g6));
-            let e = this.ae;
-            e.collectionResetting = delegateCombine(e.collectionResetting, runOn(this, this.g7));
-        }
-        g7(a, b) {
+            this.bw = true;
+            this.ay = new DoubleAnimator(0, 1, this.e3);
+            this.ay.b = EasingFunctions.cubicEase;
+            let b = this.ay;
+            b.propertyChanged = delegateCombine(b.propertyChanged, runOn(this, this.h2));
+            this.az = new DoubleAnimator(0, 1, this.e1);
+            let c = this.az;
+            c.propertyChanged = delegateCombine(c.propertyChanged, runOn(this, this.ia));
+            let d = this.ag;
+            d.collectionChanged = delegateCombine(d.collectionChanged, runOn(this, this.h0));
+            let e = this.ag;
+            e.collectionResetting = delegateCombine(e.collectionResetting, runOn(this, this.h1));
+        }
+        h1(a, b) {
             for (let c of fromEnum(this.styleMappings)) {
-                c.propertyChanged = delegateRemove(c.propertyChanged, runOn(this, this.h7));
+                c.propertyChanged = delegateRemove(c.propertyChanged, runOn(this, this.i4));
             }
-            this.bp = true;
-            this.bs = true;
-            this.ao.a2();
+            this.bw = true;
+            this.b0 = true;
+            this.aq.a2();
         }
-        g6(a, b) {
+        h0(a, b) {
             if (b.oldItems != null) {
                 for (let c of fromEn(b.oldItems)) {
                     let d = c;
                     if (d != null) {
-                        d.propertyChanged = delegateRemove(d.propertyChanged, runOn(this, this.h7));
+                        d.propertyChanged = delegateRemove(d.propertyChanged, runOn(this, this.i4));
                     }
                 }
             }
@@ -1661,137 +1708,158 @@ export let Treemap = /*@__PURE__*/ (() => {
                 for (let e of fromEn(b.newItems)) {
                     let f = e;
                     if (f != null) {
-                        f.propertyChanged = delegateCombine(f.propertyChanged, runOn(this, this.h7));
+                        f.propertyChanged = delegateCombine(f.propertyChanged, runOn(this, this.i4));
                     }
                 }
             }
-            this.bp = true;
-            this.bs = true;
-            this.ao.a2();
+            this.bw = true;
+            this.b0 = true;
+            this.aq.a2();
         }
-        h7(a, b) {
-            this.bp = true;
-            this.bs = true;
-            this.ao.a2();
+        i4(a, b) {
+            this.bw = true;
+            this.b0 = true;
+            this.aq.a2();
         }
-        ha(a, b, c, d) {
-            this.ak = null;
-            this.bp = true;
-            this.bo = true;
-            this.bs = true;
-            this.ao.a2();
+        h4(a, b, c, d) {
+            this.am = null;
+            this.bw = true;
+            this.bv = true;
+            this.b0 = true;
+            this.aq.a2();
         }
         notifySizeChanged() {
-            this.ao.as();
+            this.aq.as();
         }
         destroy() {
             this.provideContainer(null);
         }
-        av() {
+        ax() {
             let a = new TreemapVisualData();
-            a.viewport = new RectData(this.jg.left, this.jg.top, this.jg.width, this.jg.height);
+            a.viewport = new RectData(this.kb.left, this.kb.top, this.kb.width, this.kb.height);
             a.nodes = new TreemapNodeVisualDataList();
-            this.ao.ao(a);
+            this.aq.ao(a);
             return a;
         }
-        e1() {
-            let a = this.av();
+        fn() {
+            let a = this.ax();
             a.scaleByViewport();
             return a.serialize();
         }
-        hw(a, b, c) {
+        it(a, b, c) {
             if (this.propertyChanged != null) {
                 this.propertyChanged(this, new PropertyChangedEventArgs(a));
             }
-            this.h1(a, b, c);
+            this.iy(a, b, c);
         }
-        h1(a, b, c) {
+        iy(a, b, c) {
             switch (a) {
                 case "FocusItem":
-                    this.hq();
+                    this.im();
                     break;
                 case "LayoutType":
                     {
                         switch (EnumUtil.getEnumValue(TreemapLayoutType_$type, c)) {
                             case 0:
-                                this.q = new SquarifiedCalculator();
+                                this.s = new SquarifiedCalculator();
                                 break;
                             case 1:
-                                this.q = new SliceAndDiceCalculator();
+                                this.s = new SliceAndDiceCalculator();
                                 break;
                             case 2:
-                                this.q = new StrippedCalculator();
+                                this.s = new StrippedCalculator();
                                 break;
                         }
-                        this.bp = true;
-                        this.ao.a2();
+                        this.bw = true;
+                        this.aq.a2();
                     }
                     break;
                 case "BreadcrumbSequence":
-                    this.bp = true;
-                    this.ao.a2();
+                    this.bw = true;
+                    this.aq.a2();
                     break;
                 case "RootTitle":
-                    this.bp = true;
-                    this.ao.a2();
+                    this.bw = true;
+                    this.aq.a2();
                     break;
                 case "ValueMemberPath":
-                    if (this.az != null) {
-                        this.az.deregisterColumn(this.bh);
-                        this.bh = this.bf(this.g3);
-                        this.ak = null;
+                    if (this.a2 != null) {
+                        this.a2.deregisterColumn(this.bn);
+                        this.bn = this.bl(this.a2, this.hx);
+                        this.am = null;
                     }
-                    this.bp = true;
-                    this.bo = true;
-                    this.ao.a2();
+                    this.h6();
+                    this.bw = true;
+                    this.bv = true;
+                    this.aq.a2();
                     break;
                 case "CustomValueMemberPath":
-                    if (this.az != null) {
-                        this.az.deregisterColumn(this.bb);
-                        this.bb = this.bg(this.ey);
-                        this.ak = null;
+                    if (this.a2 != null) {
+                        this.a2.deregisterColumn(this.bg);
+                        this.bg = this.bm(this.fk);
+                        this.am = null;
                     }
-                    this.bp = true;
-                    this.bo = true;
-                    this.ao.a2();
+                    this.bw = true;
+                    this.bv = true;
+                    this.aq.a2();
                     break;
                 case "IdMemberPath":
-                    if (this.az != null) {
-                        this.az.deregisterColumn(this.bc);
-                        this.bc = this.bg(this.fp);
-                        this.ak = null;
+                    if (this.a2 != null) {
+                        this.a2.deregisterColumn(this.bi);
+                        this.bi = this.bm(this.gj);
+                        this.am = null;
                     }
-                    this.bp = true;
-                    this.bo = true;
-                    this.ao.a2();
+                    this.bw = true;
+                    this.bv = true;
+                    this.aq.a2();
                     break;
                 case "LabelMemberPath":
-                    if (this.az != null) {
-                        this.az.deregisterColumn(this.bd);
-                        this.bd = this.bg(this.fz);
-                        this.ak = null;
+                    if (this.a2 != null) {
+                        this.a2.deregisterColumn(this.bj);
+                        this.bj = this.bm(this.gt);
+                        this.am = null;
                     }
-                    this.bp = true;
-                    this.bo = true;
-                    this.ao.a2();
+                    this.bw = true;
+                    this.bv = true;
+                    this.aq.a2();
                     break;
                 case "ParentIdMemberPath":
-                    if (this.az != null) {
-                        this.az.deregisterColumn(this.be);
-                        this.be = this.bg(this.gh);
-                        this.ak = null;
+                    if (this.a2 != null) {
+                        this.a2.deregisterColumn(this.bk);
+                        this.bk = this.bm(this.hb);
+                        this.am = null;
                     }
-                    this.bp = true;
-                    this.bo = true;
-                    this.ao.a2();
+                    this.bw = true;
+                    this.bv = true;
+                    this.aq.a2();
                     break;
                 case "ItemsSource":
-                    this.az = ((() => {
+                    this.a2 = ((() => {
                         let $ret = new FastItemsSource();
                         $ret.e = this.dataSource;
                         return $ret;
                     })());
                     break;
+                case "HighlightedValueMemberPath":
+                    this.h6();
+                    this.am = null;
+                    this.bw = true;
+                    this.bv = true;
+                    this.aq.a2();
+                    break;
+                case "HighlightedItemsSource":
+                    this.a3 = ((() => {
+                        let $ret = new FastItemsSource();
+                        $ret.e = this.highlightedDataSource;
+                        return $ret;
+                    })());
+                    break;
+                case "HighlightedValuesDisplayMode":
+                    this.am = null;
+                    this.bw = true;
+                    this.bv = true;
+                    this.aq.a2();
+                    break;
                 case "HeaderLabelLeftMargin":
                 case "HeaderLabelTopMargin":
                 case "HeaderLabelRightMargin":
@@ -1830,218 +1898,317 @@ export let Treemap = /*@__PURE__*/ (() => {
                 case "HeaderDisplayMode":
                 case "LabelHorizontalFitMode":
                 case "LabelVerticalFitMode":
-                    this.bp = true;
-                    this.ao.a2();
+                case "HighlightedValueOpacity":
+                    this.bw = true;
+                    this.aq.a2();
                     break;
                 case "TextStyle":
-                    this.ao.az(this.a4);
-                    this.bp = true;
-                    this.ao.a2();
+                    this.aq.az(this.a8);
+                    this.bw = true;
+                    this.aq.a2();
                     break;
                 case "HeaderTextStyle":
-                    this.ao.aw(this.a2);
-                    this.bp = true;
-                    this.ao.a2();
+                    this.aq.aw(this.a6);
+                    this.bw = true;
+                    this.aq.a2();
                     break;
                 case "PixelScalingRatio":
                     if (!isNaN_(c)) {
-                        this.c1 = c;
+                        this.dg = c;
                     }
                     break;
                 case "ActualPixelScalingRatio":
-                    if (isNaN_(this.dd)) {
-                        this.c0 = this.c1 / 2;
+                    if (isNaN_(this.dv)) {
+                        this.df = this.dg / 2;
                     }
-                    if (this.ao != null) {
-                        this.ao.ay();
+                    if (this.aq != null) {
+                        this.aq.ay();
                     }
                     break;
                 case "InteractionPixelScalingRatio":
                     if (!isNaN_(c)) {
-                        this.c0 = c;
+                        this.df = c;
                     }
                     break;
                 case "ActualInteractionPixelScalingRatio":
-                    if (this.ao != null) {
-                        this.ao.ay();
+                    if (this.aq != null) {
+                        this.aq.ay();
                     }
                     break;
                 case "TransitionProgress":
-                    if (this.d9 >= 1) {
-                        this.aw.w();
-                        this.ao.ay();
+                    this.e.h(this.et, this.g, this.f);
+                    if (this.et >= 1) {
+                        this.ay.w();
+                        this.aq.ay();
                         let d = this.f;
                         this.f = this.g;
                         this.g = d;
-                        this.h0();
-                        this.h3(this.f);
-                        this.ao.a1();
-                        this.ao.a2();
+                        this.ix();
+                        this.i0(this.f);
+                        this.aq.a1();
+                        this.aq.a2();
                         return;
                     }
-                    this.e.h(this.d9, this.g, this.f);
-                    this.h3(this.e);
-                    this.ao.a1();
+                    this.i0(this.e);
+                    this.aq.a1();
                     break;
                 case "Viewport":
-                    this.bp = true;
-                    this.ao.a2();
+                    this.bw = true;
+                    this.aq.a2();
                     break;
                 case "FastItemsSource":
-                    let e = b;
-                    let f = c;
-                    if (b != null) {
-                        e.event = delegateRemove(e.event, this.ea);
-                        this.bj = false;
-                        e.deregisterColumn(this.bh);
-                        e.deregisterColumn(this.bc);
-                        e.deregisterColumn(this.be);
-                        e.deregisterColumn(this.bd);
-                        e.deregisterColumn(this.bb);
-                        this.bh = null;
-                        this.bc = null;
-                        this.be = null;
-                        this.bd = null;
-                        this.ak = null;
+                    {
+                        let e = b;
+                        let f = c;
+                        if (b != null) {
+                            e.event = delegateRemove(e.event, this.eu);
+                            this.bp = false;
+                            e.deregisterColumn(this.bn);
+                            e.deregisterColumn(this.bi);
+                            e.deregisterColumn(this.bk);
+                            e.deregisterColumn(this.bj);
+                            e.deregisterColumn(this.bg);
+                            e.deregisterColumn(this.bh);
+                            this.bn = null;
+                            this.bi = null;
+                            this.bk = null;
+                            this.bj = null;
+                            this.am = null;
+                            if (this.a3 == null) {
+                                this.bh = null;
+                            }
+                        }
+                        if (c != null) {
+                            f.event = delegateCombine(f.event, this.eu);
+                            this.bp = true;
+                            this.bn = this.bl(f, this.hx);
+                            this.bi = this.bm(this.gj);
+                            this.bk = this.bm(this.hb);
+                            this.bj = this.bm(this.gt);
+                            this.bg = this.bm(this.fk);
+                            if (this.a3 == null) {
+                                this.bh = this.bl(f, this.gb);
+                            }
+                        }
+                        this.bw = true;
+                        this.bv = true;
+                        this.aq.a2();
                     }
-                    if (c != null) {
-                        f.event = delegateCombine(f.event, this.ea);
-                        this.bj = true;
-                        this.bh = this.bf(this.g3);
-                        this.bc = this.bg(this.fp);
-                        this.be = this.bg(this.gh);
-                        this.bd = this.bg(this.fz);
-                        this.bb = this.bg(this.ey);
+                    break;
+                case "HighlightedFastItemsSource":
+                    {
+                        let g = b;
+                        let h = c;
+                        if (b != null) {
+                            g.event = delegateRemove(g.event, this.ev);
+                            g.deregisterColumn(this.bh);
+                            this.bh = null;
+                            if (this.a2 != null) {
+                                this.bh = this.bl(this.a2, this.gb);
+                            }
+                        }
+                        if (c != null) {
+                            if (this.a2 != null) {
+                                this.a2.deregisterColumn(this.bh);
+                                this.bh = null;
+                            }
+                            h.event = delegateCombine(h.event, this.ev);
+                            if (!stringIsNullOrEmpty(this.gb)) {
+                                this.bh = this.bl(h, this.gb);
+                            }
+                            else {
+                                this.bh = this.bl(h, this.hx);
+                            }
+                        }
+                        this.am = null;
+                        this.bw = true;
+                        this.bv = true;
+                        this.aq.a2();
                     }
-                    this.bp = true;
-                    this.bo = true;
-                    this.ao.a2();
                     break;
                 case "TransitionDuration":
-                    this.aw.r = this.ei;
+                    this.ay.r = this.e3;
                     break;
                 case "HighlightingTransitionDuration":
-                    this.ax.r = this.eg;
+                    this.az.r = this.e1;
                     break;
                 case "HighlightingMode":
-                    this.as = this.at();
+                    this.au = this.av();
                     break;
             }
         }
-        hq() {
-            if (this.bk) {
+        h6() {
+            if (this.a3 != null) {
+                let a = this.hx;
+                if (!stringIsNullOrEmpty(this.gb)) {
+                    a = this.gb;
+                }
+                this.a2.deregisterColumn(this.bh);
+                this.a3.deregisterColumn(this.bh);
+                this.bh = this.bl(this.a3, a);
+                this.am = null;
+            }
+            else if (this.a2 != null) {
+                let b = this.gb;
+                this.a2.deregisterColumn(this.bh);
+                this.bh = this.bl(this.a2, b);
+                this.am = null;
+            }
+        }
+        im() {
+            if (this.bq) {
                 return;
             }
-            if (this.ak == null) {
+            if (this.am == null) {
                 return;
             }
-            if (this.ek == null) {
-                this.am = null;
-                this.bp = true;
-                this.ao.a2();
+            if (this.e5 == null) {
+                this.ao = null;
+                this.bw = true;
+                this.aq.a2();
                 return;
             }
-            for (let a = 0; a < this.ak.d.count; a++) {
-                let b = this.ak.b.item(this.ak.d._inner[a]);
-                if (b.i == this.ek) {
-                    this.am = b;
-                    this.bp = true;
-                    this.ao.a2();
+            for (let a = 0; a < this.am.d.count; a++) {
+                let b = this.am.b.item(this.am.d._inner[a]);
+                if (b.k == this.e5) {
+                    this.ao = b;
+                    this.bw = true;
+                    this.aq.a2();
                     break;
                 }
             }
         }
-        get jg() {
-            return this.je;
+        get kb() {
+            return this.j9;
         }
-        set jg(a) {
-            let b = this.je;
-            this.je = a;
-            if (!b.equals1(this.je)) {
-                this.hw("Viewport", b, this.je);
+        set kb(a) {
+            let b = this.j9;
+            this.j9 = a;
+            if (!b.equals1(this.j9)) {
+                this.it("Viewport", b, this.j9);
             }
         }
-        g8(a, b) {
-            this.d9 = this.aw.o;
+        h2(a, b) {
+            this.et = this.ay.o;
         }
-        get g3() {
-            return this.er;
+        get hx() {
+            return this.fd;
         }
-        set g3(a) {
-            let b = this.er;
-            this.er = a;
-            if (b != this.er) {
-                this.h1("ValueMemberPath", b, a);
+        set hx(a) {
+            let b = this.fd;
+            this.fd = a;
+            if (b != this.fd) {
+                this.iy("ValueMemberPath", b, a);
             }
         }
-        get gt() {
-            return this.eq;
+        get hn() {
+            return this.fc;
         }
-        set gt(a) {
-            let b = this.eq;
-            this.eq = a;
-            if (b != this.eq) {
-                this.h1("RootTitle", b, a);
+        set hn(a) {
+            let b = this.fc;
+            this.fc = a;
+            if (b != this.fc) {
+                this.iy("RootTitle", b, a);
             }
         }
-        get ev() {
-            return this.el;
+        get fh() {
+            return this.e6;
         }
-        set ev(a) {
-            let b = this.el;
-            this.el = a;
-            if (b != this.eq) {
-                this.h1("BreadcrumbSequence", b, a);
+        set fh(a) {
+            let b = this.e6;
+            this.e6 = a;
+            if (b != this.fc) {
+                this.iy("BreadcrumbSequence", b, a);
             }
         }
-        get gh() {
-            return this.ep;
+        get hb() {
+            return this.fb;
         }
-        set gh(a) {
-            let b = this.ep;
-            this.ep = a;
-            if (b != this.ep) {
-                this.hw("ParentIdMemberPath", b, a);
+        set hb(a) {
+            let b = this.fb;
+            this.fb = a;
+            if (b != this.fb) {
+                this.it("ParentIdMemberPath", b, a);
             }
         }
-        get fz() {
-            return this.eo;
+        get gt() {
+            return this.fa;
         }
-        set fz(a) {
-            let b = this.eo;
-            this.eo = a;
-            if (b != this.eo) {
-                this.hw("LabelMemberPath", b, a);
+        set gt(a) {
+            let b = this.fa;
+            this.fa = a;
+            if (b != this.fa) {
+                this.it("LabelMemberPath", b, a);
             }
         }
-        get ey() {
-            return this.em;
+        get fk() {
+            return this.e7;
         }
-        set ey(a) {
-            let b = this.em;
-            this.em = a;
-            if (b != this.em) {
-                this.hw("CustomValueMemberPath", b, a);
+        set fk(a) {
+            let b = this.e7;
+            this.e7 = a;
+            if (b != this.e7) {
+                this.it("CustomValueMemberPath", b, a);
             }
         }
-        get fp() {
-            return this.en;
+        get gj() {
+            return this.e9;
         }
-        set fp(a) {
-            let b = this.en;
-            this.en = a;
-            if (b != this.en) {
-                this.hw("IdMemberPath", b, a);
+        set gj(a) {
+            let b = this.e9;
+            this.e9 = a;
+            if (b != this.e9) {
+                this.it("IdMemberPath", b, a);
             }
         }
         get dataSource() {
-            return this.b0;
+            return this.b9;
         }
         set dataSource(a) {
-            let b = this.b0;
-            this.b0 = a;
-            if (b != this.b0) {
-                this.hw("ItemsSource", b, a);
+            let b = this.b9;
+            this.b9 = a;
+            if (b != this.b9) {
+                this.it("ItemsSource", b, a);
+            }
+        }
+        get highlightedDataSource() {
+            return this.b8;
+        }
+        set highlightedDataSource(a) {
+            let b = this.b8;
+            this.b8 = a;
+            if (b != this.b8) {
+                this.it("HighlightedItemsSource", b, a);
+            }
+        }
+        get gb() {
+            return this.e8;
+        }
+        set gb(a) {
+            let b = this.e8;
+            this.e8 = a;
+            if (b != this.e8) {
+                this.it("HighlightedValueMemberPath", b, a);
+            }
+        }
+        get dt() {
+            return this.cr;
+        }
+        set dt(a) {
+            let b = this.cr;
+            this.cr = a;
+            if (b != this.cr) {
+                this.it("HighlightedValueOpacity", b, a);
+            }
+        }
+        get l() {
+            return this.k;
+        }
+        set l(a) {
+            let b = this.k;
+            this.k = a;
+            if (b != this.k) {
+                this.it("HighlightedValuesDisplayMode", enumGetBox(TreemapHighlightedValueDisplayMode_$type, b), enumGetBox(TreemapHighlightedValueDisplayMode_$type, a));
             }
         }
         get b() {
@@ -2051,11 +2218,11 @@ export let Treemap = /*@__PURE__*/ (() => {
             let b = this.a;
             this.a = a;
             if (b != this.a) {
-                this.hw("FillBrushes", b, a);
+                this.it("FillBrushes", b, a);
             }
         }
         get styleMappings() {
-            return this.ae;
+            return this.ag;
         }
         get d() {
             return this.c;
@@ -2064,193 +2231,193 @@ export let Treemap = /*@__PURE__*/ (() => {
             let b = this.c;
             this.c = a;
             if (b != this.c) {
-                this.hw("FillScaleMode", enumGetBox(TreemapFillScaleMode_$type, b), enumGetBox(TreemapFillScaleMode_$type, a));
+                this.it("FillScaleMode", enumGetBox(TreemapFillScaleMode_$type, b), enumGetBox(TreemapFillScaleMode_$type, a));
             }
         }
-        get bq() {
-            return this.bl;
+        get bx() {
+            return this.br;
         }
-        set bq(a) {
-            let b = this.bl;
-            this.bl = a;
-            if (b != this.bl) {
-                this.hw("IsFillScaleLogarithmic", b, a);
+        set bx(a) {
+            let b = this.br;
+            this.br = a;
+            if (b != this.br) {
+                this.it("IsFillScaleLogarithmic", b, a);
             }
         }
-        get ee() {
-            return this.eb;
+        get ez() {
+            return this.ew;
         }
-        set ee(a) {
-            let b = this.eb;
-            this.eb = a;
-            if (b != this.eb) {
-                this.hw("FillScaleLogarithmBase", b, a);
+        set ez(a) {
+            let b = this.ew;
+            this.ew = a;
+            if (b != this.ew) {
+                this.it("FillScaleLogarithmBase", b, a);
             }
         }
-        get c6() {
-            return this.b8;
+        get dl() {
+            return this.cl;
         }
-        set c6(a) {
-            let b = this.b8;
-            this.b8 = a;
-            if (b != this.b8) {
-                this.hw("FillScaleMinimumValue", b, a);
+        set dl(a) {
+            let b = this.cl;
+            this.cl = a;
+            if (b != this.cl) {
+                this.it("FillScaleMinimumValue", b, a);
             }
         }
-        get c5() {
-            return this.b7;
+        get dk() {
+            return this.ck;
         }
-        set c5(a) {
-            let b = this.b7;
-            this.b7 = a;
-            if (b != this.b7) {
-                this.hw("FillScaleMaximumValue", b, a);
+        set dk(a) {
+            let b = this.ck;
+            this.ck = a;
+            if (b != this.ck) {
+                this.it("FillScaleMaximumValue", b, a);
             }
         }
-        get p() {
-            return this.n;
+        get r() {
+            return this.p;
         }
-        set p(a) {
-            let b = this.n;
-            this.n = a;
-            if (b != this.n) {
-                this.hw("LabelVerticalFitMode", enumGetBox(TreemapLabelVerticalFitMode_$type, b), enumGetBox(TreemapLabelVerticalFitMode_$type, a));
+        set r(a) {
+            let b = this.p;
+            this.p = a;
+            if (b != this.p) {
+                this.it("LabelVerticalFitMode", enumGetBox(TreemapLabelVerticalFitMode_$type, b), enumGetBox(TreemapLabelVerticalFitMode_$type, a));
             }
         }
-        get o() {
-            return this.p == 0 ? 1 : this.p;
+        get q() {
+            return this.r == 0 ? 1 : this.r;
         }
-        get m() {
-            return this.k;
+        get o() {
+            return this.m;
         }
-        set m(a) {
-            let b = this.k;
-            this.k = a;
-            if (b != this.k) {
-                this.hw("LabelHorizontalFitMode", enumGetBox(TreemapLabelHorizontalFitMode_$type, b), enumGetBox(TreemapLabelHorizontalFitMode_$type, a));
+        set o(a) {
+            let b = this.m;
+            this.m = a;
+            if (b != this.m) {
+                this.it("LabelHorizontalFitMode", enumGetBox(TreemapLabelHorizontalFitMode_$type, b), enumGetBox(TreemapLabelHorizontalFitMode_$type, a));
             }
         }
-        get l() {
-            return this.m == 0 ? 1 : this.m;
+        get n() {
+            return this.o == 0 ? 1 : this.o;
         }
-        get i2() {
-            return this.iq;
+        get jx() {
+            return this.jl;
         }
-        set i2(a) {
-            let b = this.iq;
-            this.iq = a;
-            if (b != this.iq) {
-                this.hw("OverlayHeaderHoverBackground", b, a);
+        set jx(a) {
+            let b = this.jl;
+            this.jl = a;
+            if (b != this.jl) {
+                this.it("OverlayHeaderHoverBackground", b, a);
             }
         }
-        get iw() {
-            return this.ij;
+        get jr() {
+            return this.jf;
         }
-        set iw(a) {
-            let b = this.ij;
-            this.ij = a;
-            if (b != this.ij) {
-                this.hw("HeaderHoverBackground", b, a);
+        set jr(a) {
+            let b = this.jf;
+            this.jf = a;
+            if (b != this.jf) {
+                this.it("HeaderHoverBackground", b, a);
             }
         }
-        get iu() {
-            return this.ih;
+        get jp() {
+            return this.jd;
         }
-        set iu(a) {
-            let b = this.ih;
-            this.ih = a;
-            if (b != this.ih) {
-                this.hw("HeaderBackground", b, a);
+        set jp(a) {
+            let b = this.jd;
+            this.jd = a;
+            if (b != this.jd) {
+                this.it("HeaderBackground", b, a);
             }
         }
-        get i1() {
-            return this.ip;
+        get jw() {
+            return this.jk;
         }
-        set i1(a) {
-            let b = this.ip;
-            this.ip = a;
-            if (b != this.ip) {
-                this.hw("OverlayHeaderBackground", b, a);
+        set jw(a) {
+            let b = this.jk;
+            this.jk = a;
+            if (b != this.jk) {
+                this.it("OverlayHeaderBackground", b, a);
             }
         }
-        get iz() {
-            return this.im;
+        get ju() {
+            return this.ji;
         }
-        set iz(a) {
-            let b = this.im;
-            this.im = a;
-            if (b != this.im) {
-                this.hw("HeaderTextColor", b, a);
+        set ju(a) {
+            let b = this.ji;
+            this.ji = a;
+            if (b != this.ji) {
+                this.it("HeaderTextColor", b, a);
             }
         }
-        get iv() {
-            return this.ii;
+        get jq() {
+            return this.je;
         }
-        set iv(a) {
-            let b = this.ii;
-            this.ii = a;
-            if (b != this.ii) {
-                this.hw("HeaderDarkTextColor", b, a);
+        set jq(a) {
+            let b = this.je;
+            this.je = a;
+            if (b != this.je) {
+                this.it("HeaderDarkTextColor", b, a);
             }
         }
-        get jc() {
-            return this.ir;
+        get j7() {
+            return this.jm;
         }
-        set jc(a) {
-            let b = this.ir;
-            this.ir = a;
-            if (b != this.ir) {
-                this.hw("TextColor", b, a);
+        set j7(a) {
+            let b = this.jm;
+            this.jm = a;
+            if (b != this.jm) {
+                this.it("TextColor", b, a);
             }
         }
-        get it() {
-            return this.ig;
+        get jo() {
+            return this.jc;
         }
-        set it(a) {
-            let b = this.ig;
-            this.ig = a;
-            if (b != this.ig) {
-                this.hw("DarkTextColor", b, a);
+        set jo(a) {
+            let b = this.jc;
+            this.jc = a;
+            if (b != this.jc) {
+                this.it("DarkTextColor", b, a);
             }
         }
-        get iy() {
-            return this.il;
+        get jt() {
+            return this.jh;
         }
-        set iy(a) {
-            let b = this.il;
-            this.il = a;
-            if (b != this.il) {
-                this.hw("HeaderHoverTextColor", b, a);
+        set jt(a) {
+            let b = this.jh;
+            this.jh = a;
+            if (b != this.jh) {
+                this.it("HeaderHoverTextColor", b, a);
             }
         }
-        get ix() {
-            return this.ik;
+        get js() {
+            return this.jg;
         }
-        set ix(a) {
-            let b = this.ik;
-            this.ik = a;
-            if (b != this.ik) {
-                this.hw("HeaderHoverDarkTextColor", b, a);
+        set js(a) {
+            let b = this.jg;
+            this.jg = a;
+            if (b != this.jg) {
+                this.it("HeaderHoverDarkTextColor", b, a);
             }
         }
-        get a4() {
-            return this.a1;
+        get a8() {
+            return this.a5;
         }
-        set a4(a) {
-            let b = this.a1;
-            this.a1 = a;
-            if (b != this.a1) {
-                this.hw("TextStyle", b, this.a1);
+        set a8(a) {
+            let b = this.a5;
+            this.a5 = a;
+            if (b != this.a5) {
+                this.it("TextStyle", b, this.a5);
             }
         }
-        get a2() {
-            return this.a0;
+        get a6() {
+            return this.a4;
         }
-        set a2(a) {
-            let b = this.a0;
-            this.a0 = a;
-            if (b != this.a0) {
-                this.hw("HeaderTextStyle", b, this.a0);
+        set a6(a) {
+            let b = this.a4;
+            this.a4 = a;
+            if (b != this.a4) {
+                this.it("HeaderTextStyle", b, this.a4);
             }
         }
         get j() {
@@ -2260,498 +2427,524 @@ export let Treemap = /*@__PURE__*/ (() => {
             let b = this.h;
             this.h = a;
             if (b != this.h) {
-                this.hw("HeaderDisplayMode", enumGetBox(TreemapHeaderDisplayMode_$type, b), enumGetBox(TreemapHeaderDisplayMode_$type, this.h));
+                this.it("HeaderDisplayMode", enumGetBox(TreemapHeaderDisplayMode_$type, b), enumGetBox(TreemapHeaderDisplayMode_$type, this.h));
             }
         }
         get i() {
             return this.j == 0 ? 1 : this.j;
         }
-        get da() {
-            return this.cb;
+        get dq() {
+            return this.co;
         }
-        set da(a) {
-            let b = this.cb;
-            this.cb = a;
-            if (b != this.cb) {
-                this.hw("HeaderLabelLeftMargin", b, a);
+        set dq(a) {
+            let b = this.co;
+            this.co = a;
+            if (b != this.co) {
+                this.it("HeaderLabelLeftMargin", b, a);
             }
         }
-        get dc() {
-            return this.cd;
+        get ds() {
+            return this.cq;
         }
-        set dc(a) {
-            let b = this.cd;
-            this.cd = a;
-            if (b != this.cd) {
-                this.hw("HeaderLabelTopMargin", b, a);
+        set ds(a) {
+            let b = this.cq;
+            this.cq = a;
+            if (b != this.cq) {
+                this.it("HeaderLabelTopMargin", b, a);
             }
         }
-        get db() {
-            return this.cc;
+        get dr() {
+            return this.cp;
         }
-        set db(a) {
-            let b = this.cc;
-            this.cc = a;
-            if (b != this.cc) {
-                this.hw("HeaderLabelRightMargin", b, a);
+        set dr(a) {
+            let b = this.cp;
+            this.cp = a;
+            if (b != this.cp) {
+                this.it("HeaderLabelRightMargin", b, a);
             }
         }
-        get c9() {
-            return this.ca;
+        get dp() {
+            return this.cn;
         }
-        set c9(a) {
-            let b = this.ca;
-            this.ca = a;
-            if (b != this.ca) {
-                this.hw("HeaderLabelBottomMargin", b, a);
+        set dp(a) {
+            let b = this.cn;
+            this.cn = a;
+            if (b != this.cn) {
+                this.it("HeaderLabelBottomMargin", b, a);
             }
         }
-        get dl() {
-            return this.cm;
+        get d3() {
+            return this.c1;
         }
-        set dl(a) {
-            let b = this.cm;
-            this.cm = a;
-            if (b != this.cm) {
-                this.hw("OverlayHeaderLabelLeftMargin", b, a);
+        set d3(a) {
+            let b = this.c1;
+            this.c1 = a;
+            if (b != this.c1) {
+                this.it("OverlayHeaderLabelLeftMargin", b, a);
             }
         }
-        get dn() {
-            return this.co;
+        get d5() {
+            return this.c3;
         }
-        set dn(a) {
-            let b = this.co;
-            this.co = a;
-            if (b != this.co) {
-                this.hw("OverlayHeaderLabelTopMargin", b, a);
+        set d5(a) {
+            let b = this.c3;
+            this.c3 = a;
+            if (b != this.c3) {
+                this.it("OverlayHeaderLabelTopMargin", b, a);
             }
         }
-        get dm() {
-            return this.cn;
+        get d4() {
+            return this.c2;
         }
-        set dm(a) {
-            let b = this.cn;
-            this.cn = a;
-            if (b != this.cn) {
-                this.hw("OverlayHeaderLabelRightMargin", b, a);
+        set d4(a) {
+            let b = this.c2;
+            this.c2 = a;
+            if (b != this.c2) {
+                this.it("OverlayHeaderLabelRightMargin", b, a);
             }
         }
-        get dk() {
-            return this.cl;
+        get d2() {
+            return this.c0;
         }
-        set dk(a) {
-            let b = this.cl;
-            this.cl = a;
-            if (b != this.cl) {
-                this.hw("OverlayHeaderLabelBottomMargin", b, a);
+        set d2(a) {
+            let b = this.c0;
+            this.c0 = a;
+            if (b != this.c0) {
+                this.it("OverlayHeaderLabelBottomMargin", b, a);
             }
         }
-        get df() {
-            return this.cg;
+        get dx() {
+            return this.cv;
         }
-        set df(a) {
-            let b = this.cg;
-            this.cg = a;
-            if (b != this.cg) {
-                this.hw("LabelLeftMargin", b, a);
+        set dx(a) {
+            let b = this.cv;
+            this.cv = a;
+            if (b != this.cv) {
+                this.it("LabelLeftMargin", b, a);
             }
         }
-        get dh() {
-            return this.ci;
+        get dz() {
+            return this.cx;
         }
-        set dh(a) {
-            let b = this.ci;
-            this.ci = a;
-            if (b != this.ci) {
-                this.hw("LabelTopMargin", b, a);
+        set dz(a) {
+            let b = this.cx;
+            this.cx = a;
+            if (b != this.cx) {
+                this.it("LabelTopMargin", b, a);
             }
         }
-        get dg() {
-            return this.ch;
+        get dy() {
+            return this.cw;
         }
-        set dg(a) {
-            let b = this.ch;
-            this.ch = a;
-            if (b != this.ch) {
-                this.hw("LabelRightMargin", b, a);
+        set dy(a) {
+            let b = this.cw;
+            this.cw = a;
+            if (b != this.cw) {
+                this.it("LabelRightMargin", b, a);
             }
         }
-        get de() {
-            return this.cf;
+        get dw() {
+            return this.cu;
         }
-        set de(a) {
-            let b = this.cf;
-            this.cf = a;
-            if (b != this.cf) {
-                this.hw("LabelBottomMargin", b, a);
+        set dw(a) {
+            let b = this.cu;
+            this.cu = a;
+            if (b != this.cu) {
+                this.it("LabelBottomMargin", b, a);
             }
         }
-        get dr() {
-            return this.cr;
+        get d8() {
+            return this.c6;
         }
-        set dr(a) {
-            let b = this.cr;
-            this.cr = a;
-            if (b != this.cr) {
-                this.hw("ParentNodeLeftMargin", b, a);
+        set d8(a) {
+            let b = this.c6;
+            this.c6 = a;
+            if (b != this.c6) {
+                this.it("ParentNodeLeftMargin", b, a);
             }
         }
-        get dv() {
-            return this.cv;
+        get ec() {
+            return this.da;
         }
-        set dv(a) {
-            let b = this.cv;
-            this.cv = a;
-            if (b != this.cv) {
-                this.hw("ParentNodeTopMargin", b, a);
+        set ec(a) {
+            let b = this.da;
+            this.da = a;
+            if (b != this.da) {
+                this.it("ParentNodeTopMargin", b, a);
             }
         }
-        get dt() {
-            return this.ct;
+        get ea() {
+            return this.c8;
         }
-        set dt(a) {
-            let b = this.ct;
-            this.ct = a;
-            if (b != this.ct) {
-                this.hw("ParentNodeRightMargin", b, a);
+        set ea(a) {
+            let b = this.c8;
+            this.c8 = a;
+            if (b != this.c8) {
+                this.it("ParentNodeRightMargin", b, a);
             }
         }
-        get dp() {
-            return this.cp;
+        get d6() {
+            return this.c4;
         }
-        set dp(a) {
-            let b = this.cp;
-            this.cp = a;
-            if (b != this.cp) {
-                this.hw("ParentNodeBottomMargin", b, a);
+        set d6(a) {
+            let b = this.c4;
+            this.c4 = a;
+            if (b != this.c4) {
+                this.it("ParentNodeBottomMargin", b, a);
             }
         }
-        get ds() {
-            return this.cs;
+        get d9() {
+            return this.c7;
         }
-        set ds(a) {
-            let b = this.cs;
-            this.cs = a;
-            if (b != this.cs) {
-                this.hw("ParentNodeLeftPadding", b, a);
+        set d9(a) {
+            let b = this.c7;
+            this.c7 = a;
+            if (b != this.c7) {
+                this.it("ParentNodeLeftPadding", b, a);
             }
         }
-        get dw() {
-            return this.cw;
+        get ed() {
+            return this.db;
         }
-        set dw(a) {
-            let b = this.cw;
-            this.cw = a;
-            if (b != this.cw) {
-                this.hw("ParentNodeTopPadding", b, a);
+        set ed(a) {
+            let b = this.db;
+            this.db = a;
+            if (b != this.db) {
+                this.it("ParentNodeTopPadding", b, a);
             }
         }
-        get du() {
-            return this.cu;
+        get eb() {
+            return this.c9;
         }
-        set du(a) {
-            let b = this.cu;
-            this.cu = a;
-            if (b != this.cu) {
-                this.hw("ParentNodeRightPadding", b, a);
+        set eb(a) {
+            let b = this.c9;
+            this.c9 = a;
+            if (b != this.c9) {
+                this.it("ParentNodeRightPadding", b, a);
             }
         }
-        get dq() {
-            return this.cq;
+        get d7() {
+            return this.c5;
         }
-        set dq(a) {
-            let b = this.cq;
-            this.cq = a;
-            if (b != this.cq) {
-                this.hw("ParentNodeBottomPadding", b, a);
+        set d7(a) {
+            let b = this.c5;
+            this.c5 = a;
+            if (b != this.c5) {
+                this.it("ParentNodeBottomPadding", b, a);
             }
         }
-        get id() {
-            return this.ic;
+        get ja() {
+            return this.i9;
         }
-        set id(a) {
-            let b = this.ic;
-            this.ic = a;
-            if (b != this.ic) {
-                this.hw("LabelHorizontalAlignment", enumGetBox(HorizontalAlignment_$type, b), enumGetBox(HorizontalAlignment_$type, a));
+        set ja(a) {
+            let b = this.i9;
+            this.i9 = a;
+            if (b != this.i9) {
+                this.it("LabelHorizontalAlignment", enumGetBox(HorizontalAlignment_$type, b), enumGetBox(HorizontalAlignment_$type, a));
             }
         }
-        get ji() {
-            return this.jh;
+        get kd() {
+            return this.kc;
         }
-        set ji(a) {
-            let b = this.jh;
-            this.jh = a;
-            if (b != this.jh) {
-                this.hw("LabelVerticalAlignment", enumGetBox(VerticalAlignment_$type, b), enumGetBox(VerticalAlignment_$type, a));
+        set kd(a) {
+            let b = this.kc;
+            this.kc = a;
+            if (b != this.kc) {
+                this.it("LabelVerticalAlignment", enumGetBox(VerticalAlignment_$type, b), enumGetBox(VerticalAlignment_$type, a));
             }
         }
-        get c8() {
-            return this.b9;
+        get dn() {
+            return this.cm;
         }
-        set c8(a) {
-            let b = this.b9;
-            this.b9 = a;
-            if (b != this.b9) {
-                this.hw("HeaderHeight", b, a);
+        set dn(a) {
+            let b = this.cm;
+            this.cm = a;
+            if (b != this.cm) {
+                this.it("HeaderHeight", b, a);
             }
         }
-        get i0() {
-            return this.io;
+        get jv() {
+            return this.jj;
         }
-        set i0(a) {
-            let b = this.io;
-            this.io = a;
-            if (b != this.io) {
-                this.hw("Outline", b, a);
+        set jv(a) {
+            let b = this.jj;
+            this.jj = a;
+            if (b != this.jj) {
+                this.it("Outline", b, a);
             }
         }
-        get d8() {
-            return this.cy;
+        get es() {
+            return this.dd;
         }
-        set d8(a) {
-            let b = this.cy;
-            this.cy = a;
-            if (b != this.cy) {
-                this.hw("StrokeThickness", b, a);
+        set es(a) {
+            let b = this.dd;
+            this.dd = a;
+            if (b != this.dd) {
+                this.it("StrokeThickness", b, a);
             }
         }
-        get dj() {
-            return this.ck;
+        get d1() {
+            return this.cz;
         }
-        set dj(a) {
-            let b = this.ck;
-            this.ck = a;
-            if (b != this.ck) {
-                this.hw("NodeOpacity", b, a);
+        set d1(a) {
+            let b = this.cz;
+            this.cz = a;
+            if (b != this.cz) {
+                this.it("NodeOpacity", b, a);
             }
         }
-        get aj() {
-            return this.ai;
+        get al() {
+            return this.ak;
         }
-        set aj(a) {
-            let b = this.ai;
-            this.ai = a;
-            if (b != this.ai) {
-                this.hw("LayoutOrientation", enumGetBox(TreemapOrientation_$type, b), enumGetBox(TreemapOrientation_$type, a));
+        set al(a) {
+            let b = this.ak;
+            this.ak = a;
+            if (b != this.ak) {
+                this.it("LayoutOrientation", enumGetBox(TreemapOrientation_$type, b), enumGetBox(TreemapOrientation_$type, a));
             }
         }
-        get s() {
-            return this.r;
+        get u() {
+            return this.t;
         }
-        set s(a) {
-            let b = this.r;
-            this.r = a;
-            if (b != this.r) {
-                this.hw("LayoutType", enumGetBox(TreemapLayoutType_$type, b), enumGetBox(TreemapLayoutType_$type, a));
+        set u(a) {
+            let b = this.t;
+            this.t = a;
+            if (b != this.t) {
+                this.it("LayoutType", enumGetBox(TreemapLayoutType_$type, b), enumGetBox(TreemapLayoutType_$type, a));
             }
         }
-        get di() {
-            return this.cj;
+        get d0() {
+            return this.cy;
         }
-        set di(a) {
-            let b = this.cj;
-            this.cj = a;
-            if (b != this.cj) {
-                this.hw("MinimumDisplaySize", b, a);
+        set d0(a) {
+            let b = this.cy;
+            this.cy = a;
+            if (b != this.cy) {
+                this.it("MinimumDisplaySize", b, a);
             }
         }
-        get ei() {
-            return this.ed;
+        get e3() {
+            return this.ey;
         }
-        set ei(a) {
-            let b = this.ed;
-            this.ed = a;
-            if (b != this.ed) {
-                this.hw("TransitionDuration", b, a);
+        set e3(a) {
+            let b = this.ey;
+            this.ey = a;
+            if (b != this.ey) {
+                this.it("TransitionDuration", b, a);
             }
         }
-        get d9() {
-            return this.cz;
+        get et() {
+            return this.de;
         }
-        set d9(a) {
-            let b = this.cz;
-            this.cz = a;
-            if (b != this.cz) {
-                this.hw("TransitionProgress", b, a);
+        set et(a) {
+            let b = this.de;
+            this.de = a;
+            if (b != this.de) {
+                this.it("TransitionProgress", b, a);
             }
         }
-        get az() {
-            return this.ay;
+        get a2() {
+            return this.a0;
         }
-        set az(a) {
-            let b = this.ay;
-            this.ay = a;
-            if (b != this.ay) {
-                this.hw("FastItemsSource", b, this.ay);
+        set a2(a) {
+            let b = this.a0;
+            this.a0 = a;
+            if (b != this.a0) {
+                this.it("FastItemsSource", b, this.a0);
             }
         }
-        get bh() {
+        get a3() {
+            return this.a1;
+        }
+        set a3(a) {
+            let b = this.a1;
+            this.a1 = a;
+            if (b != this.a1) {
+                this.it("HighlightedFastItemsSource", b, this.a1);
+            }
+        }
+        get bn() {
+            return this.bf;
+        }
+        set bn(a) {
+            this.bf = a;
+        }
+        get bg() {
             return this.ba;
         }
-        set bh(a) {
+        set bg(a) {
             this.ba = a;
         }
-        get bb() {
-            return this.a6;
+        get bk() {
+            return this.be;
         }
-        set bb(a) {
-            this.a6 = a;
+        set bk(a) {
+            this.be = a;
         }
-        get be() {
-            return this.a9;
+        get bi() {
+            return this.bc;
         }
-        set be(a) {
-            this.a9 = a;
+        set bi(a) {
+            this.bc = a;
         }
-        get bc() {
-            return this.a7;
+        get bj() {
+            return this.bd;
         }
-        set bc(a) {
-            this.a7 = a;
+        set bj(a) {
+            this.bd = a;
         }
-        get bd() {
-            return this.a8;
+        get bh() {
+            return this.bb;
         }
-        set bd(a) {
-            this.a8 = a;
+        set bh(a) {
+            this.bb = a;
         }
-        get dx() {
-            return this.cx;
+        get ee() {
+            return this.dc;
         }
-        set dx(a) {
-            let b = this.cx;
-            this.cx = a;
-            if (b != this.cx) {
-                this.hw("PixelScalingRatio", b, a);
+        set ee(a) {
+            let b = this.dc;
+            this.dc = a;
+            if (b != this.dc) {
+                this.it("PixelScalingRatio", b, a);
             }
         }
-        get c1() {
-            return this.b3;
+        get dg() {
+            return this.cd;
         }
-        set c1(a) {
-            let b = this.b3;
-            this.b3 = a;
-            if (b != this.b3) {
-                this.hw("ActualPixelScalingRatio", b, a);
+        set dg(a) {
+            let b = this.cd;
+            this.cd = a;
+            if (b != this.cd) {
+                this.it("ActualPixelScalingRatio", b, a);
             }
         }
-        get dd() {
-            return this.ce;
+        get dv() {
+            return this.ct;
         }
-        set dd(a) {
-            let b = this.ce;
-            this.ce = a;
-            if (b != this.ce) {
-                this.hw("InteractionPixelScalingRatio", b, a);
+        set dv(a) {
+            let b = this.ct;
+            this.ct = a;
+            if (b != this.ct) {
+                this.it("InteractionPixelScalingRatio", b, a);
             }
         }
-        get c0() {
-            return this.b2;
+        get df() {
+            return this.cc;
         }
-        set c0(a) {
-            let b = this.b2;
-            this.b2 = a;
-            if (b != this.b2) {
-                this.hw("ActualInteractionPixelScalingRatio", b, a);
+        set df(a) {
+            let b = this.cc;
+            this.cc = a;
+            if (b != this.cc) {
+                this.it("ActualInteractionPixelScalingRatio", b, a);
             }
         }
-        get eg() {
-            return this.ec;
+        get e1() {
+            return this.ex;
         }
-        set eg(a) {
-            let b = this.ec;
-            this.ec = a;
-            if (b != this.ec) {
-                this.hw("HighlightingTransitionDuration", b, a);
+        set e1(a) {
+            let b = this.ex;
+            this.ex = a;
+            if (b != this.ex) {
+                this.it("HighlightingTransitionDuration", b, a);
             }
         }
-        get au() {
-            return this.ar;
+        get aw() {
+            return this.at;
         }
-        set au(a) {
-            let b = this.ar;
-            this.ar = a;
-            if (b != this.ar) {
-                this.hw("HighlightingMode", enumGetBox(TreemapHighlightingMode_$type, b), enumGetBox(TreemapHighlightingMode_$type, a));
+        set aw(a) {
+            let b = this.at;
+            this.at = a;
+            if (b != this.at) {
+                this.it("HighlightingMode", enumGetBox(TreemapHighlightingMode_$type, b), enumGetBox(TreemapHighlightingMode_$type, a));
             }
         }
-        get as() {
-            return this.aq;
+        get au() {
+            return this.as;
         }
-        set as(a) {
-            let b = this.aq;
-            this.aq = a;
-            if (b != this.aq) {
-                this.hw("ActualHighlightingMode", enumGetBox(TreemapHighlightingMode_$type, b), enumGetBox(TreemapHighlightingMode_$type, a));
+        set au(a) {
+            let b = this.as;
+            this.as = a;
+            if (b != this.as) {
+                this.it("ActualHighlightingMode", enumGetBox(TreemapHighlightingMode_$type, b), enumGetBox(TreemapHighlightingMode_$type, a));
             }
         }
-        at() {
-            if (this.au != 0) {
-                return this.au;
+        av() {
+            if (this.aw != 0) {
+                return this.aw;
             }
             return 2;
         }
-        get bi() {
-            if (this.ap == null) {
-                this.ap = new TreemapHighlightingManager();
-                this.ap.executionContext = this.ao.d();
-                this.ap.ensureAnimator = runOn(this, this.hc);
+        get du() {
+            return this.cs;
+        }
+        set du(a) {
+            let b = this.cs;
+            this.cs = a;
+            if (b != this.cs) {
+                this.it("HighlightingFadeOpacity", b, a);
             }
-            return this.ap;
         }
-        hc() {
-            let a = this.ax;
+        get bo() {
+            if (this.ar == null) {
+                this.ar = new TreemapHighlightingManager();
+                this.ar.executionContext = this.aq.d();
+                this.ar.ensureAnimator = runOn(this, this.h7);
+            }
+            return this.ar;
+        }
+        h7() {
+            let a = this.az;
             if (!a.f() && a.r > 0) {
                 a.v();
             }
             if (a.r == 0) {
-                this.ia(1);
+                this.i7(1);
             }
         }
-        g9() {
-            this.a5 = null;
+        h3() {
+            this.a9 = null;
         }
-        hf(a, b) {
-            this.ia(this.ax.o);
+        ia(a, b) {
+            this.i7(this.az.o);
         }
-        ia(a) {
-            let b = this.bi.tick(a);
-            if (a == 1 && b && this.ax.r > 0) {
-                this.ax.v();
+        i7(a) {
+            let b = this.bo.tick(a);
+            if (a == 1 && b && this.az.r > 0) {
+                this.az.v();
             }
-            if (this.bm) {
-                this.h3(this.e);
+            if (this.bs) {
+                this.i0(this.e);
             }
             else {
-                this.h3(this.f);
+                this.i0(this.f);
             }
             if (!b) {
-                this.ax.w();
+                this.az.w();
             }
         }
-        hi(a, b, c, d) {
+        id(a, b, c, d) {
             if (c) {
                 return;
             }
-            if (this.as == 1) {
+            if (this.au == 1) {
                 return;
             }
             let e = null;
-            let f = this.bi;
+            let f = this.bo;
             let g = d;
             let h = !g;
-            if (g && this.a5 != null) {
-                e = this.a5;
+            if (g && this.a9 != null) {
+                e = this.a9;
             }
             else {
                 if (a != null) {
                     e = a.f(this);
                 }
-                if (this.a5 != null && this.a5 != e) {
-                    f.endHighlight(this.a5);
+                if (this.a9 != null && this.a9 != e) {
+                    f.endHighlight(this.a9);
                 }
-                this.a5 = e;
+                this.a9 = e;
             }
             if (g) {
                 f.endHighlight(e);
@@ -2759,146 +2952,170 @@ export let Treemap = /*@__PURE__*/ (() => {
             else if (h) {
                 f.startHighlight(e);
             }
-            this.hc();
+            this.h7();
         }
-        bf(a) {
-            let b = null;
-            return this.az.registerColumn(a, b, false);
+        bl(a, b) {
+            let c = null;
+            return a.registerColumn(b, c, false);
         }
-        bg(a) {
+        bm(a) {
             let b = null;
-            return this.az.registerColumnObject(a, b, false);
+            return this.a2.registerColumnObject(a, b, false);
         }
-        hh() {
-            this.bp = true;
-            this.ao.a2();
+        ic() {
+            this.bw = true;
+            this.aq.a2();
         }
-        get bm() {
-            return this.aw.f();
+        get bs() {
+            return this.ay.f();
         }
-        al() {
+        bz() {
+            if (this.l == 2) {
+                return false;
+            }
+            if (this.bh == null) {
+                return false;
+            }
+            if (this.a3 == null && stringIsNullOrEmpty(this.gb)) {
+                return false;
+            }
+            return true;
+        }
+        an() {
             let a = new TreemapTreeData();
-            if (this.bh == null || (this.bd == null && this.bc == null)) {
+            if (this.bn == null || (this.bj == null && this.bi == null)) {
                 return null;
             }
-            for (let b = 0; b < this.az.count; b++) {
+            for (let b = 0; b < this.a2.count; b++) {
                 let c = null;
-                if (this.bb != null && this.bb.count > b) {
-                    c = this.bb.item(b);
+                if (this.bg != null && this.bg.count > b) {
+                    c = this.bg.item(b);
+                }
+                let d = NaN;
+                if (this.bz() && this.bh != null && this.bh.count > b) {
+                    d = this.bh.item(b);
+                    if (isNaN_(d)) {
+                        d = 0;
+                    }
                 }
-                let d = this.bh.item(b);
-                let e = null;
-                let f = "";
-                if (this.bd != null) {
-                    f = this.bd.item(b) != null ? this.bd.item(b).toString() : "";
+                let e = this.bn.item(b);
+                let f = null;
+                let g = "";
+                if (this.bj != null) {
+                    g = this.bj.item(b) != null ? this.bj.item(b).toString() : "";
                 }
-                if (this.bc != null) {
-                    if (this.bc.item(b) == null) {
+                if (this.bi != null) {
+                    if (this.bi.item(b) == null) {
                         continue;
                     }
-                    e = stringReplace(this.bc.item(b).toString(), " ", "_");
+                    f = stringReplace(this.bi.item(b).toString(), " ", "_");
                 }
-                if (e == null) {
-                    e = stringReplace(f, " ", "_");
-                    if (stringIsNullOrEmpty(e)) {
+                if (f == null) {
+                    f = stringReplace(g, " ", "_");
+                    if (stringIsNullOrEmpty(f)) {
                         continue;
                     }
                 }
-                let g = null;
-                if (this.be != null) {
-                    g = this.be.item(b) != null ? stringReplace(this.be.item(b).toString(), " ", "_") : null;
+                let h = null;
+                if (this.bk != null) {
+                    h = this.bk.item(b) != null ? stringReplace(this.bk.item(b).toString(), " ", "_") : null;
                 }
-                let h = new TreemapTreeNode();
-                h.j = e;
-                h.l = g;
-                h.i = this.az.item(b);
-                h.g = b;
-                h.f = d;
-                h.h = c;
-                h.k = f;
-                a.e(h);
+                let i = new TreemapTreeNode();
+                i.l = f;
+                i.n = h;
+                i.k = this.a2.item(b);
+                i.i = b;
+                i.h = e;
+                i.g = d;
+                if (!isNaN_(i.h) && !isNaN_(i.g)) {
+                    i.f = Math.max(0, Math.min(1, i.g / i.h));
+                }
+                i.j = c;
+                i.m = g;
+                a.e(i);
             }
             a.f();
             return a;
         }
-        h0() {
-            if (this.ak == null) {
-                this.ak = this.al();
-                if (this.ak == null) {
+        ix() {
+            if (this.am == null) {
+                this.am = this.an();
+                if (this.am == null) {
                     return;
                 }
-                this.hq();
+                this.b0 = true;
+                this.im();
             }
-            if (this.bs) {
-                this.bs = false;
-                for (let a = 0; a < this.ak.d.count; a++) {
-                    let b = this.ak.b.item(this.ak.d._inner[a]);
+            if (this.b0) {
+                this.b0 = false;
+                for (let a = 0; a < this.am.d.count; a++) {
+                    let b = this.am.b.item(this.am.d._inner[a]);
                     b.c.clear();
                     for (let c = 0; c < this.styleMappings.count; c++) {
-                        if (this.bn(this.styleMappings._inner[c], b)) {
+                        if (this.bt(this.styleMappings._inner[c], b)) {
                             b.c.add(this.styleMappings._inner[c]);
                         }
                     }
                 }
             }
-            if (!this.ao.q()) {
+            if (!this.aq.q()) {
                 return;
             }
             let d = new TreemapLayoutSettings();
-            d.b = this.ak;
-            if (this.am != null && !this.ak.b.containsKey(this.am.j)) {
-                this.am = null;
-                this.h8(null);
+            d.b = this.am;
+            if (this.ao != null && !this.am.b.containsKey(this.ao.l)) {
+                this.ao = null;
+                this.i5(null);
             }
             else {
-                if (this.am != null) {
-                    let e = this.ak.b.item(this.am.j);
-                    if (e != this.am) {
-                        this.am = e;
-                        this.h8(this.am);
+                if (this.ao != null) {
+                    let e = this.am.b.item(this.ao.l);
+                    if (e != this.ao) {
+                        this.ao = e;
+                        this.i5(this.ao);
                     }
                 }
             }
-            d.h = this.jg;
-            d.c = this.am;
-            d.f = this.di;
-            d.a = this.aj;
+            d.h = this.kb;
+            d.c = this.ao;
+            d.f = this.d0;
+            d.a = this.al;
             let f = this.i;
-            let g = this.dz();
-            let h = this.d1();
-            let i = this.d0();
-            let j = this.dy();
-            let k = this.d3();
-            let l = this.d5();
-            let m = this.d4();
-            let n = this.d2();
-            let o = this.ie();
-            let p = this.jj();
-            let q = this.ao.y("M");
-            let r = this.ao.aa("M");
+            let g = this.ei();
+            let h = this.ek();
+            let i = this.ej();
+            let j = this.eh();
+            let k = this.en();
+            let l = this.ep();
+            let m = this.eo();
+            let n = this.em();
+            let o = this.jb();
+            let p = this.ke();
+            let q = this.aq.y("M");
+            let r = this.aq.aa("M");
             let s = q + h + j;
             let t = r + l + n;
-            d.j = new Thickness(1, this.ds, this.dw, this.du, this.dq);
-            d.i = new Thickness(1, this.dr, this.dv, this.dt, this.dp);
-            if (!isNaN_(this.c8)) {
-                s = this.c8;
+            d.j = new Thickness(1, this.d9, this.ed, this.eb, this.d7);
+            d.i = new Thickness(1, this.d8, this.ec, this.ea, this.d6);
+            if (!isNaN_(this.dn)) {
+                s = this.dn;
             }
             d.e = s;
             if (f == 2) {
                 d.e = 0;
             }
-            d.d = this.am == null;
-            this.q.d(this.f, d);
+            d.d = this.ao == null;
+            this.s.d(this.f, d);
             let u = 1.7976931348623157E+308;
             let v = -1.7976931348623157E+308;
             if (this.d == 1 || this.d == 3) {
-                for (let w = 0; w < this.ak.d.count; w++) {
+                for (let w = 0; w < this.am.d.count; w++) {
                     let x = 0;
                     if (this.d == 1) {
-                        x = this.ak.b.item(this.ak.d._inner[w]).e();
+                        x = this.am.b.item(this.am.d._inner[w]).e();
                     }
                     else {
-                        x = this.ak.b.item(this.ak.d._inner[w]).f;
+                        x = this.am.b.item(this.am.d._inner[w]).h;
                     }
                     if (!isNaN_(x)) {
                         u = Math.min(x, u);
@@ -2910,10 +3127,10 @@ export let Treemap = /*@__PURE__*/ (() => {
                 for (let y = 0; y < this.f.e.count; y++) {
                     let z = 0;
                     if (this.d == 0) {
-                        z = this.ak.b.item(this.f.e._inner[y]).e();
+                        z = this.am.b.item(this.f.e._inner[y]).e();
                     }
                     else {
-                        z = this.ak.b.item(this.f.e._inner[y]).f;
+                        z = this.am.b.item(this.f.e._inner[y]).h;
                     }
                     if (!isNaN_(z)) {
                         u = Math.min(z, u);
@@ -2923,134 +3140,137 @@ export let Treemap = /*@__PURE__*/ (() => {
             }
             for (let aa = 0; aa < this.f.e.count; aa++) {
                 let ab = this.f.e._inner[aa];
-                let ac = this.ak.b.item(ab);
-                let ad = this.i3(ac, u, v);
-                let ae = this.i8(ac);
-                let af = this.i4(ac);
-                let ag = this.d7(ac);
-                let ah = this.d6(ac);
-                let ai = this.gs(this.f, ac, g, i, k, m, s, t);
-                let aj = this.i7(ac, ad, af);
-                let ak = this.a3(ac);
-                let al = 0;
-                if (this.br(ac)) {
-                    al = this.ao.z(ai);
+                let ac = this.am.b.item(ab);
+                let ad = this.jy(ac, u, v);
+                let ae = this.j3(ac);
+                let af = this.jz(ac);
+                let ag = this.er(ac);
+                let ah = this.eq(ac);
+                let ai = this.ef(ac);
+                let aj = this.hm(this.f, ac, g, i, k, m, s, t);
+                let ak = this.j2(ac, ad, af);
+                let al = this.a7(ac);
+                let am = 0;
+                if (this.by(ac)) {
+                    am = this.aq.z(aj);
                 }
                 else {
-                    al = this.ao.ab(ai);
+                    am = this.aq.ab(aj);
                 }
-                let am = 0;
-                if (this.br(ac)) {
-                    am = s;
+                let an = 0;
+                if (this.by(ac)) {
+                    an = s;
                 }
                 else {
-                    am = this.ao.aa(ai);
+                    an = this.aq.aa(aj);
                 }
-                this.f.l(ac, ai, ad, ae, af, aj, ag, ah, f, al, am, g, h, i, j, k, l, m, n, o, p);
+                let ao = this.el(ac);
+                let ap = this.eg(ac);
+                this.f.l(ac, aj, ad, ae, af, ak, ag, ah, ai, f, am, an, g, h, i, j, k, l, m, n, o, p, ao, ap);
                 if (ac.c.count > 0) {
-                    for (let an = 0; an < ac.c.count; an++) {
-                        let ao = ac.b != null && ac.b.count > 0;
-                        if (ac.c._inner[an].bo == 2 && ao) {
+                    for (let aq = 0; aq < ac.c.count; aq++) {
+                        let ar = ac.b != null && ac.b.count > 0;
+                        if (ac.c._inner[aq].bo == 2 && ar) {
                             continue;
                         }
-                        this.f.f(ac, ac.c._inner[an], runOn(this, this.i7));
+                        this.f.f(ac, ac.c._inner[aq], runOn(this, this.j2));
                     }
                 }
                 if (this.nodeStyling != null) {
-                    let ap = new TreemapNodeStylingEventArgs();
-                    ap.item = ac.i;
-                    if (ac.l != null) {
-                        if (this.ak.b.containsKey(ac.l)) {
-                            let aq = this.ak.b.item(ac.l);
-                            ap.parentItem = aq.i;
-                            ap.parentLabel = aq.k;
-                            ap.parentSum = aq.e();
-                            ap.parentValue = aq.f;
+                    let as = new TreemapNodeStylingEventArgs();
+                    as.item = ac.k;
+                    if (ac.n != null) {
+                        if (this.am.b.containsKey(ac.n)) {
+                            let at = this.am.b.item(ac.n);
+                            as.parentItem = at.k;
+                            as.parentLabel = at.m;
+                            as.parentSum = at.e();
+                            as.parentValue = at.h;
                         }
                     }
-                    ap.sum = ac.e();
-                    ap.value = ac.f;
-                    ap.label = ac.k;
-                    ap.customValue = ac.h;
+                    as.sum = ac.e();
+                    as.value = ac.h;
+                    as.label = ac.m;
+                    as.customValue = ac.j;
                     if (ac.b != null && ac.b.count > 0) {
-                        ap.isParent = true;
+                        as.isParent = true;
                     }
-                    ap.style = new TreemapNodeStyle();
-                    ap.highlightingInfo = this.bi.getHighlightingInfo(this, this.az, ac.g, ac.g, false);
-                    this.nodeStyling(this, ap);
-                    this.f.f(ac, ap.style, runOn(this, this.i7));
+                    as.style = new TreemapNodeStyle();
+                    as.highlightingInfo = this.bo.getHighlightingInfo(this, this.a2, ac.i, ac.i, false);
+                    this.nodeStyling(this, as);
+                    this.f.f(ac, as.style, runOn(this, this.j2));
                 }
             }
         }
-        br(a) {
+        by(a) {
             return a.b != null && a.b.count > 0;
         }
-        d2() {
-            return this.de;
+        em() {
+            return this.dw;
         }
-        d4() {
-            return this.dg;
+        eo() {
+            return this.dy;
         }
-        d5() {
-            return this.dh;
+        ep() {
+            return this.dz;
         }
-        d3() {
-            return this.df;
+        en() {
+            return this.dx;
         }
-        ie() {
-            return this.id;
+        jb() {
+            return this.ja;
         }
-        jj() {
-            return this.ji;
+        ke() {
+            return this.kd;
         }
-        dy() {
+        eh() {
             if (this.i == 2) {
-                return this.dk;
+                return this.d2;
             }
-            return this.c9;
+            return this.dp;
         }
-        d0() {
+        ej() {
             if (this.i == 2) {
-                return this.dm;
+                return this.d4;
             }
-            return this.db;
+            return this.dr;
         }
-        d1() {
+        ek() {
             if (this.i == 2) {
-                return this.dn;
+                return this.d5;
             }
-            return this.dc;
+            return this.ds;
         }
-        dz() {
+        ei() {
             if (this.i == 2) {
-                return this.dk;
+                return this.d2;
             }
-            return this.da;
+            return this.dq;
         }
-        g1(a, b, c, d, e) {
+        hv(a, b, c, d, e) {
             let f = b.length;
             let g = b;
             let h = ("\u2026");
-            if (isNaN_(this.b4)) {
-                if (this.br(a)) {
-                    this.b4 = this.ao.z(h);
+            if (isNaN_(this.ce)) {
+                if (this.by(a)) {
+                    this.ce = this.aq.z(h);
                 }
                 else {
-                    this.b4 = this.ao.ab(h);
+                    this.ce = this.aq.ab(h);
                 }
             }
-            if (c <= (this.b4 + d + e)) {
-                if (this.l == 2) {
+            if (c <= (this.ce + d + e)) {
+                if (this.n == 2) {
                     return "";
                 }
                 return h;
             }
             let i = 0;
-            if (this.br(a)) {
-                i = this.ao.z(b);
+            if (this.by(a)) {
+                i = this.aq.z(b);
             }
             else {
-                i = this.ao.ab(b);
+                i = this.aq.ab(b);
             }
             if (i + d + e <= c) {
                 return b;
@@ -3059,11 +3279,11 @@ export let Treemap = /*@__PURE__*/ (() => {
             let k = truncate(Math.ceil(f * j));
             let l = b.substr(0, k) + h;
             let m = 0;
-            if (this.br(a)) {
-                m = this.ao.z(l);
+            if (this.by(a)) {
+                m = this.aq.z(l);
             }
             else {
-                m = this.ao.ab(l);
+                m = this.aq.ab(l);
             }
             if ((m + d + e) > c) {
                 f = k;
@@ -3071,11 +3291,11 @@ export let Treemap = /*@__PURE__*/ (() => {
             else {
                 k = k + 1;
                 l = b.substr(0, k) + h;
-                if (this.br(a)) {
-                    m = this.ao.z(l);
+                if (this.by(a)) {
+                    m = this.aq.z(l);
                 }
                 else {
-                    m = this.ao.ab(l);
+                    m = this.aq.ab(l);
                 }
                 if ((m + d + e) > c) {
                     f = k;
@@ -3084,53 +3304,53 @@ export let Treemap = /*@__PURE__*/ (() => {
             while ((i + d + e) > c && f > 0) {
                 f--;
                 b = b.substr(0, f) + h;
-                if (this.l == 2) {
+                if (this.n == 2) {
                     return "";
                 }
-                if (this.br(a)) {
-                    i = this.ao.z(b);
+                if (this.by(a)) {
+                    i = this.aq.z(b);
                 }
                 else {
-                    i = this.ao.ab(b);
+                    i = this.aq.ab(b);
                 }
             }
             return b;
         }
-        gs(a, b, c, d, e, f, g, h) {
+        hm(a, b, c, d, e, f, g, h) {
             if (b == null) {
-                if (this.ev != null && this.gt != null && !stringIsNullOrEmpty(this.gt)) {
-                    return this.gt + this.ev;
+                if (this.fh != null && this.hn != null && !stringIsNullOrEmpty(this.hn)) {
+                    return this.hn + this.fh;
                 }
                 return "";
             }
             let i = a.o(b);
             let j = i.width;
             let k = i.height;
-            let l = b.k;
-            if (this.am != null && this.am == b && this.ev != null) {
+            let l = b.m;
+            if (this.ao != null && this.ao == b && this.fh != null) {
                 let m = null;
                 let n = b;
-                while (n.l != null) {
-                    if (this.ak.b.containsKey(n.l)) {
-                        m = this.ak.b.item(n.l);
-                        if (m.k != null) {
-                            l = m.k + this.ev + l;
+                while (n.n != null) {
+                    if (this.am.b.containsKey(n.n)) {
+                        m = this.am.b.item(n.n);
+                        if (m.m != null) {
+                            l = m.m + this.fh + l;
                         }
                         n = m;
                     }
                 }
-                if (this.gt != null && !stringIsNullOrEmpty(this.gt)) {
-                    l = this.gt + this.ev + l;
+                if (this.hn != null && !stringIsNullOrEmpty(this.hn)) {
+                    l = this.hn + this.fh + l;
                 }
             }
             let o = 0;
             let p = 0;
-            if (a.c(b.j)) {
-                let q = a.a(b.j);
+            if (a.c(b.l)) {
+                let q = a.a(b.l);
                 if (b.b.count > 0) {
                     o = c;
                     p = d;
-                    if (this.o == 2) {
+                    if (this.q == 2) {
                         if (k < g) {
                             return "";
                         }
@@ -3139,180 +3359,201 @@ export let Treemap = /*@__PURE__*/ (() => {
                 else {
                     o = e;
                     p = f;
-                    if (this.o == 2) {
+                    if (this.q == 2) {
                         if (k < h) {
                             return "";
                         }
                     }
                 }
             }
-            return this.g1(b, l, j, o, p);
+            return this.hv(b, l, j, o, p);
         }
-        d7(a) {
-            if (!isNaN_(this.d8)) {
-                return this.d8;
+        er(a) {
+            if (!isNaN_(this.es)) {
+                return this.es;
             }
-            return this.b6;
+            return this.cj;
+        }
+        eq(a) {
+            if (!isNaN_(this.d1)) {
+                return this.d1;
+            }
+            return this.ci;
         }
-        d6(a) {
-            if (!isNaN_(this.dj)) {
-                return this.dj;
+        ef(a) {
+            if (!isNaN_(this.du)) {
+                return this.du;
             }
-            return this.b5;
+            return this.cf;
         }
-        i4(a) {
+        el(a) {
+            if (!isNaN_(this.dt)) {
+                return this.dt;
+            }
+            return this.ch;
+        }
+        eg(a) {
+            return this.cg;
+        }
+        jz(a) {
             if (this.i == 2) {
-                return this.i9(a);
+                return this.j4(a);
             }
-            if (a == this.an) {
-                return this.i5(a);
+            if (a == this.ap) {
+                return this.j0(a);
             }
-            if (this.iu != null) {
-                return this.iu;
+            if (this.jp != null) {
+                return this.jp;
             }
-            return this.ao.a7();
+            return this.aq.a7();
         }
-        i9(a) {
-            if (a == this.an) {
-                return this.ja(a);
+        j4(a) {
+            if (a == this.ap) {
+                return this.j5(a);
             }
-            if (this.i1 != null) {
-                return this.i1;
+            if (this.jw != null) {
+                return this.jw;
             }
-            return this.ao.bc();
+            return this.aq.bc();
         }
-        i7(a, b, c) {
+        j2(a, b, c) {
             if (a.b.count > 0) {
-                if (a == this.an) {
-                    return this.i6(a, c);
+                if (a == this.ap) {
+                    return this.j1(a, c);
                 }
-                let d = this.ao.a8();
-                let e = this.ao.a9();
-                if (this.iz != null) {
-                    e = this.iz;
+                let d = this.aq.a8();
+                let e = this.aq.a9();
+                if (this.ju != null) {
+                    e = this.ju;
                 }
-                if (this.iv != null) {
-                    d = this.iv;
+                if (this.jq != null) {
+                    d = this.jq;
                 }
                 return BrushUtil.j(c, d, e);
             }
             else {
-                let f = this.ao.a6();
-                let g = this.ao.be();
-                if (this.jc != null) {
-                    g = this.jc;
+                let f = this.aq.a6();
+                let g = this.aq.be();
+                if (this.j7 != null) {
+                    g = this.j7;
                 }
-                if (this.it != null) {
-                    f = this.it;
+                if (this.jo != null) {
+                    f = this.jo;
                 }
                 return BrushUtil.j(b, f, g);
             }
         }
-        a3(a) {
+        a7(a) {
             if (a.b.count > 0) {
-                if (this.a2 != null) {
-                    return this.a2;
+                if (this.a6 != null) {
+                    return this.a6;
                 }
-                return this.ao.j();
+                return this.aq.j();
             }
             else {
-                if (this.a4 != null) {
-                    return this.a4;
+                if (this.a8 != null) {
+                    return this.a8;
                 }
-                return this.ao.k();
+                return this.aq.k();
             }
         }
         onDetachedFromUI() {
-            this.ao.av();
+            this.aq.av();
         }
         onAttachedToUI() {
-            this.ao.at();
+            this.aq.at();
         }
-        i5(a) {
-            if (this.iw != null) {
-                return this.iw;
+        j0(a) {
+            if (this.jr != null) {
+                return this.jr;
             }
-            return this.ao.ba();
+            return this.aq.ba();
         }
-        ja(a) {
-            if (this.i2 != null) {
-                return this.i2;
+        j5(a) {
+            if (this.jx != null) {
+                return this.jx;
             }
-            return this.ao.bd();
+            return this.aq.bd();
         }
-        i6(a, b) {
-            let c = this.ao.a8();
-            let d = this.ao.a9();
-            if (this.iz != null) {
-                d = this.iz;
+        j1(a, b) {
+            let c = this.aq.a8();
+            let d = this.aq.a9();
+            if (this.ju != null) {
+                d = this.ju;
             }
-            if (this.iv != null) {
-                c = this.iv;
+            if (this.jq != null) {
+                c = this.jq;
             }
-            if (this.iy != null) {
-                d = this.iy;
+            if (this.jt != null) {
+                d = this.jt;
             }
-            if (this.ix != null) {
-                c = this.ix;
+            if (this.js != null) {
+                c = this.js;
             }
             return BrushUtil.j(b, c, d);
         }
-        i8(a) {
-            if (this.i0 != null) {
-                return this.i0;
+        j3(a) {
+            if (this.jv != null) {
+                return this.jv;
             }
-            return this.ao.bb();
+            return this.aq.bb();
         }
-        i3(a, b, c) {
+        jy(a, b, c) {
             if (this.b == null || this.b.count == 0) {
-                return this.jb(a);
+                return this.j6(a);
             }
-            let d = this.c7(a);
+            let d = this.dm(a);
             if (isNaN_(d)) {
-                return this.jb(a);
+                return this.j6(a);
             }
             let e = 0;
-            if (this.bq && this.ee > 0) {
+            if (this.bx && this.ez > 0) {
                 if (d > 0) {
-                    e = (logBase(d, this.ee) - logBase(b, this.ee)) / (logBase(c, this.ee) - logBase(b, this.ee));
+                    e = (logBase(d, this.ez) - logBase(b, this.ez)) / (logBase(c, this.ez) - logBase(b, this.ez));
                 }
                 else {
-                    return this.jb(a);
+                    return this.j6(a);
                 }
             }
             else {
-                e = (d - b) / (c - b);
+                let f = c - b;
+                if (f == 0) {
+                    e = 0;
+                }
+                else {
+                    e = (d - b) / (c - b);
+                }
             }
             e = e * (this.b.count - 1);
             return BrushCollectionUtil.b(this.b, e);
         }
-        c7(a) {
+        dm(a) {
             switch (this.d) {
                 case 0:
                 case 1: return a.e();
                 case 2:
-                case 3: return a.f;
+                case 3: return a.h;
             }
             return a.e();
         }
-        jb(a) {
-            return this.ao.a7();
+        j6(a) {
+            return this.aq.a7();
         }
-        h3(a) {
+        i0(a) {
             let b = new List$1(TreemapVisual.$, 0);
-            let c = this.ao.l();
+            let c = this.aq.l();
             let d = 0;
             if (this.i == 2) {
-                d = this.eh(a, false, d, c, (e) => true, b);
-                d = this.eh(a, true, d, c, (e) => e.e.b != null && e.e.b.count > 0, b);
+                d = this.e2(a, false, d, c, (e) => true, b);
+                d = this.e2(a, true, d, c, (e) => e.e.b != null && e.e.b.count > 0, b);
             }
             else {
-                d = this.eh(a, false, d, c, (e) => true, b);
+                d = this.e2(a, false, d, c, (e) => true, b);
             }
             c.count = d;
-            this.ao.ai(b);
+            this.aq.ai(b);
         }
-        eh(a, b, c, d, e, f) {
+        e2(a, b, c, d, e, f) {
             for (let g = 0; g < a.e.count; g++) {
                 let h = a.e._inner[g];
                 let i = a.a(h);
@@ -3320,8 +3561,8 @@ export let Treemap = /*@__PURE__*/ (() => {
                     continue;
                 }
                 let j = d.item(c);
-                if (i.ac.isEmpty || (i.ac.width == 0 && i.ac.height == 0)) {
-                    j.u = 1;
+                if (i.ae.isEmpty || (i.ae.width == 0 && i.ae.height == 0)) {
+                    j.x = 1;
                     continue;
                 }
                 c++;
@@ -3330,70 +3571,76 @@ export let Treemap = /*@__PURE__*/ (() => {
                 let l = true;
                 if (this.nodeRenderStyling != null) {
                     let m = new TreemapNodeStylingEventArgs();
-                    m.item = k.i;
-                    if (k.l != null) {
-                        if (this.ak.b.containsKey(k.l)) {
-                            let n = this.ak.b.item(k.l);
-                            m.parentItem = n.i;
-                            m.parentLabel = n.k;
+                    m.item = k.k;
+                    if (k.n != null) {
+                        if (this.am.b.containsKey(k.n)) {
+                            let n = this.am.b.item(k.n);
+                            m.parentItem = n.k;
+                            m.parentLabel = n.m;
                             m.parentSum = n.e();
-                            m.parentValue = n.f;
+                            m.parentValue = n.h;
                         }
                     }
                     m.sum = k.e();
-                    m.value = k.f;
-                    m.label = k.k;
-                    m.customValue = k.h;
+                    m.value = k.h;
+                    m.label = k.m;
+                    m.customValue = k.j;
                     if (k.b != null && k.b.count > 0) {
                         m.isParent = true;
                     }
                     m.style = new TreemapNodeStyle();
-                    m.isHighlightInProgress = this.bi.inProgress;
-                    m.totalHighlightProgress = this.bi.totalHighlightingProgress;
-                    m.highlightingInfo = this.bi.getHighlightingInfo(this, this.az, k.g, k.g, false);
+                    m.isHighlightInProgress = this.bo.inProgress;
+                    m.totalHighlightProgress = this.bo.totalHighlightingProgress;
+                    m.highlightingInfo = this.bo.getHighlightingInfo(this, this.a2, k.i, k.i, false);
                     this.nodeRenderStyling(this, m);
                     l = !m.highlightingHandled;
-                    i.w(k, m.style, runOn(this, this.i7));
+                    i.y(k, m.style, runOn(this, this.j2));
                 }
                 let o = i.e.b.count == 0;
                 let p = !o && i.a == 2;
-                j.a = this.a3(i.e);
-                j.j = i.y;
-                j.m = i.ab;
-                j.k = i.z;
-                j.o = new Thickness(1, i.k, i.m, i.l, i.j);
-                j.p = new Thickness(1, i.p, i.r, i.q, i.o);
+                j.a = this.a7(i.e);
                 j.l = i.aa;
-                j.h = i.v;
-                j.g = i.t;
-                j.u = 0;
-                j.n = this.jf(i.ac, i.t);
+                j.o = i.ad;
+                j.m = i.ab;
+                j.r = new Thickness(1, i.l, i.n, i.m, i.k);
+                j.s = new Thickness(1, i.r, i.t, i.s, i.q);
+                j.n = i.ac;
+                j.j = i.x;
+                j.i = i.v;
+                j.x = 0;
+                j.p = this.ka(i.ae, i.v);
                 j.b = o;
-                j.r = !o && !p ? 0 : 1;
-                j.t = !o && p ? 0 : 1;
-                j.s = o ? 0 : 1;
-                j.e = i.n;
+                j.u = !o && !p ? 0 : 1;
+                j.w = !o && p ? 0 : 1;
+                j.v = o ? 0 : 1;
+                j.f = i.o;
+                j.e = i.j;
+                j.k = i.z;
+                j.t = i.ag;
+                j.h = i.u;
                 j.d = i.i;
-                j.i = i.x;
-                j.q = i.ad;
-                j.f = i.s;
+                j.q = Rect.empty;
+                if (i.af.height != i.ae.height) {
+                    j.q = this.ka(i.af, i.v);
+                    j.d = i.p;
+                }
                 if (!b && !o && p) {
-                    j.t = 1;
+                    j.w = 1;
                 }
                 if (b && !o && p) {
-                    j.j = null;
-                    j.m = null;
+                    j.l = null;
+                    j.o = null;
                 }
-                if (this.as != 1 && l) {
-                    let q = this.bi.getHighlightingInfo(this, this.az, k.g, k.g, false);
-                    j.j = this.is(q, this.as, j.j);
-                    j.m = this.is(q, this.as, j.m);
-                    j.f = this.c3(q, this.as, j.f, i.h, this.bi.totalHighlightingProgress, this.bi.totalHighlightingProgress);
+                if (this.au != 1 && l) {
+                    let q = this.bo.getHighlightingInfo(this, this.a2, k.i, k.i, false);
+                    j.l = this.jn(q, this.au, j.l);
+                    j.o = this.jn(q, this.au, j.o);
+                    j.h = this.di(q, this.au, j.h, i.h, this.bo.totalHighlightingProgress, this.bo.totalHighlightingProgress);
                 }
             }
             return c;
         }
-        c3(a, b, c, d, e, f) {
+        di(a, b, c, d, e, f) {
             if (b == 3) {
                 let g = 0;
                 if (a != null) {
@@ -3413,7 +3660,7 @@ export let Treemap = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        is(a, b, c) {
+        jn(a, b, c) {
             if (c != null && b == 2) {
                 let d = 0;
                 if (a != null) {
@@ -3428,14 +3675,14 @@ export let Treemap = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        jf(a, b) {
-            let c = this.c2(Math.floor(a.left), b);
-            let d = this.c2(Math.floor(a.right), b);
-            let e = this.c2(Math.floor(a.top), b);
-            let f = this.c2(Math.floor(a.bottom), b);
+        ka(a, b) {
+            let c = this.dh(Math.floor(a.left), b);
+            let d = this.dh(Math.floor(a.right), b);
+            let e = this.dh(Math.floor(a.top), b);
+            let f = this.dh(Math.floor(a.bottom), b);
             return new Rect(0, c, e, d - c, f - e);
         }
-        c2(a, b) {
+        dh(a, b) {
             let c = a;
             if (b > 0) {
                 let d = b % 2;
@@ -3453,65 +3700,66 @@ export let Treemap = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        bw() {
-            return !this.jg.isEmpty && this.ao.q();
+        b4() {
+            return !this.kb.isEmpty && this.aq.q();
         }
-        h4() {
-            if (!this.bw()) {
+        i1() {
+            if (!this.b4()) {
                 return;
             }
-            if (this.bp) {
-                let a = this.g;
-                if (this.bm) {
-                    if (this.aw.g) {
-                        this.aw.t();
+            if (this.bw) {
+                if (this.bs) {
+                    if (this.ay.g) {
+                        this.ay.t();
                     }
+                    let a = this.g;
                     this.g = this.e;
                     this.e = a;
                 }
                 else {
+                    let b = this.g;
                     this.g = this.f;
-                    this.f = a;
+                    this.f = b;
                 }
             }
-            else if (this.bm) {
-                this.e.h(this.d9, this.g, this.f);
-                this.h3(this.e);
+            else if (this.bs) {
+                this.e.h(this.et, this.g, this.f);
+                this.i0(this.e);
             }
-            if (this.bp) {
-                this.h0();
+            if (this.bw) {
+                this.ix();
             }
-            if (this.bp && this.bx) {
-                this.h6();
-                this.e.h(this.d9, this.g, this.f);
-                this.h3(this.e);
+            if (this.bw && this.b5) {
+                this.i3();
+                this.e.h(this.et, this.g, this.f);
+                this.i0(this.e);
             }
             else {
-                if (this.bp) {
-                    this.h3(this.f);
+                if (this.bw) {
+                    this.i0(this.f);
                 }
             }
-            this.bp = false;
-            this.ao.a1();
+            this.bw = false;
+            this.aq.a1();
         }
-        bn(a, b) {
+        bt(a, b) {
             let c = null;
             switch (a.bq) {
                 case 1:
-                    c = b.f;
+                    c = b.h;
                     break;
                 case 0:
                     c = b.e();
                     break;
                 case 2:
-                    c = b.h;
+                    c = b.j;
                     break;
             }
-            if (this.bt(c)) {
-                let d = this.c4(c);
+            if (this.b1(c)) {
+                let d = this.dj(c);
                 if (a.bw != null) {
-                    if (this.bt(a.bw)) {
-                        let e = this.c4(a.bw);
+                    if (this.b1(a.bw)) {
+                        let e = this.dj(a.bw);
                         if (isNaN_(e) && isNaN_(d)) {
                             return true;
                         }
@@ -3528,9 +3776,9 @@ export let Treemap = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            else if (this.bv(c)) {
+            else if (this.b3(c)) {
                 if (a.bw != null) {
-                    if (this.bv(a.bw)) {
+                    if (this.b3(a.bw)) {
                         let h = (a.bw);
                         if (Base.equalsStatic(h, c)) {
                             return true;
@@ -3545,10 +3793,10 @@ export let Treemap = /*@__PURE__*/ (() => {
             }
             return false;
         }
-        bv(a) {
+        b3(a) {
             return typeof a === 'string';
         }
-        c4(a) {
+        dj(a) {
             if (typeof a === 'number') {
                 return a;
             }
@@ -3572,7 +3820,7 @@ export let Treemap = /*@__PURE__*/ (() => {
             }
             return NaN;
         }
-        bt(a) {
+        b1(a) {
             if (typeof a === 'number') {
                 return true;
             }
@@ -3596,22 +3844,22 @@ export let Treemap = /*@__PURE__*/ (() => {
             }
             return false;
         }
-        u(a) {
+        w(a) {
             let b = this.f;
-            if (this.bm) {
+            if (this.bs) {
                 b = this.e;
             }
             let c = new List$1(TreemapNodeFrame.$, 0);
             for (let d = 0; d < b.e.count; d++) {
                 let e = b.e._inner[d];
                 let f = b.a(e);
-                if (a.x >= f.ac.left && a.x <= f.ac.right && a.y >= f.ac.top && a.y <= f.ac.bottom) {
+                if (a.x >= f.ae.left && a.x <= f.ae.right && a.y >= f.ae.top && a.y <= f.ae.bottom) {
                     c.add(f);
                 }
             }
             c.aa((g, h) => {
-                let i = this.ef(h);
-                let j = this.ef(g);
+                let i = this.e0(h);
+                let j = this.e0(g);
                 if (i > j) {
                     return 1;
                 }
@@ -3627,16 +3875,16 @@ export let Treemap = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        ef(a) {
+        e0(a) {
             let b = a.e;
             let c = 0;
-            while (b.l != null) {
-                if (this.ak == null) {
+            while (b.n != null) {
+                if (this.am == null) {
                     break;
                 }
-                if (this.ak.b.containsKey(b.l)) {
+                if (this.am.b.containsKey(b.n)) {
                     c++;
-                    b = this.ak.b.item(b.l);
+                    b = this.am.b.item(b.n);
                 }
                 else {
                     break;
@@ -3644,22 +3892,22 @@ export let Treemap = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        v(a) {
+        x(a) {
             let b = this.f;
-            if (this.bm) {
+            if (this.bs) {
                 b = this.e;
             }
             let c = new List$1(TreemapNodeFrame.$, 0);
             for (let d = 0; d < b.e.count; d++) {
                 let e = b.e._inner[d];
                 let f = b.a(e);
-                if (a.x >= f.ac.left && a.x <= f.ac.right && a.y >= f.ac.top && a.y <= f.ac.bottom) {
+                if (a.x >= f.ae.left && a.x <= f.ae.right && a.y >= f.ae.top && a.y <= f.ae.bottom) {
                     c.add(f);
                 }
             }
             c.aa((g, h) => {
-                let i = this.ef(h);
-                let j = this.ef(g);
+                let i = this.e0(h);
+                let j = this.e0(g);
                 if (i > j) {
                     return 1;
                 }
@@ -3671,7 +3919,7 @@ export let Treemap = /*@__PURE__*/ (() => {
             if (this.i == 2) {
                 for (let g of fromEnum(c)) {
                     if (g.e.b.count > 0) {
-                        if (this.bu(a, g)) {
+                        if (this.b2(a, g)) {
                             return g;
                         }
                     }
@@ -3682,286 +3930,304 @@ export let Treemap = /*@__PURE__*/ (() => {
             }
             return null;
         }
-        h6() {
-            this.cz = 0;
-            this.aw.w();
-            this.aw.v();
-            this.ao.ay();
+        i3() {
+            this.de = 0;
+            this.ay.w();
+            this.ay.v();
+            this.aq.ay();
         }
-        get bx() {
-            return this.ei > 0;
+        get b5() {
+            return this.e3 > 0;
         }
         provideContainer(a) {
-            this.ao.au(a);
-            this.aw.u(a);
-            this.ax.u(a);
+            this.aq.au(a);
+            this.ay.u(a);
+            this.az.u(a);
         }
-        he() {
-            this.ao.ap();
+        h9() {
+            this.aq.ap();
         }
-        get x() {
-            return this.t;
+        get z() {
+            return this.v;
         }
-        set x(a) {
-            let b = this.t;
-            this.t = a;
+        set z(a) {
+            let b = this.v;
+            this.v = a;
             if (b != a) {
-                this.hg(b);
-                this.hd(a);
+                this.ib(b);
+                this.h8(a);
             }
         }
-        hd(a) {
+        h8(a) {
             if (a != null) {
                 if (this.nodePointerEnter != null) {
-                    this.nodePointerEnter(this, this.y(a));
+                    this.nodePointerEnter(this, this.aa(a));
                 }
             }
         }
-        hg(a) {
+        ib(a) {
             if (a != null) {
                 if (this.nodePointerLeave != null) {
-                    this.nodePointerLeave(this, this.y(a));
+                    this.nodePointerLeave(this, this.aa(a));
                 }
             }
         }
-        y(a) {
+        aa(a) {
             let b = new TreemapNodePointerEventArgs();
             if (a != null) {
-                b.customValue = a.e.h;
-                b.item = a.e.i;
-                b.position = this.jd;
+                b.customValue = a.e.j;
+                b.item = a.e.k;
+                b.position = this.j8;
                 b.sum = a.e.e();
-                b.value = a.e.f;
-                b.label = a.e.k;
-                b.isOverHeader = this.bu(this.jd, a);
-                if (a.e.l != null && this.ak != null && this.ak.b.containsKey(a.e.l)) {
-                    let c = this.ak.b.item(a.e.l);
-                    b.parentItem = c.i;
+                b.value = a.e.h;
+                b.label = a.e.m;
+                b.isOverHeader = this.b2(this.j8, a);
+                if (a.e.n != null && this.am != null && this.am.b.containsKey(a.e.n)) {
+                    let c = this.am.b.item(a.e.n);
+                    b.parentItem = c.k;
                     b.parentSum = c.e();
-                    b.parentValue = c.f;
-                    b.parentLabel = c.k;
+                    b.parentValue = c.h;
+                    b.parentLabel = c.m;
                 }
             }
             b.isRightButton = false;
             return b;
         }
-        get ek() {
-            return this.ej;
+        get e5() {
+            return this.e4;
         }
-        set ek(a) {
-            let b = this.ej;
-            this.ej = a;
-            if (b != this.ej) {
-                this.hw("FocusItem", b, a);
+        set e5(a) {
+            let b = this.e4;
+            this.e4 = a;
+            if (b != this.e4) {
+                this.it("FocusItem", b, a);
             }
         }
-        hr(a) {
-            this.ib(a);
-            if (this.nodePointerPressed != null && this.x != null) {
-                let b = this.y(this.x);
+        io(a) {
+            this.i8(a);
+            if (this.nodePointerPressed != null && this.z != null) {
+                let b = this.aa(this.z);
                 this.nodePointerPressed(this, b);
             }
         }
-        hv(a) {
-            this.ib(a);
+        is(a) {
+            this.i8(a);
             let b = false;
-            if (this.nodePointerReleased != null && this.x != null) {
-                let c = this.y(this.x);
+            if (this.nodePointerReleased != null && this.z != null) {
+                let c = this.aa(this.z);
                 this.nodePointerReleased(this, c);
                 b = c.isHandled;
             }
             if (!b) {
-                if (this.w != null) {
-                    if (this.w.e == this.am && this.bu(a, this.w)) {
-                        this.am = null;
-                        this.bp = true;
-                        this.ao.a2();
-                        this.h8(null);
+                if (this.y != null) {
+                    if (this.y.e == this.ao && this.b2(a, this.y)) {
+                        this.ao = null;
+                        this.bw = true;
+                        this.aq.a2();
+                        this.i5(null);
                         return;
                     }
-                    this.am = this.w.e;
-                    this.h8(this.w.e);
-                    this.bp = true;
-                    this.ao.a2();
+                    this.ao = this.y.e;
+                    this.i5(this.y.e);
+                    this.bw = true;
+                    this.aq.a2();
                 }
                 else {
-                    this.am = null;
-                    this.bp = true;
-                    this.h8(null);
-                    this.ao.a2();
+                    this.ao = null;
+                    this.bw = true;
+                    this.i5(null);
+                    this.aq.a2();
                 }
             }
         }
-        h8(a) {
+        i5(a) {
             try {
-                this.bk = true;
+                this.bq = true;
                 if (a == null) {
-                    this.ek = null;
+                    this.e5 = null;
                 }
                 else {
-                    this.ek = a.i;
+                    this.e5 = a.k;
                 }
-                this.bk = false;
+                this.bq = false;
             }
             finally {
-                this.bk = false;
+                this.bq = false;
             }
         }
-        bu(a, b) {
+        b2(a, b) {
             let c = this.f;
-            if (this.bm) {
+            if (this.bs) {
                 c = this.e;
             }
             if (b == null) {
                 return false;
             }
             let d = b;
-            if (a.x >= d.ac.left && a.x <= d.ac.right && a.y >= d.ac.top && a.y <= d.ac.bottom) {
-                if (a.y - d.ac.top <= d.i) {
+            if (a.x >= d.ae.left && a.x <= d.ae.right && a.y >= d.ae.top && a.y <= d.ae.bottom) {
+                if (a.y - d.ae.top <= d.j) {
                     return true;
                 }
             }
             return false;
         }
-        hm(source_, a, b, c) {
+        ii(source_, a, b, c) {
             if (source_.dataView && source_.dataSource) {
                 source_ = source_.dataView();
             }
             ;
-            if (!this.by(source_)) {
-                return;
+            let d = null;
+            if (this.b6(source_)) {
+                d = this.a2;
+            }
+            if (this.bu(source_)) {
+                d = this.a3;
             }
-            let d = this.az;
             if (d == null) {
                 return;
             }
             d.handleCollectionChanged(new NotifyCollectionChangedEventArgs(2, 2, c, b, a));
         }
-        hj(source_) {
+        ie(source_) {
             if (source_.dataView && source_.dataSource) {
                 source_ = source_.dataView();
             }
             ;
-            if (!this.by(source_)) {
+            let a = null;
+            if (this.b6(source_)) {
+                a = this.a2;
+            }
+            if (this.bu(source_)) {
+                a = this.a3;
+            }
+            if (a == null) {
                 return;
             }
-            let a = this.az;
             a.handleCollectionChanged(new NotifyCollectionChangedEventArgs(0, 4));
         }
-        by(a) {
-            return Treemap.bz(a, this.dataSource);
+        b6(a) {
+            return Treemap.b7(a, this.dataSource);
+        }
+        bu(a) {
+            return Treemap.b7(a, this.highlightedDataSource);
         }
-        static bz(a, b) {
+        static b7(a, b) {
             return a == b;
         }
-        hk(source_, a, b) {
+        ig(source_, a, b) {
             if (source_.dataView && source_.dataSource) {
                 source_ = source_.dataView();
             }
             ;
-            if (!this.by(source_)) {
-                return;
+            let c = null;
+            if (this.b6(source_)) {
+                c = this.a2;
+            }
+            if (this.bu(source_)) {
+                c = this.a3;
             }
-            let c = this.az;
             if (c == null) {
                 return;
             }
             c.handleCollectionChanged(new NotifyCollectionChangedEventArgs(1, 0, b, a));
         }
-        hl(source_, a, b) {
+        ih(source_, a, b) {
             if (source_.dataView && source_.dataSource) {
                 source_ = source_.dataView();
             }
             ;
-            if (!this.by(source_)) {
-                return;
+            let c = null;
+            if (this.b6(source_)) {
+                c = this.a2;
+            }
+            if (this.bu(source_)) {
+                c = this.a3;
             }
-            let c = this.az;
             if (c == null) {
                 return;
             }
             c.handleCollectionChanged(new NotifyCollectionChangedEventArgs(1, 1, b, a));
         }
-        hs(a) {
-            this.ib(a);
-            this.hi(this.x, a, false, false);
+        ip(a) {
+            this.i8(a);
+            this.id(this.z, a, false, false);
         }
-        ht(a) {
-            this.hi(this.x, a, false, true);
-            this.ib(a);
-            this.w = null;
-            this.x = null;
-            if (!this.bm) {
-                this.bp = true;
-                this.ao.a2();
+        iq(a) {
+            this.id(this.z, a, false, true);
+            this.i8(a);
+            this.y = null;
+            this.z = null;
+            if (!this.bs) {
+                this.bw = true;
+                this.aq.a2();
             }
         }
-        ib(a) {
-            this.jd = { $type: Point_$type, x: a.x, y: a.y };
-            this.w = this.u(a);
-            this.x = this.v(a);
-            this.h9(a);
-        }
-        h5(a) {
-            this.hu(a);
-        }
-        hu(a) {
-            this.ib(a);
-            this.hi(this.x, a, false, false);
-            if (this.x != null) {
+        i8(a) {
+            this.j8 = { $type: Point_$type, x: a.x, y: a.y };
+            this.y = this.w(a);
+            this.z = this.x(a);
+            this.i6(a);
+        }
+        i2(a) {
+            this.ir(a);
+        }
+        ir(a) {
+            this.i8(a);
+            this.id(this.z, a, false, false);
+            if (this.z != null) {
                 if (this.nodePointerOver != null) {
-                    this.nodePointerOver(this, this.y(this.x));
+                    this.nodePointerOver(this, this.aa(this.z));
                 }
             }
         }
-        h9(a) {
-            if (!this.bm) {
-                if (this.bu(a, this.w)) {
-                    let b = this.an;
-                    this.an = this.w.e;
-                    if (this.an != b) {
-                        this.bp = true;
-                        this.ao.a2();
+        i6(a) {
+            if (!this.bs) {
+                if (this.b2(a, this.y)) {
+                    let b = this.ap;
+                    this.ap = this.y.e;
+                    if (this.ap != b) {
+                        this.bw = true;
+                        this.aq.a2();
                     }
                 }
                 else {
-                    let c = this.an;
-                    this.an = null;
-                    if (this.an != c) {
-                        this.bp = true;
-                        this.ao.a2();
+                    let c = this.ap;
+                    this.ap = null;
+                    if (this.ap != c) {
+                        this.bw = true;
+                        this.aq.a2();
                     }
                 }
             }
         }
-        hx(a) {
-            this.ib(a);
-            if (this.nodePointerPressed != null && this.x != null) {
-                let b = this.y(this.x);
+        iu(a) {
+            this.i8(a);
+            if (this.nodePointerPressed != null && this.z != null) {
+                let b = this.aa(this.z);
                 b.isRightButton = true;
                 this.nodePointerPressed(this, b);
             }
         }
-        hy(a) {
-            this.ib(a);
+        iv(a) {
+            this.i8(a);
             let b = false;
-            if (this.nodePointerReleased != null && this.x != null) {
-                let c = this.y(this.x);
+            if (this.nodePointerReleased != null && this.z != null) {
+                let c = this.aa(this.z);
                 c.isRightButton = true;
                 this.nodePointerReleased(this, c);
                 b = c.isHandled;
             }
             if (!b) {
-                this.w = null;
-                this.am = null;
-                this.h8(null);
-                this.bp = true;
-                this.ao.a2();
+                this.y = null;
+                this.ao = null;
+                this.i5(null);
+                this.bw = true;
+                this.aq.a2();
             }
         }
-        hz(a) {
-            this.bp = true;
-            this.ao.a2();
+        iw(a) {
+            this.bw = true;
+            this.aq.a2();
         }
     }
     Treemap.$t = /*@__PURE__*/ markType(Treemap, 'Treemap', Base.$, [INotifyPropertyChanged_$type]);
@@ -4018,7 +4284,7 @@ export let TreemapNodeStyle = /*@__PURE__*/ (() => {
                 this.e.add_1(a);
             }
             if (this.a != null) {
-                this.a.hz(this);
+                this.a.iw(this);
             }
         }
         get bg() {
@@ -4492,8 +4758,8 @@ export let TreemapFrame = /*@__PURE__*/ (() => {
                 let e = b.e._inner[d];
                 if (c.d.containsKey(e)) {
                     let f = TreemapNodeFrame.b(a, b.d.item(e), c.d.item(e));
-                    this.d.addItem(f.u, f);
-                    this.e.add(f.u);
+                    this.d.addItem(f.w, f);
+                    this.e.add(f.w);
                 }
             }
         }
@@ -4502,8 +4768,8 @@ export let TreemapFrame = /*@__PURE__*/ (() => {
                 let e = c.e._inner[d];
                 if (!b.d.containsKey(e)) {
                     let f = TreemapNodeFrame.c(a, c.d.item(e));
-                    this.d.addItem(f.u, f);
-                    this.e.add(f.u);
+                    this.d.addItem(f.w, f);
+                    this.e.add(f.w);
                 }
             }
         }
@@ -4512,63 +4778,73 @@ export let TreemapFrame = /*@__PURE__*/ (() => {
                 let e = b.e._inner[d];
                 if (!c.d.containsKey(e)) {
                     let f = TreemapNodeFrame.d(a, b.d.item(e));
-                    this.d.addItem(f.u, f);
-                    this.e.add(f.u);
+                    this.d.addItem(f.w, f);
+                    this.e.add(f.w);
                 }
             }
         }
         m(a, b) {
             let c;
-            if (!((() => { let d = this.d.tryGetValue(a.j, c); c = d.p1; return d.ret; })())) {
+            if (!((() => { let d = this.d.tryGetValue(a.l, c); c = d.p1; return d.ret; })())) {
                 c = new TreemapNodeFrame();
-                c.u = a.j;
+                c.w = a.l;
                 c.e = a;
-                this.d.item(c.u, c);
-                this.e.add(c.u);
+                this.d.item(c.w, c);
+                this.e.add(c.w);
             }
-            c.ac = b;
+            c.ae = b;
+            let d = c.ae;
+            if (!isNaN_(a.f)) {
+                let e = b.height * a.f;
+                let f = b.height - e;
+                d = new Rect(0, b.x, b.y + f, b.width, e);
+            }
+            c.af = d;
         }
         n(a, b) {
-            this.d.item(a.j).g = b;
+            this.d.item(a.l).g = b;
         }
         b(a) {
-            if (!this.d.containsKey(a.j)) {
+            if (!this.d.containsKey(a.l)) {
                 return false;
             }
-            return this.d.item(a.j).g;
+            return this.d.item(a.l).g;
         }
         o(a) {
             let b;
-            if (!((() => { let c = this.d.tryGetValue(a.j, b); b = c.p1; return c.ret; })())) {
+            if (!((() => { let c = this.d.tryGetValue(a.l, b); b = c.p1; return c.ret; })())) {
                 return Rect.empty;
             }
-            return b.ac;
+            return b.ae;
         }
-        l(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) {
-            let v;
-            if (!((() => { let w = this.d.tryGetValue(a.j, v); v = w.p1; return w.ret; })())) {
+        l(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) {
+            let y;
+            if (!((() => { let z = this.d.tryGetValue(a.l, y); y = z.p1; return z.ret; })())) {
                 return;
             }
-            v.v = b;
-            v.y = c;
-            v.ab = d;
-            v.t = g;
-            v.s = h;
-            v.z = e;
-            v.a = i;
-            v.n = j;
-            v.i = k;
-            v.aa = f;
-            v.k = l;
-            v.m = m;
-            v.l = n;
-            v.j = o;
-            v.p = p;
-            v.r = q;
-            v.q = r;
-            v.o = s;
-            v.x = t;
-            v.ad = u;
+            y.x = b;
+            y.aa = c;
+            y.ad = d;
+            y.v = g;
+            y.u = h;
+            y.ab = e;
+            y.a = j;
+            y.o = k;
+            y.j = l;
+            y.ac = f;
+            y.l = m;
+            y.n = n;
+            y.m = o;
+            y.k = p;
+            y.r = q;
+            y.t = r;
+            y.s = s;
+            y.q = t;
+            y.z = u;
+            y.ag = v;
+            y.h = i;
+            y.p = w;
+            y.i = x;
         }
         g() {
             this.e.clear();
@@ -4582,10 +4858,10 @@ export let TreemapFrame = /*@__PURE__*/ (() => {
         }
         f(a, b, c) {
             let d;
-            if (!((() => { let e = this.d.tryGetValue(a.j, d); d = e.p1; return e.ret; })())) {
+            if (!((() => { let e = this.d.tryGetValue(a.l, d); d = e.p1; return e.ret; })())) {
                 return;
             }
-            d.w(a, b, c);
+            d.y(a, b, c);
         }
     }
     TreemapFrame.$t = /*@__PURE__*/ markType(TreemapFrame, 'TreemapFrame');
@@ -4598,205 +4874,239 @@ export let TreemapNodeFrame = /*@__PURE__*/ (() => {
     class TreemapNodeFrame extends Base {
         constructor() {
             super();
-            this.ac = null;
+            this.ae = null;
+            this.af = null;
+            this.p = 0;
+            this.i = 0;
             this.e = null;
-            this.u = null;
-            this.v = null;
-            this.y = null;
-            this.ab = null;
-            this.t = 0;
-            this.s = 0;
+            this.w = null;
+            this.x = null;
+            this.aa = null;
+            this.ad = null;
+            this.v = 0;
+            this.u = 0;
             this.h = 0;
-            this.k = 0;
-            this.m = 0;
             this.l = 0;
-            this.j = 0;
-            this.p = 0;
+            this.n = 0;
+            this.m = 0;
+            this.k = 0;
             this.r = 0;
+            this.t = 0;
+            this.s = 0;
             this.q = 0;
-            this.o = 0;
-            this.aa = null;
-            this.z = null;
+            this.ac = null;
+            this.ab = null;
             this.a = 0;
-            this.n = 0;
-            this.i = 0;
-            this.x = 0;
-            this.ad = 0;
+            this.o = 0;
+            this.j = 0;
+            this.z = 0;
+            this.ag = 0;
             this.g = false;
-            this.ac = Rect.empty;
-            this.s = 1;
+            this.ae = Rect.empty;
+            this.u = 1;
             this.h = 0.3;
         }
         static b(a, b, c) {
             let d = new TreemapNodeFrame();
             d.e = c.e;
-            d.u = c.u;
-            d.v = c.v;
-            let e = c.ac;
+            d.w = c.w;
+            d.x = c.x;
+            let e = c.ae;
             if (e.isEmpty) {
                 e = new Rect(0, 0, 0, 0, 0);
             }
-            let f = b.ac;
+            let f = b.ae;
             if (f.isEmpty) {
                 f = new Rect(0, 0, 0, 0, 0);
             }
-            d.ac = new Rect(0, f.left + (e.left - f.left) * a, f.top + (e.top - f.top) * a, f.width + (e.width - f.width) * a, f.height + (e.height - f.height) * a);
-            d.y = BrushUtil.l(b.y, a, c.y, 0);
-            d.ab = BrushUtil.l(b.ab, a, c.ab, 0);
-            d.z = BrushUtil.l(b.z, a, c.z, 0);
+            d.ae = new Rect(0, f.left + (e.left - f.left) * a, f.top + (e.top - f.top) * a, f.width + (e.width - f.width) * a, f.height + (e.height - f.height) * a);
+            let g = c.af;
+            if (g.isEmpty) {
+                g = new Rect(0, 0, 0, 0, 0);
+            }
+            let h = b.af;
+            if (h.isEmpty) {
+                h = new Rect(0, 0, 0, 0, 0);
+            }
+            d.af = new Rect(0, h.left + (g.left - h.left) * a, h.top + (g.top - h.top) * a, h.width + (g.width - h.width) * a, h.height + (g.height - h.height) * a);
             d.aa = BrushUtil.l(b.aa, a, c.aa, 0);
-            d.t = b.t + (c.t - b.t) * a;
-            d.k = b.k + (c.k - b.k) * a;
-            d.m = b.m + (c.m - b.m) * a;
+            d.ad = BrushUtil.l(b.ad, a, c.ad, 0);
+            d.ab = BrushUtil.l(b.ab, a, c.ab, 0);
+            d.ac = BrushUtil.l(b.ac, a, c.ac, 0);
+            d.v = b.v + (c.v - b.v) * a;
             d.l = b.l + (c.l - b.l) * a;
-            d.j = b.j + (c.j - b.j) * a;
-            d.p = b.p + (c.p - b.p) * a;
+            d.n = b.n + (c.n - b.n) * a;
+            d.m = b.m + (c.m - b.m) * a;
+            d.k = b.k + (c.k - b.k) * a;
             d.r = b.r + (c.r - b.r) * a;
+            d.t = b.t + (c.t - b.t) * a;
+            d.s = b.s + (c.s - b.s) * a;
             d.q = b.q + (c.q - b.q) * a;
             d.o = b.o + (c.o - b.o) * a;
-            d.n = b.n + (c.n - b.n) * a;
-            d.i = b.i + (c.i - b.i) * a;
-            d.x = a < 0.5 ? b.x : c.x;
-            d.ad = a < 0.5 ? b.ad : c.ad;
+            d.j = b.j + (c.j - b.j) * a;
+            d.z = a < 0.5 ? b.z : c.z;
+            d.ag = a < 0.5 ? b.ag : c.ag;
             d.a = a < 0.5 ? b.a : c.a;
+            d.u = b.u + (c.u - b.u) * a;
+            d.h = b.h + (c.h - b.h) * a;
+            d.p = b.p + (c.p - b.p) * a;
+            d.i = b.i + (c.i - b.i) * a;
             return d;
         }
         static d(a, b) {
             let c = new Rect(0, 0, 0, 0, 0);
             let d = new TreemapNodeFrame();
             d.e = b.e;
-            d.v = b.v;
-            d.u = b.u;
-            let e = b.ac;
+            d.x = b.x;
+            d.w = b.w;
+            let e = b.ae;
             if (e.isEmpty) {
                 e = new Rect(0, 0, 0, 0, 0);
             }
-            d.ac = new Rect(0, e.left + (c.left - e.left) * a, e.top + (c.top - e.top) * a, e.width + (c.width - e.width) * a, e.height + (c.height - e.height) * a);
-            d.y = BrushUtil.l(b.y, a, null, 0);
-            d.ab = BrushUtil.l(b.ab, a, null, 0);
-            d.z = BrushUtil.l(b.z, a, null, 0);
+            d.ae = new Rect(0, e.left + (c.left - e.left) * a, e.top + (c.top - e.top) * a, e.width + (c.width - e.width) * a, e.height + (c.height - e.height) * a);
+            let f = b.af;
+            if (f.isEmpty) {
+                f = new Rect(0, 0, 0, 0, 0);
+            }
+            d.af = new Rect(0, f.left + (c.left - f.left) * a, f.top + (c.top - f.top) * a, f.width + (c.width - f.width) * a, f.height + (c.height - f.height) * a);
             d.aa = BrushUtil.l(b.aa, a, null, 0);
-            d.t = b.t + (0 - b.t) * a;
-            d.k = b.k + (0 - b.k) * a;
-            d.m = b.m + (0 - b.m) * a;
+            d.ad = BrushUtil.l(b.ad, a, null, 0);
+            d.ab = BrushUtil.l(b.ab, a, null, 0);
+            d.ac = BrushUtil.l(b.ac, a, null, 0);
+            d.v = b.v + (0 - b.v) * a;
             d.l = b.l + (0 - b.l) * a;
-            d.j = b.j + (0 - b.j) * a;
-            d.p = b.p + (0 - b.p) * a;
+            d.n = b.n + (0 - b.n) * a;
+            d.m = b.m + (0 - b.m) * a;
+            d.k = b.k + (0 - b.k) * a;
             d.r = b.r + (0 - b.r) * a;
+            d.t = b.t + (0 - b.t) * a;
+            d.s = b.s + (0 - b.s) * a;
             d.q = b.q + (0 - b.q) * a;
             d.o = b.o + (0 - b.o) * a;
-            d.n = b.n + (0 - b.n) * a;
-            d.i = b.i + (0 - b.i) * a;
-            d.x = b.x;
-            d.ad = b.ad;
+            d.j = b.j + (0 - b.j) * a;
+            d.z = b.z;
+            d.ag = b.ag;
             d.a = b.a;
+            d.u = b.u + (0 - b.u) * a;
+            d.h = b.h + (0 - b.h) * a;
+            d.p = b.p + (0 - b.p) * a;
+            d.i = b.i + (0 - b.i) * a;
             return d;
         }
         static c(a, b) {
             let c = new Rect(0, 0, 0, 0, 0);
             let d = new TreemapNodeFrame();
             d.e = b.e;
-            d.v = b.v;
-            d.u = b.u;
-            let e = b.ac;
+            d.x = b.x;
+            d.w = b.w;
+            let e = b.ae;
             if (e.isEmpty) {
                 e = new Rect(0, 0, 0, 0, 0);
             }
-            d.ac = new Rect(0, c.left + (e.left - c.left) * a, c.top + (e.top - c.top) * a, c.width + (e.width - c.width) * a, c.height + (e.height - c.height) * a);
-            d.y = BrushUtil.l(null, a, b.y, 0);
-            d.ab = BrushUtil.l(null, a, b.ab, 0);
-            d.z = BrushUtil.l(null, a, b.z, 0);
+            d.ae = new Rect(0, c.left + (e.left - c.left) * a, c.top + (e.top - c.top) * a, c.width + (e.width - c.width) * a, c.height + (e.height - c.height) * a);
+            let f = b.af;
+            if (f.isEmpty) {
+                f = new Rect(0, 0, 0, 0, 0);
+            }
+            d.af = new Rect(0, c.left + (f.left - c.left) * a, c.top + (f.top - c.top) * a, c.width + (f.width - c.width) * a, c.height + (f.height - c.height) * a);
             d.aa = BrushUtil.l(null, a, b.aa, 0);
-            d.t = 0 + (b.t - 0) * a;
-            d.k = 0 + (b.k - 0) * a;
-            d.m = 0 + (b.m - 0) * a;
+            d.ad = BrushUtil.l(null, a, b.ad, 0);
+            d.ab = BrushUtil.l(null, a, b.ab, 0);
+            d.ac = BrushUtil.l(null, a, b.ac, 0);
+            d.v = 0 + (b.v - 0) * a;
             d.l = 0 + (b.l - 0) * a;
-            d.j = 0 + (b.j - 0) * a;
-            d.p = 0 + (b.p - 0) * a;
+            d.n = 0 + (b.n - 0) * a;
+            d.m = 0 + (b.m - 0) * a;
+            d.k = 0 + (b.k - 0) * a;
             d.r = 0 + (b.r - 0) * a;
+            d.t = 0 + (b.t - 0) * a;
+            d.s = 0 + (b.s - 0) * a;
             d.q = 0 + (b.q - 0) * a;
             d.o = 0 + (b.o - 0) * a;
-            d.n = 0 + (b.n - 0) * a;
-            d.i = 0 + (b.i - 0) * a;
-            d.x = b.x;
-            d.ad = b.ad;
+            d.j = 0 + (b.j - 0) * a;
+            d.z = b.z;
+            d.ag = b.ag;
             d.a = b.a;
+            d.u = 0 + (b.u - 0) * a;
+            d.h = 0 + (b.h - 0) * a;
+            d.p = 0 + (b.p - 0) * a;
+            d.i = 0 + (b.i - 0) * a;
             return d;
         }
         f(a) {
             let b = new HighlightingInfo();
             b.i = a;
-            b.g = this.e.g;
-            b.f = this.e.g;
+            b.g = this.e.i;
+            b.f = this.e.i;
             return b;
         }
-        w(a, b, c) {
+        y(a, b, c) {
             let d;
             d = this;
             let e = a.b != null && a.b.count > 0;
             if (b.d("Label")) {
-                d.v = b.aq;
+                d.x = b.aq;
             }
             if (b.d("Fill")) {
-                d.y = b.be;
+                d.aa = b.be;
             }
             if (b.d("LabelHorizontalAlignment")) {
-                d.x = b.a6;
+                d.z = b.a6;
             }
             if (b.d("Outline")) {
-                d.ab = b.bj;
+                d.ad = b.bj;
             }
             if (b.d("StrokeThickness")) {
-                d.t = b.ac;
+                d.v = b.ac;
             }
             if (b.d("Opacity")) {
-                d.s = b.ab;
+                d.u = b.ab;
             }
             if (b.d("FadeOpacity")) {
                 d.h = b.r;
             }
             if (b.d("HeaderBackground")) {
-                d.z = b.bf;
+                d.ab = b.bf;
             }
             if (e) {
                 if (b.d("HeaderTextColor")) {
-                    d.aa = b.bi;
+                    d.ac = b.bi;
                 }
                 else if (b.d("Fill") || b.d("HeaderBackground")) {
-                    d.aa = c(a, d.y, d.z);
+                    d.ac = c(a, d.aa, d.ab);
                 }
             }
             else {
                 if (b.d("TextColor")) {
-                    d.aa = b.bk;
+                    d.ac = b.bk;
                 }
                 else if (b.d("Fill") || b.d("HeaderBackground")) {
-                    d.aa = c(a, d.y, d.z);
+                    d.ac = c(a, d.aa, d.ab);
                 }
             }
             if (b.d("HeaderLabelLeftMargin")) {
-                d.k = b.u;
+                d.l = b.u;
             }
             if (b.d("HeaderLabelTopMargin")) {
-                d.m = b.w;
+                d.n = b.w;
             }
             if (b.d("HeaderLabelRightMargin")) {
-                d.l = b.v;
+                d.m = b.v;
             }
             if (b.d("HeaderLabelBottomMargin")) {
-                d.j = b.t;
+                d.k = b.t;
             }
             if (b.d("LabelLeftMargin")) {
-                d.p = b.y;
+                d.r = b.y;
             }
             if (b.d("LabelTopMargin")) {
-                d.r = b.aa;
+                d.t = b.aa;
             }
             if (b.d("LabelRightMargin")) {
-                d.q = b.z;
+                d.s = b.z;
             }
             if (b.d("LabelBottomMargin")) {
-                d.o = b.x;
+                d.q = b.x;
             }
         }
     }