igniteui-angular-inputs 18.1.1 → 18.2.0-beta.1

package/esm2015/lib/ButtonView_combined.js

@@ -90,8 +90,8 @@ export let ButtonView = /*@__PURE__*/ (() => {
             this.n.setStyleProperty("overflow", "hidden");
             this.n.setStyleProperty("white-space", "no-wrap");
             this.n.setStyleProperty("color", "#000");
-            this.n.setStyleProperty("background", this.b.nf._fill);
-            NativeUI.o(this.n, this.b.kr);
+            this.n.setStyleProperty("background", this.b.nh._fill);
+            NativeUI.o(this.n, this.b.ks);
             this.n.setAttribute("id", this.b.hu);
             this.av();
             this.h.add(c.listen("change", runOn(this, this.x)));
@@ -180,6 +180,19 @@ export let ButtonView = /*@__PURE__*/ (() => {
                     g = "2.5rem";
                     l = ".4375rem";
                     break;
+                case 4:
+                    m = "0.09375rem 0.5rem";
+                    j = "0.5rem";
+                    f = "1.5rem";
+                    e = "1.5rem";
+                    h = "1.5rem";
+                    g = "1.5rem";
+                    l = "0.21875rem";
+                    b = "1rem";
+                    a = "1rem";
+                    d = "1rem";
+                    c = "1rem";
+                    break;
             }
             if (!isNaN_(this.b.bi) && !isNaN_(this.b.bk) && !isNaN_(this.b.bj) && !isNaN_(this.b.bh)) {
                 m = this.b.bk + "px " + this.b.bj + "px " + this.b.bh + "px " + this.b.bi + "px";
@@ -225,7 +238,7 @@ export let ButtonView = /*@__PURE__*/ (() => {
             }
         }
         as() {
-            switch (this.b.k5) {
+            switch (this.b.k7) {
                 case 1:
                     this.n.setStyleProperty("justify-content", "center");
                     this.o.setStyleProperty("flex-grow", "unset");
@@ -369,7 +382,7 @@ export let ButtonView = /*@__PURE__*/ (() => {
             this.b.j9();
         }
         ab(a) {
-            this.b.ka(a.originalEvent.relatedTarget);
+            this.b.ka(a.originalEvent.relatedTarget, a.originalEvent.target);
         }
         f() {
             return false;
@@ -412,7 +425,7 @@ export let ButtonView = /*@__PURE__*/ (() => {
             this.c.aw = b;
         }
         ax(a, b) {
-            let c = ElevationHelper.e(a, this.b.nr, this.b.no, this.b.ne, b);
+            let c = ElevationHelper.e(a, this.b.nt, this.b.nq, this.b.ng, b);
             this.n.setStyleProperty("box-shadow", c);
         }
         az(a) {
@@ -451,226 +464,226 @@ export let XButton = /*@__PURE__*/ (() => {
             super();
             this._view = null;
             this.d9 = null;
-            this.pf = XButton.k.ae(XButton.m, "UmbraShadowColor");
-            this.o3 = XButton.k.ae(XButton.m, "PenumbraShadowColor");
-            this.nu = XButton.k.ae(XButton.m, "AmbientShadowColor");
+            this.ph = XButton.k.ae(XButton.m, "UmbraShadowColor");
+            this.o5 = XButton.k.ae(XButton.m, "PenumbraShadowColor");
+            this.nw = XButton.k.ae(XButton.m, "AmbientShadowColor");
             this.v = XButton.k.d(XButton.m, "ElevationMode");
-            this.o6 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBackgroundColor");
-            this.o7 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBorderColor");
-            this.o8 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledTextColor");
+            this.o8 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBackgroundColor");
+            this.o9 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBorderColor");
+            this.pa = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledTextColor");
             this.da = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledElevation");
             this.dd = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "RestingElevation");
             this.dc = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverElevation");
             this.db = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusElevation");
-            this.o5 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "BorderColor");
-            this.pd = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "RippleColor");
-            this.ky = XButton.k.y(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "CornerRadius");
+            this.o7 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "BorderColor");
+            this.pf = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "RippleColor");
+            this.kz = XButton.k.y(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "CornerRadius");
             this.bp = XButton.k.i(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "BorderWidth");
-            this.o4 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "BackgroundColor");
-            this.pe = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "TextColor");
-            this.pc = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverTextColor");
-            this.pb = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverBackgroundColor");
-            this.o9 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusBackgroundColor");
-            this.pa = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusTextColor");
-            this.n8 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBackgroundColor");
-            this.n9 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBorderColor");
-            this.oa = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledTextColor");
+            this.o6 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "BackgroundColor");
+            this.pg = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "TextColor");
+            this.pe = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverTextColor");
+            this.pd = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverBackgroundColor");
+            this.pb = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusBackgroundColor");
+            this.pc = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusTextColor");
+            this.oa = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBackgroundColor");
+            this.ob = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBorderColor");
+            this.oc = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledTextColor");
             this.cy = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledElevation");
             this.c1 = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "RestingElevation");
             this.c0 = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverElevation");
             this.cz = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "FocusElevation");
-            this.n7 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "BorderColor");
-            this.of = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "RippleColor");
-            this.kv = XButton.k.y(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "CornerRadius");
+            this.n9 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "BorderColor");
+            this.oh = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "RippleColor");
+            this.kw = XButton.k.y(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "CornerRadius");
             this.bm = XButton.k.i(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "BorderWidth");
-            this.n6 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "BackgroundColor");
-            this.og = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "TextColor");
-            this.oe = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverTextColor");
-            this.od = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverBackgroundColor");
-            this.ob = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "FocusBackgroundColor");
-            this.oc = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "FocusTextColor");
-            this.ou = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBackgroundColor");
-            this.ov = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBorderColor");
-            this.ow = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledTextColor");
+            this.n8 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "BackgroundColor");
+            this.oi = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "TextColor");
+            this.og = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverTextColor");
+            this.of = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverBackgroundColor");
+            this.od = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "FocusBackgroundColor");
+            this.oe = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 1), "FocusTextColor");
+            this.ow = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBackgroundColor");
+            this.ox = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBorderColor");
+            this.oy = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledTextColor");
             this.c6 = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledElevation");
             this.c9 = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "RestingElevation");
             this.c8 = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverElevation");
             this.c7 = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "FocusElevation");
-            this.ot = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "BorderColor");
-            this.o1 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "RippleColor");
-            this.kx = XButton.k.y(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "CornerRadius");
+            this.ov = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "BorderColor");
+            this.o3 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "RippleColor");
+            this.ky = XButton.k.y(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "CornerRadius");
             this.bo = XButton.k.i(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "BorderWidth");
-            this.os = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "BackgroundColor");
-            this.o2 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "TextColor");
-            this.o0 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverTextColor");
-            this.oz = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverBackgroundColor");
-            this.ox = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "FocusBackgroundColor");
-            this.oy = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "FocusTextColor");
-            this.oj = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledBackgroundColor");
-            this.ok = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledBorderColor");
-            this.ol = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledTextColor");
+            this.ou = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "BackgroundColor");
+            this.o4 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "TextColor");
+            this.o2 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverTextColor");
+            this.o1 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverBackgroundColor");
+            this.oz = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "FocusBackgroundColor");
+            this.o0 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 2), "FocusTextColor");
+            this.ol = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledBackgroundColor");
+            this.om = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledBorderColor");
+            this.on = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledTextColor");
             this.c2 = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledElevation");
             this.c5 = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "RestingElevation");
             this.c4 = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "HoverElevation");
             this.c3 = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "FocusElevation");
-            this.oi = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "BorderColor");
-            this.oq = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "RippleColor");
-            this.kw = XButton.k.y(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "CornerRadius");
+            this.ok = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "BorderColor");
+            this.os = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "RippleColor");
+            this.kx = XButton.k.y(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "CornerRadius");
             this.bn = XButton.k.i(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "BorderWidth");
-            this.oh = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "BackgroundColor");
-            this.or = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "TextColor");
-            this.op = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "HoverTextColor");
-            this.oo = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "HoverBackgroundColor");
-            this.om = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "FocusBackgroundColor");
-            this.on = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "FocusTextColor");
-            this.nx = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledBackgroundColor");
-            this.ny = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledBorderColor");
-            this.nz = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledTextColor");
+            this.oj = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "BackgroundColor");
+            this.ot = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "TextColor");
+            this.or = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "HoverTextColor");
+            this.oq = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "HoverBackgroundColor");
+            this.oo = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "FocusBackgroundColor");
+            this.op = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 4), "FocusTextColor");
+            this.nz = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledBackgroundColor");
+            this.n0 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledBorderColor");
+            this.n1 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledTextColor");
             this.cu = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledElevation");
             this.cx = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "RestingElevation");
             this.cw = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "HoverElevation");
             this.cv = XButton.k.n(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "FocusElevation");
-            this.nw = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "BorderColor");
-            this.n4 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "RippleColor");
-            this.ku = XButton.k.y(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "CornerRadius");
+            this.ny = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "BorderColor");
+            this.n6 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "RippleColor");
+            this.kv = XButton.k.y(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "CornerRadius");
             this.bl = XButton.k.i(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "BorderWidth");
-            this.nv = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "BackgroundColor");
-            this.n5 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "TextColor");
-            this.n3 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "HoverTextColor");
-            this.n2 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "HoverBackgroundColor");
-            this.n0 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "FocusBackgroundColor");
-            this.n1 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "FocusTextColor");
+            this.nx = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "BackgroundColor");
+            this.n7 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "TextColor");
+            this.n5 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "HoverTextColor");
+            this.n4 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "HoverBackgroundColor");
+            this.n2 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "FocusBackgroundColor");
+            this.n3 = XButton.k.ad(XButton.m, enumGetBox(ButtonDisplayStyle_$type, 3), "FocusTextColor");
             this.bc = NaN;
             this.bb = NaN;
             this.d = 0;
             this.p = 0;
             this.l = 0;
             this.o = 1;
-            this.k8 = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "BorderColor");
-            this.lj = ThemeResolver.ag(XButton.m, XButton.k, "UmbraShadowColor");
-            this.lg = ThemeResolver.ag(XButton.m, XButton.k, "PenumbraShadowColor");
-            this.k6 = ThemeResolver.ag(XButton.m, XButton.k, "AmbientShadowColor");
+            this.la = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "BorderColor");
+            this.ll = ThemeResolver.ag(XButton.m, XButton.k, "UmbraShadowColor");
+            this.li = ThemeResolver.ag(XButton.m, XButton.k, "PenumbraShadowColor");
+            this.k8 = ThemeResolver.ag(XButton.m, XButton.k, "AmbientShadowColor");
             this.b0 = ThemeResolver.p(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "RestingElevation");
             this.by = ThemeResolver.p(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusElevation");
             this.bz = ThemeResolver.p(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverElevation");
-            this.lh = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "RippleColor");
-            this.kk = ThemeResolver.aa(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "CornerRadius");
-            this.k7 = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "BackgroundColor");
-            this.k9 = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBackgroundColor");
-            this.la = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBorderColor");
-            this.lb = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledTextColor");
+            this.lj = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "RippleColor");
+            this.kl = ThemeResolver.aa(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "CornerRadius");
+            this.k9 = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "BackgroundColor");
+            this.lb = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBackgroundColor");
+            this.lc = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBorderColor");
+            this.ld = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledTextColor");
             this.bx = ThemeResolver.p(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledElevation");
             this.s = ThemeResolver.f(XButton.m, XButton.k, "ElevationMode");
-            this.li = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "TextColor");
-            this.lf = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverTextColor");
-            this.lc = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusBackgroundColor");
-            this.ld = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusTextColor");
-            this.le = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverBackgroundColor");
+            this.lk = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "TextColor");
+            this.lh = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverTextColor");
+            this.le = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusBackgroundColor");
+            this.lf = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusTextColor");
+            this.lg = ThemeResolver.af(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverBackgroundColor");
             this.a2 = ThemeResolver.k(XButton.m, XButton.k, enumGetBox(ButtonDisplayStyle_$type, 0), "BorderWidth");
-            this.m1 = null;
             this.m3 = null;
-            this.m4 = null;
             this.m5 = null;
+            this.m6 = null;
+            this.m7 = null;
             this.ck = -1;
-            this.m8 = null;
-            this.m2 = null;
+            this.na = null;
+            this.m4 = null;
             this.cn = -1;
             this.cm = -1;
             this.cl = -1;
             this.be = NaN;
-            this.kq = new CornerRadius(1, NaN, NaN, NaN, NaN);
-            this.na = null;
-            this.lz = null;
+            this.kr = new CornerRadius(1, NaN, NaN, NaN, NaN);
+            this.nc = null;
             this.l1 = null;
-            this.l2 = null;
             this.l3 = null;
+            this.l4 = null;
+            this.l5 = null;
             this.b6 = -1;
-            this.l6 = null;
-            this.l0 = null;
+            this.l8 = null;
+            this.l2 = null;
             this.b9 = -1;
             this.b8 = -1;
             this.b7 = -1;
-            this.l8 = null;
+            this.ma = null;
+            this.mb = null;
             this.l9 = null;
+            this.l6 = null;
             this.l7 = null;
-            this.l4 = null;
-            this.l5 = null;
             this.a9 = NaN;
-            this.kn = new CornerRadius(1, NaN, NaN, NaN, NaN);
-            this.lk = null;
+            this.ko = new CornerRadius(1, NaN, NaN, NaN, NaN);
             this.lm = null;
-            this.ln = null;
             this.lo = null;
+            this.lp = null;
+            this.lq = null;
             this.b1 = -1;
             this.t = 0;
-            this.mc = null;
-            this.ll = null;
+            this.me = null;
+            this.ln = null;
             this.co = -1;
             this.cb = -1;
             this.ca = -1;
             this.z = null;
+            this.nf = null;
+            this.mg = null;
+            this.ne = null;
             this.nd = null;
-            this.me = null;
-            this.nc = null;
             this.nb = null;
+            this.m8 = null;
             this.m9 = null;
-            this.m6 = null;
-            this.m7 = null;
-            this.ma = null;
-            this.mb = null;
+            this.mc = null;
+            this.md = null;
             this.a3 = NaN;
-            this.kl = new CornerRadius(1, NaN, NaN, NaN, NaN);
-            this.mq = null;
+            this.km = new CornerRadius(1, NaN, NaN, NaN, NaN);
             this.ms = null;
-            this.mt = null;
             this.mu = null;
+            this.mv = null;
+            this.mw = null;
             this.cg = -1;
-            this.mx = null;
-            this.mr = null;
+            this.mz = null;
+            this.mt = null;
             this.cj = -1;
             this.ci = -1;
             this.ch = -1;
             this.bd = NaN;
-            this.kp = new CornerRadius(1, NaN, NaN, NaN, NaN);
-            this.mz = null;
+            this.kq = new CornerRadius(1, NaN, NaN, NaN, NaN);
+            this.m1 = null;
+            this.m2 = null;
             this.m0 = null;
+            this.mx = null;
             this.my = null;
-            this.mv = null;
-            this.mw = null;
-            this.lp = null;
             this.lr = null;
-            this.ls = null;
             this.lt = null;
+            this.lu = null;
+            this.lv = null;
             this.b2 = -1;
-            this.md = null;
-            this.lq = null;
+            this.mf = null;
+            this.ls = null;
             this.b5 = -1;
             this.b4 = -1;
             this.b3 = -1;
             this.a8 = NaN;
-            this.km = new CornerRadius(1, NaN, NaN, NaN, NaN);
-            this.lx = null;
+            this.kn = new CornerRadius(1, NaN, NaN, NaN, NaN);
+            this.lz = null;
+            this.l0 = null;
             this.ly = null;
             this.lw = null;
-            this.lu = null;
-            this.lv = null;
-            this.mf = null;
+            this.lx = null;
             this.mh = null;
-            this.mi = null;
             this.mj = null;
+            this.mk = null;
+            this.ml = null;
             this.cc = -1;
-            this.mm = null;
-            this.mg = null;
+            this.mo = null;
+            this.mi = null;
             this.cf = -1;
             this.ce = -1;
             this.cd = -1;
             this.ba = NaN;
-            this.ko = new CornerRadius(1, NaN, NaN, NaN, NaN);
-            this.mo = null;
+            this.kp = new CornerRadius(1, NaN, NaN, NaN, NaN);
+            this.mq = null;
+            this.mr = null;
             this.mp = null;
+            this.mm = null;
             this.mn = null;
-            this.mk = null;
-            this.ml = null;
             this.ei = "ig-native-button-" + XButton.d5++;
             this.eh = "ig-button-" + XButton.d4++;
             this.ee = "inline-block";
@@ -697,8 +710,8 @@ export let XButton = /*@__PURE__*/ (() => {
             this.a7 = NaN;
             this.a6 = NaN;
             this.a4 = NaN;
-            this.k4 = 1;
-            this.q8 = 1;
+            this.k6 = 1;
+            this.ra = 1;
             this.ae = true;
             this.propertyChanged = null;
             this.clicked = null;
@@ -831,24 +844,25 @@ export let XButton = /*@__PURE__*/ (() => {
                 case "IconTextColor":
                 case "IconHoverTextColor":
                 case "ElevationMode":
-                    this.ki();
+                    this.kj();
                     break;
                 case "BaseTheme":
-                    this.kj(this.n == 0 ? 2 : this.n);
-                    this.ki();
+                    this.kk(this.n == 0 ? 2 : this.n);
+                    this.kj();
                     break;
                 case "IsDisabled":
                     this.ap = this.disabled || this.at;
-                    this.ki();
+                    this.kj();
                     this.view.aq();
+                    this.ki();
                     break;
                 case "DisableRipple":
                     this.ap = this.disabled || this.at;
-                    this.ki();
+                    this.kj();
                     break;
                 case "TextStyle":
                 case "DisableHover":
-                    this.kh();
+                    this.ki();
                     break;
                 case "ActualDisableRipple":
                     this.view.ak();
@@ -863,7 +877,7 @@ export let XButton = /*@__PURE__*/ (() => {
                 case "ActualFocusTextColor":
                 case "ActualHoverTextColor":
                 case "ActualElevationMode":
-                    this.kh();
+                    this.ki();
                     break;
                 case "Density":
                     this.q = this.r == 0 ? 1 : this.r;
@@ -871,13 +885,16 @@ export let XButton = /*@__PURE__*/ (() => {
                 case "ActualDensity":
                 case "ActualBorderWidth":
                 case "ActualCornerRadius":
+                    if (this.e == 4) {
+                        this.kh();
+                    }
                     this.view.ay();
-                    this.kh();
+                    this.ki();
                     break;
                 case "DisplayType":
                     this.view.ay();
+                    this.kj();
                     this.ki();
-                    this.kh();
                     break;
                 case "ContentPaddingLeft":
                 case "ContentPaddingTop":
@@ -922,112 +939,124 @@ export let XButton = /*@__PURE__*/ (() => {
                     break;
             }
         }
-        ks(a, b) {
-            return new CornerRadius(1, !isNaN_(a.c) ? a.c : b.c, !isNaN_(a.d) ? a.d : b.d, !isNaN_(a.b) ? a.b : b.b, !isNaN_(a.a) ? a.a : b.a);
+        kt(a, b) {
+            return new CornerRadius(1, !isNaN_(a.d) ? a.d : b.d, !isNaN_(a.e) ? a.e : b.e, !isNaN_(a.c) ? a.c : b.c, !isNaN_(a.b) ? a.b : b.b);
         }
-        ki() {
+        kj() {
             this.u = this.w != 0 ? this.w : this.v;
-            this.nr = this.pf;
-            this.no = this.o3;
-            this.ne = this.nu;
+            this.nt = this.ph;
+            this.nq = this.o5;
+            this.ng = this.nw;
             switch (this.e) {
                 case 0:
-                    this.nh = this.pg != null ? this.pg : this.qx != null ? this.qx : this.o6;
-                    this.ni = this.ph != null ? this.ph : this.qy != null ? this.qy : this.o7;
                     this.nj = this.pi != null ? this.pi : this.qz != null ? this.qz : this.o8;
+                    this.nk = this.pj != null ? this.pj : this.q0 != null ? this.q0 : this.o9;
+                    this.nl = this.pk != null ? this.pk : this.q1 != null ? this.q1 : this.pa;
                     this.cq = this.de >= 0 ? this.de : this.dy >= 0 ? this.dy : this.da;
                     this.ct = this.d2 >= 0 ? this.d2 : this.d1 >= 0 ? this.d1 : this.dd;
                     this.cs = this.dp >= 0 ? this.dp : this.d0 >= 0 ? this.d0 : this.dc;
                     this.cr = this.dn >= 0 ? this.dn : this.dz >= 0 ? this.dz : this.db;
-                    this.ng = this.nt != null ? this.nt : this.qw != null ? this.qw : this.o5;
-                    this.nf = this.ns != null ? this.ns : this.qv != null ? this.qv : this.o4;
-                    this.nm = this.p7 != null ? this.p7 : this.q2 != null ? this.q2 : this.pb;
-                    this.kr = this.ks(this.kt, this.ks(this.k3, this.ky));
+                    this.ni = this.nv != null ? this.nv : this.qy != null ? this.qy : this.o7;
+                    this.nh = this.nu != null ? this.nu : this.qx != null ? this.qx : this.o6;
+                    this.no = this.p9 != null ? this.p9 : this.q4 != null ? this.q4 : this.pd;
+                    this.ks = this.kt(this.ku, this.kt(this.k5, this.kz));
                     this.bf = !isNaN_(this.bg) ? this.bg : !isNaN_(this.bw) ? this.bw : this.bp;
-                    this.np = this.q6 != null ? this.q6 : this.q4 != null ? this.q4 : this.pd;
-                    this.nk = this.p5 != null ? this.p5 : this.q0 != null ? this.q0 : this.o9;
-                    this.nl = this.p6 != null ? this.p6 : this.q1 != null ? this.q1 : this.pa;
-                    this.nq = this.q7 != null ? this.q7 : this.q5 != null ? this.q5 : this.pe;
+                    this.nr = this.q8 != null ? this.q8 : this.q6 != null ? this.q6 : this.pf;
+                    this.nm = this.p7 != null ? this.p7 : this.q2 != null ? this.q2 : this.pb;
                     this.nn = this.p8 != null ? this.p8 : this.q3 != null ? this.q3 : this.pc;
+                    this.ns = this.q9 != null ? this.q9 : this.q7 != null ? this.q7 : this.pg;
+                    this.np = this.qa != null ? this.qa : this.q5 != null ? this.q5 : this.pe;
                     break;
                 case 2:
-                    this.nh = this.pg != null ? this.pg : this.qm != null ? this.qm : this.ou;
-                    this.ni = this.ph != null ? this.ph : this.qn != null ? this.qn : this.ov;
                     this.nj = this.pi != null ? this.pi : this.qo != null ? this.qo : this.ow;
+                    this.nk = this.pj != null ? this.pj : this.qp != null ? this.qp : this.ox;
+                    this.nl = this.pk != null ? this.pk : this.qq != null ? this.qq : this.oy;
                     this.cq = this.de >= 0 ? this.de : this.du >= 0 ? this.du : this.c6;
                     this.ct = this.d2 >= 0 ? this.d2 : this.dx >= 0 ? this.dx : this.c9;
                     this.cs = this.dp >= 0 ? this.dp : this.dw >= 0 ? this.dw : this.c8;
                     this.cr = this.dn >= 0 ? this.dn : this.dv >= 0 ? this.dv : this.c7;
-                    this.ng = this.nt != null ? this.nt : this.ql != null ? this.ql : this.ot;
-                    this.nf = this.p7 != null ? this.p7 : this.ns != null ? this.ns : this.qk != null ? this.qk : this.os;
-                    this.nm = this.qr != null ? this.qr : this.oz;
-                    this.kr = this.ks(this.kt, this.ks(this.k2, this.kx));
+                    this.ni = this.nv != null ? this.nv : this.qn != null ? this.qn : this.ov;
+                    this.nh = this.p9 != null ? this.p9 : this.nu != null ? this.nu : this.qm != null ? this.qm : this.ou;
+                    this.no = this.qt != null ? this.qt : this.o1;
+                    this.ks = this.kt(this.ku, this.kt(this.k4, this.ky));
                     this.bf = !isNaN_(this.bg) ? this.bg : !isNaN_(this.bv) ? this.bv : this.bo;
-                    this.np = this.q6 != null ? this.q6 : this.qt != null ? this.qt : this.o1;
-                    this.nk = this.p5 != null ? this.p5 : this.qp != null ? this.qp : this.ox;
-                    this.nl = this.p6 != null ? this.p6 : this.qq != null ? this.qq : this.oy;
-                    this.nq = this.q7 != null ? this.q7 : this.qu != null ? this.qu : this.o2;
+                    this.nr = this.q8 != null ? this.q8 : this.qv != null ? this.qv : this.o3;
+                    this.nm = this.p7 != null ? this.p7 : this.qr != null ? this.qr : this.oz;
                     this.nn = this.p8 != null ? this.p8 : this.qs != null ? this.qs : this.o0;
+                    this.ns = this.q9 != null ? this.q9 : this.qw != null ? this.qw : this.o4;
+                    this.np = this.qa != null ? this.qa : this.qu != null ? this.qu : this.o2;
                     break;
                 case 1:
-                    this.nh = this.pg != null ? this.pg : this.pw != null ? this.pw : this.n8;
-                    this.ni = this.ph != null ? this.ph : this.px != null ? this.px : this.n9;
                     this.nj = this.pi != null ? this.pi : this.py != null ? this.py : this.oa;
+                    this.nk = this.pj != null ? this.pj : this.pz != null ? this.pz : this.ob;
+                    this.nl = this.pk != null ? this.pk : this.p0 != null ? this.p0 : this.oc;
                     this.cq = this.de >= 0 ? this.de : this.dj >= 0 ? this.dj : this.cy;
                     this.ct = this.d2 >= 0 ? this.d2 : this.dm >= 0 ? this.dm : this.c1;
                     this.cs = this.dp >= 0 ? this.dp : this.dl >= 0 ? this.dl : this.c0;
                     this.cr = this.dn >= 0 ? this.dn : this.dk >= 0 ? this.dk : this.cz;
-                    this.ng = this.nt != null ? this.nt : this.pv != null ? this.pv : this.n7;
-                    this.nf = this.ns != null ? this.ns : this.pu != null ? this.pu : this.n6;
-                    this.nm = this.p7 != null ? this.p7 : this.p1 != null ? this.p1 : this.od;
-                    this.kr = this.ks(this.kt, this.ks(this.k0, this.kv));
+                    this.ni = this.nv != null ? this.nv : this.px != null ? this.px : this.n9;
+                    this.nh = this.nu != null ? this.nu : this.pw != null ? this.pw : this.n8;
+                    this.no = this.p9 != null ? this.p9 : this.p3 != null ? this.p3 : this.of;
+                    this.ks = this.kt(this.ku, this.kt(this.k1, this.kw));
                     this.bf = !isNaN_(this.bg) ? this.bg : !isNaN_(this.br) ? this.br : this.bm;
-                    this.np = this.q6 != null ? this.q6 : this.p3 != null ? this.p3 : this.of;
-                    this.nk = this.p5 != null ? this.p5 : this.pz != null ? this.pz : this.ob;
-                    this.nl = this.p6 != null ? this.p6 : this.p0 != null ? this.p0 : this.oc;
-                    this.nq = this.q7 != null ? this.q7 : this.p4 != null ? this.p4 : this.og;
+                    this.nr = this.q8 != null ? this.q8 : this.p5 != null ? this.p5 : this.oh;
+                    this.nm = this.p7 != null ? this.p7 : this.p1 != null ? this.p1 : this.od;
                     this.nn = this.p8 != null ? this.p8 : this.p2 != null ? this.p2 : this.oe;
+                    this.ns = this.q9 != null ? this.q9 : this.p6 != null ? this.p6 : this.oi;
+                    this.np = this.qa != null ? this.qa : this.p4 != null ? this.p4 : this.og;
                     break;
                 case 4:
-                    this.nh = this.pg != null ? this.pg : this.qb != null ? this.qb : this.oj;
-                    this.ni = this.ph != null ? this.ph : this.qc != null ? this.qc : this.ok;
                     this.nj = this.pi != null ? this.pi : this.qd != null ? this.qd : this.ol;
+                    this.nk = this.pj != null ? this.pj : this.qe != null ? this.qe : this.om;
+                    this.nl = this.pk != null ? this.pk : this.qf != null ? this.qf : this.on;
                     this.cq = this.de >= 0 ? this.de : this.dq >= 0 ? this.dq : this.c2;
                     this.ct = this.d2 >= 0 ? this.d2 : this.dt >= 0 ? this.dt : this.c5;
                     this.cs = this.dp >= 0 ? this.dp : this.ds >= 0 ? this.ds : this.c4;
                     this.cr = this.dn >= 0 ? this.dn : this.dr >= 0 ? this.dr : this.c3;
-                    this.ng = this.nt != null ? this.nt : this.qa != null ? this.qa : this.oi;
-                    this.nf = this.ns != null ? this.ns : this.p9 != null ? this.p9 : this.oh;
-                    this.nm = this.p7 != null ? this.p7 : this.qg != null ? this.qg : this.oo;
-                    this.kr = this.ks(this.kt, this.ks(this.k1, this.kw));
+                    this.ni = this.nv != null ? this.nv : this.qc != null ? this.qc : this.ok;
+                    this.nh = this.nu != null ? this.nu : this.qb != null ? this.qb : this.oj;
+                    this.no = this.p9 != null ? this.p9 : this.qi != null ? this.qi : this.oq;
+                    this.kh();
                     this.bf = !isNaN_(this.bg) ? this.bg : !isNaN_(this.bs) ? this.bs : this.bn;
-                    this.np = this.q6 != null ? this.q6 : this.qi != null ? this.qi : this.oq;
-                    this.nk = this.p5 != null ? this.p5 : this.qe != null ? this.qe : this.om;
-                    this.nl = this.p6 != null ? this.p6 : this.qf != null ? this.qf : this.on;
-                    this.nq = this.q7 != null ? this.q7 : this.qj != null ? this.qj : this.or;
+                    this.nr = this.q8 != null ? this.q8 : this.qk != null ? this.qk : this.os;
+                    this.nm = this.p7 != null ? this.p7 : this.qg != null ? this.qg : this.oo;
                     this.nn = this.p8 != null ? this.p8 : this.qh != null ? this.qh : this.op;
+                    this.ns = this.q9 != null ? this.q9 : this.ql != null ? this.ql : this.ot;
+                    this.np = this.qa != null ? this.qa : this.qj != null ? this.qj : this.or;
                     break;
                 case 3:
-                    this.nh = this.pg != null ? this.pg : this.pl != null ? this.pl : this.nx;
-                    this.ni = this.ph != null ? this.ph : this.pm != null ? this.pm : this.ny;
                     this.nj = this.pi != null ? this.pi : this.pn != null ? this.pn : this.nz;
+                    this.nk = this.pj != null ? this.pj : this.po != null ? this.po : this.n0;
+                    this.nl = this.pk != null ? this.pk : this.pp != null ? this.pp : this.n1;
                     this.cq = this.de >= 0 ? this.de : this.df >= 0 ? this.df : this.cu;
                     this.ct = this.d2 >= 0 ? this.d2 : this.di >= 0 ? this.di : this.cx;
                     this.cs = this.dp >= 0 ? this.dp : this.dh >= 0 ? this.dh : this.cw;
                     this.cr = this.dn >= 0 ? this.dn : this.dg >= 0 ? this.dg : this.cv;
-                    this.ng = this.nt != null ? this.nt : this.pk != null ? this.pk : this.nw;
-                    this.nf = this.ns != null ? this.ns : this.pj != null ? this.pj : this.nv;
-                    this.nm = this.p7 != null ? this.p7 : this.pq != null ? this.pq : this.n2;
-                    this.kr = this.ks(this.kt, this.ks(this.kz, this.ku));
+                    this.ni = this.nv != null ? this.nv : this.pm != null ? this.pm : this.ny;
+                    this.nh = this.nu != null ? this.nu : this.pl != null ? this.pl : this.nx;
+                    this.no = this.p9 != null ? this.p9 : this.ps != null ? this.ps : this.n4;
+                    this.ks = this.kt(this.ku, this.kt(this.k0, this.kv));
                     this.bf = !isNaN_(this.bg) ? this.bg : !isNaN_(this.bq) ? this.bq : this.bl;
-                    this.np = this.q6 != null ? this.q6 : this.ps != null ? this.ps : this.pd;
-                    this.nk = this.p5 != null ? this.p5 : this.po != null ? this.po : this.n0;
-                    this.nl = this.p6 != null ? this.p6 : this.pp != null ? this.pp : this.n1;
-                    this.nq = this.q7 != null ? this.q7 : this.pt != null ? this.pt : this.n5;
+                    this.nr = this.q8 != null ? this.q8 : this.pu != null ? this.pu : this.pf;
+                    this.nm = this.p7 != null ? this.p7 : this.pq != null ? this.pq : this.n2;
                     this.nn = this.p8 != null ? this.p8 : this.pr != null ? this.pr : this.n3;
+                    this.ns = this.q9 != null ? this.q9 : this.pv != null ? this.pv : this.n7;
+                    this.np = this.qa != null ? this.qa : this.pt != null ? this.pt : this.n5;
                     break;
             }
         }
+        kh() {
+            this.ks = this.kt(this.ku, this.kt(this.k3, this.k2(this.kx)));
+        }
+        k2(a) {
+            switch (this.q) {
+                case 1: return a;
+                case 2: return a;
+                case 3: return a;
+                case 4: return new CornerRadius(0, 16);
+            }
+            return a;
+        }
         j6() {
             if (this.disabled) {
                 return;
@@ -1038,22 +1067,22 @@ export let XButton = /*@__PURE__*/ (() => {
         }
         j5() {
             this.focused = false;
-            this.kh();
+            this.ki();
         }
         j8() {
             this.focused = true;
-            this.kh();
+            this.ki();
         }
         kc() {
             this.a0 = false;
-            this.kh();
+            this.ki();
             if (this.mouseLeave != null) {
                 this.mouseLeave(this, new MouseEventArgs());
             }
         }
         kb() {
             this.a0 = true;
-            this.kh();
+            this.ki();
             if (this.mouseEnter != null) {
                 this.mouseEnter(this, new MouseEventArgs());
             }
@@ -1063,22 +1092,23 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.gotFocus(this, new FocusEventArgs());
             }
         }
-        ka(a) {
+        ka(a, b) {
             if (this.lostFocus != null) {
                 this.lostFocus(this, ((() => {
                     let $ret = new FocusEventArgs();
-                    $ret.a = a;
+                    $ret.b = a;
+                    $ret.a = b;
                     return $ret;
                 })()));
             }
         }
-        kh() {
+        ki() {
             let a = this.view.q;
             if (a == null) {
                 return;
             }
-            NativeUI.o(a, this.kr);
-            NativeUI.n(a, this.ng);
+            NativeUI.o(a, this.ks);
+            NativeUI.n(a, this.ni);
             if (!isNaN_(this.bf)) {
                 NativeUI.p(a, new Thickness(0, this.bf));
             }
@@ -1097,132 +1127,132 @@ export let XButton = /*@__PURE__*/ (() => {
                 }
             }
             if (this.disabled) {
-                NativeUI.m(a, this.nh);
+                NativeUI.m(a, this.nj);
             }
             else if (this.focused && this.az) {
-                NativeUI.m(a, this.nk);
+                NativeUI.m(a, this.nm);
             }
             else {
                 if (this.a0 && !this.ar) {
-                    NativeUI.m(a, this.nm);
+                    NativeUI.m(a, this.no);
                 }
                 else {
-                    NativeUI.m(a, this.nf);
+                    NativeUI.m(a, this.nh);
                 }
             }
-            this.view.aw(this.np, BrushUtil.h(0, 0, 0, 0));
+            this.view.aw(this.nr, BrushUtil.h(0, 0, 0, 0));
             if (this.aa != null) {
                 this.view.az(this.aa);
             }
             if (this.disabled) {
-                NativeUI.q(this.view.s, this.nj);
-                NativeUI.r(this.view.s, this.nj);
-            }
-            else if (this.focused && this.az) {
                 NativeUI.q(this.view.s, this.nl);
                 NativeUI.r(this.view.s, this.nl);
             }
+            else if (this.focused && this.az) {
+                NativeUI.q(this.view.s, this.nn);
+                NativeUI.r(this.view.s, this.nn);
+            }
             else {
                 if (this.a0 && !this.ar) {
-                    NativeUI.q(this.view.s, this.nn);
-                    NativeUI.r(this.view.s, this.nn);
+                    NativeUI.q(this.view.s, this.np);
+                    NativeUI.r(this.view.s, this.np);
                 }
                 else {
-                    NativeUI.q(this.view.s, this.nq);
-                    NativeUI.r(this.view.s, this.nq);
+                    NativeUI.q(this.view.s, this.ns);
+                    NativeUI.r(this.view.s, this.ns);
                 }
             }
         }
-        kj(a) {
-            this.pf = XButton.k.ae(a, "UmbraShadowColor");
-            this.o3 = XButton.k.ae(a, "PenumbraShadowColor");
-            this.nu = XButton.k.ae(a, "AmbientShadowColor");
+        kk(a) {
+            this.ph = XButton.k.ae(a, "UmbraShadowColor");
+            this.o5 = XButton.k.ae(a, "PenumbraShadowColor");
+            this.nw = XButton.k.ae(a, "AmbientShadowColor");
             this.v = XButton.k.d(a, "ElevationMode");
-            this.o6 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBackgroundColor");
-            this.o7 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBorderColor");
-            this.o8 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledTextColor");
+            this.o8 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBackgroundColor");
+            this.o9 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledBorderColor");
+            this.pa = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledTextColor");
             this.da = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 0), "DisabledElevation");
             this.dd = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 0), "RestingElevation");
             this.dc = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverElevation");
             this.db = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusElevation");
-            this.o5 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "BorderColor");
-            this.pd = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "RippleColor");
-            this.ky = XButton.k.y(a, enumGetBox(ButtonDisplayStyle_$type, 0), "CornerRadius");
+            this.o7 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "BorderColor");
+            this.pf = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "RippleColor");
+            this.kz = XButton.k.y(a, enumGetBox(ButtonDisplayStyle_$type, 0), "CornerRadius");
             this.bp = XButton.k.i(a, enumGetBox(ButtonDisplayStyle_$type, 0), "BorderWidth");
-            this.o4 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "BackgroundColor");
-            this.pe = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "TextColor");
-            this.pc = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverTextColor");
-            this.pb = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverBackgroundColor");
-            this.o9 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusBackgroundColor");
-            this.pa = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusTextColor");
-            this.n8 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBackgroundColor");
-            this.n9 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBorderColor");
-            this.oa = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledTextColor");
+            this.o6 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "BackgroundColor");
+            this.pg = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "TextColor");
+            this.pe = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverTextColor");
+            this.pd = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "HoverBackgroundColor");
+            this.pb = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusBackgroundColor");
+            this.pc = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 0), "FocusTextColor");
+            this.oa = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBackgroundColor");
+            this.ob = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledBorderColor");
+            this.oc = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledTextColor");
             this.cy = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 1), "DisabledElevation");
             this.c1 = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 1), "RestingElevation");
             this.c0 = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverElevation");
             this.cz = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 1), "FocusElevation");
-            this.n7 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "BorderColor");
-            this.of = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "RippleColor");
-            this.kv = XButton.k.y(a, enumGetBox(ButtonDisplayStyle_$type, 1), "CornerRadius");
+            this.n9 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "BorderColor");
+            this.oh = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "RippleColor");
+            this.kw = XButton.k.y(a, enumGetBox(ButtonDisplayStyle_$type, 1), "CornerRadius");
             this.bm = XButton.k.i(a, enumGetBox(ButtonDisplayStyle_$type, 1), "BorderWidth");
-            this.n6 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "BackgroundColor");
-            this.og = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "TextColor");
-            this.oe = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverTextColor");
-            this.od = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverBackgroundColor");
-            this.ob = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "FocusBackgroundColor");
-            this.oc = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "FocusTextColor");
-            this.ou = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBackgroundColor");
-            this.ov = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBorderColor");
-            this.ow = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledTextColor");
+            this.n8 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "BackgroundColor");
+            this.oi = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "TextColor");
+            this.og = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverTextColor");
+            this.of = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "HoverBackgroundColor");
+            this.od = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "FocusBackgroundColor");
+            this.oe = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 1), "FocusTextColor");
+            this.ow = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBackgroundColor");
+            this.ox = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledBorderColor");
+            this.oy = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledTextColor");
             this.c6 = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 2), "DisabledElevation");
             this.c9 = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 2), "RestingElevation");
             this.c8 = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverElevation");
             this.c7 = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 2), "FocusElevation");
-            this.ot = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "BorderColor");
-            this.o1 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "RippleColor");
-            this.kx = XButton.k.y(a, enumGetBox(ButtonDisplayStyle_$type, 2), "CornerRadius");
+            this.ov = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "BorderColor");
+            this.o3 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "RippleColor");
+            this.ky = XButton.k.y(a, enumGetBox(ButtonDisplayStyle_$type, 2), "CornerRadius");
             this.bo = XButton.k.i(a, enumGetBox(ButtonDisplayStyle_$type, 2), "BorderWidth");
-            this.os = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "BackgroundColor");
-            this.o2 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "TextColor");
-            this.o0 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverTextColor");
-            this.oz = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverBackgroundColor");
-            this.ox = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "FocusBackgroundColor");
-            this.oy = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "FocusTextColor");
-            this.oj = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledBackgroundColor");
-            this.ok = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledBorderColor");
-            this.ol = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledTextColor");
+            this.ou = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "BackgroundColor");
+            this.o4 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "TextColor");
+            this.o2 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverTextColor");
+            this.o1 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "HoverBackgroundColor");
+            this.oz = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "FocusBackgroundColor");
+            this.o0 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 2), "FocusTextColor");
+            this.ol = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledBackgroundColor");
+            this.om = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledBorderColor");
+            this.on = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledTextColor");
             this.c2 = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 4), "DisabledElevation");
             this.c5 = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 4), "RestingElevation");
             this.c4 = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 4), "HoverElevation");
             this.c3 = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 4), "FocusElevation");
-            this.oi = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "BorderColor");
-            this.oq = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "RippleColor");
-            this.kw = XButton.k.y(a, enumGetBox(ButtonDisplayStyle_$type, 4), "CornerRadius");
+            this.ok = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "BorderColor");
+            this.os = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "RippleColor");
+            this.kx = XButton.k.y(a, enumGetBox(ButtonDisplayStyle_$type, 4), "CornerRadius");
             this.bn = XButton.k.i(a, enumGetBox(ButtonDisplayStyle_$type, 4), "BorderWidth");
-            this.oh = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "BackgroundColor");
-            this.or = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "TextColor");
-            this.op = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "HoverTextColor");
-            this.oo = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "HoverBackgroundColor");
-            this.om = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "FocusBackgroundColor");
-            this.on = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "FocusTextColor");
-            this.nx = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledBackgroundColor");
-            this.ny = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledBorderColor");
-            this.nz = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledTextColor");
+            this.oj = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "BackgroundColor");
+            this.ot = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "TextColor");
+            this.or = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "HoverTextColor");
+            this.oq = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "HoverBackgroundColor");
+            this.oo = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "FocusBackgroundColor");
+            this.op = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 4), "FocusTextColor");
+            this.nz = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledBackgroundColor");
+            this.n0 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledBorderColor");
+            this.n1 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledTextColor");
             this.cu = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 3), "DisabledElevation");
             this.cx = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 3), "RestingElevation");
             this.cw = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 3), "HoverElevation");
             this.cv = XButton.k.n(a, enumGetBox(ButtonDisplayStyle_$type, 3), "FocusElevation");
-            this.nw = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "BorderColor");
-            this.n4 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "RippleColor");
-            this.ku = XButton.k.y(a, enumGetBox(ButtonDisplayStyle_$type, 3), "CornerRadius");
+            this.ny = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "BorderColor");
+            this.n6 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "RippleColor");
+            this.kv = XButton.k.y(a, enumGetBox(ButtonDisplayStyle_$type, 3), "CornerRadius");
             this.bl = XButton.k.i(a, enumGetBox(ButtonDisplayStyle_$type, 3), "BorderWidth");
-            this.nv = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "BackgroundColor");
-            this.n5 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "TextColor");
-            this.n3 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "HoverTextColor");
-            this.n2 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "HoverBackgroundColor");
-            this.n0 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "FocusBackgroundColor");
-            this.n1 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "FocusTextColor");
+            this.nx = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "BackgroundColor");
+            this.n7 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "TextColor");
+            this.n5 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "HoverTextColor");
+            this.n4 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "HoverBackgroundColor");
+            this.n2 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "FocusBackgroundColor");
+            this.n3 = XButton.k.ad(a, enumGetBox(ButtonDisplayStyle_$type, 3), "FocusTextColor");
         }
         get bu() {
             return this.bc;
@@ -1284,43 +1314,43 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("ActualDensity", enumGetBox(ControlDisplayDensity_$type, b), enumGetBox(ControlDisplayDensity_$type, a));
             }
         }
-        get ng() {
-            return this.k8;
+        get ni() {
+            return this.la;
         }
-        set ng(a) {
-            let b = this.k8;
-            this.k8 = a;
-            if (b != this.k8) {
+        set ni(a) {
+            let b = this.la;
+            this.la = a;
+            if (b != this.la) {
                 this.kd("ActualBorderColor", b, a);
             }
         }
-        get nr() {
-            return this.lj;
+        get nt() {
+            return this.ll;
         }
-        set nr(a) {
-            let b = this.lj;
-            this.lj = a;
-            if (b != this.lj) {
+        set nt(a) {
+            let b = this.ll;
+            this.ll = a;
+            if (b != this.ll) {
                 this.kd("ActualUmbraShadowColor", b, a);
             }
         }
-        get no() {
-            return this.lg;
+        get nq() {
+            return this.li;
         }
-        set no(a) {
-            let b = this.lg;
-            this.lg = a;
-            if (b != this.lg) {
+        set nq(a) {
+            let b = this.li;
+            this.li = a;
+            if (b != this.li) {
                 this.kd("ActualPenumbraShadowColor", b, a);
             }
         }
-        get ne() {
-            return this.k6;
+        get ng() {
+            return this.k8;
         }
-        set ne(a) {
-            let b = this.k6;
-            this.k6 = a;
-            if (b != this.k6) {
+        set ng(a) {
+            let b = this.k8;
+            this.k8 = a;
+            if (b != this.k8) {
                 this.kd("ActualAmbientShadowColor", b, a);
             }
         }
@@ -1354,36 +1384,26 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("ActualHoverElevation", b, a);
             }
         }
-        get np() {
-            return this.lh;
+        get nr() {
+            return this.lj;
         }
-        set np(a) {
-            let b = this.lh;
-            this.lh = a;
-            if (b != this.lh) {
+        set nr(a) {
+            let b = this.lj;
+            this.lj = a;
+            if (b != this.lj) {
                 this.kd("ActualRippleColor", b, a);
             }
         }
-        get kr() {
-            return this.kk;
+        get ks() {
+            return this.kl;
         }
-        set kr(a) {
-            let b = this.kk;
-            this.kk = a;
-            if (b != this.kk) {
+        set ks(a) {
+            let b = this.kl;
+            this.kl = a;
+            if (!b.equals(this.kl)) {
                 this.kd("ActualCornerRadius", b, a);
             }
         }
-        get nf() {
-            return this.k7;
-        }
-        set nf(a) {
-            let b = this.k7;
-            this.k7 = a;
-            if (b != this.k7) {
-                this.kd("ActualBackgroundColor", b, a);
-            }
-        }
         get nh() {
             return this.k9;
         }
@@ -1391,17 +1411,7 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.k9;
             this.k9 = a;
             if (b != this.k9) {
-                this.kd("ActualDisabledBackgroundColor", b, a);
-            }
-        }
-        get ni() {
-            return this.la;
-        }
-        set ni(a) {
-            let b = this.la;
-            this.la = a;
-            if (b != this.la) {
-                this.kd("ActualDisabledBorderColor", b, a);
+                this.kd("ActualBackgroundColor", b, a);
             }
         }
         get nj() {
@@ -1411,6 +1421,26 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.lb;
             this.lb = a;
             if (b != this.lb) {
+                this.kd("ActualDisabledBackgroundColor", b, a);
+            }
+        }
+        get nk() {
+            return this.lc;
+        }
+        set nk(a) {
+            let b = this.lc;
+            this.lc = a;
+            if (b != this.lc) {
+                this.kd("ActualDisabledBorderColor", b, a);
+            }
+        }
+        get nl() {
+            return this.ld;
+        }
+        set nl(a) {
+            let b = this.ld;
+            this.ld = a;
+            if (b != this.ld) {
                 this.kd("ActualDisabledTextColor", b, a);
             }
         }
@@ -1434,16 +1464,36 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("ActualElevationMode", enumGetBox(ElevationMode_$type, b), enumGetBox(ElevationMode_$type, a));
             }
         }
-        get nq() {
-            return this.li;
+        get ns() {
+            return this.lk;
         }
-        set nq(a) {
-            let b = this.li;
-            this.li = a;
-            if (b != this.li) {
+        set ns(a) {
+            let b = this.lk;
+            this.lk = a;
+            if (b != this.lk) {
                 this.kd("ActualTextColor", b, a);
             }
         }
+        get np() {
+            return this.lh;
+        }
+        set np(a) {
+            let b = this.lh;
+            this.lh = a;
+            if (b != this.lh) {
+                this.kd("ActualHoverTextColor", b, a);
+            }
+        }
+        get nm() {
+            return this.le;
+        }
+        set nm(a) {
+            let b = this.le;
+            this.le = a;
+            if (b != this.le) {
+                this.kd("ActualFocusBackgroundColor", b, a);
+            }
+        }
         get nn() {
             return this.lf;
         }
@@ -1451,36 +1501,16 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.lf;
             this.lf = a;
             if (b != this.lf) {
-                this.kd("ActualHoverTextColor", b, a);
-            }
-        }
-        get nk() {
-            return this.lc;
-        }
-        set nk(a) {
-            let b = this.lc;
-            this.lc = a;
-            if (b != this.lc) {
-                this.kd("ActualFocusBackgroundColor", b, a);
-            }
-        }
-        get nl() {
-            return this.ld;
-        }
-        set nl(a) {
-            let b = this.ld;
-            this.ld = a;
-            if (b != this.ld) {
                 this.kd("ActualFocusTextColor", b, a);
             }
         }
-        get nm() {
-            return this.le;
+        get no() {
+            return this.lg;
         }
-        set nm(a) {
-            let b = this.le;
-            this.le = a;
-            if (b != this.le) {
+        set no(a) {
+            let b = this.lg;
+            this.lg = a;
+            if (b != this.lg) {
                 this.kd("ActualHoverBackgroundColor", b, a);
             }
         }
@@ -1494,16 +1524,6 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("ActualBorderWidth", b, a);
             }
         }
-        get qv() {
-            return this.m1;
-        }
-        set qv(a) {
-            let b = this.m1;
-            this.m1 = a;
-            if (b != this.m1) {
-                this.kd("RaisedBackgroundColor", b, a);
-            }
-        }
         get qx() {
             return this.m3;
         }
@@ -1511,17 +1531,7 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.m3;
             this.m3 = a;
             if (b != this.m3) {
-                this.kd("RaisedDisabledBackgroundColor", b, a);
-            }
-        }
-        get qy() {
-            return this.m4;
-        }
-        set qy(a) {
-            let b = this.m4;
-            this.m4 = a;
-            if (b != this.m4) {
-                this.kd("RaisedDisabledBorderColor", b, a);
+                this.kd("RaisedBackgroundColor", b, a);
             }
         }
         get qz() {
@@ -1531,6 +1541,26 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.m5;
             this.m5 = a;
             if (b != this.m5) {
+                this.kd("RaisedDisabledBackgroundColor", b, a);
+            }
+        }
+        get q0() {
+            return this.m6;
+        }
+        set q0(a) {
+            let b = this.m6;
+            this.m6 = a;
+            if (b != this.m6) {
+                this.kd("RaisedDisabledBorderColor", b, a);
+            }
+        }
+        get q1() {
+            return this.m7;
+        }
+        set q1(a) {
+            let b = this.m7;
+            this.m7 = a;
+            if (b != this.m7) {
                 this.kd("RaisedDisabledTextColor", b, a);
             }
         }
@@ -1544,23 +1574,23 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("RaisedDisabledElevation", b, a);
             }
         }
-        get q2() {
-            return this.m8;
+        get q4() {
+            return this.na;
         }
-        set q2(a) {
-            let b = this.m8;
-            this.m8 = a;
-            if (b != this.m8) {
+        set q4(a) {
+            let b = this.na;
+            this.na = a;
+            if (b != this.na) {
                 this.kd("RaisedHoverBackgroundColor", b, a);
             }
         }
-        get qw() {
-            return this.m2;
+        get qy() {
+            return this.m4;
         }
-        set qw(a) {
-            let b = this.m2;
-            this.m2 = a;
-            if (b != this.m2) {
+        set qy(a) {
+            let b = this.m4;
+            this.m4 = a;
+            if (b != this.m4) {
                 this.kd("RaisedBorderColor", b, a);
             }
         }
@@ -1604,36 +1634,26 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("RaisedBorderWidth", b, a);
             }
         }
-        get k3() {
-            return this.kq;
+        get k5() {
+            return this.kr;
         }
-        set k3(a) {
-            let b = this.kq;
-            this.kq = a;
+        set k5(a) {
+            let b = this.kr;
+            this.kr = a;
             {
                 this.kd("RaisedCornerRadius", b, a);
             }
         }
-        get q4() {
-            return this.na;
+        get q6() {
+            return this.nc;
         }
-        set q4(a) {
-            let b = this.na;
-            this.na = a;
-            if (b != this.na) {
+        set q6(a) {
+            let b = this.nc;
+            this.nc = a;
+            if (b != this.nc) {
                 this.kd("RaisedRippleColor", b, a);
             }
         }
-        get pu() {
-            return this.lz;
-        }
-        set pu(a) {
-            let b = this.lz;
-            this.lz = a;
-            if (b != this.lz) {
-                this.kd("FlatBackgroundColor", b, a);
-            }
-        }
         get pw() {
             return this.l1;
         }
@@ -1641,17 +1661,7 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.l1;
             this.l1 = a;
             if (b != this.l1) {
-                this.kd("FlatDisabledBackgroundColor", b, a);
-            }
-        }
-        get px() {
-            return this.l2;
-        }
-        set px(a) {
-            let b = this.l2;
-            this.l2 = a;
-            if (b != this.l2) {
-                this.kd("FlatDisabledBorderColor", b, a);
+                this.kd("FlatBackgroundColor", b, a);
             }
         }
         get py() {
@@ -1661,6 +1671,26 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.l3;
             this.l3 = a;
             if (b != this.l3) {
+                this.kd("FlatDisabledBackgroundColor", b, a);
+            }
+        }
+        get pz() {
+            return this.l4;
+        }
+        set pz(a) {
+            let b = this.l4;
+            this.l4 = a;
+            if (b != this.l4) {
+                this.kd("FlatDisabledBorderColor", b, a);
+            }
+        }
+        get p0() {
+            return this.l5;
+        }
+        set p0(a) {
+            let b = this.l5;
+            this.l5 = a;
+            if (b != this.l5) {
                 this.kd("FlatDisabledTextColor", b, a);
             }
         }
@@ -1674,23 +1704,23 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("FlatDisabledElevation", b, a);
             }
         }
-        get p1() {
-            return this.l6;
+        get p3() {
+            return this.l8;
         }
-        set p1(a) {
-            let b = this.l6;
-            this.l6 = a;
-            if (b != this.l6) {
+        set p3(a) {
+            let b = this.l8;
+            this.l8 = a;
+            if (b != this.l8) {
                 this.kd("FlatHoverBackgroundColor", b, a);
             }
         }
-        get pv() {
-            return this.l0;
+        get px() {
+            return this.l2;
         }
-        set pv(a) {
-            let b = this.l0;
-            this.l0 = a;
-            if (b != this.l0) {
+        set px(a) {
+            let b = this.l2;
+            this.l2 = a;
+            if (b != this.l2) {
                 this.kd("FlatBorderColor", b, a);
             }
         }
@@ -1724,16 +1754,26 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("FlatFocusElevation", b, a);
             }
         }
-        get p3() {
-            return this.l8;
+        get p5() {
+            return this.ma;
         }
-        set p3(a) {
-            let b = this.l8;
-            this.l8 = a;
-            if (b != this.l8) {
+        set p5(a) {
+            let b = this.ma;
+            this.ma = a;
+            if (b != this.ma) {
                 this.kd("FlatRippleColor", b, a);
             }
         }
+        get p6() {
+            return this.mb;
+        }
+        set p6(a) {
+            let b = this.mb;
+            this.mb = a;
+            if (b != this.mb) {
+                this.kd("FlatTextColor", b, a);
+            }
+        }
         get p4() {
             return this.l9;
         }
@@ -1741,7 +1781,17 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.l9;
             this.l9 = a;
             if (b != this.l9) {
-                this.kd("FlatTextColor", b, a);
+                this.kd("FlatHoverTextColor", b, a);
+            }
+        }
+        get p1() {
+            return this.l6;
+        }
+        set p1(a) {
+            let b = this.l6;
+            this.l6 = a;
+            if (b != this.l6) {
+                this.kd("FlatFocusBackgroundColor", b, a);
             }
         }
         get p2() {
@@ -1751,26 +1801,6 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.l7;
             this.l7 = a;
             if (b != this.l7) {
-                this.kd("FlatHoverTextColor", b, a);
-            }
-        }
-        get pz() {
-            return this.l4;
-        }
-        set pz(a) {
-            let b = this.l4;
-            this.l4 = a;
-            if (b != this.l4) {
-                this.kd("FlatFocusBackgroundColor", b, a);
-            }
-        }
-        get p0() {
-            return this.l5;
-        }
-        set p0(a) {
-            let b = this.l5;
-            this.l5 = a;
-            if (b != this.l5) {
                 this.kd("FlatFocusTextColor", b, a);
             }
         }
@@ -1784,44 +1814,24 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("FlatBorderWidth", b, a);
             }
         }
-        get k0() {
-            return this.kn;
+        get k1() {
+            return this.ko;
         }
-        set k0(a) {
-            let b = this.kn;
-            this.kn = a;
+        set k1(a) {
+            let b = this.ko;
+            this.ko = a;
             {
                 this.kd("FlatCornerRadius", b, a);
             }
         }
-        get ns() {
-            return this.lk;
-        }
-        set ns(a) {
-            let b = this.lk;
-            this.lk = a;
-            if (b != this.lk) {
-                this.kd("BackgroundColor", b, a);
-            }
-        }
-        get pg() {
+        get nu() {
             return this.lm;
         }
-        set pg(a) {
+        set nu(a) {
             let b = this.lm;
             this.lm = a;
             if (b != this.lm) {
-                this.kd("DisabledBackgroundColor", b, a);
-            }
-        }
-        get ph() {
-            return this.ln;
-        }
-        set ph(a) {
-            let b = this.ln;
-            this.ln = a;
-            if (b != this.ln) {
-                this.kd("DisabledBorderColor", b, a);
+                this.kd("BackgroundColor", b, a);
             }
         }
         get pi() {
@@ -1831,6 +1841,26 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.lo;
             this.lo = a;
             if (b != this.lo) {
+                this.kd("DisabledBackgroundColor", b, a);
+            }
+        }
+        get pj() {
+            return this.lp;
+        }
+        set pj(a) {
+            let b = this.lp;
+            this.lp = a;
+            if (b != this.lp) {
+                this.kd("DisabledBorderColor", b, a);
+            }
+        }
+        get pk() {
+            return this.lq;
+        }
+        set pk(a) {
+            let b = this.lq;
+            this.lq = a;
+            if (b != this.lq) {
                 this.kd("DisabledTextColor", b, a);
             }
         }
@@ -1854,23 +1884,23 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("ElevationMode", enumGetBox(ElevationMode_$type, b), enumGetBox(ElevationMode_$type, a));
             }
         }
-        get p7() {
-            return this.mc;
+        get p9() {
+            return this.me;
         }
-        set p7(a) {
-            let b = this.mc;
-            this.mc = a;
-            if (b != this.mc) {
+        set p9(a) {
+            let b = this.me;
+            this.me = a;
+            if (b != this.me) {
                 this.kd("HoverBackgroundColor", b, a);
             }
         }
-        get nt() {
-            return this.ll;
+        get nv() {
+            return this.ln;
         }
-        set nt(a) {
-            let b = this.ll;
-            this.ll = a;
-            if (b != this.ll) {
+        set nv(a) {
+            let b = this.ln;
+            this.ln = a;
+            if (b != this.ln) {
                 this.kd("BorderColor", b, a);
             }
         }
@@ -1914,36 +1944,46 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("TextStyle", b, a);
             }
         }
-        get q7() {
-            return this.nd;
+        get q9() {
+            return this.nf;
         }
-        set q7(a) {
-            let b = this.nd;
-            this.nd = a;
-            if (b != this.nd) {
+        set q9(a) {
+            let b = this.nf;
+            this.nf = a;
+            if (b != this.nf) {
                 this.kd("TextColor", b, a);
             }
         }
-        get p8() {
-            return this.me;
+        get qa() {
+            return this.mg;
         }
-        set p8(a) {
-            let b = this.me;
-            this.me = a;
-            if (b != this.me) {
+        set qa(a) {
+            let b = this.mg;
+            this.mg = a;
+            if (b != this.mg) {
                 this.kd("HoverTextColor", b, a);
             }
         }
-        get q6() {
-            return this.nc;
+        get q8() {
+            return this.ne;
         }
-        set q6(a) {
-            let b = this.nc;
-            this.nc = a;
-            if (b != this.nc) {
+        set q8(a) {
+            let b = this.ne;
+            this.ne = a;
+            if (b != this.ne) {
                 this.kd("RippleColor", b, a);
             }
         }
+        get q7() {
+            return this.nd;
+        }
+        set q7(a) {
+            let b = this.nd;
+            this.nd = a;
+            if (b != this.nd) {
+                this.kd("RaisedTextColor", b, a);
+            }
+        }
         get q5() {
             return this.nb;
         }
@@ -1951,7 +1991,17 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.nb;
             this.nb = a;
             if (b != this.nb) {
-                this.kd("RaisedTextColor", b, a);
+                this.kd("RaisedHoverTextColor", b, a);
+            }
+        }
+        get q2() {
+            return this.m8;
+        }
+        set q2(a) {
+            let b = this.m8;
+            this.m8 = a;
+            if (b != this.m8) {
+                this.kd("RaisedFocusBackgroundColor", b, a);
             }
         }
         get q3() {
@@ -1961,46 +2011,26 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.m9;
             this.m9 = a;
             if (b != this.m9) {
-                this.kd("RaisedHoverTextColor", b, a);
-            }
-        }
-        get q0() {
-            return this.m6;
-        }
-        set q0(a) {
-            let b = this.m6;
-            this.m6 = a;
-            if (b != this.m6) {
-                this.kd("RaisedFocusBackgroundColor", b, a);
-            }
-        }
-        get q1() {
-            return this.m7;
-        }
-        set q1(a) {
-            let b = this.m7;
-            this.m7 = a;
-            if (b != this.m7) {
                 this.kd("RaisedFocusTextColor", b, a);
             }
         }
-        get p5() {
-            return this.ma;
+        get p7() {
+            return this.mc;
         }
-        set p5(a) {
-            let b = this.ma;
-            this.ma = a;
-            if (b != this.ma) {
+        set p7(a) {
+            let b = this.mc;
+            this.mc = a;
+            if (b != this.mc) {
                 this.kd("FocusBackgroundColor", b, a);
             }
         }
-        get p6() {
-            return this.mb;
+        get p8() {
+            return this.md;
         }
-        set p6(a) {
-            let b = this.mb;
-            this.mb = a;
-            if (b != this.mb) {
+        set p8(a) {
+            let b = this.md;
+            this.md = a;
+            if (b != this.md) {
                 this.kd("FocusTextColor", b, a);
             }
         }
@@ -2014,26 +2044,16 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("BorderWidth", b, a);
             }
         }
-        get kt() {
-            return this.kl;
+        get ku() {
+            return this.km;
         }
-        set kt(a) {
-            let b = this.kl;
-            this.kl = a;
+        set ku(a) {
+            let b = this.km;
+            this.km = a;
             {
                 this.kd("CornerRadius", b, a);
             }
         }
-        get qk() {
-            return this.mq;
-        }
-        set qk(a) {
-            let b = this.mq;
-            this.mq = a;
-            if (b != this.mq) {
-                this.kd("OutlinedBackgroundColor", b, a);
-            }
-        }
         get qm() {
             return this.ms;
         }
@@ -2041,17 +2061,7 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.ms;
             this.ms = a;
             if (b != this.ms) {
-                this.kd("OutlinedDisabledBackgroundColor", b, a);
-            }
-        }
-        get qn() {
-            return this.mt;
-        }
-        set qn(a) {
-            let b = this.mt;
-            this.mt = a;
-            if (b != this.mt) {
-                this.kd("OutlinedDisabledBorderColor", b, a);
+                this.kd("OutlinedBackgroundColor", b, a);
             }
         }
         get qo() {
@@ -2061,6 +2071,26 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.mu;
             this.mu = a;
             if (b != this.mu) {
+                this.kd("OutlinedDisabledBackgroundColor", b, a);
+            }
+        }
+        get qp() {
+            return this.mv;
+        }
+        set qp(a) {
+            let b = this.mv;
+            this.mv = a;
+            if (b != this.mv) {
+                this.kd("OutlinedDisabledBorderColor", b, a);
+            }
+        }
+        get qq() {
+            return this.mw;
+        }
+        set qq(a) {
+            let b = this.mw;
+            this.mw = a;
+            if (b != this.mw) {
                 this.kd("OutlinedDisabledTextColor", b, a);
             }
         }
@@ -2074,23 +2104,23 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("OutlinedDisabledElevation", b, a);
             }
         }
-        get qr() {
-            return this.mx;
+        get qt() {
+            return this.mz;
         }
-        set qr(a) {
-            let b = this.mx;
-            this.mx = a;
-            if (b != this.mx) {
+        set qt(a) {
+            let b = this.mz;
+            this.mz = a;
+            if (b != this.mz) {
                 this.kd("OutlinedHoverBackgroundColor", b, a);
             }
         }
-        get ql() {
-            return this.mr;
+        get qn() {
+            return this.mt;
         }
-        set ql(a) {
-            let b = this.mr;
-            this.mr = a;
-            if (b != this.mr) {
+        set qn(a) {
+            let b = this.mt;
+            this.mt = a;
+            if (b != this.mt) {
                 this.kd("OutlinedBorderColor", b, a);
             }
         }
@@ -2134,26 +2164,36 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("OutlinedBorderWidth", b, a);
             }
         }
-        get k2() {
-            return this.kp;
+        get k4() {
+            return this.kq;
         }
-        set k2(a) {
-            let b = this.kp;
-            this.kp = a;
+        set k4(a) {
+            let b = this.kq;
+            this.kq = a;
             {
                 this.kd("OutlinedCornerRadius", b, a);
             }
         }
-        get qt() {
-            return this.mz;
+        get qv() {
+            return this.m1;
         }
-        set qt(a) {
-            let b = this.mz;
-            this.mz = a;
-            if (b != this.mz) {
+        set qv(a) {
+            let b = this.m1;
+            this.m1 = a;
+            if (b != this.m1) {
                 this.kd("OutlinedRippleColor", b, a);
             }
         }
+        get qw() {
+            return this.m2;
+        }
+        set qw(a) {
+            let b = this.m2;
+            this.m2 = a;
+            if (b != this.m2) {
+                this.kd("OutlinedTextColor", b, a);
+            }
+        }
         get qu() {
             return this.m0;
         }
@@ -2161,47 +2201,27 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.m0;
             this.m0 = a;
             if (b != this.m0) {
-                this.kd("OutlinedTextColor", b, a);
-            }
-        }
-        get qs() {
-            return this.my;
-        }
-        set qs(a) {
-            let b = this.my;
-            this.my = a;
-            if (b != this.my) {
                 this.kd("OutlinedHoverTextColor", b, a);
             }
         }
-        get qp() {
-            return this.mv;
+        get qr() {
+            return this.mx;
         }
-        set qp(a) {
-            let b = this.mv;
-            this.mv = a;
-            if (b != this.mv) {
+        set qr(a) {
+            let b = this.mx;
+            this.mx = a;
+            if (b != this.mx) {
                 this.kd("OutlinedFocusBackgroundColor", b, a);
             }
         }
-        get qq() {
-            return this.mw;
-        }
-        set qq(a) {
-            let b = this.mw;
-            this.mw = a;
-            if (b != this.mw) {
-                this.kd("OutlinedFocusTextColor", b, a);
-            }
-        }
-        get pj() {
-            return this.lp;
+        get qs() {
+            return this.my;
         }
-        set pj(a) {
-            let b = this.lp;
-            this.lp = a;
-            if (b != this.lp) {
-                this.kd("FabBackgroundColor", b, a);
+        set qs(a) {
+            let b = this.my;
+            this.my = a;
+            if (b != this.my) {
+                this.kd("OutlinedFocusTextColor", b, a);
             }
         }
         get pl() {
@@ -2211,17 +2231,7 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.lr;
             this.lr = a;
             if (b != this.lr) {
-                this.kd("FabDisabledBackgroundColor", b, a);
-            }
-        }
-        get pm() {
-            return this.ls;
-        }
-        set pm(a) {
-            let b = this.ls;
-            this.ls = a;
-            if (b != this.ls) {
-                this.kd("FabDisabledBorderColor", b, a);
+                this.kd("FabBackgroundColor", b, a);
             }
         }
         get pn() {
@@ -2231,6 +2241,26 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.lt;
             this.lt = a;
             if (b != this.lt) {
+                this.kd("FabDisabledBackgroundColor", b, a);
+            }
+        }
+        get po() {
+            return this.lu;
+        }
+        set po(a) {
+            let b = this.lu;
+            this.lu = a;
+            if (b != this.lu) {
+                this.kd("FabDisabledBorderColor", b, a);
+            }
+        }
+        get pp() {
+            return this.lv;
+        }
+        set pp(a) {
+            let b = this.lv;
+            this.lv = a;
+            if (b != this.lv) {
                 this.kd("FabDisabledTextColor", b, a);
             }
         }
@@ -2244,23 +2274,23 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("FabDisabledElevation", b, a);
             }
         }
-        get pq() {
-            return this.md;
+        get ps() {
+            return this.mf;
         }
-        set pq(a) {
-            let b = this.md;
-            this.md = a;
-            if (b != this.md) {
+        set ps(a) {
+            let b = this.mf;
+            this.mf = a;
+            if (b != this.mf) {
                 this.kd("FabHoverBackgroundColor", b, a);
             }
         }
-        get pk() {
-            return this.lq;
+        get pm() {
+            return this.ls;
         }
-        set pk(a) {
-            let b = this.lq;
-            this.lq = a;
-            if (b != this.lq) {
+        set pm(a) {
+            let b = this.ls;
+            this.ls = a;
+            if (b != this.ls) {
                 this.kd("FabBorderColor", b, a);
             }
         }
@@ -2304,26 +2334,36 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("FabBorderWidth", b, a);
             }
         }
-        get kz() {
-            return this.km;
+        get k0() {
+            return this.kn;
         }
-        set kz(a) {
-            let b = this.km;
-            this.km = a;
+        set k0(a) {
+            let b = this.kn;
+            this.kn = a;
             {
                 this.kd("FabCornerRadius", b, a);
             }
         }
-        get ps() {
-            return this.lx;
+        get pu() {
+            return this.lz;
         }
-        set ps(a) {
-            let b = this.lx;
-            this.lx = a;
-            if (b != this.lx) {
+        set pu(a) {
+            let b = this.lz;
+            this.lz = a;
+            if (b != this.lz) {
                 this.kd("FabRippleColor", b, a);
             }
         }
+        get pv() {
+            return this.l0;
+        }
+        set pv(a) {
+            let b = this.l0;
+            this.l0 = a;
+            if (b != this.l0) {
+                this.kd("FabTextColor", b, a);
+            }
+        }
         get pt() {
             return this.ly;
         }
@@ -2331,49 +2371,29 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.ly;
             this.ly = a;
             if (b != this.ly) {
-                this.kd("FabTextColor", b, a);
+                this.kd("FabHoverTextColor", b, a);
             }
         }
-        get pr() {
+        get pq() {
             return this.lw;
         }
-        set pr(a) {
+        set pq(a) {
             let b = this.lw;
             this.lw = a;
             if (b != this.lw) {
-                this.kd("FabHoverTextColor", b, a);
-            }
-        }
-        get po() {
-            return this.lu;
-        }
-        set po(a) {
-            let b = this.lu;
-            this.lu = a;
-            if (b != this.lu) {
                 this.kd("FabFocusBackgroundColor", b, a);
             }
         }
-        get pp() {
-            return this.lv;
+        get pr() {
+            return this.lx;
         }
-        set pp(a) {
-            let b = this.lv;
-            this.lv = a;
-            if (b != this.lv) {
+        set pr(a) {
+            let b = this.lx;
+            this.lx = a;
+            if (b != this.lx) {
                 this.kd("FabFocusTextColor", b, a);
             }
         }
-        get p9() {
-            return this.mf;
-        }
-        set p9(a) {
-            let b = this.mf;
-            this.mf = a;
-            if (b != this.mf) {
-                this.kd("IconBackgroundColor", b, a);
-            }
-        }
         get qb() {
             return this.mh;
         }
@@ -2381,17 +2401,7 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.mh;
             this.mh = a;
             if (b != this.mh) {
-                this.kd("IconDisabledBackgroundColor", b, a);
-            }
-        }
-        get qc() {
-            return this.mi;
-        }
-        set qc(a) {
-            let b = this.mi;
-            this.mi = a;
-            if (b != this.mi) {
-                this.kd("IconDisabledBorderColor", b, a);
+                this.kd("IconBackgroundColor", b, a);
             }
         }
         get qd() {
@@ -2401,6 +2411,26 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.mj;
             this.mj = a;
             if (b != this.mj) {
+                this.kd("IconDisabledBackgroundColor", b, a);
+            }
+        }
+        get qe() {
+            return this.mk;
+        }
+        set qe(a) {
+            let b = this.mk;
+            this.mk = a;
+            if (b != this.mk) {
+                this.kd("IconDisabledBorderColor", b, a);
+            }
+        }
+        get qf() {
+            return this.ml;
+        }
+        set qf(a) {
+            let b = this.ml;
+            this.ml = a;
+            if (b != this.ml) {
                 this.kd("IconDisabledTextColor", b, a);
             }
         }
@@ -2414,23 +2444,23 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("IconDisabledElevation", b, a);
             }
         }
-        get qg() {
-            return this.mm;
+        get qi() {
+            return this.mo;
         }
-        set qg(a) {
-            let b = this.mm;
-            this.mm = a;
-            if (b != this.mm) {
+        set qi(a) {
+            let b = this.mo;
+            this.mo = a;
+            if (b != this.mo) {
                 this.kd("IconHoverBackgroundColor", b, a);
             }
         }
-        get qa() {
-            return this.mg;
+        get qc() {
+            return this.mi;
         }
-        set qa(a) {
-            let b = this.mg;
-            this.mg = a;
-            if (b != this.mg) {
+        set qc(a) {
+            let b = this.mi;
+            this.mi = a;
+            if (b != this.mi) {
                 this.kd("IconBorderColor", b, a);
             }
         }
@@ -2474,26 +2504,36 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("IconBorderWidth", b, a);
             }
         }
-        get k1() {
-            return this.ko;
+        get k3() {
+            return this.kp;
         }
-        set k1(a) {
-            let b = this.ko;
-            this.ko = a;
+        set k3(a) {
+            let b = this.kp;
+            this.kp = a;
             {
                 this.kd("IconCornerRadius", b, a);
             }
         }
-        get qi() {
-            return this.mo;
+        get qk() {
+            return this.mq;
         }
-        set qi(a) {
-            let b = this.mo;
-            this.mo = a;
-            if (b != this.mo) {
+        set qk(a) {
+            let b = this.mq;
+            this.mq = a;
+            if (b != this.mq) {
                 this.kd("IconRippleColor", b, a);
             }
         }
+        get ql() {
+            return this.mr;
+        }
+        set ql(a) {
+            let b = this.mr;
+            this.mr = a;
+            if (b != this.mr) {
+                this.kd("IconTextColor", b, a);
+            }
+        }
         get qj() {
             return this.mp;
         }
@@ -2501,7 +2541,17 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.mp;
             this.mp = a;
             if (b != this.mp) {
-                this.kd("IconTextColor", b, a);
+                this.kd("IconHoverTextColor", b, a);
+            }
+        }
+        get qg() {
+            return this.mm;
+        }
+        set qg(a) {
+            let b = this.mm;
+            this.mm = a;
+            if (b != this.mm) {
+                this.kd("IconFocusBackgroundColor", b, a);
             }
         }
         get qh() {
@@ -2511,26 +2561,6 @@ export let XButton = /*@__PURE__*/ (() => {
             let b = this.mn;
             this.mn = a;
             if (b != this.mn) {
-                this.kd("IconHoverTextColor", b, a);
-            }
-        }
-        get qe() {
-            return this.mk;
-        }
-        set qe(a) {
-            let b = this.mk;
-            this.mk = a;
-            if (b != this.mk) {
-                this.kd("IconFocusBackgroundColor", b, a);
-            }
-        }
-        get qf() {
-            return this.ml;
-        }
-        set qf(a) {
-            let b = this.ml;
-            this.ml = a;
-            if (b != this.ml) {
                 this.kd("IconFocusTextColor", b, a);
             }
         }
@@ -2788,24 +2818,24 @@ export let XButton = /*@__PURE__*/ (() => {
                 this.kd("ContentPaddingBottom", b, this.a4);
             }
         }
-        get k5() {
-            return this.k4;
+        get k7() {
+            return this.k6;
         }
-        set k5(a) {
-            let b = this.k4;
-            this.k4 = a;
-            if (b != this.k4) {
-                this.kd("HorizontalContentAlignment", enumGetBox(HorizontalAlignment_$type, b), enumGetBox(HorizontalAlignment_$type, this.k4));
+        set k7(a) {
+            let b = this.k6;
+            this.k6 = a;
+            if (b != this.k6) {
+                this.kd("HorizontalContentAlignment", enumGetBox(HorizontalAlignment_$type, b), enumGetBox(HorizontalAlignment_$type, this.k6));
             }
         }
-        get q9() {
-            return this.q8;
+        get rb() {
+            return this.ra;
         }
-        set q9(a) {
-            let b = this.q8;
-            this.q8 = a;
-            if (b != this.q8) {
-                this.kd("VerticalContentAlignment", enumGetBox(VerticalAlignment_$type, b), enumGetBox(VerticalAlignment_$type, this.q8));
+        set rb(a) {
+            let b = this.ra;
+            this.ra = a;
+            if (b != this.ra) {
+                this.kd("VerticalContentAlignment", enumGetBox(VerticalAlignment_$type, b), enumGetBox(VerticalAlignment_$type, this.ra));
             }
         }
         get aq() {
@@ -2820,8 +2850,8 @@ export let XButton = /*@__PURE__*/ (() => {
         }
         ke() {
             this.j3();
-            this.view.aw(this.np, BrushUtil.h(0, 0, 0, 0));
-            this.kh();
+            this.view.aw(this.nr, BrushUtil.h(0, 0, 0, 0));
+            this.ki();
         }
         get a() {
             let a = new AnimationKeyFrameEffectTiming();
@@ -2869,12 +2899,12 @@ export let XButton = /*@__PURE__*/ (() => {
             c.h = this.n;
             c.i = this.q;
             c.c = AppearanceHelper.a(NativeUI.ak(a));
-            c.g = AppearanceHelper.a(this.nr);
-            c.d = AppearanceHelper.a(this.no);
-            c.a = AppearanceHelper.a(this.ne);
+            c.g = AppearanceHelper.a(this.nt);
+            c.d = AppearanceHelper.a(this.nq);
+            c.a = AppearanceHelper.a(this.ng);
             c.u = this.ct;
-            c.e = AppearanceHelper.a(this.np);
-            c.ag = this.kr;
+            c.e = AppearanceHelper.a(this.nr);
+            c.ag = this.ks;
             c.b = AppearanceHelper.a(NativeUI.aj(a));
             c.j = this.u;
             c.f = AppearanceHelper.a(NativeUI.al(b));