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

package/esm5/lib/ButtonView_combined.js

@@ -118,8 +118,8 @@ var ButtonView = /** @class */ /*@__PURE__*/ (function (_super) {
         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)));
@@ -208,6 +208,19 @@ var ButtonView = /** @class */ /*@__PURE__*/ (function (_super) {
                 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";
@@ -253,7 +266,7 @@ var ButtonView = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     ButtonView.prototype.as = function () {
-        switch (this.b.k5) {
+        switch (this.b.k7) {
             case 1:
                 this.n.setStyleProperty("justify-content", "center");
                 this.o.setStyleProperty("flex-grow", "unset");
@@ -397,7 +410,7 @@ var ButtonView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.b.j9();
     };
     ButtonView.prototype.ab = function (a) {
-        this.b.ka(a.originalEvent.relatedTarget);
+        this.b.ka(a.originalEvent.relatedTarget, a.originalEvent.target);
     };
     ButtonView.prototype.f = function () {
         return false;
@@ -457,7 +470,7 @@ var ButtonView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.c.aw = b;
     };
     ButtonView.prototype.ax = function (a, b) {
-        var c = ElevationHelper.e(a, this.b.nr, this.b.no, this.b.ne, b);
+        var c = ElevationHelper.e(a, this.b.nt, this.b.nq, this.b.ng, b);
         this.n.setStyleProperty("box-shadow", c);
     };
     ButtonView.prototype.az = function (a) {
@@ -496,226 +509,226 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         var _this = _super.call(this) || this;
         _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";
@@ -742,8 +755,8 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         _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;
@@ -881,24 +894,25 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
             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();
@@ -913,7 +927,7 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
             case "ActualFocusTextColor":
             case "ActualHoverTextColor":
             case "ActualElevationMode":
-                this.kh();
+                this.ki();
                 break;
             case "Density":
                 this.q = this.r == 0 ? 1 : this.r;
@@ -921,13 +935,16 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
             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":
@@ -972,112 +989,124 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
                 break;
         }
     };
-    XButton.prototype.ks = function (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);
+    XButton.prototype.kt = function (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);
     };
-    XButton.prototype.ki = function () {
+    XButton.prototype.kj = function () {
         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;
         }
     };
+    XButton.prototype.kh = function () {
+        this.ks = this.kt(this.ku, this.kt(this.k3, this.k2(this.kx)));
+    };
+    XButton.prototype.k2 = function (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;
+    };
     XButton.prototype.j6 = function () {
         if (this.disabled) {
             return;
@@ -1088,22 +1117,22 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     XButton.prototype.j5 = function () {
         this.focused = false;
-        this.kh();
+        this.ki();
     };
     XButton.prototype.j8 = function () {
         this.focused = true;
-        this.kh();
+        this.ki();
     };
     XButton.prototype.kc = function () {
         this.a0 = false;
-        this.kh();
+        this.ki();
         if (this.mouseLeave != null) {
             this.mouseLeave(this, new MouseEventArgs());
         }
     };
     XButton.prototype.kb = function () {
         this.a0 = true;
-        this.kh();
+        this.ki();
         if (this.mouseEnter != null) {
             this.mouseEnter(this, new MouseEventArgs());
         }
@@ -1113,22 +1142,23 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
             this.gotFocus(this, new FocusEventArgs());
         }
     };
-    XButton.prototype.ka = function (a) {
+    XButton.prototype.ka = function (a, b) {
         if (this.lostFocus != null) {
             this.lostFocus(this, ((function () {
                 var $ret = new FocusEventArgs();
-                $ret.a = a;
+                $ret.b = a;
+                $ret.a = b;
                 return $ret;
             })()));
         }
     };
-    XButton.prototype.kh = function () {
+    XButton.prototype.ki = function () {
         var 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));
         }
@@ -1147,132 +1177,132 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         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);
             }
         }
     };
-    XButton.prototype.kj = function (a) {
-        this.pf = XButton.k.ae(a, "UmbraShadowColor");
-        this.o3 = XButton.k.ae(a, "PenumbraShadowColor");
-        this.nu = XButton.k.ae(a, "AmbientShadowColor");
+    XButton.prototype.kk = function (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");
     };
     Object.defineProperty(XButton.prototype, "bu", {
         get: function () {
@@ -1358,56 +1388,56 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "ng", {
+    Object.defineProperty(XButton.prototype, "ni", {
         get: function () {
-            return this.k8;
+            return this.la;
         },
         set: function (a) {
-            var b = this.k8;
-            this.k8 = a;
-            if (b != this.k8) {
+            var b = this.la;
+            this.la = a;
+            if (b != this.la) {
                 this.kd("ActualBorderColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "nr", {
+    Object.defineProperty(XButton.prototype, "nt", {
         get: function () {
-            return this.lj;
+            return this.ll;
         },
         set: function (a) {
-            var b = this.lj;
-            this.lj = a;
-            if (b != this.lj) {
+            var b = this.ll;
+            this.ll = a;
+            if (b != this.ll) {
                 this.kd("ActualUmbraShadowColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "no", {
+    Object.defineProperty(XButton.prototype, "nq", {
         get: function () {
-            return this.lg;
+            return this.li;
         },
         set: function (a) {
-            var b = this.lg;
-            this.lg = a;
-            if (b != this.lg) {
+            var b = this.li;
+            this.li = a;
+            if (b != this.li) {
                 this.kd("ActualPenumbraShadowColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "ne", {
+    Object.defineProperty(XButton.prototype, "ng", {
         get: function () {
-            return this.k6;
+            return this.k8;
         },
         set: function (a) {
-            var b = this.k6;
-            this.k6 = a;
-            if (b != this.k6) {
+            var b = this.k8;
+            this.k8 = a;
+            if (b != this.k8) {
                 this.kd("ActualAmbientShadowColor", b, a);
             }
         },
@@ -1456,84 +1486,84 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "np", {
+    Object.defineProperty(XButton.prototype, "nr", {
         get: function () {
-            return this.lh;
+            return this.lj;
         },
         set: function (a) {
-            var b = this.lh;
-            this.lh = a;
-            if (b != this.lh) {
+            var b = this.lj;
+            this.lj = a;
+            if (b != this.lj) {
                 this.kd("ActualRippleColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "kr", {
+    Object.defineProperty(XButton.prototype, "ks", {
         get: function () {
-            return this.kk;
+            return this.kl;
         },
         set: function (a) {
-            var b = this.kk;
-            this.kk = a;
-            if (b != this.kk) {
+            var b = this.kl;
+            this.kl = a;
+            if (!b.equals(this.kl)) {
                 this.kd("ActualCornerRadius", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "nf", {
+    Object.defineProperty(XButton.prototype, "nh", {
         get: function () {
-            return this.k7;
+            return this.k9;
         },
         set: function (a) {
-            var b = this.k7;
-            this.k7 = a;
-            if (b != this.k7) {
+            var b = this.k9;
+            this.k9 = a;
+            if (b != this.k9) {
                 this.kd("ActualBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "nh", {
+    Object.defineProperty(XButton.prototype, "nj", {
         get: function () {
-            return this.k9;
+            return this.lb;
         },
         set: function (a) {
-            var b = this.k9;
-            this.k9 = a;
-            if (b != this.k9) {
+            var b = this.lb;
+            this.lb = a;
+            if (b != this.lb) {
                 this.kd("ActualDisabledBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "ni", {
+    Object.defineProperty(XButton.prototype, "nk", {
         get: function () {
-            return this.la;
+            return this.lc;
         },
         set: function (a) {
-            var b = this.la;
-            this.la = a;
-            if (b != this.la) {
+            var b = this.lc;
+            this.lc = a;
+            if (b != this.lc) {
                 this.kd("ActualDisabledBorderColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "nj", {
+    Object.defineProperty(XButton.prototype, "nl", {
         get: function () {
-            return this.lb;
+            return this.ld;
         },
         set: function (a) {
-            var b = this.lb;
-            this.lb = a;
-            if (b != this.lb) {
+            var b = this.ld;
+            this.ld = a;
+            if (b != this.ld) {
                 this.kd("ActualDisabledTextColor", b, a);
             }
         },
@@ -1568,70 +1598,70 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "nq", {
+    Object.defineProperty(XButton.prototype, "ns", {
         get: function () {
-            return this.li;
+            return this.lk;
         },
         set: function (a) {
-            var b = this.li;
-            this.li = a;
-            if (b != this.li) {
+            var b = this.lk;
+            this.lk = a;
+            if (b != this.lk) {
                 this.kd("ActualTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "nn", {
+    Object.defineProperty(XButton.prototype, "np", {
         get: function () {
-            return this.lf;
+            return this.lh;
         },
         set: function (a) {
-            var b = this.lf;
-            this.lf = a;
-            if (b != this.lf) {
+            var b = this.lh;
+            this.lh = a;
+            if (b != this.lh) {
                 this.kd("ActualHoverTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "nk", {
+    Object.defineProperty(XButton.prototype, "nm", {
         get: function () {
-            return this.lc;
+            return this.le;
         },
         set: function (a) {
-            var b = this.lc;
-            this.lc = a;
-            if (b != this.lc) {
+            var b = this.le;
+            this.le = a;
+            if (b != this.le) {
                 this.kd("ActualFocusBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "nl", {
+    Object.defineProperty(XButton.prototype, "nn", {
         get: function () {
-            return this.ld;
+            return this.lf;
         },
         set: function (a) {
-            var b = this.ld;
-            this.ld = a;
-            if (b != this.ld) {
+            var b = this.lf;
+            this.lf = a;
+            if (b != this.lf) {
                 this.kd("ActualFocusTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "nm", {
+    Object.defineProperty(XButton.prototype, "no", {
         get: function () {
-            return this.le;
+            return this.lg;
         },
         set: function (a) {
-            var b = this.le;
-            this.le = a;
-            if (b != this.le) {
+            var b = this.lg;
+            this.lg = a;
+            if (b != this.lg) {
                 this.kd("ActualHoverBackgroundColor", b, a);
             }
         },
@@ -1652,56 +1682,56 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qv", {
+    Object.defineProperty(XButton.prototype, "qx", {
         get: function () {
-            return this.m1;
+            return this.m3;
         },
         set: function (a) {
-            var b = this.m1;
-            this.m1 = a;
-            if (b != this.m1) {
+            var b = this.m3;
+            this.m3 = a;
+            if (b != this.m3) {
                 this.kd("RaisedBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qx", {
+    Object.defineProperty(XButton.prototype, "qz", {
         get: function () {
-            return this.m3;
+            return this.m5;
         },
         set: function (a) {
-            var b = this.m3;
-            this.m3 = a;
-            if (b != this.m3) {
+            var b = this.m5;
+            this.m5 = a;
+            if (b != this.m5) {
                 this.kd("RaisedDisabledBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qy", {
+    Object.defineProperty(XButton.prototype, "q0", {
         get: function () {
-            return this.m4;
+            return this.m6;
         },
         set: function (a) {
-            var b = this.m4;
-            this.m4 = a;
-            if (b != this.m4) {
+            var b = this.m6;
+            this.m6 = a;
+            if (b != this.m6) {
                 this.kd("RaisedDisabledBorderColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qz", {
+    Object.defineProperty(XButton.prototype, "q1", {
         get: function () {
-            return this.m5;
+            return this.m7;
         },
         set: function (a) {
-            var b = this.m5;
-            this.m5 = a;
-            if (b != this.m5) {
+            var b = this.m7;
+            this.m7 = a;
+            if (b != this.m7) {
                 this.kd("RaisedDisabledTextColor", b, a);
             }
         },
@@ -1722,28 +1752,28 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "q2", {
+    Object.defineProperty(XButton.prototype, "q4", {
         get: function () {
-            return this.m8;
+            return this.na;
         },
         set: function (a) {
-            var b = this.m8;
-            this.m8 = a;
-            if (b != this.m8) {
+            var b = this.na;
+            this.na = a;
+            if (b != this.na) {
                 this.kd("RaisedHoverBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qw", {
+    Object.defineProperty(XButton.prototype, "qy", {
         get: function () {
-            return this.m2;
+            return this.m4;
         },
         set: function (a) {
-            var b = this.m2;
-            this.m2 = a;
-            if (b != this.m2) {
+            var b = this.m4;
+            this.m4 = a;
+            if (b != this.m4) {
                 this.kd("RaisedBorderColor", b, a);
             }
         },
@@ -1806,13 +1836,13 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "k3", {
+    Object.defineProperty(XButton.prototype, "k5", {
         get: function () {
-            return this.kq;
+            return this.kr;
         },
         set: function (a) {
-            var b = this.kq;
-            this.kq = a;
+            var b = this.kr;
+            this.kr = a;
             {
                 this.kd("RaisedCornerRadius", b, a);
             }
@@ -1820,70 +1850,70 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "q4", {
+    Object.defineProperty(XButton.prototype, "q6", {
         get: function () {
-            return this.na;
+            return this.nc;
         },
         set: function (a) {
-            var b = this.na;
-            this.na = a;
-            if (b != this.na) {
+            var b = this.nc;
+            this.nc = a;
+            if (b != this.nc) {
                 this.kd("RaisedRippleColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pu", {
+    Object.defineProperty(XButton.prototype, "pw", {
         get: function () {
-            return this.lz;
+            return this.l1;
         },
         set: function (a) {
-            var b = this.lz;
-            this.lz = a;
-            if (b != this.lz) {
+            var b = this.l1;
+            this.l1 = a;
+            if (b != this.l1) {
                 this.kd("FlatBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pw", {
+    Object.defineProperty(XButton.prototype, "py", {
         get: function () {
-            return this.l1;
+            return this.l3;
         },
         set: function (a) {
-            var b = this.l1;
-            this.l1 = a;
-            if (b != this.l1) {
+            var b = this.l3;
+            this.l3 = a;
+            if (b != this.l3) {
                 this.kd("FlatDisabledBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "px", {
+    Object.defineProperty(XButton.prototype, "pz", {
         get: function () {
-            return this.l2;
+            return this.l4;
         },
         set: function (a) {
-            var b = this.l2;
-            this.l2 = a;
-            if (b != this.l2) {
+            var b = this.l4;
+            this.l4 = a;
+            if (b != this.l4) {
                 this.kd("FlatDisabledBorderColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "py", {
+    Object.defineProperty(XButton.prototype, "p0", {
         get: function () {
-            return this.l3;
+            return this.l5;
         },
         set: function (a) {
-            var b = this.l3;
-            this.l3 = a;
-            if (b != this.l3) {
+            var b = this.l5;
+            this.l5 = a;
+            if (b != this.l5) {
                 this.kd("FlatDisabledTextColor", b, a);
             }
         },
@@ -1904,28 +1934,28 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "p1", {
+    Object.defineProperty(XButton.prototype, "p3", {
         get: function () {
-            return this.l6;
+            return this.l8;
         },
         set: function (a) {
-            var b = this.l6;
-            this.l6 = a;
-            if (b != this.l6) {
+            var b = this.l8;
+            this.l8 = a;
+            if (b != this.l8) {
                 this.kd("FlatHoverBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pv", {
+    Object.defineProperty(XButton.prototype, "px", {
         get: function () {
-            return this.l0;
+            return this.l2;
         },
         set: function (a) {
-            var b = this.l0;
-            this.l0 = a;
-            if (b != this.l0) {
+            var b = this.l2;
+            this.l2 = a;
+            if (b != this.l2) {
                 this.kd("FlatBorderColor", b, a);
             }
         },
@@ -1974,70 +2004,70 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "p3", {
+    Object.defineProperty(XButton.prototype, "p5", {
         get: function () {
-            return this.l8;
+            return this.ma;
         },
         set: function (a) {
-            var b = this.l8;
-            this.l8 = a;
-            if (b != this.l8) {
+            var b = this.ma;
+            this.ma = a;
+            if (b != this.ma) {
                 this.kd("FlatRippleColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "p4", {
+    Object.defineProperty(XButton.prototype, "p6", {
         get: function () {
-            return this.l9;
+            return this.mb;
         },
         set: function (a) {
-            var b = this.l9;
-            this.l9 = a;
-            if (b != this.l9) {
+            var b = this.mb;
+            this.mb = a;
+            if (b != this.mb) {
                 this.kd("FlatTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "p2", {
+    Object.defineProperty(XButton.prototype, "p4", {
         get: function () {
-            return this.l7;
+            return this.l9;
         },
         set: function (a) {
-            var b = this.l7;
-            this.l7 = a;
-            if (b != this.l7) {
+            var b = this.l9;
+            this.l9 = a;
+            if (b != this.l9) {
                 this.kd("FlatHoverTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pz", {
+    Object.defineProperty(XButton.prototype, "p1", {
         get: function () {
-            return this.l4;
+            return this.l6;
         },
         set: function (a) {
-            var b = this.l4;
-            this.l4 = a;
-            if (b != this.l4) {
+            var b = this.l6;
+            this.l6 = a;
+            if (b != this.l6) {
                 this.kd("FlatFocusBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "p0", {
+    Object.defineProperty(XButton.prototype, "p2", {
         get: function () {
-            return this.l5;
+            return this.l7;
         },
         set: function (a) {
-            var b = this.l5;
-            this.l5 = a;
-            if (b != this.l5) {
+            var b = this.l7;
+            this.l7 = a;
+            if (b != this.l7) {
                 this.kd("FlatFocusTextColor", b, a);
             }
         },
@@ -2058,13 +2088,13 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "k0", {
+    Object.defineProperty(XButton.prototype, "k1", {
         get: function () {
-            return this.kn;
+            return this.ko;
         },
         set: function (a) {
-            var b = this.kn;
-            this.kn = a;
+            var b = this.ko;
+            this.ko = a;
             {
                 this.kd("FlatCornerRadius", b, a);
             }
@@ -2072,56 +2102,56 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "ns", {
+    Object.defineProperty(XButton.prototype, "nu", {
         get: function () {
-            return this.lk;
+            return this.lm;
         },
         set: function (a) {
-            var b = this.lk;
-            this.lk = a;
-            if (b != this.lk) {
+            var b = this.lm;
+            this.lm = a;
+            if (b != this.lm) {
                 this.kd("BackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pg", {
+    Object.defineProperty(XButton.prototype, "pi", {
         get: function () {
-            return this.lm;
+            return this.lo;
         },
         set: function (a) {
-            var b = this.lm;
-            this.lm = a;
-            if (b != this.lm) {
+            var b = this.lo;
+            this.lo = a;
+            if (b != this.lo) {
                 this.kd("DisabledBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "ph", {
+    Object.defineProperty(XButton.prototype, "pj", {
         get: function () {
-            return this.ln;
+            return this.lp;
         },
         set: function (a) {
-            var b = this.ln;
-            this.ln = a;
-            if (b != this.ln) {
+            var b = this.lp;
+            this.lp = a;
+            if (b != this.lp) {
                 this.kd("DisabledBorderColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pi", {
+    Object.defineProperty(XButton.prototype, "pk", {
         get: function () {
-            return this.lo;
+            return this.lq;
         },
         set: function (a) {
-            var b = this.lo;
-            this.lo = a;
-            if (b != this.lo) {
+            var b = this.lq;
+            this.lq = a;
+            if (b != this.lq) {
                 this.kd("DisabledTextColor", b, a);
             }
         },
@@ -2156,28 +2186,28 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "p7", {
+    Object.defineProperty(XButton.prototype, "p9", {
         get: function () {
-            return this.mc;
+            return this.me;
         },
         set: function (a) {
-            var b = this.mc;
-            this.mc = a;
-            if (b != this.mc) {
+            var b = this.me;
+            this.me = a;
+            if (b != this.me) {
                 this.kd("HoverBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "nt", {
+    Object.defineProperty(XButton.prototype, "nv", {
         get: function () {
-            return this.ll;
+            return this.ln;
         },
         set: function (a) {
-            var b = this.ll;
-            this.ll = a;
-            if (b != this.ll) {
+            var b = this.ln;
+            this.ln = a;
+            if (b != this.ln) {
                 this.kd("BorderColor", b, a);
             }
         },
@@ -2240,126 +2270,126 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "q7", {
+    Object.defineProperty(XButton.prototype, "q9", {
         get: function () {
-            return this.nd;
+            return this.nf;
         },
         set: function (a) {
-            var b = this.nd;
-            this.nd = a;
-            if (b != this.nd) {
+            var b = this.nf;
+            this.nf = a;
+            if (b != this.nf) {
                 this.kd("TextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "p8", {
+    Object.defineProperty(XButton.prototype, "qa", {
         get: function () {
-            return this.me;
+            return this.mg;
         },
         set: function (a) {
-            var b = this.me;
-            this.me = a;
-            if (b != this.me) {
+            var b = this.mg;
+            this.mg = a;
+            if (b != this.mg) {
                 this.kd("HoverTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "q6", {
+    Object.defineProperty(XButton.prototype, "q8", {
         get: function () {
-            return this.nc;
+            return this.ne;
         },
         set: function (a) {
-            var b = this.nc;
-            this.nc = a;
-            if (b != this.nc) {
+            var b = this.ne;
+            this.ne = a;
+            if (b != this.ne) {
                 this.kd("RippleColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "q5", {
+    Object.defineProperty(XButton.prototype, "q7", {
         get: function () {
-            return this.nb;
+            return this.nd;
         },
         set: function (a) {
-            var b = this.nb;
-            this.nb = a;
-            if (b != this.nb) {
+            var b = this.nd;
+            this.nd = a;
+            if (b != this.nd) {
                 this.kd("RaisedTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "q3", {
+    Object.defineProperty(XButton.prototype, "q5", {
         get: function () {
-            return this.m9;
+            return this.nb;
         },
         set: function (a) {
-            var b = this.m9;
-            this.m9 = a;
-            if (b != this.m9) {
+            var b = this.nb;
+            this.nb = a;
+            if (b != this.nb) {
                 this.kd("RaisedHoverTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "q0", {
+    Object.defineProperty(XButton.prototype, "q2", {
         get: function () {
-            return this.m6;
+            return this.m8;
         },
         set: function (a) {
-            var b = this.m6;
-            this.m6 = a;
-            if (b != this.m6) {
+            var b = this.m8;
+            this.m8 = a;
+            if (b != this.m8) {
                 this.kd("RaisedFocusBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "q1", {
+    Object.defineProperty(XButton.prototype, "q3", {
         get: function () {
-            return this.m7;
+            return this.m9;
         },
         set: function (a) {
-            var b = this.m7;
-            this.m7 = a;
-            if (b != this.m7) {
+            var b = this.m9;
+            this.m9 = a;
+            if (b != this.m9) {
                 this.kd("RaisedFocusTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "p5", {
+    Object.defineProperty(XButton.prototype, "p7", {
         get: function () {
-            return this.ma;
+            return this.mc;
         },
         set: function (a) {
-            var b = this.ma;
-            this.ma = a;
-            if (b != this.ma) {
+            var b = this.mc;
+            this.mc = a;
+            if (b != this.mc) {
                 this.kd("FocusBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "p6", {
+    Object.defineProperty(XButton.prototype, "p8", {
         get: function () {
-            return this.mb;
+            return this.md;
         },
         set: function (a) {
-            var b = this.mb;
-            this.mb = a;
-            if (b != this.mb) {
+            var b = this.md;
+            this.md = a;
+            if (b != this.md) {
                 this.kd("FocusTextColor", b, a);
             }
         },
@@ -2380,13 +2410,13 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "kt", {
+    Object.defineProperty(XButton.prototype, "ku", {
         get: function () {
-            return this.kl;
+            return this.km;
         },
         set: function (a) {
-            var b = this.kl;
-            this.kl = a;
+            var b = this.km;
+            this.km = a;
             {
                 this.kd("CornerRadius", b, a);
             }
@@ -2394,56 +2424,56 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qk", {
+    Object.defineProperty(XButton.prototype, "qm", {
         get: function () {
-            return this.mq;
+            return this.ms;
         },
         set: function (a) {
-            var b = this.mq;
-            this.mq = a;
-            if (b != this.mq) {
+            var b = this.ms;
+            this.ms = a;
+            if (b != this.ms) {
                 this.kd("OutlinedBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qm", {
+    Object.defineProperty(XButton.prototype, "qo", {
         get: function () {
-            return this.ms;
+            return this.mu;
         },
         set: function (a) {
-            var b = this.ms;
-            this.ms = a;
-            if (b != this.ms) {
+            var b = this.mu;
+            this.mu = a;
+            if (b != this.mu) {
                 this.kd("OutlinedDisabledBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qn", {
+    Object.defineProperty(XButton.prototype, "qp", {
         get: function () {
-            return this.mt;
+            return this.mv;
         },
         set: function (a) {
-            var b = this.mt;
-            this.mt = a;
-            if (b != this.mt) {
+            var b = this.mv;
+            this.mv = a;
+            if (b != this.mv) {
                 this.kd("OutlinedDisabledBorderColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qo", {
+    Object.defineProperty(XButton.prototype, "qq", {
         get: function () {
-            return this.mu;
+            return this.mw;
         },
         set: function (a) {
-            var b = this.mu;
-            this.mu = a;
-            if (b != this.mu) {
+            var b = this.mw;
+            this.mw = a;
+            if (b != this.mw) {
                 this.kd("OutlinedDisabledTextColor", b, a);
             }
         },
@@ -2464,28 +2494,28 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qr", {
+    Object.defineProperty(XButton.prototype, "qt", {
         get: function () {
-            return this.mx;
+            return this.mz;
         },
         set: function (a) {
-            var b = this.mx;
-            this.mx = a;
-            if (b != this.mx) {
+            var b = this.mz;
+            this.mz = a;
+            if (b != this.mz) {
                 this.kd("OutlinedHoverBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "ql", {
+    Object.defineProperty(XButton.prototype, "qn", {
         get: function () {
-            return this.mr;
+            return this.mt;
         },
         set: function (a) {
-            var b = this.mr;
-            this.mr = a;
-            if (b != this.mr) {
+            var b = this.mt;
+            this.mt = a;
+            if (b != this.mt) {
                 this.kd("OutlinedBorderColor", b, a);
             }
         },
@@ -2548,13 +2578,13 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "k2", {
+    Object.defineProperty(XButton.prototype, "k4", {
         get: function () {
-            return this.kp;
+            return this.kq;
         },
         set: function (a) {
-            var b = this.kp;
-            this.kp = a;
+            var b = this.kq;
+            this.kq = a;
             {
                 this.kd("OutlinedCornerRadius", b, a);
             }
@@ -2562,126 +2592,126 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qt", {
+    Object.defineProperty(XButton.prototype, "qv", {
         get: function () {
-            return this.mz;
+            return this.m1;
         },
         set: function (a) {
-            var b = this.mz;
-            this.mz = a;
-            if (b != this.mz) {
+            var b = this.m1;
+            this.m1 = a;
+            if (b != this.m1) {
                 this.kd("OutlinedRippleColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qu", {
+    Object.defineProperty(XButton.prototype, "qw", {
         get: function () {
-            return this.m0;
+            return this.m2;
         },
         set: function (a) {
-            var b = this.m0;
-            this.m0 = a;
-            if (b != this.m0) {
+            var b = this.m2;
+            this.m2 = a;
+            if (b != this.m2) {
                 this.kd("OutlinedTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qs", {
+    Object.defineProperty(XButton.prototype, "qu", {
         get: function () {
-            return this.my;
+            return this.m0;
         },
         set: function (a) {
-            var b = this.my;
-            this.my = a;
-            if (b != this.my) {
+            var b = this.m0;
+            this.m0 = a;
+            if (b != this.m0) {
                 this.kd("OutlinedHoverTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qp", {
+    Object.defineProperty(XButton.prototype, "qr", {
         get: function () {
-            return this.mv;
-        },
-        set: function (a) {
-            var b = this.mv;
-            this.mv = a;
-            if (b != this.mv) {
+            return this.mx;
+        },
+        set: function (a) {
+            var b = this.mx;
+            this.mx = a;
+            if (b != this.mx) {
                 this.kd("OutlinedFocusBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qq", {
+    Object.defineProperty(XButton.prototype, "qs", {
         get: function () {
-            return this.mw;
+            return this.my;
         },
         set: function (a) {
-            var b = this.mw;
-            this.mw = a;
-            if (b != this.mw) {
+            var b = this.my;
+            this.my = a;
+            if (b != this.my) {
                 this.kd("OutlinedFocusTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pj", {
+    Object.defineProperty(XButton.prototype, "pl", {
         get: function () {
-            return this.lp;
+            return this.lr;
         },
         set: function (a) {
-            var b = this.lp;
-            this.lp = a;
-            if (b != this.lp) {
+            var b = this.lr;
+            this.lr = a;
+            if (b != this.lr) {
                 this.kd("FabBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pl", {
+    Object.defineProperty(XButton.prototype, "pn", {
         get: function () {
-            return this.lr;
+            return this.lt;
         },
         set: function (a) {
-            var b = this.lr;
-            this.lr = a;
-            if (b != this.lr) {
+            var b = this.lt;
+            this.lt = a;
+            if (b != this.lt) {
                 this.kd("FabDisabledBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pm", {
+    Object.defineProperty(XButton.prototype, "po", {
         get: function () {
-            return this.ls;
+            return this.lu;
         },
         set: function (a) {
-            var b = this.ls;
-            this.ls = a;
-            if (b != this.ls) {
+            var b = this.lu;
+            this.lu = a;
+            if (b != this.lu) {
                 this.kd("FabDisabledBorderColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pn", {
+    Object.defineProperty(XButton.prototype, "pp", {
         get: function () {
-            return this.lt;
+            return this.lv;
         },
         set: function (a) {
-            var b = this.lt;
-            this.lt = a;
-            if (b != this.lt) {
+            var b = this.lv;
+            this.lv = a;
+            if (b != this.lv) {
                 this.kd("FabDisabledTextColor", b, a);
             }
         },
@@ -2702,28 +2732,28 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pq", {
+    Object.defineProperty(XButton.prototype, "ps", {
         get: function () {
-            return this.md;
+            return this.mf;
         },
         set: function (a) {
-            var b = this.md;
-            this.md = a;
-            if (b != this.md) {
+            var b = this.mf;
+            this.mf = a;
+            if (b != this.mf) {
                 this.kd("FabHoverBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pk", {
+    Object.defineProperty(XButton.prototype, "pm", {
         get: function () {
-            return this.lq;
+            return this.ls;
         },
         set: function (a) {
-            var b = this.lq;
-            this.lq = a;
-            if (b != this.lq) {
+            var b = this.ls;
+            this.ls = a;
+            if (b != this.ls) {
                 this.kd("FabBorderColor", b, a);
             }
         },
@@ -2786,13 +2816,13 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "kz", {
+    Object.defineProperty(XButton.prototype, "k0", {
         get: function () {
-            return this.km;
+            return this.kn;
         },
         set: function (a) {
-            var b = this.km;
-            this.km = a;
+            var b = this.kn;
+            this.kn = a;
             {
                 this.kd("FabCornerRadius", b, a);
             }
@@ -2800,126 +2830,126 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "ps", {
+    Object.defineProperty(XButton.prototype, "pu", {
         get: function () {
-            return this.lx;
+            return this.lz;
         },
         set: function (a) {
-            var b = this.lx;
-            this.lx = a;
-            if (b != this.lx) {
+            var b = this.lz;
+            this.lz = a;
+            if (b != this.lz) {
                 this.kd("FabRippleColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pt", {
+    Object.defineProperty(XButton.prototype, "pv", {
         get: function () {
-            return this.ly;
+            return this.l0;
         },
         set: function (a) {
-            var b = this.ly;
-            this.ly = a;
-            if (b != this.ly) {
+            var b = this.l0;
+            this.l0 = a;
+            if (b != this.l0) {
                 this.kd("FabTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pr", {
+    Object.defineProperty(XButton.prototype, "pt", {
         get: function () {
-            return this.lw;
+            return this.ly;
         },
         set: function (a) {
-            var b = this.lw;
-            this.lw = a;
-            if (b != this.lw) {
+            var b = this.ly;
+            this.ly = a;
+            if (b != this.ly) {
                 this.kd("FabHoverTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "po", {
+    Object.defineProperty(XButton.prototype, "pq", {
         get: function () {
-            return this.lu;
+            return this.lw;
         },
         set: function (a) {
-            var b = this.lu;
-            this.lu = a;
-            if (b != this.lu) {
+            var b = this.lw;
+            this.lw = a;
+            if (b != this.lw) {
                 this.kd("FabFocusBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "pp", {
+    Object.defineProperty(XButton.prototype, "pr", {
         get: function () {
-            return this.lv;
+            return this.lx;
         },
         set: function (a) {
-            var b = this.lv;
-            this.lv = a;
-            if (b != this.lv) {
+            var b = this.lx;
+            this.lx = a;
+            if (b != this.lx) {
                 this.kd("FabFocusTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "p9", {
+    Object.defineProperty(XButton.prototype, "qb", {
         get: function () {
-            return this.mf;
+            return this.mh;
         },
         set: function (a) {
-            var b = this.mf;
-            this.mf = a;
-            if (b != this.mf) {
+            var b = this.mh;
+            this.mh = a;
+            if (b != this.mh) {
                 this.kd("IconBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qb", {
+    Object.defineProperty(XButton.prototype, "qd", {
         get: function () {
-            return this.mh;
+            return this.mj;
         },
         set: function (a) {
-            var b = this.mh;
-            this.mh = a;
-            if (b != this.mh) {
+            var b = this.mj;
+            this.mj = a;
+            if (b != this.mj) {
                 this.kd("IconDisabledBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qc", {
+    Object.defineProperty(XButton.prototype, "qe", {
         get: function () {
-            return this.mi;
+            return this.mk;
         },
         set: function (a) {
-            var b = this.mi;
-            this.mi = a;
-            if (b != this.mi) {
+            var b = this.mk;
+            this.mk = a;
+            if (b != this.mk) {
                 this.kd("IconDisabledBorderColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qd", {
+    Object.defineProperty(XButton.prototype, "qf", {
         get: function () {
-            return this.mj;
+            return this.ml;
         },
         set: function (a) {
-            var b = this.mj;
-            this.mj = a;
-            if (b != this.mj) {
+            var b = this.ml;
+            this.ml = a;
+            if (b != this.ml) {
                 this.kd("IconDisabledTextColor", b, a);
             }
         },
@@ -2940,28 +2970,28 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qg", {
+    Object.defineProperty(XButton.prototype, "qi", {
         get: function () {
-            return this.mm;
+            return this.mo;
         },
         set: function (a) {
-            var b = this.mm;
-            this.mm = a;
-            if (b != this.mm) {
+            var b = this.mo;
+            this.mo = a;
+            if (b != this.mo) {
                 this.kd("IconHoverBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qa", {
+    Object.defineProperty(XButton.prototype, "qc", {
         get: function () {
-            return this.mg;
+            return this.mi;
         },
         set: function (a) {
-            var b = this.mg;
-            this.mg = a;
-            if (b != this.mg) {
+            var b = this.mi;
+            this.mi = a;
+            if (b != this.mi) {
                 this.kd("IconBorderColor", b, a);
             }
         },
@@ -3024,13 +3054,13 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "k1", {
+    Object.defineProperty(XButton.prototype, "k3", {
         get: function () {
-            return this.ko;
+            return this.kp;
         },
         set: function (a) {
-            var b = this.ko;
-            this.ko = a;
+            var b = this.kp;
+            this.kp = a;
             {
                 this.kd("IconCornerRadius", b, a);
             }
@@ -3038,70 +3068,70 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qi", {
+    Object.defineProperty(XButton.prototype, "qk", {
         get: function () {
-            return this.mo;
+            return this.mq;
         },
         set: function (a) {
-            var b = this.mo;
-            this.mo = a;
-            if (b != this.mo) {
+            var b = this.mq;
+            this.mq = a;
+            if (b != this.mq) {
                 this.kd("IconRippleColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qj", {
+    Object.defineProperty(XButton.prototype, "ql", {
         get: function () {
-            return this.mp;
+            return this.mr;
         },
         set: function (a) {
-            var b = this.mp;
-            this.mp = a;
-            if (b != this.mp) {
+            var b = this.mr;
+            this.mr = a;
+            if (b != this.mr) {
                 this.kd("IconTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qh", {
+    Object.defineProperty(XButton.prototype, "qj", {
         get: function () {
-            return this.mn;
+            return this.mp;
         },
         set: function (a) {
-            var b = this.mn;
-            this.mn = a;
-            if (b != this.mn) {
+            var b = this.mp;
+            this.mp = a;
+            if (b != this.mp) {
                 this.kd("IconHoverTextColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qe", {
+    Object.defineProperty(XButton.prototype, "qg", {
         get: function () {
-            return this.mk;
+            return this.mm;
         },
         set: function (a) {
-            var b = this.mk;
-            this.mk = a;
-            if (b != this.mk) {
+            var b = this.mm;
+            this.mm = a;
+            if (b != this.mm) {
                 this.kd("IconFocusBackgroundColor", b, a);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "qf", {
+    Object.defineProperty(XButton.prototype, "qh", {
         get: function () {
-            return this.ml;
+            return this.mn;
         },
         set: function (a) {
-            var b = this.ml;
-            this.ml = a;
-            if (b != this.ml) {
+            var b = this.mn;
+            this.mn = a;
+            if (b != this.mn) {
                 this.kd("IconFocusTextColor", b, a);
             }
         },
@@ -3466,29 +3496,29 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "k5", {
+    Object.defineProperty(XButton.prototype, "k7", {
         get: function () {
-            return this.k4;
+            return this.k6;
         },
         set: function (a) {
-            var b = this.k4;
-            this.k4 = a;
-            if (b != this.k4) {
-                this.kd("HorizontalContentAlignment", enumGetBox(HorizontalAlignment_$type, b), enumGetBox(HorizontalAlignment_$type, this.k4));
+            var b = this.k6;
+            this.k6 = a;
+            if (b != this.k6) {
+                this.kd("HorizontalContentAlignment", enumGetBox(HorizontalAlignment_$type, b), enumGetBox(HorizontalAlignment_$type, this.k6));
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(XButton.prototype, "q9", {
+    Object.defineProperty(XButton.prototype, "rb", {
         get: function () {
-            return this.q8;
+            return this.ra;
         },
         set: function (a) {
-            var b = this.q8;
-            this.q8 = a;
-            if (b != this.q8) {
-                this.kd("VerticalContentAlignment", enumGetBox(VerticalAlignment_$type, b), enumGetBox(VerticalAlignment_$type, this.q8));
+            var b = this.ra;
+            this.ra = a;
+            if (b != this.ra) {
+                this.kd("VerticalContentAlignment", enumGetBox(VerticalAlignment_$type, b), enumGetBox(VerticalAlignment_$type, this.ra));
             }
         },
         enumerable: false,
@@ -3510,8 +3540,8 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
     });
     XButton.prototype.ke = function () {
         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();
     };
     Object.defineProperty(XButton.prototype, "a", {
         get: function () {
@@ -3563,12 +3593,12 @@ var XButton = /** @class */ /*@__PURE__*/ (function (_super) {
         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));