igniteui-angular-inputs 19.0.0 → 19.1.0-beta.0

package/esm2015/lib/InputGroupView_combined.js

@@ -17,9 +17,9 @@ import { stringReplace, stringIsNullOrEmpty } from "igniteui-angular-core";
 import { TransformGroup } from "igniteui-angular-core";
 import { TranslateTransform } from "igniteui-angular-core";
 import { SuffixShiftType_$type } from "./SuffixShiftType";
+import { isNaN_ } from "igniteui-angular-core";
 import { PrefixShiftType_$type } from "./PrefixShiftType";
 import { LabelShiftType_$type } from "./LabelShiftType";
-import { isNaN_ } from "igniteui-angular-core";
 import { HorizontalAlignment_$type } from "igniteui-angular-core";
 import { MouseButtonEventArgs } from "igniteui-angular-core";
 import { KeyEventArgs } from "igniteui-angular-core";
@@ -70,7 +70,7 @@ export let InputGroupView = /*@__PURE__*/ (() => {
         }
         ac(a) {
             if (typeCast(XLabel.$, a) !== null) {
-                a.bd = "flex-start";
+                a.be = "flex-start";
             }
         }
         ae(a) {
@@ -267,82 +267,93 @@ export let SuffixView = /*@__PURE__*/ (() => {
         constructor() {
             super();
             this.a = null;
-            this.g = null;
+            this.h = null;
             this.b = null;
-            this.e = new List$1(Delegate_$type, 0);
+            this.f = new List$1(Delegate_$type, 0);
+            this.d = false;
             this.c = true;
-            this.h = null;
+            this.i = null;
         }
-        o() {
+        p() {
         }
-        d() {
+        e() {
             return true;
         }
-        get r() {
+        get s() {
             return null;
         }
-        m(a) {
+        n(a) {
             if (a == null) {
-                for (let b of fromEnum(this.e)) {
+                for (let b of fromEnum(this.f)) {
                     b();
                 }
-                this.e.clear();
+                this.f.clear();
             }
-            this.g = a;
-            this.g.rootWrapper.setStyleProperty("display", "inline-block");
-            let c = this.g.createElement("div");
+            this.h = a;
+            this.h.rootWrapper.setStyleProperty("display", "inline-block");
+            let c = this.h.createElement("div");
             c.addClass("ig-suffix-content");
-            this.g.append(c);
+            this.h.append(c);
             c.setStyleProperty("cursor", "pointer");
-            this.h = c;
-            this.g.getPortal(c, "ChildContent", (d) => {
+            this.i = c;
+            this.h.getPortal(c, "ChildContent", (d) => {
             }, true);
             this.a.am();
         }
-        q() {
-            let a = new TransformGroup();
-            a.j.add(((() => {
+        r() {
+            let a = this.g();
+            if (isNaN_(a) || a == 0) {
+                if (!this.d) {
+                    this.d = true;
+                    this.h.setTimeout(() => {
+                        this.d = false;
+                        this.r();
+                    }, 100);
+                }
+            }
+            let b = new TransformGroup();
+            b.j.add(((() => {
                 let $ret = new TranslateTransform();
-                $ret.k = this.a.k == 2 ? (this.f() * -0.25) : 0;
+                $ret.k = this.a.k == 2 ? (this.g() * -0.25) : 0;
                 return $ret;
             })()));
-            a.j.add(((() => {
+            b.j.add(((() => {
                 let $ret = new ScaleTransform();
                 $ret.l = 1;
                 $ret.m = 1;
                 return $ret;
             })()));
-            NativeUI.af(this.g.rootWrapper, a);
-            this.g.rootWrapper.setStyleProperty("transform-origin", "0px 0px");
+            NativeUI.af(this.h.rootWrapper, b);
+            this.h.rootWrapper.setStyleProperty("transform-origin", "0px 0px");
         }
-        f() {
-            let a = this.g.rootWrapper.getStyleProperty("height");
+        g() {
+            let a = this.h.rootWrapper.getStyleProperty("height");
             return parseFloat(stringReplace(a, "px", ""));
         }
-        p() {
-            if (this.d()) {
+        q() {
+            if (this.e()) {
             }
         }
-        i(a) {
+        j(a) {
             this.a.aj();
         }
-        j(a) {
+        k(a) {
             this.a.ak();
         }
-        l() {
+        m() {
             this.c = true;
-            this.e.add(this.g.rootWrapper.listen("mouseenter", runOn(this, this.i)));
-            this.e.add(this.g.rootWrapper.listen("mouseleave", runOn(this, this.j)));
+            this.f.add(this.h.rootWrapper.listen("mouseenter", runOn(this, this.j)));
+            this.f.add(this.h.rootWrapper.listen("mouseleave", runOn(this, this.k)));
         }
-        n() {
+        o() {
             this.c = false;
-            for (let a of fromEnum(this.e)) {
+            for (let a of fromEnum(this.f)) {
                 a();
             }
-            this.e.clear();
+            this.f.clear();
         }
-        k(a) {
-            this.h.append(a);
+        l(a) {
+            this.i.append(a);
         }
     }
     SuffixView.$t = markType(SuffixView, 'SuffixView');
@@ -356,82 +367,93 @@ export let PrefixView = /*@__PURE__*/ (() => {
         constructor() {
             super();
             this.a = null;
-            this.g = null;
+            this.h = null;
             this.b = null;
-            this.e = new List$1(Delegate_$type, 0);
+            this.f = new List$1(Delegate_$type, 0);
+            this.d = false;
             this.c = true;
-            this.h = null;
+            this.i = null;
         }
-        o() {
+        p() {
         }
-        d() {
+        e() {
             return true;
         }
-        get r() {
+        get s() {
             return null;
         }
-        m(a) {
+        n(a) {
             if (a == null) {
-                for (let b of fromEnum(this.e)) {
+                for (let b of fromEnum(this.f)) {
                     b();
                 }
-                this.e.clear();
+                this.f.clear();
             }
-            this.g = a;
-            this.g.rootWrapper.setStyleProperty("display", "inline-block");
-            let c = this.g.createElement("div");
+            this.h = a;
+            this.h.rootWrapper.setStyleProperty("display", "inline-block");
+            let c = this.h.createElement("div");
             c.addClass("ig-prefix-content");
-            this.g.append(c);
+            this.h.append(c);
             c.setStyleProperty("cursor", "pointer");
-            this.h = c;
-            this.g.getPortal(c, "ChildContent", (d) => {
+            this.i = c;
+            this.h.getPortal(c, "ChildContent", (d) => {
             }, true);
             this.a.am();
         }
-        q() {
-            let a = new TransformGroup();
-            a.j.add(((() => {
+        r() {
+            let a = this.g();
+            if (isNaN_(a) || a == 0) {
+                if (!this.d) {
+                    this.d = true;
+                    this.h.setTimeout(() => {
+                        this.d = false;
+                        this.r();
+                    }, 100);
+                }
+            }
+            let b = new TransformGroup();
+            b.j.add(((() => {
                 let $ret = new TranslateTransform();
-                $ret.k = this.a.k == 2 ? (this.f() * -0.25) : 0;
+                $ret.k = this.a.k == 2 ? (this.g() * -0.25) : 0;
                 return $ret;
             })()));
-            a.j.add(((() => {
+            b.j.add(((() => {
                 let $ret = new ScaleTransform();
                 $ret.l = 1;
                 $ret.m = 1;
                 return $ret;
             })()));
-            NativeUI.af(this.g.rootWrapper, a);
-            this.g.rootWrapper.setStyleProperty("transform-origin", "0px 0px");
+            NativeUI.af(this.h.rootWrapper, b);
+            this.h.rootWrapper.setStyleProperty("transform-origin", "0px 0px");
         }
-        f() {
-            let a = this.g.rootWrapper.getStyleProperty("height");
+        g() {
+            let a = this.h.rootWrapper.getStyleProperty("height");
             return parseFloat(stringReplace(a, "px", ""));
         }
-        p() {
-            if (this.d()) {
+        q() {
+            if (this.e()) {
             }
         }
-        i(a) {
+        j(a) {
             this.a.aj();
         }
-        j(a) {
+        k(a) {
             this.a.ak();
         }
-        l() {
+        m() {
             this.c = true;
-            this.e.add(this.g.rootWrapper.listen("mouseenter", runOn(this, this.i)));
-            this.e.add(this.g.rootWrapper.listen("mouseleave", runOn(this, this.j)));
+            this.f.add(this.h.rootWrapper.listen("mouseenter", runOn(this, this.j)));
+            this.f.add(this.h.rootWrapper.listen("mouseleave", runOn(this, this.k)));
         }
-        n() {
+        o() {
             this.c = false;
-            for (let a of fromEnum(this.e)) {
+            for (let a of fromEnum(this.f)) {
                 a();
             }
-            this.e.clear();
+            this.f.clear();
         }
-        k(a) {
-            this.h.append(a);
+        l(a) {
+            this.i.append(a);
         }
     }
     PrefixView.$t = markType(PrefixView, 'PrefixView');
@@ -498,20 +520,20 @@ export let LabelView = /*@__PURE__*/ (() => {
             c.setStyleProperty("overflow", "hidden");
             c.setStyleProperty("height", "1.125rem");
             c.setStyleProperty("backface-visibility", "hidden");
-            NativeUI.q(this.m.rootWrapper, this.c.c2);
+            NativeUI.q(this.m.rootWrapper, this.c.c3);
             c.setStyleProperty("outline-style", "none");
             c.setStyleProperty("box-shadow", "none");
             c.setStyleProperty("font-family", "Verdana");
             c.setStyleProperty("font-size", "1rem");
             this.n = c;
             this.m.append(this.n);
-            this.c.ck();
+            this.c.cl();
         }
         l() {
             return this.c.l == 0 ? (this.j() * 0.5) : 0;
         }
         aj() {
-            this.c.bj = "block";
+            this.c.bk = "block";
             let a = new TransformGroup();
             a.j.add(((() => {
                 let $ret = new TranslateTransform();
@@ -558,8 +580,8 @@ export let LabelView = /*@__PURE__*/ (() => {
         }
         ab() {
             if (this.m != null) {
-                this.m.rootWrapper.setStyleProperty("display", this.c.bj);
-                this.n.setStyleProperty("display", this.c.bj);
+                this.m.rootWrapper.setStyleProperty("display", this.c.bk);
+                this.n.setStyleProperty("display", this.c.bk);
                 let ext_ = this.m.getExternal(this.c, null, null);
                 if (ext_ && ext_._onDisplayChanged) {
                     ext_._onDisplayChanged();
@@ -569,8 +591,8 @@ export let LabelView = /*@__PURE__*/ (() => {
         }
         w() {
             if (this.m != null) {
-                this.m.rootWrapper.setStyleProperty("align-items", this.c.bb);
-                this.n.setStyleProperty("align-items", this.c.bb);
+                this.m.rootWrapper.setStyleProperty("align-items", this.c.bc);
+                this.n.setStyleProperty("align-items", this.c.bc);
                 let ext_ = this.m.getExternal(this.c, null, null);
                 if (ext_ && ext_._onAlignItemsChanged) {
                     ext_._onAlignItemsChanged();
@@ -580,8 +602,8 @@ export let LabelView = /*@__PURE__*/ (() => {
         }
         x() {
             if (this.m != null) {
-                this.m.rootWrapper.setStyleProperty("align-self", this.c.bd);
-                this.n.setStyleProperty("align-self", this.c.bd);
+                this.m.rootWrapper.setStyleProperty("align-self", this.c.be);
+                this.n.setStyleProperty("align-self", this.c.be);
                 let ext_ = this.m.getExternal(this.c, null, null);
                 if (ext_ && ext_._onAlignSelfChanged) {
                     ext_._onAlignSelfChanged();
@@ -591,8 +613,8 @@ export let LabelView = /*@__PURE__*/ (() => {
         }
         ac() {
             if (this.m != null) {
-                this.m.rootWrapper.setStyleProperty("flex-direction", this.c.bm);
-                this.n.setStyleProperty("flex-direction", this.c.bm);
+                this.m.rootWrapper.setStyleProperty("flex-direction", this.c.bn);
+                this.n.setStyleProperty("flex-direction", this.c.bn);
                 let ext_ = this.m.getExternal(this.c, null, null);
                 if (ext_ && ext_._onFlexDirectionChanged) {
                     ext_._onFlexDirectionChanged();
@@ -602,8 +624,8 @@ export let LabelView = /*@__PURE__*/ (() => {
         }
         ad() {
             if (this.m != null) {
-                this.m.rootWrapper.setStyleProperty("flex-grow", this.c.bo);
-                this.n.setStyleProperty("flex-grow", this.c.bo);
+                this.m.rootWrapper.setStyleProperty("flex-grow", this.c.bp);
+                this.n.setStyleProperty("flex-grow", this.c.bp);
                 let ext_ = this.m.getExternal(this.c, null, null);
                 if (ext_ && ext_._onFlexGrowChanged) {
                     ext_._onFlexGrowChanged();
@@ -672,10 +694,10 @@ export let LabelView = /*@__PURE__*/ (() => {
             return parseFloat(stringReplace(a, "px", ""));
         }
         t(a) {
-            this.c.cg();
+            this.c.ch();
         }
         u(a) {
-            this.c.ch();
+            this.c.ci();
         }
         y() {
             this.f = true;
@@ -1154,7 +1176,7 @@ export let XSuffix = /*@__PURE__*/ (() => {
             let a = new SuffixView();
             a.a = this;
             this.view = a;
-            this.view.o();
+            this.view.p();
         }
         get view() {
             return this._view;
@@ -1187,10 +1209,10 @@ export let XSuffix = /*@__PURE__*/ (() => {
             }
         }
         al() {
-            this.view.q();
+            this.view.r();
         }
         ai() {
-            this.view.q();
+            this.view.r();
         }
         ap() {
         }
@@ -1245,13 +1267,13 @@ export let XSuffix = /*@__PURE__*/ (() => {
         am() {
         }
         onDetachedFromUI() {
-            this.view.n();
+            this.view.o();
         }
         onAttachedToUI() {
-            this.view.l();
+            this.view.m();
         }
         r() {
-            return this.view.d();
+            return this.view.e();
         }
         t() {
             return this.i();
@@ -1269,10 +1291,10 @@ export let XSuffix = /*@__PURE__*/ (() => {
             return a;
         }
         appendContentChild(a) {
-            this.view.k(a);
+            this.view.l(a);
         }
         provideContainer(a) {
-            this.view.m(a);
+            this.view.n(a);
         }
     }
     XSuffix.$t = markType(XSuffix, 'XSuffix', XInputGroupItem.$);
@@ -1296,7 +1318,7 @@ export let XPrefix = /*@__PURE__*/ (() => {
             let a = new PrefixView();
             a.a = this;
             this.view = a;
-            this.view.o();
+            this.view.p();
         }
         get view() {
             return this._view;
@@ -1329,10 +1351,10 @@ export let XPrefix = /*@__PURE__*/ (() => {
             }
         }
         al() {
-            this.view.q();
+            this.view.r();
         }
         ai() {
-            this.view.q();
+            this.view.r();
         }
         ap() {
         }
@@ -1387,13 +1409,13 @@ export let XPrefix = /*@__PURE__*/ (() => {
         am() {
         }
         onDetachedFromUI() {
-            this.view.n();
+            this.view.o();
         }
         onAttachedToUI() {
-            this.view.l();
+            this.view.m();
         }
         r() {
-            return this.view.d();
+            return this.view.e();
         }
         t() {
             return this.i();
@@ -1411,10 +1433,10 @@ export let XPrefix = /*@__PURE__*/ (() => {
             return a;
         }
         appendContentChild(a) {
-            this.view.k(a);
+            this.view.l(a);
         }
         provideContainer(a) {
-            this.view.m(a);
+            this.view.n(a);
         }
     }
     XPrefix.$t = markType(XPrefix, 'XPrefix', XInputGroupItem.$);
@@ -1939,7 +1961,7 @@ export let XInputGroup = /*@__PURE__*/ (() => {
                         a.l = 2;
                         break;
                 }
-                a.cn(this.ai, false);
+                a.co(this.ai, false);
             });
         }
         kf() {
@@ -2145,8 +2167,8 @@ export let XInputGroup = /*@__PURE__*/ (() => {
         onChildrenMutated() {
             this.jr((a) => a.view.a8());
             this.js((a) => a.view.aj());
-            this.jt((a) => a.view.q());
-            this.ju((a) => a.view.q());
+            this.jt((a) => a.view.r());
+            this.ju((a) => a.view.r());
         }
         jp() {
             this.view.af();
@@ -2272,11 +2294,11 @@ export let XInputGroup = /*@__PURE__*/ (() => {
         jv() {
             this.jp();
             if (this.ai) {
-                this.js((a) => a.cn(true, !this.aj));
+                this.js((a) => a.co(true, !this.aj));
                 this.jr((a) => a.dq(this.ar, !this.aj));
             }
             else {
-                this.js((a) => a.cn(false, !this.aj));
+                this.js((a) => a.co(false, !this.aj));
                 this.jr((a) => a.dq(this.ar, !this.aj));
             }
         }
@@ -2284,12 +2306,12 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             this.jp();
             if (this.ao) {
                 let a = 1;
-                this.js((b) => b.am = true);
+                this.js((b) => b.an = true);
                 this.j4(a);
             }
             else {
                 let b = -1;
-                this.js((c) => c.am = false);
+                this.js((c) => c.an = false);
                 this.j4(b);
             }
         }
@@ -3593,8 +3615,8 @@ export let XInputGroup = /*@__PURE__*/ (() => {
         ensureShift() {
             this.jr((a) => a.view.a8());
             this.js((a) => a.view.aj());
-            this.jt((a) => a.view.q());
-            this.ju((a) => a.view.q());
+            this.jt((a) => a.view.r());
+            this.ju((a) => a.view.r());
         }
         aq() {
             return this.view.g();
@@ -3645,7 +3667,7 @@ export let XInputGroup = /*@__PURE__*/ (() => {
                     if (this.inputs._inner[b].e == null) {
                         this.inputs._inner[b].e = "Label" + a.l.count.toString();
                     }
-                    a.l.add1(this.inputs._inner[b].av());
+                    a.l.add1(this.inputs._inner[b].aw());
                 }
                 else if (typeCast(XInput.$, this.inputs._inner[b]) !== null) {
                     if (this.inputs._inner[b].e == null) {
@@ -3700,22 +3722,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(2));
             $ret.addItem("CornerRadius", new CornerRadius(1, 4, 4, 4, 4));
             $ret.addItem("ContentPadding", new Thickness(1, 16, 0, 16, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("FocusBorderColor", BrushUtil.h(255, 0, 153, 155));
-            $ret.addItem("FocusLabelColor", BrushUtil.h(255, 0, 153, 155));
+            $ret.addItem("BorderColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("FocusBorderColor", BrushUtil.j(255, 0, 153, 155));
+            $ret.addItem("FocusLabelColor", BrushUtil.j(255, 0, 153, 155));
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("UnderlineRippleColor", BrushUtil.h(255, 0, 153, 155));
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("FocusUnderlineColor", BrushUtil.h(255, 0, 153, 155));
+            $ret.addItem("UnderlineColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("UnderlineRippleColor", BrushUtil.j(255, 0, 153, 155));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("FocusUnderlineColor", BrushUtil.j(255, 0, 153, 155));
             $ret.addItem("UnderlineOpacity", 0);
             $ret.addItem("HoverUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineRippleOpacity", 0);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 1), new Theme(0, ((() => {
@@ -3724,22 +3746,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(0));
             $ret.addItem("CornerRadius", new CornerRadius(1, 4, 4, 0, 0));
             $ret.addItem("ContentPadding", new Thickness(1, 16, 0, 16, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("FocusBorderColor", BrushUtil.h(255, 0, 153, 155));
-            $ret.addItem("FocusLabelColor", BrushUtil.h(255, 0, 153, 155));
+            $ret.addItem("BorderColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("FocusBorderColor", BrushUtil.j(255, 0, 153, 155));
+            $ret.addItem("FocusLabelColor", BrushUtil.j(255, 0, 153, 155));
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("UnderlineRippleColor", BrushUtil.h(255, 0, 153, 155));
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("FocusUnderlineColor", BrushUtil.h(255, 0, 153, 155));
+            $ret.addItem("UnderlineColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("UnderlineRippleColor", BrushUtil.j(255, 0, 153, 155));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("FocusUnderlineColor", BrushUtil.j(255, 0, 153, 155));
             $ret.addItem("UnderlineOpacity", 1);
             $ret.addItem("HoverUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineRippleOpacity", 1);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(20, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(20, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 0), new Theme(0, ((() => {
@@ -3748,22 +3770,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(0));
             $ret.addItem("CornerRadius", new CornerRadius(0, 0));
             $ret.addItem("ContentPadding", new Thickness(0, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("FocusBorderColor", BrushUtil.h(255, 0, 153, 155));
-            $ret.addItem("FocusLabelColor", BrushUtil.h(255, 0, 153, 155));
+            $ret.addItem("BorderColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("FocusBorderColor", BrushUtil.j(255, 0, 153, 155));
+            $ret.addItem("FocusLabelColor", BrushUtil.j(255, 0, 153, 155));
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("UnderlineRippleColor", BrushUtil.h(255, 0, 153, 155));
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("FocusUnderlineColor", BrushUtil.h(255, 0, 153, 155));
+            $ret.addItem("UnderlineColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("UnderlineRippleColor", BrushUtil.j(255, 0, 153, 155));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("FocusUnderlineColor", BrushUtil.j(255, 0, 153, 155));
             $ret.addItem("UnderlineOpacity", 1);
             $ret.addItem("HoverUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineRippleOpacity", 1);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 3), new Theme(0, ((() => {
@@ -3772,22 +3794,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(2));
             $ret.addItem("CornerRadius", new CornerRadius(0, 4));
             $ret.addItem("ContentPadding", new Thickness(1, 16, 0, 16, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("FocusBorderColor", BrushUtil.h(255, 0, 153, 155));
-            $ret.addItem("FocusLabelColor", BrushUtil.h(255, 0, 153, 155));
+            $ret.addItem("BorderColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("FocusBorderColor", BrushUtil.j(255, 0, 153, 155));
+            $ret.addItem("FocusLabelColor", BrushUtil.j(255, 0, 153, 155));
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("UnderlineRippleColor", BrushUtil.h(255, 0, 153, 155));
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(138, 0, 0, 0));
-            $ret.addItem("FocusUnderlineColor", BrushUtil.h(255, 0, 153, 155));
+            $ret.addItem("UnderlineColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("UnderlineRippleColor", BrushUtil.j(255, 0, 153, 155));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(138, 0, 0, 0));
+            $ret.addItem("FocusUnderlineColor", BrushUtil.j(255, 0, 153, 155));
             $ret.addItem("UnderlineOpacity", 0);
             $ret.addItem("HoverUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineRippleOpacity", 0);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         return $ret;
@@ -3803,22 +3825,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(2));
             $ret.addItem("CornerRadius", new CornerRadius(0, 4));
             $ret.addItem("ContentPadding", new Thickness(1, 16, 0, 16, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("FocusBorderColor", BrushUtil.h(255, 33, 150, 243));
-            $ret.addItem("FocusLabelColor", BrushUtil.h(255, 33, 150, 243));
+            $ret.addItem("BorderColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("FocusBorderColor", BrushUtil.j(255, 33, 150, 243));
+            $ret.addItem("FocusLabelColor", BrushUtil.j(255, 33, 150, 243));
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("UnderlineRippleColor", BrushUtil.h(255, 33, 150, 243));
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("FocusUnderlineColor", BrushUtil.h(255, 33, 150, 243));
+            $ret.addItem("UnderlineColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("UnderlineRippleColor", BrushUtil.j(255, 33, 150, 243));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("FocusUnderlineColor", BrushUtil.j(255, 33, 150, 243));
             $ret.addItem("UnderlineOpacity", 0);
             $ret.addItem("HoverUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineRippleOpacity", 0);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 1), new Theme(0, ((() => {
@@ -3827,22 +3849,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(0));
             $ret.addItem("CornerRadius", new CornerRadius(1, 4, 4, 0, 0));
             $ret.addItem("ContentPadding", new Thickness(1, 16, 0, 16, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("FocusBorderColor", BrushUtil.h(255, 33, 150, 243));
-            $ret.addItem("FocusLabelColor", BrushUtil.h(255, 33, 150, 243));
+            $ret.addItem("BorderColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("FocusBorderColor", BrushUtil.j(255, 33, 150, 243));
+            $ret.addItem("FocusLabelColor", BrushUtil.j(255, 33, 150, 243));
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("UnderlineRippleColor", BrushUtil.h(255, 33, 150, 243));
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("FocusUnderlineColor", BrushUtil.h(255, 33, 150, 243));
+            $ret.addItem("UnderlineColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("UnderlineRippleColor", BrushUtil.j(255, 33, 150, 243));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("FocusUnderlineColor", BrushUtil.j(255, 33, 150, 243));
             $ret.addItem("UnderlineOpacity", 1);
             $ret.addItem("HoverUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineRippleOpacity", 1);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(20, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(20, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 0), new Theme(0, ((() => {
@@ -3851,22 +3873,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(0));
             $ret.addItem("CornerRadius", new CornerRadius(0, 0));
             $ret.addItem("ContentPadding", new Thickness(0, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("FocusBorderColor", BrushUtil.h(255, 33, 150, 243));
-            $ret.addItem("FocusLabelColor", BrushUtil.h(255, 33, 150, 243));
+            $ret.addItem("BorderColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("FocusBorderColor", BrushUtil.j(255, 33, 150, 243));
+            $ret.addItem("FocusLabelColor", BrushUtil.j(255, 33, 150, 243));
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("UnderlineRippleColor", BrushUtil.h(255, 33, 150, 243));
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("FocusUnderlineColor", BrushUtil.h(255, 33, 150, 243));
+            $ret.addItem("UnderlineColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("UnderlineRippleColor", BrushUtil.j(255, 33, 150, 243));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("FocusUnderlineColor", BrushUtil.j(255, 33, 150, 243));
             $ret.addItem("UnderlineOpacity", 1);
             $ret.addItem("HoverUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineRippleOpacity", 1);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 3), new Theme(0, ((() => {
@@ -3875,27 +3897,27 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(2));
             $ret.addItem("CornerRadius", new CornerRadius(0, 4));
             $ret.addItem("ContentPadding", new Thickness(1, 16, 0, 16, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("FocusBorderColor", BrushUtil.h(255, 33, 150, 243));
-            $ret.addItem("FocusLabelColor", BrushUtil.h(255, 33, 150, 243));
+            $ret.addItem("BorderColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("FocusBorderColor", BrushUtil.j(255, 33, 150, 243));
+            $ret.addItem("FocusLabelColor", BrushUtil.j(255, 33, 150, 243));
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("UnderlineRippleColor", BrushUtil.h(255, 33, 150, 243));
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(255, 186, 191, 199));
-            $ret.addItem("FocusUnderlineColor", BrushUtil.h(255, 33, 150, 243));
+            $ret.addItem("UnderlineColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("UnderlineRippleColor", BrushUtil.j(255, 33, 150, 243));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(255, 186, 191, 199));
+            $ret.addItem("FocusUnderlineColor", BrushUtil.j(255, 33, 150, 243));
             $ret.addItem("UnderlineOpacity", 0);
             $ret.addItem("HoverUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineRippleOpacity", 0);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         return $ret;
     })()));
-    XInputGroup.n5 = BrushUtil.h(255, 105, 136, 255);
+    XInputGroup.n5 = BrushUtil.j(255, 105, 136, 255);
     XInputGroup.l = new Theme(1, ((() => {
         let $ret = new Dictionary$2(String_$type, Base.$, 0);
         return $ret;
@@ -3907,22 +3929,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(2));
             $ret.addItem("CornerRadius", new CornerRadius(0, 4));
             $ret.addItem("ContentPadding", new Thickness(1, 8, 0, 8, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(25, 0, 0, 0));
+            $ret.addItem("BorderColor", BrushUtil.j(25, 0, 0, 0));
             $ret.addItem("FocusBorderColor", XInputGroup.n5);
             $ret.addItem("FocusLabelColor", XInputGroup.n5);
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(25, 0, 0, 0));
+            $ret.addItem("UnderlineColor", BrushUtil.j(25, 0, 0, 0));
             $ret.addItem("UnderlineRippleColor", XInputGroup.n5);
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(255, 0, 0, 0));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(255, 0, 0, 0));
             $ret.addItem("FocusUnderlineColor", XInputGroup.n5);
             $ret.addItem("UnderlineOpacity", 0);
             $ret.addItem("HoverUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineRippleOpacity", 0);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 1), new Theme(0, ((() => {
@@ -3931,22 +3953,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(0));
             $ret.addItem("CornerRadius", new CornerRadius(1, 4, 4, 0, 0));
             $ret.addItem("ContentPadding", new Thickness(1, 16, 0, 16, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(255, 186, 191, 199));
+            $ret.addItem("BorderColor", BrushUtil.j(255, 186, 191, 199));
             $ret.addItem("FocusBorderColor", XInputGroup.n5);
             $ret.addItem("FocusLabelColor", XInputGroup.n5);
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(255, 186, 191, 199));
+            $ret.addItem("UnderlineColor", BrushUtil.j(255, 186, 191, 199));
             $ret.addItem("UnderlineRippleColor", XInputGroup.n5);
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(255, 186, 191, 199));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(255, 186, 191, 199));
             $ret.addItem("FocusUnderlineColor", XInputGroup.n5);
             $ret.addItem("UnderlineOpacity", 1);
             $ret.addItem("HoverUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineRippleOpacity", 1);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(25, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(25, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 0), new Theme(0, ((() => {
@@ -3955,22 +3977,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(0));
             $ret.addItem("CornerRadius", new CornerRadius(0, 0));
             $ret.addItem("ContentPadding", new Thickness(0, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(255, 186, 191, 199));
+            $ret.addItem("BorderColor", BrushUtil.j(255, 186, 191, 199));
             $ret.addItem("FocusBorderColor", XInputGroup.n5);
             $ret.addItem("FocusLabelColor", XInputGroup.n5);
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(255, 186, 191, 199));
+            $ret.addItem("UnderlineColor", BrushUtil.j(255, 186, 191, 199));
             $ret.addItem("UnderlineRippleColor", XInputGroup.n5);
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(255, 186, 191, 199));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(255, 186, 191, 199));
             $ret.addItem("FocusUnderlineColor", XInputGroup.n5);
             $ret.addItem("UnderlineOpacity", 1);
             $ret.addItem("HoverUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineRippleOpacity", 1);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 3), new Theme(0, ((() => {
@@ -3979,22 +4001,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(2));
             $ret.addItem("CornerRadius", new CornerRadius(0, 4));
             $ret.addItem("ContentPadding", new Thickness(1, 16, 0, 16, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(255, 186, 191, 199));
+            $ret.addItem("BorderColor", BrushUtil.j(255, 186, 191, 199));
             $ret.addItem("FocusBorderColor", XInputGroup.n5);
             $ret.addItem("FocusLabelColor", XInputGroup.n5);
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(255, 186, 191, 199));
+            $ret.addItem("UnderlineColor", BrushUtil.j(255, 186, 191, 199));
             $ret.addItem("UnderlineRippleColor", XInputGroup.n5);
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(255, 186, 191, 199));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(255, 186, 191, 199));
             $ret.addItem("FocusUnderlineColor", XInputGroup.n5);
             $ret.addItem("UnderlineOpacity", 0);
             $ret.addItem("HoverUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineRippleOpacity", 0);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         return $ret;
@@ -4010,22 +4032,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(2));
             $ret.addItem("CornerRadius", new CornerRadius(0, 4));
             $ret.addItem("ContentPadding", new Thickness(1, 8, 0, 8, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("BorderColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("FocusBorderColor", XInputGroup.n5);
             $ret.addItem("FocusLabelColor", XInputGroup.n5);
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("UnderlineColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("UnderlineRippleColor", XInputGroup.n5);
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("FocusUnderlineColor", XInputGroup.n5);
             $ret.addItem("UnderlineOpacity", 0);
             $ret.addItem("HoverUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineRippleOpacity", 0);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 1), new Theme(0, ((() => {
@@ -4034,22 +4056,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(0));
             $ret.addItem("CornerRadius", new CornerRadius(1, 4, 4, 0, 0));
             $ret.addItem("ContentPadding", new Thickness(1, 16, 0, 16, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("BorderColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("FocusBorderColor", XInputGroup.n5);
             $ret.addItem("FocusLabelColor", XInputGroup.n5);
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("UnderlineColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("UnderlineRippleColor", XInputGroup.n5);
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("FocusUnderlineColor", XInputGroup.n5);
             $ret.addItem("UnderlineOpacity", 1);
             $ret.addItem("HoverUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineRippleOpacity", 1);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(128, 55, 63, 86));
+            $ret.addItem("BackgroundColor", BrushUtil.j(128, 55, 63, 86));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 0), new Theme(0, ((() => {
@@ -4058,22 +4080,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(0));
             $ret.addItem("CornerRadius", new CornerRadius(0, 0));
             $ret.addItem("ContentPadding", new Thickness(0, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("BorderColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("FocusBorderColor", XInputGroup.n5);
             $ret.addItem("FocusLabelColor", XInputGroup.n5);
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("UnderlineColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("UnderlineRippleColor", XInputGroup.n5);
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("FocusUnderlineColor", XInputGroup.n5);
             $ret.addItem("UnderlineOpacity", 1);
             $ret.addItem("HoverUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineOpacity", 1);
             $ret.addItem("FocusUnderlineRippleOpacity", 1);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         $ret.addItem(enumGetBox(InputGroupDisplayType_$type, 3), new Theme(0, ((() => {
@@ -4082,22 +4104,22 @@ export let XInputGroup = /*@__PURE__*/ (() => {
             $ret.addItem("FocusBorderWidth", DeviceUtils.g(2));
             $ret.addItem("CornerRadius", new CornerRadius(0, 4));
             $ret.addItem("ContentPadding", new Thickness(1, 16, 0, 16, 0));
-            $ret.addItem("BorderColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("BorderColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("FocusBorderColor", XInputGroup.n5);
             $ret.addItem("FocusLabelColor", XInputGroup.n5);
             $ret.addItem("UnderlineWidth", DeviceUtils.g(1));
             $ret.addItem("UnderlineRippleWidth", DeviceUtils.g(2));
             $ret.addItem("HoverUnderlineWidth", DeviceUtils.g(2));
-            $ret.addItem("UnderlineColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("UnderlineColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("UnderlineRippleColor", XInputGroup.n5);
-            $ret.addItem("HoverUnderlineColor", BrushUtil.h(51, 255, 255, 255));
+            $ret.addItem("HoverUnderlineColor", BrushUtil.j(51, 255, 255, 255));
             $ret.addItem("FocusUnderlineColor", XInputGroup.n5);
             $ret.addItem("UnderlineOpacity", 0);
             $ret.addItem("HoverUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineOpacity", 0);
             $ret.addItem("FocusUnderlineRippleOpacity", 0);
             $ret.addItem("UnderlineRippleOpacity", 0);
-            $ret.addItem("BackgroundColor", BrushUtil.h(0, 0, 0, 0));
+            $ret.addItem("BackgroundColor", BrushUtil.j(0, 0, 0, 0));
             return $ret;
         })())));
         return $ret;
@@ -4140,41 +4162,42 @@ export let XLabel = /*@__PURE__*/ (() => {
             super();
             this.n = 0;
             this._view = null;
+            this.ak = false;
             this.aa = null;
             this.z = null;
             this.ab = false;
             this.r = 0;
             this.q = 1;
-            this.cu = ThemeResolver.ah(XLabel.o, XLabel.dd, XLabel.c6);
-            this.cr = ThemeResolver.ah(XLabel.o, XLabel.da, XLabel.c3);
+            this.cv = ThemeResolver.ah(XLabel.o, XLabel.de, XLabel.c7);
             this.cs = ThemeResolver.ah(XLabel.o, XLabel.db, XLabel.c4);
             this.ct = ThemeResolver.ah(XLabel.o, XLabel.dc, XLabel.c5);
+            this.cu = ThemeResolver.ah(XLabel.o, XLabel.dd, XLabel.c6);
             this.u = null;
-            this.cy = XLabel.de;
-            this.cv = XLabel.c7;
+            this.cz = XLabel.df;
             this.cw = XLabel.c8;
+            this.cx = XLabel.c9;
             this.k = 0;
             this.ag = false;
             this.ae = false;
             this.v = null;
-            this.cx = null;
-            this.a3 = "ig-label-" + XLabel.au++;
-            this.az = "inline-block";
+            this.cy = null;
+            this.a4 = "ig-label-" + XLabel.av++;
             this.a0 = "inline-block";
-            this.a1 = null;
-            this.aw = "center";
+            this.a1 = "inline-block";
+            this.a2 = null;
             this.ax = "center";
-            this.as = 0;
+            this.ay = "center";
+            this.at = 0;
             this.ac = false;
-            this.a2 = null;
-            this.ay = null;
-            this.a4 = null;
+            this.a3 = null;
+            this.az = null;
+            this.a5 = null;
             this.af = false;
             this.aj = false;
             this.ad = false;
             this.ai = false;
             this.ah = false;
-            this.aq = false;
+            this.ar = false;
             let a = new LabelView();
             a.c = this;
             this.view = a;
@@ -4205,7 +4228,7 @@ export let XLabel = /*@__PURE__*/ (() => {
             a.b = 0;
             return a;
         }
-        ca() {
+        cb() {
             this.view.v();
             let a = false;
             if (this.aa == null) {
@@ -4243,39 +4266,39 @@ export let XLabel = /*@__PURE__*/ (() => {
                     $ret.m = 0.75;
                     return $ret;
                 })()));
-                this.aa = KeyFrameAnimationFactory.f.c(this.view.b(this.i).m(new AnimationKeyFrameProperty(14, b), new AnimationKeyFrameProperty(2, BrushUtil.h(0, 255, 255, 255))).m(new AnimationKeyFrameProperty(14, d), new AnimationKeyFrameProperty(2, BrushUtil.h(this.l == 2 ? 255 : 0, 255, 255, 255))));
+                this.aa = KeyFrameAnimationFactory.f.c(this.view.b(this.i).m(new AnimationKeyFrameProperty(14, b), new AnimationKeyFrameProperty(2, BrushUtil.j(0, 255, 255, 255))).m(new AnimationKeyFrameProperty(14, d), new AnimationKeyFrameProperty(2, BrushUtil.j(this.l == 2 ? 255 : 0, 255, 255, 255))));
             }
             if (this.z == null) {
-                this.z = KeyFrameAnimationFactory.f.c(this.view.a(this.i).m(new AnimationKeyFrameProperty(7, this.c2)).m(new AnimationKeyFrameProperty(7, this.cz)));
+                this.z = KeyFrameAnimationFactory.f.c(this.view.a(this.i).m(new AnimationKeyFrameProperty(7, this.c3)).m(new AnimationKeyFrameProperty(7, this.c0)));
             }
         }
-        cl(a, b) {
+        cm(a, b) {
             if ((b > 0 && a.playbackRate < 0) || (b < 0 && a.playbackRate > 0)) {
                 a.reverse();
-                if (this.aq) {
+                if (this.ar) {
                     a.finish();
-                    this.cb(a);
+                    this.cc(a);
                     return;
                 }
-                a.finished.f((c) => this.cb(a));
+                a.finished.f((c) => this.cc(a));
             }
             else {
                 a.play();
-                if (this.aq) {
+                if (this.ar) {
                     a.finish();
-                    this.cb(a);
+                    this.cc(a);
                     return;
                 }
-                a.finished.f((c) => this.cb(a));
+                a.finished.f((c) => this.cc(a));
             }
         }
-        cb(a) {
+        cc(a) {
             a.commitStyles();
             if (a == this.aa && this.ai) {
                 this.aa = null;
                 if (this.ab) {
                     this.ab = false;
-                    this.cf();
+                    this.cg();
                 }
             }
             if (a == this.z && this.ah) {
@@ -4286,15 +4309,15 @@ export let XLabel = /*@__PURE__*/ (() => {
             super.h(a, b, c);
             switch (a) {
                 case "BaseTheme":
-                    this.co(this.p);
-                    this.cq();
+                    this.cp(this.p);
+                    this.cr();
                     break;
                 case "TextColor":
                 case "HoverTextColor":
                 case "TextStyle":
                 case "HighlightTextColor":
                 case "HoverHighlightTextColor":
-                    this.cq();
+                    this.cr();
                     break;
                 case "ActualTextColor":
                 case "ActualHoverTextColor":
@@ -4317,7 +4340,7 @@ export let XLabel = /*@__PURE__*/ (() => {
                             this.ah = true;
                         }
                     }
-                    this.cp();
+                    this.cq();
                     break;
                 case "Text":
                     this.view.ai();
@@ -4333,10 +4356,10 @@ export let XLabel = /*@__PURE__*/ (() => {
                     this.view.aj();
                     break;
                 case "IsHighlighted":
-                    this.ce();
+                    this.cf();
                     break;
                 case "IsShifted":
-                    this.cf();
+                    this.cg();
                     break;
                 case "ShiftType":
                     if (this.aa != null) {
@@ -4347,7 +4370,7 @@ export let XLabel = /*@__PURE__*/ (() => {
                             this.ai = true;
                         }
                     }
-                    this.ci();
+                    this.cj();
                     break;
                 case "Display":
                     this.view.ab();
@@ -4366,38 +4389,44 @@ export let XLabel = /*@__PURE__*/ (() => {
                     break;
             }
         }
-        ci() {
+        cj() {
             this.view.aj();
         }
-        cf() {
+        cg() {
             this.view.af();
-            this.ca();
+            if (this.ak) {
+                return;
+            }
+            this.cb();
             let a = 1;
-            let b = this.ao;
+            let b = this.ap;
             if (!b) {
                 a = -1;
             }
-            this.cl(this.aa, a);
+            this.cm(this.aa, a);
         }
-        ce() {
-            this.ca();
+        cf() {
+            if (this.ak) {
+                return;
+            }
+            this.cb();
             let a = 1;
-            let b = this.am;
+            let b = this.an;
             if (!b) {
                 a = -1;
             }
-            this.cl(this.z, a);
+            this.cm(this.z, a);
         }
         onSizeReady() {
             if (this.aa != null) {
-                this.b9();
-                if (this.ao) {
+                this.ca();
+                if (this.ap) {
                     this.view.aj();
-                    this.cf();
+                    this.cg();
                 }
             }
         }
-        b9() {
+        ca() {
             if (this.aa != null && this.aa.playState == 3) {
                 this.aa = null;
             }
@@ -4406,26 +4435,26 @@ export let XLabel = /*@__PURE__*/ (() => {
                 this.ai = true;
             }
         }
-        cq() {
-            this.c2 = this.di != null ? this.di : XLabel.de;
-            this.c1 = this.dh != null ? this.dh : XLabel.de;
-            this.cz = this.df != null ? this.df : XLabel.c7;
+        cr() {
+            this.c3 = this.dj != null ? this.dj : XLabel.df;
+            this.c2 = this.di != null ? this.di : XLabel.df;
+            this.c0 = this.dg != null ? this.dg : XLabel.c8;
             this.w = this.y != null ? this.y : XLabel.x;
         }
-        cp() {
+        cq() {
             if (this.w != null) {
                 this.view.am(this.w);
             }
             else {
                 this.view.am(this.view.e());
             }
-            this.view.ah(this.c2);
+            this.view.ah(this.c3);
         }
-        co(a) {
-            XLabel.de = ThemeResolver.ah(a, XLabel.dd, XLabel.c6);
-            XLabel.c7 = ThemeResolver.ah(a, XLabel.da, XLabel.c3);
-            XLabel.c9 = ThemeResolver.ah(a, XLabel.dc, XLabel.c5);
+        cp(a) {
+            XLabel.df = ThemeResolver.ah(a, XLabel.de, XLabel.c7);
             XLabel.c8 = ThemeResolver.ah(a, XLabel.db, XLabel.c4);
+            XLabel.da = ThemeResolver.ah(a, XLabel.dd, XLabel.c6);
+            XLabel.c9 = ThemeResolver.ah(a, XLabel.dc, XLabel.c5);
         }
         get t() {
             return this.r;
@@ -4447,26 +4476,16 @@ export let XLabel = /*@__PURE__*/ (() => {
                 this.g("ActualDensity", enumGetBox(ControlDisplayDensity_$type, b), enumGetBox(ControlDisplayDensity_$type, a));
             }
         }
-        get c2() {
-            return this.cu;
+        get c3() {
+            return this.cv;
         }
-        set c2(a) {
-            let b = this.cu;
-            this.cu = a;
-            if (b != this.cu) {
+        set c3(a) {
+            let b = this.cv;
+            this.cv = a;
+            if (b != this.cv) {
                 this.g("ActualTextColor", b, a);
             }
         }
-        get cz() {
-            return this.cr;
-        }
-        set cz(a) {
-            let b = this.cr;
-            this.cr = a;
-            if (b != this.cr) {
-                this.g("ActualHighlightTextColor", b, a);
-            }
-        }
         get c0() {
             return this.cs;
         }
@@ -4474,7 +4493,7 @@ export let XLabel = /*@__PURE__*/ (() => {
             let b = this.cs;
             this.cs = a;
             if (b != this.cs) {
-                this.g("ActualHoverHighlightTextColor", b, a);
+                this.g("ActualHighlightTextColor", b, a);
             }
         }
         get c1() {
@@ -4484,6 +4503,16 @@ export let XLabel = /*@__PURE__*/ (() => {
             let b = this.ct;
             this.ct = a;
             if (b != this.ct) {
+                this.g("ActualHoverHighlightTextColor", b, a);
+            }
+        }
+        get c2() {
+            return this.cu;
+        }
+        set c2(a) {
+            let b = this.cu;
+            this.cu = a;
+            if (b != this.cu) {
                 this.g("ActualHoverTextColor", b, a);
             }
         }
@@ -4497,26 +4526,16 @@ export let XLabel = /*@__PURE__*/ (() => {
                 this.g("ActualTextStyle", b, a);
             }
         }
-        get di() {
-            return this.cy;
+        get dj() {
+            return this.cz;
         }
-        set di(a) {
-            let b = this.cy;
-            this.cy = a;
-            if (b != this.cy) {
+        set dj(a) {
+            let b = this.cz;
+            this.cz = a;
+            if (b != this.cz) {
                 this.g("TextColor", b, a);
             }
         }
-        get df() {
-            return this.cv;
-        }
-        set df(a) {
-            let b = this.cv;
-            this.cv = a;
-            if (b != this.cv) {
-                this.g("HighlightTextColor", b, a);
-            }
-        }
         get dg() {
             return this.cw;
         }
@@ -4524,6 +4543,16 @@ export let XLabel = /*@__PURE__*/ (() => {
             let b = this.cw;
             this.cw = a;
             if (b != this.cw) {
+                this.g("HighlightTextColor", b, a);
+            }
+        }
+        get dh() {
+            return this.cx;
+        }
+        set dh(a) {
+            let b = this.cx;
+            this.cx = a;
+            if (b != this.cx) {
                 this.g("HoverHighlightTextColor", b, a);
             }
         }
@@ -4537,45 +4566,45 @@ export let XLabel = /*@__PURE__*/ (() => {
                 this.g("ShiftType", enumGetBox(LabelShiftType_$type, b), enumGetBox(LabelShiftType_$type, a));
             }
         }
-        get ao() {
+        get ap() {
             return this.ag;
         }
-        set ao(a) {
+        set ap(a) {
             let b = this.ag;
             this.ag = a;
             if (b != this.ag) {
                 this.g("IsShifted", b, a);
             }
         }
-        cn(a, b = true) {
-            let c = this.aq;
+        co(a, b = true) {
+            let c = this.ar;
             if (!b) {
-                this.aq = true;
+                this.ar = true;
             }
             try {
-                this.ao = a;
+                this.ap = a;
             }
             finally {
                 if (!b) {
-                    this.aq = c;
+                    this.ar = c;
                 }
             }
         }
-        get am() {
+        get an() {
             return this.ae;
         }
-        set am(a) {
+        set an(a) {
             let b = this.ae;
             this.ae = a;
             if (b != this.ae) {
                 this.g("IsHighlighted", b, a);
             }
         }
-        cg() {
-            this.an = true;
-        }
         ch() {
-            this.an = false;
+            this.ao = true;
+        }
+        ci() {
+            this.ao = false;
         }
         get y() {
             return this.v;
@@ -4587,134 +4616,134 @@ export let XLabel = /*@__PURE__*/ (() => {
                 this.g("TextStyle", b, a);
             }
         }
-        get dh() {
-            return this.cx;
+        get di() {
+            return this.cy;
         }
-        set dh(a) {
-            let b = this.cx;
-            this.cx = a;
-            if (b != this.cx) {
+        set di(a) {
+            let b = this.cy;
+            this.cy = a;
+            if (b != this.cy) {
                 this.g("HoverTextColor", b, a);
             }
         }
-        get bv() {
-            return this.a3;
+        get bw() {
+            return this.a4;
         }
-        set bv(a) {
-            let b = this.a3;
-            this.a3 = a;
-            if (b != this.a3) {
+        set bw(a) {
+            let b = this.a4;
+            this.a4 = a;
+            if (b != this.a4) {
                 this.g("Id", b, a);
             }
         }
-        get bj() {
-            return this.az;
-        }
-        set bj(a) {
-            let b = this.az;
-            this.az = a;
-            if (b != this.az) {
-                this.g("Display", b, a);
-            }
-        }
-        get bm() {
+        get bk() {
             return this.a0;
         }
-        set bm(a) {
+        set bk(a) {
             let b = this.a0;
             this.a0 = a;
             if (b != this.a0) {
-                this.g("FlexDirection", b, a);
+                this.g("Display", b, a);
             }
         }
-        get bo() {
+        get bn() {
             return this.a1;
         }
-        set bo(a) {
+        set bn(a) {
             let b = this.a1;
             this.a1 = a;
             if (b != this.a1) {
-                this.g("FlexGrow", b, a);
+                this.g("FlexDirection", b, a);
             }
         }
-        get bb() {
-            return this.aw;
+        get bp() {
+            return this.a2;
         }
-        set bb(a) {
-            let b = this.aw;
-            this.aw = a;
-            if (b != this.aw) {
-                this.g("AlignItems", b, a);
+        set bp(a) {
+            let b = this.a2;
+            this.a2 = a;
+            if (b != this.a2) {
+                this.g("FlexGrow", b, a);
             }
         }
-        get bd() {
+        get bc() {
             return this.ax;
         }
-        set bd(a) {
+        set bc(a) {
             let b = this.ax;
             this.ax = a;
             if (b != this.ax) {
+                this.g("AlignItems", b, a);
+            }
+        }
+        get be() {
+            return this.ay;
+        }
+        set be(a) {
+            let b = this.ay;
+            this.ay = a;
+            if (b != this.ay) {
                 this.g("AlignSelf", b, a);
             }
         }
-        get ak() {
+        get al() {
             return this.ac;
         }
-        get at() {
-            return this.as;
+        get au() {
+            return this.at;
         }
-        set at(a) {
-            let b = this.as;
-            this.as = a;
+        set au(a) {
+            let b = this.at;
+            this.at = a;
             this.ac = true;
-            if (b != this.as) {
+            if (b != this.at) {
                 this.g("TabIndex", b, a);
             }
         }
-        get bq() {
-            return this.a2;
+        get br() {
+            return this.a3;
         }
-        set bq(a) {
-            let b = this.a2;
-            this.a2 = a;
-            if (b != this.a2) {
+        set br(a) {
+            let b = this.a3;
+            this.a3 = a;
+            if (b != this.a3) {
                 this.g("TabIndex", b, a);
             }
         }
-        get bf() {
-            return this.ay;
+        get bg() {
+            return this.az;
         }
-        set bf(a) {
-            let b = this.ay;
-            this.ay = a;
-            if (b != this.ay) {
+        set bg(a) {
+            let b = this.az;
+            this.az = a;
+            if (b != this.az) {
                 this.g("AriaLabel", b, a);
             }
         }
         get text() {
-            return this.a4;
+            return this.a5;
         }
         set text(a) {
-            let b = this.a4;
-            this.a4 = a;
-            if (b != this.a4) {
+            let b = this.a5;
+            this.a5 = a;
+            if (b != this.a5) {
                 this.g("Text", b, a);
             }
         }
-        get an() {
+        get ao() {
             return this.af;
         }
-        set an(a) {
+        set ao(a) {
             let b = this.af;
             this.af = a;
             if (b != this.af) {
                 this.g("IsHover", b, a);
             }
         }
-        get ar() {
+        get as() {
             return this.aj;
         }
-        set ar(a) {
+        set as(a) {
             let b = this.aj;
             this.aj = a;
             if (b != this.aj) {
@@ -4731,7 +4760,7 @@ export let XLabel = /*@__PURE__*/ (() => {
                 this.g("IsDisabled", b, a);
             }
         }
-        ck() {
+        cl() {
             this.view.ai();
         }
         onDetachedFromUI() {
@@ -4740,13 +4769,13 @@ export let XLabel = /*@__PURE__*/ (() => {
         onAttachedToUI() {
             this.view.y();
         }
-        ap() {
+        aq() {
             return this.view.g();
         }
-        av() {
+        aw() {
             return this.j();
         }
-        bl() {
+        bm() {
             let a = this.j();
             return a.q();
         }
@@ -4758,15 +4787,15 @@ export let XLabel = /*@__PURE__*/ (() => {
             a.d = this.s;
             a.a = AppearanceHelper.a(NativeUI.al(b));
             a.b = this.l;
-            a.i = this.ao;
-            a.g = this.am;
-            a.m = this.bj;
-            a.n = this.bm;
-            a.o = this.bo;
-            a.l = this.bb;
+            a.i = this.ap;
+            a.g = this.an;
+            a.m = this.bk;
+            a.n = this.bn;
+            a.o = this.bp;
+            a.l = this.bc;
             a.r = this.text;
-            a.h = this.an;
-            a.j = this.ar;
+            a.h = this.ao;
+            a.j = this.as;
             a.f = this.disabled;
             a.p = this.e;
             if (this.w != null) {
@@ -4804,21 +4833,21 @@ export let XLabel = /*@__PURE__*/ (() => {
         }
     }
     XLabel.$t = markType(XLabel, 'XLabel', XInputGroupItem.$);
-    XLabel.dd = BrushUtil.h(221, 0, 0, 0);
-    XLabel.da = BrushUtil.h(255, 0, 153, 155);
-    XLabel.dc = BrushUtil.h(221, 0, 0, 0);
-    XLabel.db = BrushUtil.h(255, 0, 153, 155);
-    XLabel.c6 = BrushUtil.h(255, 24, 29, 31);
-    XLabel.c3 = BrushUtil.h(255, 33, 150, 243);
-    XLabel.c5 = BrushUtil.h(255, 24, 29, 31);
-    XLabel.c4 = BrushUtil.h(255, 33, 150, 243);
+    XLabel.de = BrushUtil.j(221, 0, 0, 0);
+    XLabel.db = BrushUtil.j(255, 0, 153, 155);
+    XLabel.dd = BrushUtil.j(221, 0, 0, 0);
+    XLabel.dc = BrushUtil.j(255, 0, 153, 155);
+    XLabel.c7 = BrushUtil.j(255, 24, 29, 31);
+    XLabel.c4 = BrushUtil.j(255, 33, 150, 243);
+    XLabel.c6 = BrushUtil.j(255, 24, 29, 31);
+    XLabel.c5 = BrushUtil.j(255, 33, 150, 243);
     XLabel.o = 2;
-    XLabel.de = ThemeResolver.ah(XLabel.o, XLabel.dd, XLabel.c6);
-    XLabel.c7 = ThemeResolver.ah(XLabel.o, XLabel.da, XLabel.c3);
-    XLabel.c9 = ThemeResolver.ah(XLabel.o, XLabel.dc, XLabel.c5);
+    XLabel.df = ThemeResolver.ah(XLabel.o, XLabel.de, XLabel.c7);
     XLabel.c8 = ThemeResolver.ah(XLabel.o, XLabel.db, XLabel.c4);
+    XLabel.da = ThemeResolver.ah(XLabel.o, XLabel.dd, XLabel.c6);
+    XLabel.c9 = ThemeResolver.ah(XLabel.o, XLabel.dc, XLabel.c5);
     XLabel.x = null;
-    XLabel.au = 0;
+    XLabel.av = 0;
     return XLabel;
 })();
 /**
@@ -5611,8 +5640,8 @@ export let XInput = /*@__PURE__*/ (() => {
         }
     }
     XInput.$t = markType(XInput, 'XInput', XInputGroupItem.$);
-    XInput.d6 = BrushUtil.h(221, 0, 0, 0);
-    XInput.d5 = BrushUtil.h(221, 0, 0, 0);
+    XInput.d6 = BrushUtil.j(221, 0, 0, 0);
+    XInput.d5 = BrushUtil.j(221, 0, 0, 0);
     XInput.ae = null;
     XInput.bf = 0;
     return XInput;